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"
-#include "base/win/scoped_hdc.h"
-#include "base/win/win_util.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkTypes.h"
 
 namespace {
 
 static_assert(offsetof(RECT, left) == offsetof(SkIRect, fLeft), "o1");
 static_assert(offsetof(RECT, top) == offsetof(SkIRect, fTop), "o2");
 static_assert(offsetof(RECT, right) == offsetof(SkIRect, fRight), "o3");
 static_assert(offsetof(RECT, bottom) == offsetof(SkIRect, fBottom), "o4");
@@ skipping 165 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;
-
-  // 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)))
-    return nullptr;
-
-  SelectObject(scoped_hdc.Get(), bitmap);
-
-  // 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);
+  CreateBitmapHeaderWithColorDepth(width, height, 32, hdr);
 }
 
 HBITMAP CreateHBitmap(int width, int height, bool is_opaque,
                       HANDLE shared_section, void** data) {
   // CreateDIBSection fails to allocate anything if we try to create an empty
   // bitmap, so just create a minimal bitmap.
   if ((width == 0) || (height == 0)) {
     width = 1;
     height = 1;
   }
 
   BITMAPINFOHEADER hdr = {0};
   CreateBitmapHeader(width, height, &hdr);
   HBITMAP hbitmap = CreateDIBSection(NULL, reinterpret_cast<BITMAPINFO*>(&hdr),
                                      0, data, shared_section, 0);
 
   // 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