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

[dbates at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6c44cdb443f787b250eaa4eca4d4e70a7d9dbe78
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 23:17:23 2010 +0000

    2010-12-16  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Only include ScrollAnimatorWin.h and compile ScrollAnimatorWin.cpp
            on Windows if ENABLE_SMOOTH_SCROLLING=1
            https://bugs.webkit.org/show_bug.cgi?id=51215
    
            Conditionally include the files ScrollAnimatorWin.h and ScrollAnimatorWin.cpp when building
            the Qt Windows with smooth scrolling enabled.
    
            No change in functionality since these files are guarded by ENABLE(SMOOTH_SCROLLING).
    
            * WebCore.pro:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74217 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3a1a8a7..76da7c7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-16  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Only include ScrollAnimatorWin.h and compile ScrollAnimatorWin.cpp
+        on Windows if ENABLE_SMOOTH_SCROLLING=1
+        https://bugs.webkit.org/show_bug.cgi?id=51215
+
+        Conditionally include the files ScrollAnimatorWin.h and ScrollAnimatorWin.cpp when building
+        the Qt Windows with smooth scrolling enabled.
+
+        No change in functionality since these files are guarded by ENABLE(SMOOTH_SCROLLING).
+
+        * WebCore.pro:
+
 2010-12-16  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index dc2fe65..fc806bb 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2777,13 +2777,18 @@ maemo5 {
     SOURCES += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp
 }
 
-
+contains(DEFINES, ENABLE_SMOOTH_SCROLLING=1) {
     win32-*|wince* {
         HEADERS += platform/ScrollAnimatorWin.h
-        SOURCES += platform/ScrollAnimatorWin.cpp \
-                   platform/win/SystemTimeWin.cpp \
-                   platform/graphics/win/TransformationMatrixWin.cpp
+        SOURCES += platform/ScrollAnimatorWin.cpp
     }
+}
+
+win32-*|wince* {
+    SOURCES += \
+        platform/win/SystemTimeWin.cpp \
+        platform/graphics/win/TransformationMatrixWin.cpp
+}
 
     mac {
         SOURCES += \

-- 
WebKit Debian packaging