[webkit-changes] [109119] trunk/Source

Tue, 28 Feb 2012 10:23:06 -0800

Title: [109119] trunk/Source
Revision
109119
Author
[email protected]
Date
2012-02-28 10:22:13 -0800 (Tue, 28 Feb 2012)

Log Message

Unreviewed, speculative test fix after r109016.

Source/WebCore:

* platform/graphics/chromium/TransparencyWin.cpp:
(WebCore::TransparencyWin::OwnedBuffers::OwnedBuffers): Explicitly pass a scale of 1 to ImageBuffer::create.
* platform/graphics/chromium/TransparencyWin.h:
(WebCore): Update names of re-enabled tests.

Source/WebKit/chromium:

* tests/TransparencyWinTest.cpp:
(WebCore::TEST): Update all ImageBuffer::create calls to include a scale of 1.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (109118 => 109119)


--- trunk/Source/WebCore/ChangeLog	2012-02-28 18:21:02 UTC (rev 109118)
+++ trunk/Source/WebCore/ChangeLog	2012-02-28 18:22:13 UTC (rev 109119)
@@ -1,3 +1,12 @@
+2012-02-28  Adam Klein  <[email protected]>
+
+        Unreviewed, speculative test fix after r109016.
+
+        * platform/graphics/chromium/TransparencyWin.cpp:
+        (WebCore::TransparencyWin::OwnedBuffers::OwnedBuffers): Explicitly pass a scale of 1 to ImageBuffer::create.
+        * platform/graphics/chromium/TransparencyWin.h:
+        (WebCore): Update names of re-enabled tests.
+
 2012-02-28  Antti Koivisto  <[email protected]>
 
         Give StyleRule files of its own

Modified: trunk/Source/WebCore/platform/graphics/chromium/TransparencyWin.cpp (109118 => 109119)


