[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f50e00b2caf0827b30dd0d183c8035de95d022d7
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 13 13:49:42 2010 +0000

    [Qt] Fix the build on Windows.
    
    Patch by Jocelyn Turcotte <jocelyn.turcotte at nokia.com> on 2010-01-13
    Reviewed by Simon Hausmann.
    
    PluginViewWin.cpp requires the conversion operator from TransformationMatrix to XFORM.
    
    * WebCore.pro: Build TransformationMatrixWin.cpp.
    * platform/graphics/transforms/TransformationMatrix.h: Enable the conversion operator to XFORM.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53183 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e466aef..1d0b578 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-13  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix the build on Windows.
+
+        PluginViewWin.cpp requires the conversion operator from TransformationMatrix to XFORM.
+
+        * WebCore.pro: Build TransformationMatrixWin.cpp.
+        * platform/graphics/transforms/TransformationMatrix.h: Enable the conversion operator to XFORM.
+
 2010-01-13  Miikka Heikkinen <miikka.heikkinen at digia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index a7d807a..133c19f 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2495,7 +2495,8 @@ SOURCES += \
     ../WebKit/qt/Api/qwebkitversion.cpp
 
 
-    win32-*|wince*: SOURCES += platform/win/SystemTimeWin.cpp
+    win32-*|wince*: SOURCES += platform/win/SystemTimeWin.cpp \
+                               platform/graphics/win/TransformationMatrixWin.cpp
 
     mac {
         SOURCES += \
diff --git a/WebCore/platform/graphics/transforms/TransformationMatrix.h b/WebCore/platform/graphics/transforms/TransformationMatrix.h
index 802ad3c..558a11d 100644
--- a/WebCore/platform/graphics/transforms/TransformationMatrix.h
+++ b/WebCore/platform/graphics/transforms/TransformationMatrix.h
@@ -307,7 +307,7 @@ public:
     operator wxGraphicsMatrix() const;
 #endif
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS))
     operator XFORM() const;
 #endif
 

-- 
WebKit Debian packaging