Replace setMatrixClip() with BeginPlatformPaint() logic

skia/ext/bitmap_platform_device_cairo.h

 // Copyright 2013 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_BITMAP_PLATFORM_DEVICE_CAIRO_H_
 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_
 
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
@@ skipping 63 matching lines @@
   // Constructs a device with size |width| * |height| with contents initialized
   // to zero. |is_opaque| should be set if the caller knows the bitmap will be
   // completely opaque and allows some optimizations.
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque);
 
   // This doesn't take ownership of |data|. If |data| is NULL, the contents
   // of the device are initialized to 0.
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
                                       uint8_t* data);
 
-  // Overridden from SkBaseDevice:
-  void setMatrixClip(const SkMatrix& transform,
-                     const SkRegion& region,
-                     const SkClipStack&) override;
-
  protected:
   SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
 
  private:
   // Overridden from PlatformDevice:
-  cairo_t* BeginPlatformPaint() override;
+  cairo_t* BeginPlatformPaint(const SkMatrix& transform,
+                              const SkIRect& clip_bounds) override;
 
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
                                       cairo_surface_t* surface);
 
-  // Sets the transform and clip operations. This will not update the Cairo
-  // context, but will mark the config as dirty. The next call of LoadConfig
-  // will pick up these changes.
-  void SetMatrixClip(const SkMatrix& transform, const SkRegion& region);
-
   // Loads the current transform and clip into the context.
-  void LoadConfig();
+  void LoadConfig(const SkMatrix& transform, const SkIRect& clip_bounds);
 
   // Graphics context used to draw into the surface.
   cairo_t* cairo_;
 
   // True when there is a transform or clip that has not been set to the
   // context.  The context is retrieved for every text operation, and the
   // transform and clip do not change as much. We can save time by not loading
   // the clip and transform for every one.
   bool config_dirty_;
 
-  // Translation assigned to the context: we need to keep track of this
-  // separately so it can be updated even if the context isn't created yet.
-  SkMatrix transform_;
-
-  // The current clipping
-  SkRegion clip_region_;
-
   DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice);
   friend class ScopedPlatformPaint;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_