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

Unified Diff: chrome/browser/ui/views/panels/panel_frame_view.cc

Issue 673623002: Fix regions generation on windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix review issues. Created 6 years, 2 months 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
« no previous file with comments | « no previous file | ui/gfx/gfx_tests.gyp » ('j') | ui/views/win/hwnd_message_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 aca6c2d6be4ba61e4d28e7d0418c88a55ad717c9..2645c57afb488fc4e2ae6355903af4e27d45fc07 100644
--- a/chrome/browser/ui/views/panels/panel_frame_view.cc
+++ b/chrome/browser/ui/views/panels/panel_frame_view.cc
@@ -355,9 +355,12 @@ void PanelFrameView::SetWindowCornerStyle(panel::CornerStyle corner_style) {
gfx::Path window_mask;
GetWindowMask(size(), &window_mask);
- base::win::ScopedRegion new_region(gfx::CreateHRGNFromSkPath(window_mask));
+ base::win::ScopedRegion new_region;
+ if (!window_mask.isEmpty())
+ new_region.Set(gfx::CreateHRGNFromSkPath(window_mask));
if (current_region_result == ERROR ||
+ new_region == NULL ||
Wez 2014/10/28 18:21:57 We need to treat a NULL new region and current_reg
alex-ac 2014/10/29 14:19:48 Done.
!::EqualRgn(current_region, new_region)) {
// SetWindowRgn takes ownership of the new_region.
::SetWindowRgn(native_window, new_region.release(), TRUE);
« no previous file with comments | « no previous file | ui/gfx/gfx_tests.gyp » ('j') | ui/views/win/hwnd_message_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698