[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 ae08f9ae4c4c29dc62f06436bbcab9e69730d3f1
Author: noam.rosenthal at nokia.com <noam.rosenthal at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 20:20:15 2010 +0000

    2010-10-25  No'am Rosenthal  <noam.rosenthal at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Texmap] [Qt] Texture mapper initial implementation
            https://bugs.webkit.org/show_bug.cgi?id=47070
    
            Add a config flag and a define (WTF_USE_TEXTURE_MAPPER) to WebCore, to enable opt-in compilation of texture-mapper with Qt.
    
            No new tests: WIP for a new implementation.
    
            * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 83b99dd..57035b5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-25  No'am Rosenthal  <noam.rosenthal at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Texmap] [Qt] Texture mapper initial implementation
+        https://bugs.webkit.org/show_bug.cgi?id=47070
+
+        Add a config flag and a define (WTF_USE_TEXTURE_MAPPER) to WebCore, to enable opt-in compilation of texture-mapper with Qt.
+
+        No new tests: WIP for a new implementation.
+
+        * WebCore.pro:
+
 2010-10-25  Jian Li  <jianli at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 551bd9b..b555207 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2070,7 +2070,6 @@ HEADERS += \
     platform/graphics/Pattern.h \
     platform/graphics/Pen.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 \
@@ -2606,7 +2605,6 @@ 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 \
@@ -3819,6 +3817,29 @@ win32:!win32-g++*:contains(QMAKE_HOST.arch, x86_64):{
     }
 }
 
+# Uncomment this to enable Texture Mapper.
+# CONFIG += texmap
+
+contains(CONFIG, texmap) {
+    DEFINES += WTF_USE_TEXTURE_MAPPER=1
+    HEADERS += \
+        platform/graphics/texmap/TextureMapper.h \
+        platform/graphics/texmap/TextureMapperPlatformLayer.h
+
+    SOURCES += \
+        platform/graphics/qt/TextureMapperQt.cpp \
+        platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
+
+    contains(QT_CONFIG, opengl) {
+        QT += opengl
+        HEADERS += platform/graphics/opengl/TextureMapperGL.h
+        SOURCES += platform/graphics/opengl/TextureMapperGL.cpp
+    }
+} else {
+    HEADERS += platform/graphics/qt/GraphicsLayerQt.h
+    SOURCES += platform/graphics/qt/GraphicsLayerQt.cpp
+}
+
 symbian {
     shared {
         contains(CONFIG, def_files) {

-- 
WebKit Debian packaging