diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 19:49:05 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 19:49:05 +0000 |
| commit | f1600e08408e53406fa2b90ea92d230d01650759 (patch) | |
| tree | 01d31bfc68a82b20d1bdb2f47ae1fb5c6dbefd50 /webkit | |
| parent | cb45bb3a18d06883b1d768272a0ce67663498883 (diff) | |
| download | chromium_src-f1600e08408e53406fa2b90ea92d230d01650759.zip chromium_src-f1600e08408e53406fa2b90ea92d230d01650759.tar.gz chromium_src-f1600e08408e53406fa2b90ea92d230d01650759.tar.bz2 | |
Bring the Mac Chromium render theme up to date and easier to keep merged. Chromium side of things.
BUG=http://crbug.com/19604
TEST=no visible change on Leopard, draws correctly on Snow Leopard
Review URL: http://codereview.chromium.org/173212
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/webkit.gyp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index d2cf2b8..b47d34e 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -126,6 +126,9 @@ 'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver', 'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver', 'WebFontCache=ChromiumWebCoreObjCWebFontCache', + + # Use USE_NEW_THEME on Mac. + 'WTF_USE_NEW_THEME=1', ], 'webcore_include_dirs+': [ # platform/graphics/cg and mac needs to come before @@ -654,7 +657,8 @@ # Use platform/MIMETypeRegistryChromium.cpp instead. '../third_party/WebKit/WebCore/platform/MIMETypeRegistry.cpp', - # USE_NEW_THEME only. + # Theme.cpp is used only if we're using USE_NEW_THEME. We are not for + # Windows and Linux. We manually include Theme.cpp for the Mac below. '../third_party/WebKit/WebCore/platform/Theme.cpp', # Exclude some, but not all, of plugins. @@ -821,8 +825,12 @@ # the specific exclusions in the "sources!" list below. ['include', '/third_party/WebKit/WebCore/loader/archive/cf/LegacyWebArchive\\.cpp$'], ['include', '/third_party/WebKit/WebCore/platform/graphics/mac/ColorMac\\.mm$'], + ['include', '/third_party/WebKit/WebCore/platform/graphics/mac/FloatPointMac\\.mm$'], + ['include', '/third_party/WebKit/WebCore/platform/graphics/mac/FloatRectMac\\.mm$'], + ['include', '/third_party/WebKit/WebCore/platform/graphics/mac/FloatSizeMac\\.mm$'], ['include', '/third_party/WebKit/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'], ['include', '/third_party/WebKit/WebCore/platform/graphics/mac/GraphicsContextMac\\.mm$'], + ['include', '/third_party/WebKit/WebCore/platform/graphics/mac/IntRectMac\\.mm$'], ['include', '/third_party/WebKit/WebCore/platform/mac/BlockExceptions\\.mm$'], ['include', '/third_party/WebKit/WebCore/platform/mac/LocalCurrentGraphicsContext\\.mm$'], ['include', '/third_party/WebKit/WebCore/platform/mac/PurgeableBufferMac\\.cpp$'], @@ -831,6 +839,8 @@ ['include', '/third_party/WebKit/WebCore/platform/mac/WebCoreTextRenderer\\.mm$'], ['include', '/third_party/WebKit/WebCore/platform/text/mac/ShapeArabic\\.c$'], ['include', '/third_party/WebKit/WebCore/platform/text/mac/String(Impl)?Mac\\.mm$'], + # Use USE_NEW_THEME on Mac. + ['include', '/third_party/WebKit/WebCore/platform/Theme\\.cpp$'], ['include', '/third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface\\.m$'], ], |