Convert SkiaBitLocker to use PaintCanvas

skia/ext/skia_utils_mac_unittest.mm

 // 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.
 
 #include "skia/ext/skia_utils_mac.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
 
 class SkiaUtilsMacTest : public testing::Test {
  public:
   // Creates a red or blue bitmap.
   SkBitmap CreateSkBitmap(int width, int height, bool isred, bool tfbit);
 
   // Creates a red image.
   NSImage* CreateNSImage(int width, int height);
 
   // Checks that the given bitmap rep is actually red or blue.
   void TestImageRep(NSBitmapImageRep* imageRep, bool isred);
 
   // Checks that the given bitmap is red.
   void TestSkBitmap(const SkBitmap& bitmap);
 
-  enum BitLockerTest {
-    TestIdentity = 0,
-    TestTranslate = 1,
-    TestClip = 2,
-    TestXClip = TestTranslate | TestClip,
-  };
-  void RunBitLockerTest(BitLockerTest test);
-
   // If not red, is blue.
   // If not tfbit (twenty-four-bit), is 444.
   void ShapeHelper(int width, int height, bool isred, bool tfbit);
 };
 
 SkBitmap SkiaUtilsMacTest::CreateSkBitmap(int width, int height,
                                           bool isred, bool tfbit) {
   SkColorType ct = tfbit ? kN32_SkColorType : kARGB_4444_SkColorType;
   SkImageInfo info = SkImageInfo::Make(width, height, ct, kPremul_SkAlphaType);
 
@@ skipping 74 matching lines @@
   int x = bitmap.width() > 17 ? 17 : 0;
   int y = bitmap.height() > 17 ? 17 : 0;
   SkColor color = bitmap.getColor(x, y);
 
   EXPECT_EQ(255u, SkColorGetR(color));
   EXPECT_EQ(0u, SkColorGetB(color));
   EXPECT_EQ(0u, SkColorGetG(color));
   EXPECT_EQ(255u, SkColorGetA(color));
 }
 
-void SkiaUtilsMacTest::RunBitLockerTest(BitLockerTest test) {
-  const unsigned width = 2;
-  const unsigned height = 2;
-  const unsigned storageSize = width * height;
-  const unsigned original[] = {0xFF333333, 0xFF666666, 0xFF999999, 0xFFCCCCCC};
-  EXPECT_EQ(storageSize, sizeof(original) / sizeof(original[0]));
-  unsigned bits[storageSize];
-  memcpy(bits, original, sizeof(original));
-  SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
-  SkBitmap bitmap;
-  bitmap.installPixels(info, bits, info.minRowBytes());
-
-  SkCanvas canvas(bitmap);
-  if (test & TestTranslate)
-    canvas.translate(width / 2, 0);
-  if (test & TestClip) {
-    SkRect clipRect = {0, height / 2, width, height};
-    canvas.clipRect(clipRect);
-  }
-  {
-    SkIRect clip = SkIRect::MakeSize(canvas.getBaseLayerSize()).
-        makeOffset((test & TestTranslate) ? - (static_cast<int>(width)) / 2 : 0, 0);
-    skia::SkiaBitLocker bitLocker(&canvas, clip);
-    CGContextRef cgContext = bitLocker.cgContext();
-    CGColorRef testColor = CGColorGetConstantColor(kCGColorWhite);
-    CGContextSetFillColorWithColor(cgContext, testColor);
-    CGRect cgRect = {{0, 0}, {width, height}};
-    CGContextFillRect(cgContext, cgRect);
-  }
-  const unsigned results[][storageSize] = {
-    {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}, // identity
-    {0xFF333333, 0xFFFFFFFF, 0xFF999999, 0xFFFFFFFF}, // translate
-    {0xFF333333, 0xFF666666, 0xFFFFFFFF, 0xFFFFFFFF}, // clip
-    {0xFF333333, 0xFF666666, 0xFF999999, 0xFFFFFFFF}  // translate | clip
-  };
-  for (unsigned index = 0; index < storageSize; index++)
-    EXPECT_EQ(results[test][index], bits[index]);
-}
-
 void SkiaUtilsMacTest::ShapeHelper(int width, int height,
                                    bool isred, bool tfbit) {
   SkBitmap thing(CreateSkBitmap(width, height, isred, tfbit));
 
   // Confirm size
   NSImage* image = skia::SkBitmapToNSImage(thing);
   EXPECT_DOUBLE_EQ([image size].width, (double)width);
   EXPECT_DOUBLE_EQ([image size].height, (double)height);
 
   EXPECT_TRUE([[image representations] count] == 1);
@@ skipping 35 matching lines @@
   NSImage* image = CreateNSImage(width, height);
   EXPECT_EQ(1u, [[image representations] count]);
   NSBitmapImageRep* imageRep = base::mac::ObjCCastStrict<NSBitmapImageRep>(
       [[image representations] lastObject]);
   NSColorSpace* colorSpace = [NSColorSpace genericRGBColorSpace];
   SkBitmap bitmap(skia::NSImageRepToSkBitmapWithColorSpace(
       imageRep, [image size], false, [colorSpace CGColorSpace]));
   TestSkBitmap(bitmap);
 }
 
-TEST_F(SkiaUtilsMacTest, BitLocker_Identity) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestIdentity);
-}
-
-TEST_F(SkiaUtilsMacTest, BitLocker_Translate) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestTranslate);
-}
-
-TEST_F(SkiaUtilsMacTest, BitLocker_Clip) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestClip);
-}
-
-TEST_F(SkiaUtilsMacTest, BitLocker_XClip) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestXClip);
-}
-
 }  // namespace