Merge 67401 - 210-09-13 Darin Fisher <darin@chromium.org>...

WebCore/ChangeLog

Index: WebCore/ChangeLog
===================================================================
--- WebCore/ChangeLog	(revision 67407)
+++ WebCore/ChangeLog	(working copy)
@@ -1,3 +1,18 @@
+210-09-13  Darin Fisher  <darin@chromium.org>
+
+        Reviewed by David Levin.
+
+        Add option to conditionally compile smooth scrolling support.
+        https://bugs.webkit.org/show_bug.cgi?id=45689
+
+        The OS(WINDOWS) conditional becomes unnecessary since
+        ENABLE(SMOOTH_SCROLLING) should only be specified on
+        platforms that have a smooth scrolling implementation.
+
+        * platform/ScrollAnimator.cpp:
+        * platform/ScrollAnimatorWin.cpp:
+        * platform/ScrollAnimatorWin.h:
+
 2010-09-10  Peter Kasting  <pkasting@google.com>
 
         Reviewed by Darin Adler.