diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-31 01:03:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-31 01:03:52 +0000 |
| commit | 10a6e77b356565b7c8d18812747b261f0605aae4 (patch) | |
| tree | 669258341cb2099c6be4d7d5909bcebb0307dcc4 /views | |
| parent | b7b412a5ee120091770e9c8bd10b5cb17a8a9aa4 (diff) | |
| download | chromium_src-10a6e77b356565b7c8d18812747b261f0605aae4.zip chromium_src-10a6e77b356565b7c8d18812747b261f0605aae4.tar.gz chromium_src-10a6e77b356565b7c8d18812747b261f0605aae4.tar.bz2 | |
bsds: views/ and webkit/ support for FreeBSD/OpenBSD
- add a TOOLKIT_USES_GTK #define to catch GTK and Views+GTK
- lots of ifdef twiddling
Review URL: http://codereview.chromium.org/519030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/view.cc | 2 | ||||
| -rw-r--r-- | views/views.gyp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/views/view.cc b/views/view.cc index 123fe86..248622b 100644 --- a/views/view.cc +++ b/views/view.cc @@ -433,7 +433,7 @@ bool View::HitTest(const gfx::Point& l) const { // TODO: can this use SkRegion's contains instead? #if defined(OS_WIN) return !!PtInRegion(rgn, l.x(), l.y()); -#elif defined(OS_LINUX) +#elif defined(TOOLKIT_USES_GTK) return gdk_region_point_in(rgn.Get(), l.x(), l.y()); #endif } diff --git a/views/views.gyp b/views/views.gyp index c48e5de..2697eec 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -13,7 +13,7 @@ ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'], ], 'conditions': [ - ['OS=="linux"', {'sources/': [ + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [ ['include', '/gtk/'], ['include', '_(gtk|linux|posix|skia|x)\\.cc$'], ['include', '/(gtk|x11)_[^/]*\\.cc$'], @@ -297,7 +297,7 @@ '../chrome/third_party/wtl/include', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:x11', @@ -375,7 +375,7 @@ '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../chrome/chrome.gyp:packed_resources', |