Attachment 340855 Details for Bug 185821 – Patch

[patch] Patch

bug-185821-20180521185559.patch (text/plain), 1.70 KB, created by Olivier Blin on 2018-05-21 09:56:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Blin

Created: 2018-05-21 09:56:00 PDT

Size: 1.70 KB

patch

obsolete

>Subversion Revision: 232013
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4434c93435d9ae0fa4a8b8b89f16b1e90724690f..c50a3dad68a96310413baa1a3b88d0c4e15c449c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-21  Olivier Blin  <olivier.blin@softathome.com>
>+
>+        Fix FrameLoader build without video
>+        https://bugs.webkit.org/show_bug.cgi?id=185821
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Regression(r231392): Release assert in ScriptController::canExecuteScripts via HTMLMediaElement::~HTMLMediaElement()
>+        https://bugs.webkit.org/show_bug.cgi?id=185288
>+
>+        No new tests, build fix only.
>+
>+        * loader/FrameLoader.cpp:
>+        (WebCore::FrameLoader::checkCompleted): Flag HTMLMediaElement::isRunningDestructor() usage.
>+
> 2018-05-19  Eric Carlson  <eric.carlson@apple.com>
> 
>         Improve NowPlaying "title"
>diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
>index 16bf82355fe06836d4330ab1a806e553b4a0f581..8c6e54be60839d913bfa99d2df1a42374b6b5f66 100644
>--- a/Source/WebCore/loader/FrameLoader.cpp
>+++ b/Source/WebCore/loader/FrameLoader.cpp
>@@ -814,12 +814,14 @@ void FrameLoader::checkCompleted()
>     if (m_isComplete)
>         return;
>     
>+#if ENABLE(VIDEO)
>     // FIXME: Remove this code once https://webkit.org/b/185284 is fixed.
>     if (HTMLMediaElement::isRunningDestructor()) {
>         ASSERT_NOT_REACHED();
>         scheduleCheckCompleted();
>         return;
>     }
>+#endif
> 
>     // FIXME: It would be better if resource loads were kicked off after render tree update (or didn't complete synchronously).
>     //        https://bugs.webkit.org/show_bug.cgi?id=171729

Actions: View | Formatted Diff | Diff

Attachments on bug 185821: 340855