Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: ui/gfx/path_win.cc

Issue 1406403007: Eliminate HICON leaks caused by creating icons from bitmap image. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/gfx/icon_util_unittest.cc ('k') | ui/gfx/path_win_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/path_win.h" 5 #include "ui/gfx/path_win.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/win/scoped_gdi_object.h" 8 #include "base/win/scoped_gdi_object.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/gfx/path.h" 10 #include "ui/gfx/path.h"
11 11
12 namespace gfx { 12 namespace gfx {
13 13
14 HRGN CreateHRGNFromSkRegion(const SkRegion& region) { 14 HRGN CreateHRGNFromSkRegion(const SkRegion& region) {
15 base::win::ScopedRegion temp(::CreateRectRgn(0, 0, 0, 0)); 15 base::win::ScopedRegion temp(::CreateRectRgn(0, 0, 0, 0));
16 base::win::ScopedRegion result(::CreateRectRgn(0, 0, 0, 0)); 16 base::win::ScopedRegion result(::CreateRectRgn(0, 0, 0, 0));
17 17
18 for (SkRegion::Iterator i(region); !i.done(); i.next()) { 18 for (SkRegion::Iterator i(region); !i.done(); i.next()) {
19 const SkIRect& rect = i.rect(); 19 const SkIRect& rect = i.rect();
20 ::SetRectRgn(temp, rect.left(), rect.top(), rect.right(), rect.bottom()); 20 ::SetRectRgn(temp.get(),
21 ::CombineRgn(result, result, temp, RGN_OR); 21 rect.left(), rect.top(), rect.right(), rect.bottom());
22 ::CombineRgn(result.get(), result.get(), temp.get(), RGN_OR);
22 } 23 }
23 24
24 return result.release(); 25 return result.release();
25 } 26 }
26 27
27 HRGN CreateHRGNFromSkPath(const SkPath& path) { 28 HRGN CreateHRGNFromSkPath(const SkPath& path) {
28 SkRegion clip_region; 29 SkRegion clip_region;
29 clip_region.setRect(path.getBounds().round()); 30 clip_region.setRect(path.getBounds().round());
30 SkRegion region; 31 SkRegion region;
31 region.setPath(path, clip_region); 32 region.setPath(path, clip_region);
32 return CreateHRGNFromSkRegion(region); 33 return CreateHRGNFromSkRegion(region);
33 } 34 }
34 35
35 } // namespace gfx 36 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/icon_util_unittest.cc ('k') | ui/gfx/path_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698