Changeset 232019 in webkit

Timestamp:

May 21, 2018 10:50:04 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Fix FrameLoader build without video
​https://bugs.webkit.org/show_bug.cgi?id=185821

Patch by Olivier Blin <Olivier Blin> on 2018-05-21
Reviewed by Michael Catanzaro.

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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 Michael Catanzaro.
+
+        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-21  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -815 +815 @@
         return;
     
+#if ENABLE(VIDEO)
     // FIXME: Remove this code once https://webkit.org/b/185284 is fixed.
     if (HTMLMediaElement::isRunningDestructor()) {
@@ -821 +822 @@
         return;
     }
+#endif
 
     // FIXME: It would be better if resource loads were kicked off after render tree update (or didn't complete synchronously).