Fix GDI leak in NativeThemeWin::PaintIndirect

skia/ext/skia_utils_win.cc

 // 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.
 
 #include "skia/ext/skia_utils_win.h"
 
 #include <stddef.h>
 #include <windows.h>
 
 #include "base/debug/gdi_debug_util_win.h"
@@ skipping 177 matching lines @@
 
 SkBitmap MapPlatformBitmap(HDC context) {
   BITMAP backing;
   const SkImageInfo size(PrepareAllocation(context, &backing));
   SkBitmap bitmap;
   if (!size.isEmpty())
     bitmap.installPixels(size, backing.bmBits, size.minRowBytes());
   return bitmap;
 }
 
-HDC CreateOffscreenSurface(int width, int height) {
-  HBITMAP bitmap = nullptr;
-
+HDC CreateOffscreenSurface(base::win::ScopedBitmap* bitmap,
+                           int width,
+                           int height) {
+  DCHECK(bitmap);

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

Nit: Blank line below this

[Rafał Chłodnicki, 2016/09/26 10:12:09]

Done.

   // If this process doesn't have access to GDI, we'll have to use a shared
   // memory segment instead.
   if (!base::win::IsUser32AndGdi32Available())
     return nullptr;
 
-  bitmap = CreateHBitmap(width, height, false, nullptr, nullptr);
-  if (!bitmap)
-    return nullptr;
-
   base::win::ScopedCreateDC scoped_hdc(CreateCompatibleDC(nullptr));
   if (!scoped_hdc.IsValid())
     return nullptr;
+
   InitializeDC(scoped_hdc.Get());
   HRGN clip = CreateRectRgn(0, 0, width, height);
-  if ((SelectClipRgn(scoped_hdc.Get(), clip) == ERROR) ||
-      (!DeleteObject(clip)))
+  if (SelectClipRgn(scoped_hdc.Get(), clip) == ERROR || !DeleteObject(clip))

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

Nit: Removing the second set of parnes was good, I wouldn't have removed the
first though.

[Rafał Chłodnicki, 2016/09/26 10:12:09]

Done.

     return nullptr;
 
-  SelectObject(scoped_hdc.Get(), bitmap);
+  bitmap->reset(CreateHBitmap(width, height, false, nullptr, nullptr));
+  if (!bitmap->is_valid())
+    return nullptr;
+
+  SelectObject(scoped_hdc.Get(), bitmap->get());
 
   // The caller must call DeleteDC(hdc) on this object once done with it.
   return scoped_hdc.Take();
 }
 
 void CreateBitmapHeader(int width, int height, BITMAPINFOHEADER* hdr) {
    CreateBitmapHeaderWithColorDepth(width, height, 32, hdr);
 }
 
 HBITMAP CreateHBitmap(int width, int height, bool is_opaque,
@@ skipping 13 matching lines @@
   // If CreateDIBSection() failed, try to get some useful information out
   // before we crash for post-mortem analysis.
   if (!hbitmap)
     base::debug::GDIBitmapAllocFailure(&hdr, shared_section);
 
   return hbitmap;
 }
 
 }  // namespace skia