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

[kevino at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f7bc4b5b6cff7db0c65ff151e112c7ab224960d4
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 13 22:28:24 2010 +0000

    [wx] Build fix. Make the XFORM operator work on wx port.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53206 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0c31840..9895178 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-13  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix. Make the XFORM operator work on wx port.
+
+        * platform/graphics/transforms/TransformationMatrix.h:
+        * wscript:
+
 2010-01-13  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/platform/graphics/transforms/TransformationMatrix.h b/WebCore/platform/graphics/transforms/TransformationMatrix.h
index 558a11d..be9beef 100644
--- a/WebCore/platform/graphics/transforms/TransformationMatrix.h
+++ b/WebCore/platform/graphics/transforms/TransformationMatrix.h
@@ -41,6 +41,9 @@
 #include <SkMatrix.h>
 #elif PLATFORM(WX) && USE(WXGC)
 #include <wx/graphics.h>
+#if OS(WINDOWS)
+#include <windows.h>
+#endif
 #endif
 
 namespace WebCore {
@@ -307,7 +310,7 @@ public:
     operator wxGraphicsMatrix() const;
 #endif
 
-#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS))
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(WX) && OS(WINDOWS))
     operator XFORM() const;
 #endif
 
diff --git a/WebCore/wscript b/WebCore/wscript
index 4400f94..19cc392 100644
--- a/WebCore/wscript
+++ b/WebCore/wscript
@@ -36,6 +36,7 @@ if build_port == "wx":
                # wxTimer on Windows has a bug that causes it to eat crashes in callbacks
                # so we need to use the Win port's implementation until the wx bug fix is
                # widely available (it was fixed in 2.8.10).
+               'platform/graphics/win/TransformationMatrixWin.cpp',
                'platform/win/SharedTimerWin.cpp',
                # Use the Windows plugin architecture
                'page/win/PageWin.cpp',

-- 
WebKit Debian packaging