Title: [149567] trunk/Source/WebCore
Revision
149567
Author
[email protected]
Date
2013-05-04 13:25:13 -0700 (Sat, 04 May 2013)

Log Message

REGRESSION(r142647): Flaky Test: fast/frames/crash-remove-iframe-during-object-beforeload.html
<http://webkit.org/b/115322>
<rdar://problem/13810719>

Reviewed by Anders Carlsson.

Don't cache the FrameView::renderView() in a local since updating Widgets may blow it away.

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

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (149566 => 149567)


--- trunk/Source/WebCore/ChangeLog	2013-05-04 20:22:01 UTC (rev 149566)
+++ trunk/Source/WebCore/ChangeLog	2013-05-04 20:25:13 UTC (rev 149567)
@@ -1,5 +1,18 @@
 2013-05-04  Andreas Kling  <[email protected]>
 
+        REGRESSION(r142647): Flaky Test: fast/frames/crash-remove-iframe-during-object-beforeload.html
+        <http://webkit.org/b/115322>
+        <rdar://problem/13810719>
+
+        Reviewed by Anders Carlsson.
+
+        Don't cache the FrameView::renderView() in a local since updating Widgets may blow it away.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::performPostLayoutTasks):
+
+2013-05-04  Andreas Kling  <[email protected]>
+
         Remove GraphicsContext::strokeArc(), which is unused.
 
         From Blink r149608 by <[email protected]>

Modified: trunk/Source/WebCore/page/FrameView.cpp (149566 => 149567)


--- trunk/Source/WebCore/page/FrameView.cpp	2013-05-04 20:22:01 UTC (rev 149566)
+++ trunk/Source/WebCore/page/FrameView.cpp	2013-05-04 20:25:13 UTC (rev 149567)
@@ -2760,8 +2760,7 @@
     // with didLayout(LayoutMilestones).
     m_frame->loader()->client()->dispatchDidLayout();
 
-    RenderView* renderView = this->renderView();
-    if (renderView)
+    if (RenderView* renderView = this->renderView())
         renderView->updateWidgetPositions();
     
     for (unsigned i = 0; i < maxUpdateWidgetsIterations; i++) {
@@ -2775,8 +2774,10 @@
     }
 
 #if USE(ACCELERATED_COMPOSITING)
-    if (renderView && renderView->usesCompositing())
-        renderView->compositor()->frameViewDidLayout();
+    if (RenderView* renderView = this->renderView()) {
+        if (renderView->usesCompositing())
+            renderView->compositor()->frameViewDidLayout();
+    }
 #endif
 
     scrollToAnchor();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to