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

Source/WebCore/WebCore.gypi

 {
     'variables': {
         'project_dir': ['.'],
         # These headers are part of WebCore's private API in the Apple Mac build.
         'webcore_privateheader_files': [
             '<(PRODUCT_DIR)/DerivedSources/WebCore/CSSPropertyNames.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMAbstractView.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMAttr.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMBlob.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMBlobInternal.h',
@@ skipping 3816 matching lines @@
             'platform/chromium/PlatformScreenChromium.cpp',
             'platform/chromium/PlatformThemeChromiumGtk.cpp',
             'platform/chromium/PlatformThemeChromiumGtk.h',
             'platform/chromium/PlatformWidget.h',
             'platform/chromium/PopupMenuChromium.cpp',
             'platform/chromium/PopupMenuChromium.h',
             'platform/chromium/PopupMenuPrivate.h',
             'platform/chromium/ReadableDataObject.cpp',
             'platform/chromium/ReadableDataObject.h',
             'platform/chromium/SSLKeyGeneratorChromium.cpp',
+            'platform/chromium/ScrollAnimatorChromiumMac.h',
+            'platform/chromium/ScrollAnimatorChromiumMac.mm',
             'platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h',
             'platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm',
             'platform/chromium/ScrollbarThemeChromium.cpp',
             'platform/chromium/ScrollbarThemeChromium.h',
             'platform/chromium/ScrollbarThemeChromiumLinux.cpp',
             'platform/chromium/ScrollbarThemeChromiumLinux.h',
             'platform/chromium/ScrollbarThemeChromiumMac.h',
             'platform/chromium/ScrollbarThemeChromiumMac.mm',
             'platform/chromium/ScrollbarThemeChromiumWin.cpp',
             'platform/chromium/ScrollbarThemeChromiumWin.h',
@@ skipping 4134 matching lines @@
             '<(PRODUCT_DIR)/DerivedSources/WebCore/XMLViewerJS.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/XPathGrammar.cpp',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/XPathGrammar.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/tokenizer.cpp',
         ],
         'export_file_generator_files': [
             '<(PRODUCT_DIR)/DerivedSources/WebCore/ExportFileGenerator.cpp',
         ],
     }
 }