Changeset 27766 in webkit

Timestamp:

Nov 13, 2007, 4:49:21 PM (18 years ago)

Author:

mitz@apple.com

Message:

Reviewed by Darin Adler.

• fix <​http://bugs.webkit.org/show_bug.cgi?id=13371> DumpRenderTree --pixel-tests renders each test twice

• DumpRenderTree/mac/DumpRenderTree.mm: (dumpRenderTree): Removed the --paint option because the painting code is always exercised as a result of -[FrameLoadDelegate webView:didFinishLoadFromFrame:] calling -displayIfNeeded. (dump): Changed to always grab the image from the window since the view is always displayed. (runTest): (displayWebView):
• Scripts/run-webkit-tests: No need to pass --paint to DumpRenderTree because it always paints.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/DumpRenderTree.mm (modified) (7 diffs)
• Scripts/run-webkit-tests (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-11-13  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix <http://bugs.webkit.org/show_bug.cgi?id=13371>
+          DumpRenderTree --pixel-tests renders each test twice
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (dumpRenderTree): Removed the --paint option because the painting code
+        is always exercised as a result of
+        -[FrameLoadDelegate webView:didFinishLoadFromFrame:]
+        calling -displayIfNeeded.
+        (dump): Changed to always grab the image from the window since the view
+        is always displayed.
+        (runTest):
+        (displayWebView):
+        * Scripts/run-webkit-tests: No need to pass --paint to DumpRenderTree
+        because it always paints.
+
 2007-11-12  Antti Koivisto  <antti@apple.com>
 

trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -126 +126 @@
 
 static int dumpPixels;
-static int paint;
 static int dumpAllPixels;
 static int threaded;
-static BOOL readFromWindow;
 static int testRepaintDefault;
 static int repaintSweepHorizontallyDefault;
@@ -442 +440 @@
         {"notree", no_argument, &dumpTree, NO},
         {"pixel-tests", no_argument, &dumpPixels, YES},
-        {"paint", no_argument, &paint, YES},
         {"repaint", no_argument, &testRepaintDefault, YES},
         {"tree", no_argument, &dumpTree, YES},
@@ -903 +900 @@
             [NSGraphicsContext setCurrentContext:nsContext];
 
-            if (readFromWindow) {
+            if (!layoutTestController->testRepaint()) {
                 NSBitmapImageRep *imageRep;
                 [view displayIfNeeded];
@@ -911 +908 @@
                 [imageRep draw];
                 [imageRep release];
-            } else if (!layoutTestController->testRepaint())
-                [view displayRectIgnoringOpacity:NSMakeRect(0, 0, webViewSize.width, webViewSize.height) inContext:nsContext];
-            else if (!layoutTestController->testRepaintSweepHorizontally()) {
+            } else if (!layoutTestController->testRepaintSweepHorizontally()) {
                 NSRect line = NSMakeRect(0, 0, webViewSize.width, 1);
                 while (line.origin.y < webViewSize.height) {
@@ -977 +972 @@
         printf("#EOF\n");
     }
-    
+
     fflush(stdout);
 
-    if (paint)
-        displayWebView();
-    
     done = YES;
 }
@@ -1024 +1016 @@
 
     done = NO;
-    readFromWindow = NO;
 
     if (disallowedURLs)
@@ -1133 +1124 @@
     NSRectFillUsingOperation([webView frame], NSCompositeSourceOver);
     [webView unlockFocus];
-    readFromWindow = YES;
 }
 

trunk/WebKitTools/Scripts/run-webkit-tests

@@ -418 +418 @@
 push @toolArgs, "--horizontal-sweep" if $repaintSweepHorizontally;
 push @toolArgs, "--threaded" if $threaded;
-push @toolArgs, "--paint" if $shouldCheckLeaks; # Otherwise, DRT won't exercise painting leaks.
 push @toolArgs, "-";