Bring the Mac Chromium render theme up to date and easier to keep merged. Chr...

webkit/webkit.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'feature_defines': [
       'ENABLE_CHANNEL_MESSAGING=1',
       'ENABLE_DATABASE=1',
       'ENABLE_DATAGRID=0',
@@ skipping 108 matching lines @@
           # Periodically run:
           # nm libwebcore.a | grep -E '[atsATS] ([+-]\[|\.objc_class_name)'
           # and make sure that everything listed there has the alternate
           # ChromiumWebCoreObjC name, and that nothing extraneous is listed
           # here. If all Objective-C can be eliminated from Chromium's WebCore
           # library, these defines should be removed entirely.
           # TODO(yaar) move these out of command line defines.
           '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
           # platform/graphics/chromium so that the Mac build picks up the
           # version of ImageBufferData.h in the cg directory and
           # FontPlatformData.h in the mac directory.  The + prepends this
           # directory to the list.
           # TODO(port): This shouldn't need to be prepended.
           # TODO(port): Eliminate dependency on platform/graphics/mac and
           # related directories.
@@ skipping 508 matching lines @@
 
         # Use loader/icon/IconDatabaseNone.cpp instead.
         '../third_party/WebKit/WebCore/loader/icon/IconDatabase.cpp',
 
         # Use platform/KURLGoogle.cpp instead.
         '../third_party/WebKit/WebCore/platform/KURL.cpp',
 
         # 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.
         '../third_party/WebKit/WebCore/plugins/PluginDatabase.cpp',
         '../third_party/WebKit/WebCore/plugins/PluginInfoStore.cpp',
         '../third_party/WebKit/WebCore/plugins/PluginMainThreadScheduler.cpp',
         '../third_party/WebKit/WebCore/plugins/PluginPackage.cpp',
         '../third_party/WebKit/WebCore/plugins/PluginStream.cpp',
         '../third_party/WebKit/WebCore/plugins/PluginView.cpp',
         '../third_party/WebKit/WebCore/plugins/npapi.cpp',
@@ skipping 146 matching lines @@
             ['include', '/platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],
 
             # Use native Mac font code from WebCore.
             ['include', '/platform/(graphics/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'],
 
             # Cherry-pick some files that can't be included by broader regexps.
             # Some of these are used instead of Chromium platform files, see
             # 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$'],
             ['include', '/third_party/WebKit/WebCore/platform/mac/ScrollbarThemeMac\\.mm$'],
             ['include', '/third_party/WebKit/WebCore/platform/mac/WebCoreSystemInterface\\.mm$'],
             ['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$'],
           ],
           'sources!': [
             # The Mac currently uses FontCustomPlatformData.cpp from
             # platform/graphics/mac, included by regex above, instead.
             '../third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp',
 
             # The Mac currently uses ScrollbarThemeMac.mm, included by regex
             # above, instead of ScrollbarThemeChromium.cpp.
@@ skipping 717 matching lines @@
           'files': [
 
             '<@(webinspector_image_files)',
 
           ],
         },
       ],
     },
   ], # targets
 }