Limit manual control of platform painting

skia/ext/bitmap_platform_device_win.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_BITMAP_PLATFORM_DEVICE_WIN_H_
 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_WIN_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "skia/ext/platform_canvas.h"
 #include "skia/ext/platform_device.h"
 #include "skia/ext/refptr.h"
 
 namespace skia {
 
 // A device is basically a wrapper around SkBitmap that provides a surface for
 // SkCanvas to draw into. Our device provides a surface Windows can also write
 // to. BitmapPlatformDevice creates a bitmap using CreateDIBSection() in a
 // format that Skia supports and can then use this to draw ClearType into, etc.
 // This pixel data is provided to the bitmap that the device contains so that it
@@ skipping 11 matching lines @@
   static BitmapPlatformDevice* Create(int width, int height,
                                       bool is_opaque, HANDLE shared_section,
                                       bool do_clear = false);
 
   // Create a BitmapPlatformDevice with no shared section. The bitmap is not
   // initialized to 0.
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque);
 
   ~BitmapPlatformDevice() override;
 
-  // PlatformDevice overrides
-  // Retrieves the bitmap DC, which is the memory DC for our bitmap data. The
-  // bitmap DC is lazy created.
-  PlatformSurface BeginPlatformPaint() override;
-  void EndPlatformPaint() override;
-
-  // Loads the given transform and clipping region into the HDC. This is
-  // overridden from SkBaseDevice.
+  // Loads (lazily) the given transform and clipping region into the HDC. This
+  // is overridden from SkBaseDevice, where it is deprecated.
   void setMatrixClip(const SkMatrix& transform,
                      const SkRegion& region,
                      const SkClipStack&) override;
 
   void DrawToHDC(HDC dc, int x, int y, const RECT* src_rect) override;
 
  protected:
+  // PlatformDevice overrides
+  // Retrieves the bitmap DC, which is the memory DC for our bitmap data. The
+  // bitmap DC may be lazily created.
+  PlatformSurface BeginPlatformPaint() override;
+
   // Flushes the Windows device context so that the pixel data can be accessed
   // directly by Skia. Overridden from SkBaseDevice, this is called when Skia
   // starts accessing pixel data.
   const SkBitmap& onAccessBitmap() override;
 
   SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
 
  private:
   // Private constructor.
   BitmapPlatformDevice(HBITMAP hbitmap, const SkBitmap& bitmap);
@@ skipping 31 matching lines @@
   // Sets the transform and clip operations. This will not update the DC,
   // 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. Can be called even
   // when |hbitmap_| is NULL (will be a NOP).
   void LoadConfig();
 
 #ifdef SK_DEBUG
   int begin_paint_count_;

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

Nit: no longer used?

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

Done.

 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice);
+  friend class skia::ScopedPlatformPaint;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_WIN_H_