Title: [199356] releases/WebKitGTK/webkit-2.12
Revision
199356
Author
[email protected]
Date
2016-04-12 09:10:46 -0700 (Tue, 12 Apr 2016)

Log Message

Merge r197989 - CRASH at WebCore::RenderView::updateVisibleViewportRect
https://bugs.webkit.org/show_bug.cgi?id=155209
<rdar://problem/23997530>

Reviewed by Simon Fraser.

Source/WebCore:

Test: media/video-crash-invisible-autoplay-display-none.html

Between the time when the video element's renderer is created and destroyed, we may have unset the
InvisibleAutoplayNotPermitted restriction. So rather than check for that restriction before
unregistering for the "visible in viewport" notification, unregister only if the renderer
was previously registered.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::willDetachRenderers):

LayoutTests:

(These files were mistakenly landed in a previous commit:)
* media/video-crash-invisible-autoplay-display-none-expected.txt: Added.
* media/video-crash-invisible-autoplay-display-none.html: Added.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (199355 => 199356)


--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog	2016-04-12 16:08:47 UTC (rev 199355)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog	2016-04-12 16:10:46 UTC (rev 199356)
@@ -1,3 +1,15 @@
+2016-03-10  Jer Noble  <[email protected]>
+
+        CRASH at WebCore::RenderView::updateVisibleViewportRect
+        https://bugs.webkit.org/show_bug.cgi?id=155209
+        <rdar://problem/23997530>
+
+        Reviewed by Simon Fraser.
+
+        (These files were mistakenly landed in a previous commit:)
+        * media/video-crash-invisible-autoplay-display-none-expected.txt: Added.
+        * media/video-crash-invisible-autoplay-display-none.html: Added.
+
 2016-03-08  Brent Fulgham  <[email protected]>
 
         Local HTML should be blocked from localStorage access unless "Disable Local File Restrictions" is checked..

Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199355 => 199356)


--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog	2016-04-12 16:08:47 UTC (rev 199355)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog	2016-04-12 16:10:46 UTC (rev 199356)
@@ -1,3 +1,21 @@
+2016-03-10  Jer Noble  <[email protected]>
+
+        CRASH at WebCore::RenderView::updateVisibleViewportRect
+        https://bugs.webkit.org/show_bug.cgi?id=155209
+        <rdar://problem/23997530>
+
+        Reviewed by Simon Fraser.
+
+        Test: media/video-crash-invisible-autoplay-display-none.html
+
+        Between the time when the video element's renderer is created and destroyed, we may have unset the
+        InvisibleAutoplayNotPermitted restriction. So rather than check for that restriction before
+        unregistering for the "visible in viewport" notification, unregister only if the renderer
+        was previously registered.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::willDetachRenderers):
+
 2016-03-10  Said Abou-Hallawa  <[email protected]>
 
         REGRESSION: GuardMallloc crash in SVGListPropertyTearOff<SVGPointList>::processIncomingListItemWrapper

Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLMediaElement.cpp (199355 => 199356)


--- releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLMediaElement.cpp	2016-04-12 16:08:47 UTC (rev 199355)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLMediaElement.cpp	2016-04-12 16:10:46 UTC (rev 199356)
@@ -798,7 +798,7 @@
 
 void HTMLMediaElement::willDetachRenderers()
 {
-    if (renderer() && m_mediaSession->hasBehaviorRestriction(MediaElementSession::InvisibleAutoplayNotPermitted))
+    if (renderer())
         renderer()->unregisterForVisibleInViewportCallback();
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to