Fix GDI leak in NativeThemeWin::PaintIndirect

skia/ext/skia_utils_win.h

 // Copyright (c) 2006-2008 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_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"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
 #include "build/build_config.h"
 #include <windows.h>
 
 struct SkIRect;
 struct SkPoint;
@@ skipping 48 matching lines @@
 // Creates a surface writing to the pixels backing |context|'s bitmap.
 // Returns null on error.
 SK_API sk_sp<SkSurface> MapPlatformSurface(HDC context);
 
 // Creates a bitmap backed by the same pixels backing the HDC's bitmap.
 // Returns an empty bitmap on error.
 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);
 
 SK_API HBITMAP CreateHBitmap(int width, int height, bool is_opaque,
                              HANDLE shared_section = nullptr,
                              void** data = nullptr);
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_SKIA_UTILS_WIN_H_