diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 05:05:48 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 05:05:48 +0000 |
| commit | a3406979cd56b42ec58244e6382ca77c2c93205d (patch) | |
| tree | 76d2c688df49a6d3dc3d182c86b15ffe5ba9cf8e /views/window | |
| parent | 1111563020b92fc9f6943e0b5c00f66de2f57082 (diff) | |
| download | chromium_src-a3406979cd56b42ec58244e6382ca77c2c93205d.zip chromium_src-a3406979cd56b42ec58244e6382ca77c2c93205d.tar.gz chromium_src-a3406979cd56b42ec58244e6382ca77c2c93205d.tar.bz2 | |
Attempt 2 at:
Gets find bar animation/clipping to work on views/gtk.
The only difference between this and the first version is fixing an
include in extension_host that was triggering mac to build views, as
well as an extraneous SetSlideDuration I had used for testing.
BUG=none
TEST=none
TBR=ben
Review URL: http://codereview.chromium.org/342116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30942 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); |