Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>...

WebCore/WebCore.pro

Index: WebCore/WebCore.pro
===================================================================
--- WebCore/WebCore.pro	(revision 67003)
+++ WebCore/WebCore.pro	(working copy)
@@ -957,7 +957,9 @@
     platform/network/ResourceResponseBase.cpp \
     platform/text/RegularExpression.cpp \
     platform/SchemeRegistry.cpp \
+    platform/ScrollAnimator.cpp \
     platform/Scrollbar.cpp \
+    platform/ScrollbarClient.cpp \
     platform/ScrollbarThemeComposite.cpp \
     platform/ScrollView.cpp \
     platform/text/SegmentedString.cpp \
@@ -1787,7 +1789,9 @@
     platform/qt/QtStyleOptionWebComboBox.h \
     platform/qt/RenderThemeQt.h \
     platform/qt/ScrollbarThemeQt.h \
+    platform/ScrollAnimator.h \
     platform/Scrollbar.h \
+    platform/ScrollbarClient.h \
     platform/ScrollbarThemeComposite.h \
     platform/ScrollView.h \
     platform/SearchPopupMenu.h \
@@ -2347,8 +2351,12 @@
 }
 
 
-    win32-*|wince*: SOURCES += platform/win/SystemTimeWin.cpp \
-                               platform/graphics/win/TransformationMatrixWin.cpp
+    win32-*|wince* {
+        HEADERS += platform/ScrollAnimatorWin.h
+        SOURCES += platform/ScrollAnimatorWin.cpp \
+                   platform/win/SystemTimeWin.cpp \
+                   platform/graphics/win/TransformationMatrixWin.cpp
+    }
 
     mac {
         SOURCES += \