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/view.cc | |
| 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/view.cc')
| -rw-r--r-- | views/view.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/views/view.cc b/views/view.cc index 1e1cd20..34ec1c3 100644 --- a/views/view.cc +++ b/views/view.cc @@ -429,14 +429,12 @@ 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) - GdkRegion* region = mask.CreateGdkRegion(); - bool result = gdk_region_point_in(region, l.x(), l.y()); - gdk_region_destroy(region); - return result; + return gdk_region_point_in(rgn.Get(), l.x(), l.y()); #endif } // No mask, but inside our bounds. |