Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org>

Source/WebCore/WebCore.gyp/WebCore.gyp

 #
 # Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 1130 matching lines @@
               # performance is monitored by the "Check Objective-C Rename"
               # postbuild step, and any suspicious-looking symbols not handled
               # here or whitelisted in that step will cause a build failure.
               #
               # If this is unhandled, the console will receive log messages
               # such as:
               # com.google.Chrome[] objc[]: Class ScrollbarPrefsObserver is implemented in both .../Google Chrome.app/Contents/Versions/.../Google Chrome Helper.app/Contents/MacOS/../../../Google Chrome Framework.framework/Google Chrome Framework and /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore. One of the two will be used. Which one is undefined.
               'ScrollbarPrefsObserver=ChromiumWebCoreObjCScrollbarPrefsObserver',
               'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver',
               'WebFontCache=ChromiumWebCoreObjCWebFontCache',
+              'ScrollAnimationHelperDelegate=ChromiumWebCoreObjCScrollAnimationHelperDelegate',
+              'ScrollbarPainterControllerDelegate=ChromiumWebCoreObjCScrollbarPainterControllerDelegate',
+              'ScrollbarPainterDelegate=ChromiumWebCoreObjCScrollbarPainterDelegate',
+              'ScrollbarPartAnimation=ChromiumWebCoreObjCScrollbarPartAnimation',
             ],
             'include_dirs': [
               '../../../WebKitLibraries',
             ],
             'postbuilds': [
               {
                 # This step ensures that any Objective-C names that aren't
                 # redefined to be "safe" above will cause a build failure.
                 'postbuild_name': 'Check Objective-C Rename',
                 'variables': {
@@ skipping 198 matching lines @@
             # 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', 'rendering/RenderThemeMac\\.mm$'],
             ['include', 'platform/graphics/mac/ColorMac\\.mm$'],
             ['include', 'platform/graphics/mac/FloatPointMac\\.mm$'],
             ['include', 'platform/graphics/mac/FloatRectMac\\.mm$'],
             ['include', 'platform/graphics/mac/FloatSizeMac\\.mm$'],
             ['include', 'platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'],
             ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
+            ['include', 'platform/graphics/mac/IntPointMac\\.mm$'],
             ['include', 'platform/graphics/mac/IntRectMac\\.mm$'],
             ['include', 'platform/mac/BlockExceptions\\.mm$'],
             ['include', 'platform/mac/KillRingMac\\.mm$'],
             ['include', 'platform/mac/LocalCurrentGraphicsContext\\.mm$'],
             ['include', 'platform/mac/PurgeableBufferMac\\.cpp$'],
             ['include', 'platform/mac/WebCoreSystemInterface\\.mm$'],
             ['include', 'platform/mac/WebCoreTextRenderer\\.mm$'],
             ['include', 'platform/text/mac/ShapeArabic\\.c$'],
             ['include', 'platform/text/mac/String(Impl)?Mac\\.mm$'],
             # Use USE_NEW_THEME on Mac.
@@ skipping 343 matching lines @@
         }],
         ['enable_svg!=0', {
           'dependencies': [
             'webcore_svg',
           ],
         }],
       ],
     },
   ],  # targets
 }