Changeset 168580 in webkit

Timestamp:

May 10, 2014 12:50:34 PM (10 years ago)

Author:

Darin Adler

Message:

REGRESSION (r166853): fast/preloader/document-write.html is very flaky
​https://bugs.webkit.org/show_bug.cgi?id=130942

Reviewed by Anders Carlsson.

Source/WebCore:

• style/StyleResolveTree.cpp:

(WebCore::Style::suspendMemoryCacheClientCalls): Use a RefPtr to the main
frame as a weak pointer to a Page that will work unless the page is destroyed.
The old code tried to do it with a RefPtr to a document, but as the FIXME
points out, that won't work if the document is disassociated with its frame.

LayoutTests:

• platform/mac/TestExpectations: Turned the test back on.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleResolveTree.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-05-10  Darin Adler  <darin@apple.com>
+
+        REGRESSION (r166853): fast/preloader/document-write.html is very flaky
+        https://bugs.webkit.org/show_bug.cgi?id=130942
+
+        Reviewed by Anders Carlsson.
+
+        * platform/mac/TestExpectations: Turned the test back on.
+
 2014-05-09  Dean Jackson  <dino@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1353 +1353 @@
 webkit.org/b/130972 transitions/3d/interrupted-transition.html [ Pass Failure Timeout ]
 
-webkit.org/b/130942 fast/preloader/document-write.html [ Pass Failure ]
-
 webkit.org/b/118153 compositing/repaint/positioned-movement.html [ Pass Failure ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-10  Darin Adler  <darin@apple.com>
+
+        REGRESSION (r166853): fast/preloader/document-write.html is very flaky
+        https://bugs.webkit.org/show_bug.cgi?id=130942
+
+        Reviewed by Anders Carlsson.
+
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::suspendMemoryCacheClientCalls): Use a RefPtr to the main
+        frame as a weak pointer to a Page that will work unless the page is destroyed.
+        The old code tried to do it with a RefPtr to a document, but as the FIXME
+        points out, that won't work if the document is disassociated with its frame.
+
 2014-05-10  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -35 +35 @@
 #include "InsertionPoint.h"
 #include "LoaderStrategy.h"
+#include "MainFrame.h"
 #include "NodeRenderStyle.h"
 #include "NodeRenderingTraversal.h"
@@ -988 +989 @@
     page->setMemoryCacheClientCallsEnabled(false);
 
-    RefPtr<Document> protectedDocument = &document;
-    postResolutionCallbackQueue().append([protectedDocument]{
-        // FIXME: If the document becomes unassociated with the page during style resolution
-        // then this won't work and the memory cache client calls will be permanently disabled.
-        if (Page* page = protectedDocument->page())
+    RefPtr<MainFrame> protectedMainFrame = &page->mainFrame();
+    postResolutionCallbackQueue().append([protectedMainFrame]{
+        if (Page* page = protectedMainFrame->page())
             page->setMemoryCacheClientCallsEnabled(true);
     });