diff options
| author | Steve Block <steveblock@google.com> | 2010-02-15 12:23:52 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-16 11:48:32 +0000 |
| commit | 8a0914b749bbe7da7768e07a7db5c6d4bb09472b (patch) | |
| tree | 73f9065f370435d6fde32ae129d458a8c77c8dff /WebCore/platform/graphics/chromium/TransparencyWin.cpp | |
| parent | bf14be70295513b8076f3fa47a268a7e42b2c478 (diff) | |
| download | external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.zip external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.gz external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.bz2 | |
Merge webkit.org at r54731 : Initial merge by git
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
Diffstat (limited to 'WebCore/platform/graphics/chromium/TransparencyWin.cpp')
| -rw-r--r-- | WebCore/platform/graphics/chromium/TransparencyWin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 |