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

Unified Diff: chrome/browser/ui/views/panels/panel_frame_view.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/panels/panel_frame_view.cc
diff --git a/chrome/browser/ui/views/panels/panel_frame_view.cc b/chrome/browser/ui/views/panels/panel_frame_view.cc
index dbb5929255ab50c8a68eebb96d66e024374f5f94..63a2ba92159280f458b84813d026646369de0398 100644
--- a/chrome/browser/ui/views/panels/panel_frame_view.cc
+++ b/chrome/browser/ui/views/panels/panel_frame_view.cc
@@ -357,18 +357,19 @@ void PanelFrameView::SetWindowCornerStyle(panel::CornerStyle corner_style) {
// window region if the region really differs.
HWND native_window = views::HWNDForWidget(panel_view_->window());
base::win::ScopedRegion current_region(::CreateRectRgn(0, 0, 0, 0));
- ::GetWindowRgn(native_window, current_region);
+ ::GetWindowRgn(native_window, current_region.get());
gfx::Path window_mask;
GetWindowMask(size(), &window_mask);
base::win::ScopedRegion new_region;
if (!window_mask.isEmpty())
- new_region.Set(gfx::CreateHRGNFromSkPath(window_mask));
+ new_region.reset(gfx::CreateHRGNFromSkPath(window_mask));
const bool has_current_region = current_region != NULL;
const bool has_new_region = new_region != NULL;
if (has_current_region != has_new_region ||
- (has_current_region && !::EqualRgn(current_region, new_region))) {
+ (has_current_region &&
+ !::EqualRgn(current_region.get(), new_region.get()))) {
// SetWindowRgn takes ownership of the new_region.
::SetWindowRgn(native_window, new_region.release(), TRUE);
}
« no previous file with comments | « chrome/browser/ui/views/frame/taskbar_decorator_win.cc ('k') | chrome/browser/ui/views/status_icons/status_icon_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698