Title: [151380] releases/WebKitGTK/webkit-2.0
Revision
151380
Author
[email protected]
Date
2013-06-10 04:25:17 -0700 (Mon, 10 Jun 2013)

Log Message

Merge r151312 - Frame flattening: crash when child iframe is removed during beforeload.
https://bugs.webkit.org/show_bug.cgi?id=116220

Patch by Zalan Bujtas <[email protected]> on 2013-06-07
Reviewed by Antti Koivisto.

FrameView can get destroyed in updateWidget(). Normally, it is protected by layout()
but with frame flattening on, it can also be called asynchronously through the
post layout timer.

Source/WebCore:

Test: fast/frames/flattening/crash-remove-iframe-during-object-beforeload.html

* page/FrameView.cpp:
(WebCore::FrameView::performPostLayoutTasks):

LayoutTests:

* fast/frames/flattening/crash-remove-iframe-during-object-beforeload-expected.txt: Added.
* fast/frames/flattening/crash-remove-iframe-during-object-beforeload.html: Added.

Modified Paths

Added Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/LayoutTests/ChangeLog (151379 => 151380)


--- releases/WebKitGTK/webkit-2.0/LayoutTests/ChangeLog	2013-06-10 11:10:53 UTC (rev 151379)
+++ releases/WebKitGTK/webkit-2.0/LayoutTests/ChangeLog	2013-06-10 11:25:17 UTC (rev 151380)
@@ -1,3 +1,17 @@
+2013-06-07  Zalan Bujtas  <[email protected]>
+
+        Frame flattening: crash when child iframe is removed during beforeload.
+        https://bugs.webkit.org/show_bug.cgi?id=116220
+
+        Reviewed by Antti Koivisto.
+
+        FrameView can get destroyed in updateWidget(). Normally, it is protected by layout()
+        but with frame flattening on, it can also be called asynchronously through the
+        post layout timer.
+
+        * fast/frames/flattening/crash-remove-iframe-during-object-beforeload-expected.txt: Added.
+        * fast/frames/flattening/crash-remove-iframe-during-object-beforeload.html: Added.
+
 2013-04-12  Balazs Kelemen  <[email protected]>
 
         [GStreamer] Media attribute preload="none" is not honored

Added: releases/WebKitGTK/webkit-2.0/LayoutTests/fast/frames/flattening/crash-remove-iframe-during-object-beforeload-expected.txt (0 => 151380)


--- releases/WebKitGTK/webkit-2.0/LayoutTests/fast/frames/flattening/crash-remove-iframe-during-object-beforeload-expected.txt	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.0/LayoutTests/fast/frames/flattening/crash-remove-iframe-during-object-beforeload-expected.txt	2013-06-10 11:25:17 UTC (rev 151380)
@@ -0,0 +1,3 @@
+Frame flattening: this tests if removing the iframe, while the iframe's object's beforeload is executed is safe.
+PASS if no crash is observed, while loading iframe.
+

Added: releases/WebKitGTK/webkit-2.0/LayoutTests/fast/frames/flattening/crash-remove-iframe-during-object-beforeload.html (0 => 151380)


--- releases/WebKitGTK/webkit-2.0/LayoutTests/fast/frames/flattening/crash-remove-iframe-during-object-beforeload.html	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.0/LayoutTests/fast/frames/flattening/crash-remove-iframe-during-object-beforeload.html	2013-06-10 11:25:17 UTC (rev 151380)
@@ -0,0 +1,18 @@
+<html>
+<head>
+<script>
+if (window.testRunner && window.internals) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    window.internals.settings.setFrameFlatteningEnabled(true);
+}
+
+</script>
+</head>
+<body>
+<div>Frame flattening: this tests if removing the iframe, while the iframe's object's beforeload is executed is safe.</div> 
+<div>PASS if no crash is observed, while loading iframe.</div>
+<iframe _onload_='setTimeout("if (window.testRunner) testRunner.notifyDone()", 100);' 
+        src=''></iframe>
+</body>
+</html>

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (151379 => 151380)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog	2013-06-10 11:10:53 UTC (rev 151379)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog	2013-06-10 11:25:17 UTC (rev 151380)
@@ -1,3 +1,19 @@
+2013-06-07  Zalan Bujtas  <[email protected]>
+
+        Frame flattening: crash when child iframe is removed during beforeload.
+        https://bugs.webkit.org/show_bug.cgi?id=116220
+
+        Reviewed by Antti Koivisto.
+
+        FrameView can get destroyed in updateWidget(). Normally, it is protected by layout()
+        but with frame flattening on, it can also be called asynchronously through the
+        post layout timer.
+
+        Test: fast/frames/flattening/crash-remove-iframe-during-object-beforeload.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::performPostLayoutTasks):
+
 2013-05-19  Martin Robinson  <[email protected]>
 
         GtkSelectionData length is off by one

Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/page/FrameView.cpp (151379 => 151380)


--- releases/WebKitGTK/webkit-2.0/Source/WebCore/page/FrameView.cpp	2013-06-10 11:10:53 UTC (rev 151379)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/page/FrameView.cpp	2013-06-10 11:25:17 UTC (rev 151380)
@@ -2603,6 +2603,9 @@
     if (renderView)
         renderView->updateWidgetPositions();
     
+    // layout() protects FrameView, but it still can get destroyed when updateWidgets()
+    // is called through the post layout timer.
+    RefPtr<FrameView> protector(this);
     for (unsigned i = 0; i < maxUpdateWidgetsIterations; i++) {
         if (updateWidgets())
             break;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to