Turn on more of the platform_canvas_unittests

skia/ext/platform_canvas_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(awalker): clean up the const/non-const reference handling in this test
 
 #include "skia/ext/platform_canvas.h"
 
 #include <stdint.h>
 
@@ skipping 20 matching lines @@
 #include <cairo.h>
 #else
 #include <cairo/cairo.h>
 #endif  // OS_OPENBSD
 #endif  // USE_CAIRO
 
 namespace skia {
 
 namespace {
 
-#if defined(OS_WIN)
+// Uses DstATop transfer mode with SK_ColorBLACK 0xff000000:
+//   the destination pixel will end up with 0xff alpha
+//   if it was transparent black (0x0) before the blend,
+//      it will be set to opaque black (0xff000000).
+//   if it has nonzero alpha before the blend,
+//      it will retain its color.
 void MakeOpaque(SkCanvas* canvas, int x, int y, int width, int height) {
   if (width <= 0 || height <= 0)
     return;
 
   SkRect rect;
   rect.setXYWH(SkIntToScalar(x), SkIntToScalar(y),
                SkIntToScalar(width), SkIntToScalar(height));
   SkPaint paint;
   paint.setColor(SK_ColorBLACK);
   paint.setXfermodeMode(SkXfermode::kDstATop_Mode);
   canvas->drawRect(rect, paint);
 }
-#endif
 
 bool IsOfColor(const SkBitmap& bitmap, int x, int y, uint32_t color) {
   // For masking out the alpha values.
   static uint32_t alpha_mask =
       static_cast<uint32_t>(SK_A32_MASK) << SK_A32_SHIFT;
   return (*bitmap.getAddr32(x, y) | alpha_mask) == (color | alpha_mask);
 }
 
 // Return true if the canvas is filled to canvas_color, and contains a single
 // rectangle filled to rect_color. This function ignores the alpha channel,
@@ skipping 204 matching lines @@
 TEST(PlatformCanvas, FillLayer) {
   // Create the canvas initialized to opaque white.
   sk_sp<SkCanvas> canvas(CreatePlatformCanvas(16, 16, true));
 
   // Make a layer and fill it completely to make sure that the bounds are
   // correct.
   canvas->drawColor(SK_ColorWHITE);
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(*canvas, 0, 0, 100, 100);
-#if defined(OS_WIN)
     MakeOpaque(canvas.get(), 0, 0, 100, 100);
-#endif
   }
   EXPECT_TRUE(VerifyBlackRect(*canvas, kLayerX, kLayerY, kLayerW, kLayerH));
 
   // Make a layer and fill it partially to make sure the translation is correct.
   canvas->drawColor(SK_ColorWHITE);
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(*canvas, kInnerX, kInnerY, kInnerW, kInnerH);
-#if defined(OS_WIN)
     MakeOpaque(canvas.get(), kInnerX, kInnerY, kInnerW, kInnerH);
-#endif
   }
   EXPECT_TRUE(VerifyBlackRect(*canvas, kInnerX, kInnerY, kInnerW, kInnerH));
 
   // Add a clip on the layer and fill to make sure clip is correct.
   canvas->drawColor(SK_ColorWHITE);
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     canvas->save();
     AddClip(*canvas, kInnerX, kInnerY, kInnerW, kInnerH);
     DrawNativeRect(*canvas, 0, 0, 100, 100);
-#if defined(OS_WIN)
     MakeOpaque(canvas.get(), kInnerX, kInnerY, kInnerW, kInnerH);
-#endif
     canvas->restore();
   }
   EXPECT_TRUE(VerifyBlackRect(*canvas, kInnerX, kInnerY, kInnerW, kInnerH));
 
   // Add a clip and then make the layer to make sure the clip is correct.
   canvas->drawColor(SK_ColorWHITE);
   canvas->save();
   AddClip(*canvas, kInnerX, kInnerY, kInnerW, kInnerH);
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(*canvas, 0, 0, 100, 100);
-#if defined(OS_WIN)
     MakeOpaque(canvas.get(), 0, 0, 100, 100);
-#endif
   }
   canvas->restore();
   EXPECT_TRUE(VerifyBlackRect(*canvas, kInnerX, kInnerY, kInnerW, kInnerH));
 }
 
