[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[krit at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit bd01cc39999b8256843798bf32a28fbfd3748fca
Author: krit at webkit.org <krit at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 8 21:55:50 2010 +0000

    2010-02-08  Dirk Schulze  <krit at webkit.org>
    
            Unreviewed build fix of ChromiumWin.
    
            * platform/graphics/chromium/TransparencyWin.cpp:
            (WebCore::):
            (WebCore::TransparencyWin::setupLayerForOpaqueCompositeLayer):
            (WebCore::TransparencyWin::setupTransformForKeepTransform):
            * platform/graphics/chromium/TransparencyWin.h:
            * rendering/RenderThemeChromiumWin.cpp:
            (WebCore::):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54509 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3f8371e..8a8493d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-08  Dirk Schulze  <krit at webkit.org>
+
+        Unreviewed build fix of ChromiumWin.
+
+        * platform/graphics/chromium/TransparencyWin.cpp:
+        (WebCore::):
+        (WebCore::TransparencyWin::setupLayerForOpaqueCompositeLayer):
+        (WebCore::TransparencyWin::setupTransformForKeepTransform):
+        * platform/graphics/chromium/TransparencyWin.h:
+        * rendering/RenderThemeChromiumWin.cpp:
+        (WebCore::):
+
 2010-02-05  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/platform/graphics/chromium/TransparencyWin.cpp b/WebCore/platform/graphics/chromium/TransparencyWin.cpp
index 80df2ec..47cc894 100644
--- a/WebCore/platform/graphics/chromium/TransparencyWin.cpp
+++ b/WebCore/platform/graphics/chromium/TransparencyWin.cpp
@@ -31,11 +31,11 @@
 #include "config.h"
 #include <windows.h>
 
+#include "AffineTransform.h"
 #include "GraphicsContext.h"
 #include "ImageBuffer.h"
 #include "PlatformContextSkia.h"
 #include "SimpleFontData.h"
-#include "TransformationMatrix.h"
 #include "TransparencyWin.h"
 
 #include "SkColorPriv.h"
@@ -61,7 +61,7 @@ inline const SkBitmap& bitmapForContext(const GraphicsContext& context)
 
 void compositeToCopy(const GraphicsContext& sourceLayers,
                      GraphicsContext& destContext,
-                     const TransformationMatrix& matrix)
+                     const AffineTransform& matrix)
 {
     // Make a list of all devices. The iterator goes top-down, and we want
     // bottom-up. Note that each layer can also have an offset in canvas
@@ -247,7 +247,7 @@ void TransparencyWin::setupLayerForOpaqueCompositeLayer()
     if (!m_validLayer)
         return;
 
-    TransformationMatrix mapping;
+    AffineTransform mapping;
     mapping.translate(-m_transformedSourceRect.x(), -m_transformedSourceRect.y());
     if (m_transformMode == Untransform){ 
         // Compute the inverse mapping from the canvas space to the
@@ -307,7 +307,7 @@ void TransparencyWin::setupTransformForKeepTransform(const IntRect& region)
         // Account for the fact that the layer may be offset from the
         // original. This only happens when we create a layer that has the
         // same coordinate space as the parent.
-        TransformationMatrix xform;
+        AffineTransform xform;
         xform.translate(-m_transformedSourceRect.x(), -m_transformedSourceRect.y());
 
         // We're making a layer, so apply the old transform to the new one
diff --git a/WebCore/platform/graphics/chromium/TransparencyWin.h b/WebCore/platform/graphics/chromium/TransparencyWin.h
index ab75375..b6bef91 100644
--- a/WebCore/platform/graphics/chromium/TransparencyWin.h
+++ b/WebCore/platform/graphics/chromium/TransparencyWin.h
@@ -33,9 +33,9 @@
 
 #include <windows.h>
 
+#include "AffineTransform.h"
 #include "ImageBuffer.h"
 #include "Noncopyable.h"
-#include "TransformationMatrix.h"
 #include "wtf/OwnPtr.h"
 
 class SkBitmap;
@@ -193,7 +193,7 @@ private:
     GraphicsContext* m_destContext;
 
     // The original transform from the destination context.
-    TransformationMatrix m_orgTransform;
+    AffineTransform m_orgTransform;
 
     LayerMode m_layerMode;
     TransformMode m_transformMode;
diff --git a/WebCore/rendering/RenderThemeChromiumWin.cpp b/WebCore/rendering/RenderThemeChromiumWin.cpp
index 4b38d53..db31825 100644
--- a/WebCore/rendering/RenderThemeChromiumWin.cpp
+++ b/WebCore/rendering/RenderThemeChromiumWin.cpp
@@ -86,7 +86,7 @@ private:
             return transformMode == KeepTransform ? NoLayer : OpaqueCompositeLayer;
     }
 
-    static TransformMode getTransformMode(const TransformationMatrix& matrix)
+    static TransformMode getTransformMode(const AffineTransform& matrix)
     {
         if (matrix.b() != 0 || matrix.c() != 0)  // Skew.
             return Untransform;

-- 
WebKit Debian packaging