Remove SkDevice, obsolete constructor

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"
@@ skipping 15 matching lines @@
   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,
-    TestNoBits = 4,
-    TestTranslateNoBits = TestTranslate | TestNoBits,
-    TestClipNoBits = TestClip | TestNoBits,
-    TestXClipNoBits = TestXClip | TestNoBits,
   };
   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) {
@@ skipping 77 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));
 }
 
-// setBitmapDevice has been deprecated/removed. Is this test still useful?
 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);
   }
   {
-    skia::SkiaBitLocker bitLocker(&canvas);
+    SkIRect clip = SkIRect::MakeSize(canvas.getBaseLayerSize()).
+        makeOffset((test & TestTranslate) ? -width / 2 : 0, 0);
+    skia::SkiaBitLocker bitLocker(&canvas, SkIRect::MakeSize(canvas.getBaseLayerSize()));

[f(malita), 2016/06/08 14:24:36]

You meant to pass clip here :)

     CGContextRef cgContext = bitLocker.cgContext();
     CGColorRef testColor = CGColorGetConstantColor(kCGColorWhite);
     CGContextSetFillColorWithColor(cgContext, testColor);
     CGRect cgRect = {{0, 0}, {width, height}};
     CGContextFillRect(cgContext, cgRect);
-    if (test & TestNoBits) {
-      if (test & TestClip) {
-        SkRect clipRect = {0, height / 2, width, height};
-        canvas.clipRect(clipRect);
-      }
-    }
   }
   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 & ~TestNoBits][index], bits[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);
@@ skipping 53 matching lines @@
 }
 
 TEST_F(SkiaUtilsMacTest, BitLocker_Clip) {
   RunBitLockerTest(SkiaUtilsMacTest::TestClip);
 }
 
 TEST_F(SkiaUtilsMacTest, BitLocker_XClip) {
   RunBitLockerTest(SkiaUtilsMacTest::TestXClip);
 }
 
-TEST_F(SkiaUtilsMacTest, BitLocker_NoBits) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestNoBits);
-}
-
-TEST_F(SkiaUtilsMacTest, BitLocker_TranslateNoBits) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestTranslateNoBits);
-}
-
-TEST_F(SkiaUtilsMacTest, BitLocker_ClipNoBits) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestClipNoBits);
-}
-
-TEST_F(SkiaUtilsMacTest, BitLocker_XClipNoBits) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestXClipNoBits);
-}
-
 }  // namespace