-#if !defined(USE_AURA)  // http://crbug.com/154358
-
 // Test that translation + make layer works properly.
 TEST(PlatformCanvas, TranslateLayer) {
   // Create the canvas initialized to opaque white.
   sk_sp<SkCanvas> canvas(CreatePlatformCanvas(16, 16, true));
 
   // Make a layer and fill it completely to make sure that the bounds are
   // correct.
   canvas->drawColor(SK_ColorWHITE);
   canvas->save();
   canvas->translate(1, 1);
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(*canvas, 0, 0, 100, 100);
-#if defined(OS_WIN)
     MakeOpaque(canvas.get(), 0, 0, 100, 100);
-#endif
   }
   canvas->restore();
   EXPECT_TRUE(VerifyBlackRect(*canvas, kLayerX + 1, kLayerY + 1,
                               kLayerW, kLayerH));
 
   // Translate then make the layer.
   canvas->drawColor(SK_ColorWHITE);
   canvas->save();
   canvas->translate(1, 1);
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(*canvas, kInnerX, kInnerY, kInnerW, kInnerH);
-#if defined(OS_WIN)
     MakeOpaque(canvas.get(), kInnerX, kInnerY, kInnerW, kInnerH);
-#endif
   }
   canvas->restore();
   EXPECT_TRUE(VerifyBlackRect(*canvas, kInnerX + 1, kInnerY + 1,
                               kInnerW, kInnerH));
 
   // Make the layer then translate.
   canvas->drawColor(SK_ColorWHITE);
   canvas->save();
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     canvas->translate(1, 1);
     DrawNativeRect(*canvas, kInnerX, kInnerY, kInnerW, kInnerH);
-#if defined(OS_WIN)
     MakeOpaque(canvas.get(), kInnerX, kInnerY, kInnerW, kInnerH);
-#endif
   }
   canvas->restore();
   EXPECT_TRUE(VerifyBlackRect(*canvas, kInnerX + 1, kInnerY + 1,
                               kInnerW, kInnerH));
 
   // Translate both before and after, and have a clip.
   canvas->drawColor(SK_ColorWHITE);
   canvas->save();
   canvas->translate(1, 1);
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     canvas->drawColor(SK_ColorWHITE);
     canvas->translate(1, 1);
     AddClip(*canvas, kInnerX + 1, kInnerY + 1, kInnerW - 1, kInnerH - 1);
     DrawNativeRect(*canvas, 0, 0, 100, 100);
-#if defined(OS_WIN)
     MakeOpaque(canvas.get(), kLayerX, kLayerY, kLayerW, kLayerH);
-#endif
   }
   canvas->restore();
   EXPECT_TRUE(VerifyBlackRect(*canvas, kInnerX + 3, kInnerY + 3,
                               kInnerW - 1, kInnerH - 1));
 
 // TODO(dglazkov): Figure out why this fails on Mac (antialiased clipping?),
 // modify test and remove this guard.
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(USE_AURA)
   // Translate both before and after, and have a path clip.
   canvas->drawColor(SK_ColorWHITE);
   canvas->save();
   canvas->translate(1, 1);
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     canvas->drawColor(SK_ColorWHITE);
     canvas->translate(1, 1);
 
     SkPath path;
     SkRect rect;
     rect.iset(kInnerX - 1, kInnerY - 1,
               kInnerX + kInnerW, kInnerY + kInnerH);
     const SkScalar kRadius = 2.0;
     path.addRoundRect(rect, kRadius, kRadius);
     canvas->clipPath(path);
 
     DrawNativeRect(*canvas, 0, 0, 100, 100);
-#if defined(OS_WIN)
     MakeOpaque(canvas.get(), kLayerX, kLayerY, kLayerW, kLayerH);
-#endif
   }
   canvas->restore();
   EXPECT_TRUE(VerifyRoundedRect(*canvas, SK_ColorWHITE, SK_ColorBLACK,
                                 kInnerX + 1, kInnerY + 1, kInnerW, kInnerH));
 #endif
 }
 
-#endif  // #if !defined(USE_AURA)
-
 }  // namespace skia