diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 01:15:59 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 01:15:59 +0000 |
| commit | 6c856ae733bf8d1f187ec5b93e07216ace0c4693 (patch) | |
| tree | 1bca8fe2359b7334d99bfba154876e38ba319688 /views/view.cc | |
| parent | 1f97d19d40c07ecc87070a9dd616f966f9f7619e (diff) | |
| download | chromium_src-6c856ae733bf8d1f187ec5b93e07216ace0c4693.zip chromium_src-6c856ae733bf8d1f187ec5b93e07216ace0c4693.tar.gz chromium_src-6c856ae733bf8d1f187ec5b93e07216ace0c4693.tar.bz2 | |
Revert 30903 - Gets find bar animation/clipping to work on views/gtk.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/340077
TBR=sky@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view.cc')
| -rw-r--r-- | views/view.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/views/view.cc b/views/view.cc index 34ec1c3..1e1cd20 100644 --- a/views/view.cc +++ b/views/view.cc @@ -429,12 +429,14 @@ bool View::HitTest(const gfx::Point& l) const { if (HasHitTestMask()) { gfx::Path mask; GetHitTestMask(&mask); - ScopedRegion rgn(mask.CreateNativeRegion()); - // TODO: can this use SkRegion's contains instead? #if defined(OS_WIN) + ScopedHRGN rgn(mask.CreateHRGN()); return !!PtInRegion(rgn, l.x(), l.y()); #elif defined(OS_LINUX) - return gdk_region_point_in(rgn.Get(), l.x(), l.y()); + GdkRegion* region = mask.CreateGdkRegion(); + bool result = gdk_region_point_in(region, l.x(), l.y()); + gdk_region_destroy(region); + return result; #endif } // No mask, but inside our bounds. |