From 8a0914b749bbe7da7768e07a7db5c6d4bb09472b Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 15 Feb 2010 12:23:52 +0000 Subject: Merge webkit.org at r54731 : Initial merge by git Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a --- WebCore/platform/graphics/skia/SkiaFontWin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'WebCore/platform/graphics/skia/SkiaFontWin.cpp') diff --git a/WebCore/platform/graphics/skia/SkiaFontWin.cpp b/WebCore/platform/graphics/skia/SkiaFontWin.cpp index f1c5cdc..58fa7d3 100644 --- a/WebCore/platform/graphics/skia/SkiaFontWin.cpp +++ b/WebCore/platform/graphics/skia/SkiaFontWin.cpp @@ -31,13 +31,13 @@ #include "config.h" #include "SkiaFontWin.h" +#include "AffineTransform.h" #include "PlatformContextSkia.h" #include "Gradient.h" #include "Pattern.h" #include "SkCanvas.h" #include "SkPaint.h" #include "SkShader.h" -#include "TransformationMatrix.h" #include #include @@ -237,7 +237,7 @@ bool windowsCanHandleTextDrawing(GraphicsContext* context) // in using Skia will show you the hinted outlines for the smaller size, // which look weird. All else being equal, it's better to use Windows' text // drawing, so we don't check for zooms. - const TransformationMatrix& matrix = context->getCTM(); + const AffineTransform& matrix = context->getCTM(); if (matrix.b() != 0 || matrix.c() != 0) // Check for skew. return false; -- cgit v1.1