Changeset 106669 in webkit

Timestamp:

Feb 3, 2012 9:31:20 AM (12 years ago)

Author:

jknotten@chromium.org

Message:

[skia] Fix unit test PlatformContextSkiaTest.trackOpaqueOvalTest
​https://bugs.webkit.org/show_bug.cgi?id=77738

We need to clear the bitmap before the test runs, otherwise the
contents of the bitmap will be uninitialised. This causes an
unpredicatable result as the canvas draw operations blend the
destination bitmap with the source colour.

Similarly, valgrind discovered that
PlatformContextSkiaTest.trackOpaqueTest and
PlatformContextSkiaTest.trackOpaqueLineTest suffers from the same
problem.

Also, re-enable WebFrameTest.FindInPage which was falsely
blamed for making this test fail.

Reviewed by Stephen White.

• tests/PlatformContextSkiaTest.cpp:

(WebCore::TEST):

• tests/WebFrameTest.cpp:

(WebKit::TEST_F):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• tests/PlatformContextSkiaTest.cpp (modified) (3 diffs)
• tests/WebFrameTest.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-02-03  John Knottenbelt  <jknotten@chromium.org>
+
+        [skia] Fix unit test PlatformContextSkiaTest.trackOpaqueOvalTest
+        https://bugs.webkit.org/show_bug.cgi?id=77738
+
+        We need to clear the bitmap before the test runs, otherwise the
+        contents of the bitmap will be uninitialised. This causes an
+        unpredicatable result as the canvas draw operations blend the
+        destination bitmap with the source colour.
+
+        Similarly, valgrind discovered that
+        PlatformContextSkiaTest.trackOpaqueTest and
+        PlatformContextSkiaTest.trackOpaqueLineTest suffers from the same
+        problem.
+
+        Also, re-enable WebFrameTest.FindInPage which was falsely
+        blamed for making this test fail.
+
+        Reviewed by Stephen White.
+
+        * tests/PlatformContextSkiaTest.cpp:
+        (WebCore::TEST):
+        * tests/WebFrameTest.cpp:
+        (WebKit::TEST_F):
+
 2012-02-03  Dana Jansens  <danakj@chromium.org>
 

trunk/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp

@@ -59 +59 @@
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
     bitmap.allocPixels();
+    bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
@@ -260 +261 @@
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
     bitmap.allocPixels();
+    bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
@@ -499 +501 @@
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
     bitmap.allocPixels();
+    bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 

trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp

@@ -382 +382 @@
 }
 
-TEST_F(WebFrameTest, DISABLED_FindInPage)
+TEST_F(WebFrameTest, FindInPage)
 {
     registerMockedHttpURLLoad("find.html");