Remove SkDevice, obsolete constructor

skia/ext/skia_utils_mac.h

 // 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.
 
 #ifndef SKIA_EXT_SKIA_UTILS_MAC_H_
 #define SKIA_EXT_SKIA_UTILS_MAC_H_
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <vector>
 
@@ skipping 79 matching lines @@
                                                 CGColorSpaceRef colorSpace);
 
 // Given an SkBitmap, return an autoreleased NSImage in the generic color space.
 // DEPRECATED, use SkBitmapToNSImageWithColorSpace() instead.
 // TODO(thakis): Remove this -- http://crbug.com/69432
 SK_API NSImage* SkBitmapToNSImage(const SkBitmap& icon);
 
 // Converts a SkCanvas temporarily to a CGContext
 class SK_API SkiaBitLocker {
  public:
-  // TODO(ccameron): delete this constructor
-  explicit SkiaBitLocker(SkCanvas* canvas);
+  /**
+    User clip rect is an *additional* clip to be applied in addition to the
+    current state of the canvas, in *local* rather than device coordinates.
+    If no additional clipping is desired, pass in
+    SkIRect::MakeSize(canvas->getBaseLayerSize()).

[f(malita), 2016/06/08 13:16:54]

If the clip is in local coords, then the last part of the comment doesn't seem
right: one would need to also run the clip through the inverse CTM.

Do we have unit test coverage for non-identity CTM cases?

[tomhudson, 2016/06/08 14:19:35]

Done.

+   */
   SkiaBitLocker(SkCanvas* canvas,
                 const SkIRect& userClipRect,

[f(malita), 2016/06/08 13:27:17]

Not new to this CL, but userClipRect should be an SkRect: we convert to one
anyway, and we probably need the additional precision for local coords.

[tomhudson, 2016/06/08 14:19:36]

Blink has always provided an IntRect.

                 SkScalar bitmapScaleFactor = 1);
   ~SkiaBitLocker();
   CGContextRef cgContext();
   bool hasEmptyClipRegion() const;
 
  private:
   void releaseIfNeeded();
   SkIRect computeDirtyRect();
 
   SkCanvas* canvas_;
 
-  // If the user specified a clip rect it would draw into then the locker may
-  // skip the step of searching for a rect bounding the pixels that the user
-  // has drawn into.
-  bool userClipRectSpecified_;
-
   CGContextRef cgContext_;
   // offscreen_ is only valid if useDeviceBits_ is false
   SkBitmap offscreen_;
   SkIPoint bitmapOffset_;
   SkScalar bitmapScaleFactor_;
 
   // True if we are drawing to |canvas_|'s backing store directly.
   // Otherwise, the bits in |bitmap_| are our allocation and need to
   // be copied over to |canvas_|.
   bool useDeviceBits_;
 
   // True if |bitmap_| is a dummy 1x1 bitmap allocated for the sake of creating
   // a non-NULL CGContext (it is invalid to use a NULL CGContext), and will not
   // be copied to |canvas_|. This will happen if |canvas_|'s clip region is
   // empty.
   bool bitmapIsDummy_;
 };
 
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_SKIA_UTILS_MAC_H_