stop using (deprecated) setClipRegion, add flag for new clipop type

ui/gfx/skbitmap_operations_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.
 
 #include "ui/gfx/skbitmap_operations.h"
 
 #include <stdint.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 488 matching lines @@
   EXPECT_EQ(2, result.height());
 
   SkAutoLockPixels lock(result);
   for (int x = 0; x < input.width(); ++x) {
     for (int y = 0; y < input.height(); ++y) {
       EXPECT_EQ(*input.getAddr32(x, y), *result.getAddr32(y, x));
     }
   }
 }
 
+void DrawRectWithColor(SkCanvas* canvas,
+                       int left,
+                       int top,
+                       int right,
+                       int bottom,
+                       SkColor color) {
+  SkPaint paint;
+  paint.setColor(color);
+  paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+  canvas->drawRect(
+      SkRect::MakeLTRB(SkIntToScalar(left), SkIntToScalar(top),
+                       SkIntToScalar(right), SkIntToScalar(bottom)),
+      paint);
+}
+
 // Check that Rotate provides the desired results
 TEST(SkBitmapOperationsTest, RotateImage) {
   const int src_w = 6, src_h = 4;
   SkBitmap src;
   // Create a simple 4 color bitmap:
   // RRRBBB
   // RRRBBB
   // GGGYYY
   // GGGYYY
   src.allocN32Pixels(src_w, src_h);
 
   SkCanvas canvas(src);
   src.eraseARGB(0, 0, 0, 0);
-  SkRegion region;
 
-  region.setRect(0, 0, src_w / 2, src_h / 2);
-  canvas.setClipRegion(region);
   // This region is a semi-transparent red to test non-opaque pixels.
-  canvas.drawColor(0x1FFF0000, SkXfermode::kSrc_Mode);
-  region.setRect(src_w / 2, 0, src_w, src_h / 2);
-  canvas.setClipRegion(region);
-  canvas.drawColor(SK_ColorBLUE, SkXfermode::kSrc_Mode);
-  region.setRect(0, src_h / 2, src_w / 2, src_h);
-  canvas.setClipRegion(region);
-  canvas.drawColor(SK_ColorGREEN, SkXfermode::kSrc_Mode);
-  region.setRect(src_w / 2, src_h / 2, src_w, src_h);
-  canvas.setClipRegion(region);
-  canvas.drawColor(SK_ColorYELLOW, SkXfermode::kSrc_Mode);
-  canvas.flush();
+  DrawRectWithColor(&canvas, 0, 0, src_w / 2, src_h / 2, 0x1FFF0000);
+  DrawRectWithColor(&canvas, src_w / 2, 0, src_w, src_h / 2, SK_ColorBLUE);
+  DrawRectWithColor(&canvas, 0, src_h / 2, src_w / 2, src_h, SK_ColorGREEN);
+  DrawRectWithColor(&canvas, src_w / 2, src_h / 2, src_w, src_h,
+                    SK_ColorYELLOW);
 
   SkBitmap rotate90, rotate180, rotate270;
   rotate90 = SkBitmapOperations::Rotate(src,
                                         SkBitmapOperations::ROTATION_90_CW);
   rotate180 = SkBitmapOperations::Rotate(src,
                                          SkBitmapOperations::ROTATION_180_CW);
   rotate270 = SkBitmapOperations::Rotate(src,
                                          SkBitmapOperations::ROTATION_270_CW);
 
   ASSERT_EQ(rotate90.width(), src.height());
@@ skipping 10 matching lines @@
 
   for (int x=0; x < src_w; ++x) {
     for (int y=0; y < src_h; ++y) {
       ASSERT_EQ(*src.getAddr32(x,y), *rotate90.getAddr32(src_h - (y+1),x));
       ASSERT_EQ(*src.getAddr32(x,y), *rotate270.getAddr32(y, src_w - (x+1)));
       ASSERT_EQ(*src.getAddr32(x,y),
                 *rotate180.getAddr32(src_w - (x+1), src_h - (y+1)));
     }
   }
 }