Replace setMatrixClip() with BeginPlatformPaint() logic

skia/ext/skia_utils_mac.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 <stdint.h>
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"
 #include "skia/ext/bitmap_platform_device_mac.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 
 namespace {
 
 // Draws an NSImage or an NSImageRep with a given size into a SkBitmap.
 SkBitmap NSImageOrNSImageRepToSkBitmapWithColorSpace(
     NSImage* image,
     NSImageRep* image_rep,
     NSSize size,
     bool is_opaque,
@@ skipping 157 matching lines @@
                                 count:4];
 }
 
 SkBitmap CGImageToSkBitmap(CGImageRef image) {
   if (!image)
     return SkBitmap();
 
   int width = CGImageGetWidth(image);
   int height = CGImageGetHeight(image);
 
-  std::unique_ptr<skia::BitmapPlatformDevice> device(
+  sk_sp<skia::BitmapPlatformDevice> device(
       skia::BitmapPlatformDevice::Create(NULL, width, height, false));
 
-  CGContextRef context = device->GetBitmapContext();
+  SkCanvas* canvas = skia::CreateCanvas(device, RETURN_NULL_ON_FAILURE);

[f(malita), 2016/05/11 19:29:37]

Ditto.

[tomhudson, 2016/05/19 12:24:12]

Done.

+  ScopedPlatformPaint p(canvas);
+  CGContextRef context = p.GetPlatformSurface();
 
   // We need to invert the y-axis of the canvas so that Core Graphics drawing
   // happens right-side up. Skia has an upper-left origin and CG has a lower-
   // left one.
   CGContextScaleCTM(context, 1.0, -1.0);
   CGContextTranslateCTM(context, 0, -height);
 
   // We want to copy transparent pixels from |image|, instead of blending it
   // onto uninitialized pixels.
   CGContextSetBlendMode(context, kCGBlendModeCopy);
@@ skipping 253 matching lines @@
   CGContextConcatCTM(cgContext_, SkMatrixToCGAffineTransform(matrix));
   
   return cgContext_;
 }
 
 bool SkiaBitLocker::hasEmptyClipRegion() const {
   return canvas_->isClipEmpty();
 }
 
 }  // namespace skia