Fix GDI leak in NativeThemeWin::PaintIndirect

skia/ext/skia_utils_win.h

Index: skia/ext/skia_utils_win.h
diff --git a/skia/ext/skia_utils_win.h b/skia/ext/skia_utils_win.h
index 368d91b895fa200bd2d0203ba590e63f7a5875e5..00b71250a322b3381a853c45cb8d32469e23ec42 100644
--- a/skia/ext/skia_utils_win.h
+++ b/skia/ext/skia_utils_win.h
@@ -5,6 +5,7 @@
 #ifndef SKIA_EXT_SKIA_UTILS_WIN_H_
 #define SKIA_EXT_SKIA_UTILS_WIN_H_
 
+#include "base/win/scoped_gdi_object.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkMatrix.h"
@@ -73,10 +74,14 @@ SK_API SkBitmap MapPlatformBitmap(HDC context);
 
 // Creates an offscreen HDC suitable for writing to via MapPlatformSurface().
 // Caller is responsible for calling DeleteDC() when done.
+// The |bitmap| is a pointer to the ScopedBitmap instance that caller must
+// provide so that the bitmap is deleted when returned HDC gets deleted.
 // Will return null if any errors are encountered.
 // TODO(fmalita): consider returning ScopedCreateDC() when that type is
 // returnable (https://crbug.com/622442)
-SK_API HDC CreateOffscreenSurface(int width, int height);
+SK_API HDC CreateOffscreenSurface(base::win::ScopedBitmap* bitmap,

[Peter Kasting, 2016/09/23 18:45:00]

Nit: Outparam should go last.

+                                  int width,
+                                  int height);
 
 // Fills in a BITMAPINFOHEADER structure given the bitmap's size.
 SK_API void CreateBitmapHeader(int width, int height, BITMAPINFOHEADER* hdr);