--- trunk/Source/WebCore/platform/graphics/chromium/TransparencyWin.cpp	2012-02-28 18:21:02 UTC (rev 109118)
+++ trunk/Source/WebCore/platform/graphics/chromium/TransparencyWin.cpp	2012-02-28 18:22:13 UTC (rev 109119)
@@ -109,7 +109,7 @@
 public:
     OwnedBuffers(const IntSize& size, bool needReferenceBuffer)
     {
-        m_destBitmap = ImageBuffer::create(size);
+        m_destBitmap = ImageBuffer::create(size, 1);
 
         if (needReferenceBuffer) {
             m_referenceBitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());

Modified: trunk/Source/WebCore/platform/graphics/chromium/TransparencyWin.h (109118 => 109119)


--- trunk/Source/WebCore/platform/graphics/chromium/TransparencyWin.h	2012-02-28 18:21:02 UTC (rev 109118)
+++ trunk/Source/WebCore/platform/graphics/chromium/TransparencyWin.h	2012-02-28 18:22:13 UTC (rev 109119)
@@ -44,10 +44,10 @@
 namespace WebCore {
 
 class GraphicsContext;
-class TransparencyWin_DISABLED_NoLayer_Test;
-class TransparencyWin_DISABLED_WhiteLayer_Test;
-class TransparencyWin_DISABLED_TextComposite_Test;
-class TransparencyWin_DISABLED_OpaqueCompositeLayer_Test;
+class TransparencyWin_NoLayer_Test;
+class TransparencyWin_WhiteLayer_Test;
+class TransparencyWin_TextComposite_Test;
+class TransparencyWin_OpaqueCompositeLayer_Test;
 
 // Helper class that abstracts away drawing ClearType text and Windows form
 // controls either to the original context directly, or to an offscreen context

Modified: trunk/Source/WebKit/chromium/ChangeLog (109118 => 109119)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-02-28 18:21:02 UTC (rev 109118)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-02-28 18:22:13 UTC (rev 109119)
@@ -1,3 +1,10 @@
+2012-02-28  Adam Klein  <[email protected]>
+
+        Unreviewed, speculative test fix after r109016.
+
+        * tests/TransparencyWinTest.cpp:
+        (WebCore::TEST): Update all ImageBuffer::create calls to include a scale of 1.
+
 2012-02-28  Sheriff Bot  <[email protected]>
 
         Unreviewed.  Rolled DEPS.

Modified: trunk/Source/WebKit/chromium/tests/TransparencyWinTest.cpp (109118 => 109119)


--- trunk/Source/WebKit/chromium/tests/TransparencyWinTest.cpp	2012-02-28 18:21:02 UTC (rev 109118)
+++ trunk/Source/WebKit/chromium/tests/TransparencyWinTest.cpp	2012-02-28 18:22:13 UTC (rev 109119)
@@ -98,9 +98,9 @@
     return out;
 }
 
-TEST(TransparencyWin, DISABLED_NoLayer)
+TEST(TransparencyWin, NoLayer)
 {
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(17, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(17, 16), 1, ColorSpaceDeviceRGB));
 
     // KeepTransform
     {
@@ -137,9 +137,9 @@
     src->context()->restore();
 }
 
-TEST(TransparencyWin, DISABLED_WhiteLayer)
+TEST(TransparencyWin, WhiteLayer)
 {
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
 
     // KeepTransform
     {
@@ -189,9 +189,9 @@
     src->context()->restore();
 }
 
-TEST(TransparencyWin, DISABLED_TextComposite)
+TEST(TransparencyWin, TextComposite)
 {
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
 
     // KeepTransform is the only valid transform mode for TextComposite.
     {
@@ -208,9 +208,9 @@
     }
 }
 
-TEST(TransparencyWin, DISABLED_OpaqueCompositeLayer)
+TEST(TransparencyWin, OpaqueCompositeLayer)
 {
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
 
     // KeepTransform
     {
@@ -277,10 +277,10 @@
     src->context()->restore();
 }
 
-TEST(TransparencyWin, DISABLED_WhiteLayerPixelTest)
+TEST(TransparencyWin, WhiteLayerPixelTest)
 {
     // Make a total transparent buffer, and draw the white layer inset by 1 px.
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
 
     {
         TransparencyWin helper;
@@ -303,13 +303,13 @@
     EXPECT_EQ(Color(Color::white), getPixelAt(src->context(), 4, 4));
 }
 
-TEST(TransparencyWin, DISABLED_OpaqueCompositeLayerPixel)
+TEST(TransparencyWin, OpaqueCompositeLayerPixel)
 {
     Color red(0xFFFF0000), darkRed(0xFFBF0000);
     Color green(0xFF00FF00);
 
     // Make a red bottom layer, followed by a half green next layer @ 50%.
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
 
     FloatRect fullRect(0, 0, 16, 16);
     src->context()->fillRect(fullRect, red, ColorSpaceDeviceRGB);
@@ -362,7 +362,7 @@
 TEST(TransparencyWin, TranslateOpaqueCompositeLayer)
 {
     // Fill with white.
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
     Color white(0xFFFFFFFF);
     FloatRect fullRect(0, 0, 16, 16);
     src->context()->fillRect(fullRect, white, ColorSpaceDeviceRGB);
@@ -399,7 +399,7 @@
 // tests that the propert transform is applied to the copied layer.
 TEST(TransparencyWin, RotateOpaqueCompositeLayer)
 {
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
 
     // The background is white.
     Color white(0xFFFFFFFF);
@@ -478,7 +478,7 @@
 
 TEST(TransparencyWin, DISABLED_TranslateScaleOpaqueCompositeLayer)
 {
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
 
     // The background is white on top with red on bottom.
     Color white(0xFFFFFFFF);
@@ -526,7 +526,7 @@
 TEST(TransparencyWin, Scale)
 {
     // Create an opaque white buffer.
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
     FloatRect fullBuffer(0, 0, 16, 16);
     src->context()->fillRect(fullBuffer, Color::white, ColorSpaceDeviceRGB);
 
@@ -579,7 +579,7 @@
 TEST(TransparencyWin, ScaleTransparency)
 {
     // Create an opaque white buffer.
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
     FloatRect fullBuffer(0, 0, 16, 16);
     src->context()->fillRect(fullBuffer, Color::white, ColorSpaceDeviceRGB);
 
@@ -637,7 +637,7 @@
 
 TEST(TransparencyWin, Text)
 {
-    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), ColorSpaceDeviceRGB));
+    OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), 1, ColorSpaceDeviceRGB));
 
     // Our text should end up 50% transparent blue-green.
     Color fullResult(0x80008080);

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to