| Index: skia/ext/skia_utils_mac.h
|
| diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h
|
| index d15fa568447482847e8014fd9dd8f34870da020b..e88c1100076be4033711eb53159ef629d15def3b 100644
|
| --- a/skia/ext/skia_utils_mac.h
|
| +++ b/skia/ext/skia_utils_mac.h
|
| @@ -97,8 +97,13 @@ 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()) transformed by the inverse
|
| + CTM.
|
| + */
|
| SkiaBitLocker(SkCanvas* canvas,
|
| const SkIRect& userClipRect,
|
| SkScalar bitmapScaleFactor = 1);
|
| @@ -112,11 +117,6 @@ class SK_API SkiaBitLocker {
|
|
|
| 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_;
|
|
|