Changeset 80175 in webkit

Timestamp:

Mar 2, 2011 3:19:01 PM (13 years ago)

Author:

Adam Roben

Message:

Wait for force a paint in WebKitTestRunner until we're actually ready to dump the output

This matches DumpRenderTree on Windows.

Fixes <​http://webkit.org/b/55469> <rdar://problem/9068539> REGRESSION (r79863): Lots of
dom/html/level2/html/HTMLFrameElement*.html tests crashing in FrameView::paintOverhangAreas
in WebKit2

Reviewed by Beth Dakin.

• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::dump): Moved code to force a paint here...
(WTR::InjectedBundlePage::didFinishLoadForFrame): ...from here.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-02  Adam Roben  <aroben@apple.com>
+
+        Wait for force a paint in WebKitTestRunner until we're actually ready to dump the output
+
+        This matches DumpRenderTree on Windows.
+
+        Fixes <http://webkit.org/b/55469> <rdar://problem/9068539> REGRESSION (r79863): Lots of
+        dom/html/level2/html/HTMLFrameElement*.html tests crashing in FrameView::paintOverhangAreas
+        in WebKit2
+
+        Reviewed by Beth Dakin.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::dump): Moved code to force a paint here...
+        (WTR::InjectedBundlePage::didFinishLoadForFrame): ...from here.
+
 2011-03-02  Daniel Cheng  <dcheng@chromium.org>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -496 +496 @@
     InjectedBundle::shared().layoutTestController()->invalidateWaitToDumpWatchdogTimer();
 
+    // Force a paint before dumping. This matches DumpRenderTree on Windows. (DumpRenderTree on Mac
+    // does this at a slightly different time.) See <http://webkit.org/b/55469> for details.
+    WKBundlePageForceRepaint(m_page);
+
     WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
     string url = toSTD(adoptWK(WKURLCopyString(adoptWK(WKBundleFrameCopyURL(frame)).get())));
@@ -534 +538 @@
         return;
     InjectedBundle::shared().setTopLoadingFrame(0);
-
-    WKBundlePageForceRepaint(m_page);
 
     if (InjectedBundle::shared().layoutTestController()->waitToDump())