diff options
Diffstat (limited to 'WebCore/platform/graphics/chromium')
4 files changed, 12 insertions, 12 deletions
diff --git a/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp b/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp index e8fa860..8dac612 100644 --- a/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp +++ b/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp @@ -406,12 +406,12 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, cons } -FontPlatformData* FontCache::getSimilarFontPlatformData(const Font& font) +SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font) { return 0; } -FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription& description) +SimpleFontData* FontCache::getLastResortFallbackFont(const FontDescription& description) { FontDescription::GenericFamilyType generic = description.genericFamily(); @@ -428,7 +428,7 @@ FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription& de else if (generic == FontDescription::MonospaceFamily) fontStr = courierStr; - return getCachedFontPlatformData(description, fontStr); + return getCachedFontData(description, fontStr); } static LONG toGDIFontWeight(FontWeight fontWeight) diff --git a/WebCore/platform/graphics/chromium/FontCacheLinux.cpp b/WebCore/platform/graphics/chromium/FontCacheLinux.cpp index 3fe1561..03d23c7 100644 --- a/WebCore/platform/graphics/chromium/FontCacheLinux.cpp +++ b/WebCore/platform/graphics/chromium/FontCacheLinux.cpp @@ -66,12 +66,12 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, return getCachedFontData(getCachedFontPlatformData(font.fontDescription(), atomicFamily, false)); } -FontPlatformData* FontCache::getSimilarFontPlatformData(const Font& font) +SimpleFontData* FontCache::getSimilarFontPlatformData(const Font& font) { return 0; } -FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription& description) +SimpleFontData* FontCache::getLastResortFallbackFont(const FontDescription& description) { static const AtomicString sansStr("Sans"); static const AtomicString serifStr("Serif"); @@ -92,7 +92,7 @@ FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription& de } ASSERT(fontPlatformData); - return fontPlatformData; + return getCachedFontData(fontPlatformData); } void FontCache::getTraitsInFamily(const AtomicString& familyName, 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; |