Assert on BeginPlatformPaint/EndPlatformPaint mismatch.

skia/ext/bitmap_platform_device_win.h

Index: skia/ext/bitmap_platform_device_win.h
===================================================================
--- skia/ext/bitmap_platform_device_win.h	(revision 84213)
+++ skia/ext/bitmap_platform_device_win.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKIA_BITMAP_PLATFORM_DEVICE_WIN_H_
-#define SKIA_BITMAP_PLATFORM_DEVICE_WIN_H_
+#ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_WIN_H_
+#define SKIA_EXT_BITMAP_PLATFORM_DEVICE_WIN_H_
 #pragma once
 
 #include "skia/ext/platform_device_win.h"
@@ -12,7 +12,7 @@
 
 class BitmapPlatformDeviceFactory : public SkDeviceFactory {
  public:
-  virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config, 
+  virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config,
                               int width, int height,
                               bool isOpaque, bool isForLayer);
 };
@@ -72,6 +72,7 @@
   // Retrieves the bitmap DC, which is the memory DC for our bitmap data. The
   // bitmap DC is lazy created.
   virtual PlatformSurface BeginPlatformPaint();
+  virtual void EndPlatformPaint();
 
   // Loads the given transform and clipping region into the HDC. This is
   // overridden from SkDevice.
@@ -108,9 +109,13 @@
   // Data associated with this device, guaranteed non-null. We hold a reference
   // to this object.
   BitmapPlatformDeviceData* data_;
+
+#ifdef SK_DEBUG
+  int begin_paint_count_;
+#endif
 };
 
 }  // namespace skia
 
-#endif  // SKIA_BITMAP_PLATFORM_DEVICE_WIN_H_
+#endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_WIN_H_