Limit manual control of platform painting

skia/ext/bitmap_platform_device_cairo.h

Index: skia/ext/bitmap_platform_device_cairo.h
diff --git a/skia/ext/bitmap_platform_device_cairo.h b/skia/ext/bitmap_platform_device_cairo.h
index 6a81c725e827641659d2e6ca137e9d38ca9afc51..1306f0a4b99901704a5c0715be17c76506d129ac 100644
--- a/skia/ext/bitmap_platform_device_cairo.h
+++ b/skia/ext/bitmap_platform_device_cairo.h
@@ -10,6 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "skia/ext/platform_canvas.h"

[f(malita), 2016/03/29 17:31:07]

Nit: forward-declare ScopedPlatformPaint instead of include?

(ditto for all other instances)

[tomhudson, 2016/03/29 17:47:31]

Ugh, I had problems with that when I was declaring friends, but I did it wrong
before.

Done

 #include "skia/ext/platform_device.h"
 
 typedef struct _cairo_surface cairo_surface_t;
@@ -84,10 +85,10 @@ class BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice {
                      const SkRegion& region,
                      const SkClipStack&) override;
 
+ protected:
   // Overridden from PlatformDevice:
   cairo_t* BeginPlatformPaint() override;

[f(malita), 2016/03/29 17:31:07]

Nit: if this is only called from ScopedPlatformPaint, can it be private?

[tomhudson, 2016/03/29 17:47:31]

Done.

 
- protected:
   SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
 
  private:
@@ -119,6 +120,7 @@ class BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice {
   SkRegion clip_region_;
 
   DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice);
+  friend class skia::ScopedPlatformPaint;

[f(malita), 2016/03/29 17:31:07]

Nit: we're in the 'skia' namespace, I don't think we need an explicit namespace.

(ditto for all other instances)

[tomhudson, 2016/03/29 17:47:31]

Done.

 };
 
 }  // namespace skia