[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[darin at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit f83c54bd8460d8cd8d31b58fced321a20eef8d76
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 18:56:46 2010 +0000

    210-09-13  Darin Fisher  <darin at 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:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67401 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 35c52bf..a35cdf8 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-13  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by David Levin.
+
+        Add option to conditionally compile smooth scrolling support.
+        https://bugs.webkit.org/show_bug.cgi?id=45689
+
+        ENABLE(SMOOTH_SCROLLING) is disabled by default for all platforms.
+
+        * wtf/Platform.h:
+
 2010-09-13  Adam Roben  <aroben at apple.com>
 
         Copy JavaScriptCore's generated sources to the right directory
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 6749e04..d1c9706 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -1045,6 +1045,10 @@
 #define ENABLE_PAN_SCROLLING 1
 #endif
 
+#if !defined(ENABLE_SMOOTH_SCROLLING)
+#define ENABLE_SMOOTH_SCROLLING 0
+#endif
+
 /* Use the QXmlStreamReader implementation for XMLDocumentParser */
 /* Use the QXmlQuery implementation for XSLTProcessor */
 #if PLATFORM(QT)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8bb3b63..9e13d0a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+210-09-13  Darin Fisher  <darin at 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-13  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/platform/ScrollAnimator.cpp b/WebCore/platform/ScrollAnimator.cpp
index c863c1d..583e833 100644
--- a/WebCore/platform/ScrollAnimator.cpp
+++ b/WebCore/platform/ScrollAnimator.cpp
@@ -36,7 +36,7 @@
 
 namespace WebCore {
 
-#if !OS(WINDOWS)
+#if !ENABLE(SMOOTH_SCROLLING)
 ScrollAnimator* ScrollAnimator::create(ScrollbarClient* client)
 {
     return new ScrollAnimator(client);
diff --git a/WebCore/platform/ScrollAnimatorWin.cpp b/WebCore/platform/ScrollAnimatorWin.cpp
index f4bf5d2..025aa71 100644
--- a/WebCore/platform/ScrollAnimatorWin.cpp
+++ b/WebCore/platform/ScrollAnimatorWin.cpp
@@ -29,6 +29,9 @@
  */
 
 #include "config.h"
+
+#if ENABLE(SMOOTH_SCROLLING)
+
 #include "ScrollAnimatorWin.h"
 
 #include "ScrollbarClient.h"
@@ -294,3 +297,5 @@ void ScrollAnimatorWin::animateScroll(PerAxisData* data)
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(SMOOTH_SCROLLING)
diff --git a/WebCore/platform/ScrollAnimatorWin.h b/WebCore/platform/ScrollAnimatorWin.h
index 002a454..7043634 100644
--- a/WebCore/platform/ScrollAnimatorWin.h
+++ b/WebCore/platform/ScrollAnimatorWin.h
@@ -31,6 +31,8 @@
 #ifndef ScrollAnimatorWin_h
 #define ScrollAnimatorWin_h
 
+#if ENABLE(SMOOTH_SCROLLING)
+
 #include "ScrollAnimator.h"
 #include "Timer.h"
 
@@ -68,4 +70,7 @@ private:
 };
 
 }
+
+#endif // ENABLE(SMOOTH_SCROLLING)
+
 #endif

-- 
WebKit Debian packaging