Diff
Modified: trunk/Source/WebCore/ChangeLog (191325 => 191326)
--- trunk/Source/WebCore/ChangeLog 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/ChangeLog 2015-10-20 02:43:59 UTC (rev 191326)
@@ -1,3 +1,17 @@
+2015-10-19 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r191324.
+ https://bugs.webkit.org/show_bug.cgi?id=150352
+
+ Shadowing CTM's state is not necessary (Requested by litherum
+ on #webkit).
+
+ Reverted changeset:
+
+ "Host GraphicsContext's CTM inside GraphicsContextState"
+ https://bugs.webkit.org/show_bug.cgi?id=150146
+ http://trac.webkit.org/changeset/191324
+
2015-10-19 Myles C. Maxfield <mmaxfi...@apple.com>
Host GraphicsContext's CTM inside GraphicsContextState
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (191325 => 191326)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-10-20 02:43:59 UTC (rev 191326)
@@ -142,87 +142,6 @@
restorePlatformState();
}
-void GraphicsContext::concatCTM(const AffineTransform& other)
-{
- if (paintingDisabled())
- return;
-
- checkCTMInvariants();
-
- m_state.ctm *= other;
- concatPlatformCTM(other);
-
- checkCTMInvariants();
-}
-
-void GraphicsContext::scale(float x, float y)
-{
- if (paintingDisabled())
- return;
-
- checkCTMInvariants();
-
- m_state.ctm.scale(x, y);
- scalePlatformCTM(x, y);
-
- checkCTMInvariants();
-}
-
-void GraphicsContext::rotate(float angle)
-{
- if (paintingDisabled())
- return;
-
- checkCTMInvariants();
-
- m_state.ctm.rotate(rad2deg(angle));
- rotatePlatformCTM(angle);
-
- checkCTMInvariants();
-}
-
-void GraphicsContext::translate(float x, float y)
-{
- if (paintingDisabled())
- return;
-
- checkCTMInvariants();
-
- m_state.ctm.translate(x, y);
- translatePlatformCTM(x, y);
-
- checkCTMInvariants();
-}
-
-void GraphicsContext::setCTM(const AffineTransform& other)
-{
- if (paintingDisabled())
- return;
-
- checkCTMInvariants();
-
- m_state.ctm = other;
- setPlatformCTM(other);
-
- checkCTMInvariants();
-}
-
-AffineTransform GraphicsContext::getCTM(IncludeDeviceScale includeScale) const
-{
- if (paintingDisabled())
- return AffineTransform();
-
- AffineTransform result;
- if (includeScale == DefinitelyIncludeDeviceScale)
- result = m_state.userToDeviceSpaceCTM * m_state.ctm;
- else
- result = m_state.ctm;
-
- ASSERT(result.isEssentiallyEqualTo(getPlatformCTM(includeScale)));
-
- return result;
-}
-
void GraphicsContext::drawRaisedEllipse(const FloatRect& rect, const Color& ellipseColor, ColorSpace ellipseColorSpace, const Color& shadowColor, ColorSpace shadowColorSpace)
{
if (paintingDisabled())
@@ -376,8 +295,6 @@
{
beginPlatformTransparencyLayer(opacity);
++m_transparencyCount;
-
- resetPlatformCTM();
}
void GraphicsContext::endTransparencyLayer()
@@ -737,8 +654,7 @@
void GraphicsContext::applyDeviceScaleFactor(float deviceScaleFactor)
{
- scale(deviceScaleFactor, deviceScaleFactor);
-
+ scale(FloatSize(deviceScaleFactor, deviceScaleFactor));
platformApplyDeviceScaleFactor(deviceScaleFactor);
}
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (191325 => 191326)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2015-10-20 02:43:59 UTC (rev 191326)
@@ -156,9 +156,6 @@
CompositeOperator compositeOperator { CompositeSourceOver };
BlendMode blendMode { BlendModeNormal };
- AffineTransform userToDeviceSpaceCTM;
- AffineTransform ctm;
-
bool shouldAntialias : 1;
bool shouldSmoothFonts : 1;
bool antialiasedFontDilationEnabled : 1;
@@ -423,25 +420,18 @@
void canvasClip(const Path&, WindRule = RULE_EVENODD);
void clipOut(const Path&);
- WEBCORE_EXPORT void scale(const FloatSize& size) { scale(size.width(), size.height()); }
+ WEBCORE_EXPORT void scale(const FloatSize&);
void rotate(float angleInRadians);
void translate(const FloatSize& size) { translate(size.width(), size.height()); }
- WEBCORE_EXPORT void scale(float x, float y);
WEBCORE_EXPORT void translate(float x, float y);
void setURLForRect(const URL&, const IntRect&);
- void checkCTMInvariants() const
- {
- ASSERT(getCTM(DefinitelyIncludeDeviceScale).isEssentiallyEqualTo(getPlatformCTM(DefinitelyIncludeDeviceScale)));
- ASSERT(getCTM(PossiblyIncludeDeviceScale).isEssentiallyEqualTo(getPlatformCTM(PossiblyIncludeDeviceScale)));
- }
void concatCTM(const AffineTransform&);
void setCTM(const AffineTransform&);
- void resetPlatformCTM();
enum IncludeDeviceScale { DefinitelyIncludeDeviceScale, PossiblyIncludeDeviceScale };
- AffineTransform getCTM(IncludeDeviceScale = PossiblyIncludeDeviceScale) const;
+ AffineTransform getCTM(IncludeDeviceScale includeScale = PossiblyIncludeDeviceScale) const;
#if ENABLE(3D_TRANSFORMS) && USE(TEXTURE_MAPPER)
// This is needed when using accelerated-compositing in software mode, like in TextureMapper.
@@ -555,13 +545,6 @@
void setPlatformAlpha(float);
void setPlatformCompositeOperation(CompositeOperator, BlendMode = BlendModeNormal);
- void concatPlatformCTM(const AffineTransform&);
- void scalePlatformCTM(float x, float y);
- void rotatePlatformCTM(float);
- void translatePlatformCTM(float, float);
- void setPlatformCTM(const AffineTransform&);
- AffineTransform getPlatformCTM(IncludeDeviceScale = PossiblyIncludeDeviceScale) const; // This is only computed to ASSERT() that the GraphicsContextState agrees with the underlying platform.
-
void beginPlatformTransparencyLayer(float opacity);
void endPlatformTransparencyLayer();
static bool supportsTransparencyLayers();
Modified: trunk/Source/WebCore/platform/graphics/Image.h (191325 => 191326)
--- trunk/Source/WebCore/platform/graphics/Image.h 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2015-10-20 02:43:59 UTC (rev 191326)
@@ -133,7 +133,7 @@
enum TileRule { StretchTile, RoundTile, SpaceTile, RepeatTile };
- virtual PassNativeImagePtr nativeImageForCurrentFrame() { return nullptr; }
+ virtual PassNativeImagePtr nativeImageForCurrentFrame() { return 0; }
virtual ImageOrientation orientationForCurrentFrame() { return ImageOrientation(); }
// Accessors for native image formats.
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (191325 => 191326)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-10-20 02:43:59 UTC (rev 191326)
@@ -194,16 +194,8 @@
delete m_data;
}
-void GraphicsContext::resetPlatformCTM()
+AffineTransform GraphicsContext::getCTM(IncludeDeviceScale) const
{
- if (platformContext())
- m_state.ctm = getPlatformCTM();
- else
- m_state.ctm.makeIdentity();
-}
-
-AffineTransform GraphicsContext::getPlatformCTM(IncludeDeviceScale) const
-{
if (paintingDisabled())
return AffineTransform();
@@ -719,14 +711,14 @@
return result;
}
-void GraphicsContext::translatePlatformCTM(float x, float y)
+void GraphicsContext::translate(float x, float y)
{
if (paintingDisabled())
return;
cairo_t* cr = platformContext()->cr();
cairo_translate(cr, x, y);
- m_data->translatePlatformCTM(x, y);
+ m_data->translate(x, y);
}
void GraphicsContext::setPlatformFillColor(const Color&, ColorSpace)
@@ -781,7 +773,7 @@
notImplemented();
}
-void GraphicsContext::concatPlatformCTM(const AffineTransform& transform)
+void GraphicsContext::concatCTM(const AffineTransform& transform)
{
if (paintingDisabled())
return;
@@ -789,10 +781,10 @@
cairo_t* cr = platformContext()->cr();
const cairo_matrix_t matrix = cairo_matrix_t(transform);
cairo_transform(cr, &matrix);
- m_data->concatPlatformCTM(transform);
+ m_data->concatCTM(transform);
}
-void GraphicsContext::setPlatformCTM(const AffineTransform& transform)
+void GraphicsContext::setCTM(const AffineTransform& transform)
{
if (paintingDisabled())
return;
@@ -800,7 +792,7 @@
cairo_t* cr = platformContext()->cr();
const cairo_matrix_t matrix = cairo_matrix_t(transform);
cairo_set_matrix(cr, &matrix);
- m_data->setPlatformCTM(transform);
+ m_data->setCTM(transform);
}
void GraphicsContext::setPlatformShadow(FloatSize const& size, float, Color const&, ColorSpace)
@@ -1011,22 +1003,22 @@
cairo_set_fill_rule(cr, savedFillRule);
}
-void GraphicsContext::rotatePlatformCTM(float radians)
+void GraphicsContext::rotate(float radians)
{
if (paintingDisabled())
return;
cairo_rotate(platformContext()->cr(), radians);
- m_data->rotatePlatformCTM(radians);
+ m_data->rotate(radians);
}
-void GraphicsContext::scalePlatformCTM(float x, float y)
+void GraphicsContext::scale(const FloatSize& size)
{
if (paintingDisabled())
return;
- cairo_scale(platformContext()->cr(), x, y);
- m_data->scalePlatformCTM(x, y);
+ cairo_scale(platformContext()->cr(), size.width(), size.height());
+ m_data->scale(size);
}
void GraphicsContext::clipOut(const FloatRect& r)
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h (191325 => 191326)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h 2015-10-20 02:43:59 UTC (rev 191326)
@@ -67,24 +67,24 @@
void flush();
void clip(const FloatRect&);
void clip(const Path&);
- void scalePlatformCTM(float, float);
- void rotatePlatformCTM(float);
- void translatePlatformCTM(float, float);
- void concatPlatformCTM(const AffineTransform&);
- void setPlatformCTM(const AffineTransform&);
+ void scale(const FloatSize&);
+ void rotate(float);
+ void translate(float, float);
+ void concatCTM(const AffineTransform&);
+ void setCTM(const AffineTransform&);
void syncContext(cairo_t* cr);
#else
// On everything else, we do nothing.
- void save() { }
- void restore() { }
- void flush() { }
- void clip(const FloatRect&) { }
- void clip(const Path&) { }
- void scalePlatformCTM(float, float) { }
- void rotatePlatformCTM(float) { }
- void translatePlatformCTM(float, float) { }
- void concatPlatformCTM(const AffineTransform&) { }
- void setPlatformCTM(const AffineTransform&) { }
+ void save() {}
+ void restore() {}
+ void flush() {}
+ void clip(const FloatRect&) {}
+ void clip(const Path&) {}
+ void scale(const FloatSize&) {}
+ void rotate(float) {}
+ void translate(float, float) {}
+ void concatCTM(const AffineTransform&) {}
+ void setCTM(const AffineTransform&) {}
void syncContext(cairo_t*) { }
#endif
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (191325 => 191326)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-10-20 02:43:59 UTC (rev 191326)
@@ -104,16 +104,6 @@
}
#endif
-void GraphicsContext::resetPlatformCTM()
-{
- m_state.ctm = CGContextGetCTM(platformContext());
-#if PLATFORM(WIN) || PLATFORM(IOS)
- m_state.userToDeviceSpaceCTM = static_cast<AffineTransform>(CGContextGetUserSpaceToDeviceSpaceTransform(platformContext())) * m_state.ctm.inverse();
-#else
- m_state.userToDeviceSpaceCTM = CGContextGetDefaultUserSpaceToDeviceSpaceTransform(platformContext());
-#endif
-}
-
void GraphicsContext::platformInit(CGContextRef cgContext)
{
m_data = new GraphicsContextPlatformPrivate(cgContext);
@@ -123,7 +113,6 @@
setPlatformFillColor(fillColor(), fillColorSpace());
setPlatformStrokeColor(strokeColor(), strokeColorSpace());
setPlatformStrokeThickness(strokeThickness());
- resetPlatformCTM();
}
}
@@ -165,7 +154,7 @@
return;
CGContextRef context = platformContext();
- GraphicsContextStateSaver stateSaver(*this);
+ CGContextStateSaver stateSaver(context);
#if PLATFORM(IOS)
// Anti-aliasing is on by default on the iPhone. Need to turn it off when drawing images.
@@ -279,7 +268,7 @@
return;
CGContextRef context = platformContext();
- GraphicsContextStateSaver stateSaver(*this);
+ CGContextStateSaver stateSaver(context);
CGContextClipToRect(context, destRect);
setPlatformCompositeOperation(op, blendMode);
@@ -681,7 +670,7 @@
FloatRect rect = path.fastBoundingRect();
FloatSize layerSize = getCTM().mapSize(rect.size());
- CGLayerRef layer = CGLayerCreateWithContext(context, layerSize, nullptr);
+ CGLayerRef layer = CGLayerCreateWithContext(context, layerSize, 0);
CGContextRef layerContext = CGLayerGetContext(layer);
CGContextScaleCTM(layerContext, layerSize.width() / rect.width(), layerSize.height() / rect.height());
@@ -1264,52 +1253,52 @@
CGContextEOClip(platformContext());
}
-void GraphicsContext::scalePlatformCTM(float x, float y)
+void GraphicsContext::scale(const FloatSize& size)
{
if (paintingDisabled())
return;
- CGContextScaleCTM(platformContext(), x, y);
- m_data->scalePlatformCTM(x, y);
+ CGContextScaleCTM(platformContext(), size.width(), size.height());
+ m_data->scale(size);
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-void GraphicsContext::rotatePlatformCTM(float angle)
+void GraphicsContext::rotate(float angle)
{
if (paintingDisabled())
return;
CGContextRotateCTM(platformContext(), angle);
- m_data->rotatePlatformCTM(angle);
+ m_data->rotate(angle);
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-void GraphicsContext::translatePlatformCTM(float x, float y)
+void GraphicsContext::translate(float x, float y)
{
if (paintingDisabled())
return;
CGContextTranslateCTM(platformContext(), x, y);
- m_data->translatePlatformCTM(x, y);
+ m_data->translate(x, y);
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-void GraphicsContext::concatPlatformCTM(const AffineTransform& transform)
+void GraphicsContext::concatCTM(const AffineTransform& transform)
{
if (paintingDisabled())
return;
CGContextConcatCTM(platformContext(), transform);
- m_data->concatPlatformCTM(transform);
+ m_data->concatCTM(transform);
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-void GraphicsContext::setPlatformCTM(const AffineTransform& transform)
+void GraphicsContext::setCTM(const AffineTransform& transform)
{
if (paintingDisabled())
return;
CGContextSetCTM(platformContext(), transform);
- m_data->setPlatformCTM(transform);
+ m_data->setCTM(transform);
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-AffineTransform GraphicsContext::getPlatformCTM(IncludeDeviceScale includeScale) const
+AffineTransform GraphicsContext::getCTM(IncludeDeviceScale includeScale) const
{
if (paintingDisabled())
return AffineTransform();
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h (191325 => 191326)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h 2015-10-20 02:43:59 UTC (rev 191326)
@@ -53,16 +53,16 @@
#if PLATFORM(COCOA)
// These methods do nothing on Mac.
- void save() { }
- void restore() { }
- void flush() { }
- void clip(const FloatRect&) { }
- void clip(const Path&) { }
- void scalePlatformCTM(float, float) { }
- void rotatePlatformCTM(float) { }
- void translatePlatformCTM(float, float) { }
- void concatPlatformCTM(const AffineTransform&) { }
- void setPlatformCTM(const AffineTransform&) { }
+ void save() {}
+ void restore() {}
+ void flush() {}
+ void clip(const FloatRect&) {}
+ void clip(const Path&) {}
+ void scale(const FloatSize&) {}
+ void rotate(float) {}
+ void translate(float, float) {}
+ void concatCTM(const AffineTransform&) {}
+ void setCTM(const AffineTransform&) {}
#endif
#if PLATFORM(WIN)
@@ -72,11 +72,11 @@
void flush();
void clip(const FloatRect&);
void clip(const Path&);
- void scalePlatformCTM(float x, float y);
- void rotatePlatformCTM(float);
- void translatePlatformCTM(float, float);
- void concatPlatformCTM(const AffineTransform&);
- void setPlatformCTM(const AffineTransform&);
+ void scale(const FloatSize&);
+ void rotate(float);
+ void translate(float, float);
+ void concatCTM(const AffineTransform&);
+ void setCTM(const AffineTransform&);
HDC m_hdc;
bool m_shouldIncludeChildWindows;
Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h (191325 => 191326)
--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2015-10-20 02:43:59 UTC (rev 191326)
@@ -30,7 +30,6 @@
#include "PlatformExportMacros.h"
#include <array>
#include <wtf/FastMalloc.h>
-#include <wtf/MathExtras.h>
#if USE(CG)
typedef struct CGAffineTransform CGAffineTransform;
@@ -141,7 +140,6 @@
return (m_transform[1] == 0 && m_transform[2] == 0) || (m_transform[0] == 0 && m_transform[3] == 0);
}
- // FIXME: If you compare floats for equality, you're gonna have a bad time. We should delete this.
bool operator== (const AffineTransform& m2) const
{
return (m_transform[0] == m2.m_transform[0]
@@ -154,21 +152,6 @@
bool operator!=(const AffineTransform& other) const { return !(*this == other); }
- bool isEssentiallyEqualTo(const AffineTransform& m2, double epsilon = 0.001) const
- {
- // WTF::areEssentiallyEqual() doesn't work well in this case. That function is designed to allow for error
- // which scales proportionately to the values. However, AffineTransforms are often rotated by pi/2, which
- // are not exactly representable. This results in AffineTransform components which are close to, but not
- // exactly equal to, zero. In this case, the error and the value are approximately equal, which leads to
- // a false negative return.
- return std::abs(m_transform[0] - m2.m_transform[0]) < epsilon
- && std::abs(m_transform[1] - m2.m_transform[1]) < epsilon
- && std::abs(m_transform[2] - m2.m_transform[2]) < epsilon
- && std::abs(m_transform[3] - m2.m_transform[3]) < epsilon
- && std::abs(m_transform[4] - m2.m_transform[4]) < epsilon
- && std::abs(m_transform[5] - m2.m_transform[5]) < epsilon;
- }
-
// *this = *this * t (i.e., a multRight)
AffineTransform& operator*=(const AffineTransform& t)
{
Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp (191325 => 191326)
--- trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp 2015-10-20 02:43:59 UTC (rev 191326)
@@ -171,24 +171,24 @@
notImplemented();
}
-void GraphicsContextPlatformPrivate::scalePlatformCTM(float x, float y)
+void GraphicsContextPlatformPrivate::scale(const FloatSize& size)
{
if (!m_hdc)
return;
- XFORM xform = TransformationMatrix().scaleNonUniform(x, y);
+ XFORM xform = TransformationMatrix().scaleNonUniform(size.width(), size.height());
ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
}
static const double deg2rad = 0.017453292519943295769; // pi/180
-void GraphicsContextPlatformPrivate::rotatePlatformCTM(float degreesAngle)
+void GraphicsContextPlatformPrivate::rotate(float degreesAngle)
{
XFORM xform = TransformationMatrix().rotate(degreesAngle);
ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
}
-void GraphicsContextPlatformPrivate::translatePlatformCTM(float x , float y)
+void GraphicsContextPlatformPrivate::translate(float x , float y)
{
if (!m_hdc)
return;
@@ -197,7 +197,7 @@
ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
}
-void GraphicsContextPlatformPrivate::concatPlatformCTM(const AffineTransform& transform)
+void GraphicsContextPlatformPrivate::concatCTM(const AffineTransform& transform)
{
if (!m_hdc)
return;
@@ -206,7 +206,7 @@
ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
}
-void GraphicsContextPlatformPrivate::setPlatformCTM(const AffineTransform& transform)
+void GraphicsContextPlatformPrivate::setCTM(const AffineTransform& transform)
{
if (!m_hdc)
return;
Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (191325 => 191326)
--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-10-20 02:43:59 UTC (rev 191326)
@@ -216,13 +216,12 @@
NSGraphicsContext *nsContext = [NSGraphicsContext currentContext];
CGContextRef cgContext = static_cast<CGContextRef>([nsContext graphicsPort]);
+ GraphicsContext graphicsContext(cgContext);
// Safari doesn't flip the NSGraphicsContext before calling WebKit, yet WebCore requires a flipped graphics context.
BOOL flipped = [nsContext isFlipped];
if (!flipped)
CGContextScaleCTM(cgContext, 1, -1);
-
- GraphicsContext graphicsContext(cgContext);
FontCascade webCoreFont(FontPlatformData(toCTFont(font), [font pointSize]), Antialiased);
TextRun run(StringView(buffer.data(), length));
Modified: trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h (191325 => 191326)
--- trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2015-10-20 02:23:44 UTC (rev 191325)
+++ trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2015-10-20 02:43:59 UTC (rev 191326)
@@ -143,8 +143,6 @@
void CGContextSetCompositeOperation(CGContextRef, CGCompositeOperation);
void CGContextSetShouldAntialiasFonts(CGContextRef, bool shouldAntialiasFonts);
void CGContextResetClip(CGContextRef);
-CGAffineTransform CGContextGetUserSpaceToDeviceSpaceTransform(CGContextRef);
-CGAffineTransform CGContextGetDefaultUserSpaceToDeviceSpaceTransform(CGContextRef);
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
void CGContextSetFontDilation(CGContextRef, CGSize);
void CGContextSetFontRenderingStyle(CGContextRef, CGFontRenderingStyle);
