diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 00:38:45 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 00:38:45 +0000 |
commit | b7aaf42c6a4a3ce2b45801079f6f7dbea073d0e8 (patch) | |
tree | 312d25b9356bfc94bdff0983a831dcd6968d05e8 /views/window | |
parent | eebc0b413d66975e86be3814103438c3ec154bec (diff) | |
download | chromium_src-b7aaf42c6a4a3ce2b45801079f6f7dbea073d0e8.zip chromium_src-b7aaf42c6a4a3ce2b45801079f6f7dbea073d0e8.tar.gz chromium_src-b7aaf42c6a4a3ce2b45801079f6f7dbea073d0e8.tar.bz2 |
Gets find bar animation/clipping to work on views/gtk.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/340077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r-- | views/window/window_gtk.cc | 2 | ||||
-rw-r--r-- | views/window/window_win.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc index 9bf2071..fff4e74 100644 --- a/views/window/window_gtk.cc +++ b/views/window/window_gtk.cc @@ -326,7 +326,7 @@ void WindowGtk::OnSizeAllocate(GtkWidget* widget, GtkAllocation* allocation) { non_client_view_->GetWindowMask(gfx::Size(allocation->width, allocation->height), &window_mask); - GdkRegion* mask_region = window_mask.CreateGdkRegion(); + GdkRegion* mask_region = window_mask.CreateNativeRegion(); gdk_window_shape_combine_region(GetNativeView()->window, mask_region, 0, 0); if (mask_region) gdk_region_destroy(mask_region); diff --git a/views/window/window_win.cc b/views/window/window_win.cc index f77b806..66a1e85 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -1355,11 +1355,11 @@ void WindowWin::ResetWindowRegion(bool force) { gfx::Path window_mask; non_client_view_->GetWindowMask( gfx::Size(window_rect.Width(), window_rect.Height()), &window_mask); - new_region = window_mask.CreateHRGN(); + new_region = window_mask.CreateNativeRegion(); } if (current_rgn_result == ERROR || !EqualRgn(current_rgn, new_region)) { - // SetWindowRgn takes ownership of the HRGN created by CreateHRGN. + // SetWindowRgn takes ownership of the HRGN created by CreateNativeRegion. SetWindowRgn(new_region, TRUE); } else { DeleteObject(new_region); |