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

[noam.rosenthal at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 8d816621afd80a698ef4b76ea169c123fd5d2603
Author: noam.rosenthal at nokia.com <noam.rosenthal at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 14:54:31 2010 +0000

    2010-08-17  No'am Rosenthal  <noam.rosenthal at nokia.com>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] Move the accelerated compositing build flag to the right place
            https://bugs.webkit.org/show_bug.cgi?id=43882
    
            * wtf/Platform.h:
    2010-08-17  No'am Rosenthal  <noam.rosenthal at nokia.com>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] Move the accelerated compositing build flag to the right place
            https://bugs.webkit.org/show_bug.cgi?id=43882
    
            No new tests: build fix.
    
            * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 0d6ac10..a1311a7 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-17  No'am Rosenthal  <noam.rosenthal at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Move the accelerated compositing build flag to the right place
+        https://bugs.webkit.org/show_bug.cgi?id=43882
+
+        * wtf/Platform.h:
+
 2010-08-17  Yuta Kitamura  <yutak at chromium.org>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index a7c04b5..f653adb 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -1052,6 +1052,10 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #define WTF_USE_ACCELERATED_COMPOSITING 1
 #endif
 
+#if PLATFORM(QT)
+#define WTF_USE_ACCELERATED_COMPOSITING 1
+#endif
+
 /* FIXME: Defining ENABLE_3D_RENDERING here isn't really right, but it's always used with
    with WTF_USE_ACCELERATED_COMPOSITING, and it allows the feature to be turned on and
    off in one place. */
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 766ef0d..b27acbe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-17  No'am Rosenthal  <noam.rosenthal at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Move the accelerated compositing build flag to the right place
+        https://bugs.webkit.org/show_bug.cgi?id=43882
+
+        No new tests: build fix.
+
+        * WebCore.pro:
+
 2010-08-17  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r65500.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 76e3782..5f6fec3 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -895,6 +895,7 @@ SOURCES += \
     platform/graphics/GeneratedImage.cpp \
     platform/graphics/Gradient.cpp \
     platform/graphics/GraphicsContext.cpp \
+    platform/graphics/GraphicsLayer.cpp \
     platform/graphics/GraphicsTypes.cpp \
     platform/graphics/Image.cpp \
     platform/graphics/ImageBuffer.cpp \
@@ -1003,6 +1004,8 @@ SOURCES += \
     rendering/RenderIndicator.cpp \
     rendering/RenderInline.cpp \
     rendering/RenderLayer.cpp \
+    rendering/RenderLayerBacking.cpp \
+    rendering/RenderLayerCompositor.cpp \
     rendering/RenderLineBoxList.cpp \
     rendering/RenderListBox.cpp \
     rendering/RenderListItem.cpp \
@@ -1679,6 +1682,8 @@ HEADERS += \
     platform/graphics/GeneratedImage.h \
     platform/graphics/Gradient.h \
     platform/graphics/GraphicsContext.h \
+    platform/graphics/GraphicsLayer.h \
+    platform/graphics/GraphicsLayerClient.h \
     platform/graphics/GraphicsTypes.h \
     platform/graphics/Image.h \
     platform/graphics/ImageSource.h \
@@ -1692,6 +1697,7 @@ HEADERS += \
     platform/graphics/Pen.h \
     platform/graphics/qt/ContextShadow.h \
     platform/graphics/qt/FontCustomPlatformData.h \
+    platform/graphics/qt/GraphicsLayerQt.h \
     platform/graphics/qt/ImageDecoderQt.h \
     platform/graphics/qt/StillImageQt.h \
     platform/graphics/qt/TransparencyLayer.h \
@@ -1820,6 +1826,8 @@ HEADERS += \
     rendering/RenderInline.h \
     rendering/RenderInputSpeech.h \
     rendering/RenderLayer.h \
+    rendering/RenderLayerBacking.h \
+    rendering/RenderLayerCompositor.h \
     rendering/RenderLineBoxList.h \
     rendering/RenderListBox.h \
     rendering/RenderListItem.h \
@@ -2194,6 +2202,7 @@ SOURCES += \
     platform/graphics/qt/FloatRectQt.cpp \
     platform/graphics/qt/GradientQt.cpp \
     platform/graphics/qt/GraphicsContextQt.cpp \
+    platform/graphics/qt/GraphicsLayerQt.cpp \
     platform/graphics/qt/IconQt.cpp \
     platform/graphics/qt/ImageBufferQt.cpp \
     platform/graphics/qt/ImageDecoderQt.cpp \
@@ -3245,19 +3254,6 @@ win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{
             plugins/win/PaintHooks.asm
     }
 }
-contains(DEFINES, WTF_USE_ACCELERATED_COMPOSITING) {
-HEADERS += \
-    rendering/RenderLayerBacking.h \
-    rendering/RenderLayerCompositor.h \
-    platform/graphics/GraphicsLayer.h \
-    platform/graphics/GraphicsLayerClient.h \
-    platform/graphics/qt/GraphicsLayerQt.h
-SOURCES += \
-    platform/graphics/GraphicsLayer.cpp \
-    platform/graphics/qt/GraphicsLayerQt.cpp \
-    rendering/RenderLayerBacking.cpp \
-    rendering/RenderLayerCompositor.cpp
-}
 
 symbian {
     shared {

-- 
WebKit Debian packaging