commit 4e024c53df641e3e7f7038d7f1ba79ce785708c0
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon May 21 17:50:04 2018 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon May 21 17:50:04 2018 +0000
tree c46309cb09c24ec8f1c15c2fa398f196c3414d5e
parent 1a4e6673797621c02af3777fb083ef2b376871ab

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

Patch by Olivier Blin <olivier.blin@softathome.com> 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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@232019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/loader/FrameLoader.cpp

diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index 16bf823..8c6e54b 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -814,12 +814,14 @@
     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