Diff
Modified: trunk/Source/WebCore/ChangeLog (191323 => 191324)
--- trunk/Source/WebCore/ChangeLog 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/ChangeLog 2015-10-20 00:36:03 UTC (rev 191324)
@@ -1,3 +1,127 @@
+2015-10-19 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Host GraphicsContext's CTM inside GraphicsContextState
+ https://bugs.webkit.org/show_bug.cgi?id=150146
+
+ There are 6 operations which interact with CTMs:
+ - Get
+ - Set
+ - Concatenate
+ - Scale
+ - Rotate
+ - Translate
+
+ This patch modifies all these operations so that these operations shadow the
+ platform's CTM inside GraphicsContextState. This way, we don't have to consult
+ with the underlying graphics context in order to know the current CTM.
+
+ There are currently many places in the Core Graphics ports where we will change
+ the platform's CTM out from under the GraphicsContext. This patch migrates
+ those users to going through GraphicsContext, thereby preserving the integrity
+ of the shadowed state.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/GraphicsContext.cpp: Setters deletate to platform calls.
+ The getter can just consult with the shadowed state.
+ (WebCore::GraphicsContext::concatCTM):
+ (WebCore::GraphicsContext::scale):
+ (WebCore::GraphicsContext::rotate):
+ (WebCore::GraphicsContext::translate):
+ (WebCore::GraphicsContext::setCTM):
+ (WebCore::GraphicsContext::getCTM):
+ (WebCore::GraphicsContext::beginTransparencyLayer):
+ (WebCore::GraphicsContext::applyDeviceScaleFactor):
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::GraphicsContext::scale):
+ (WebCore::GraphicsContext::checkCTMInvariants): Make sure the shadowed state
+ matches the platform graphics context's state.
+ * platform/graphics/Image.h:
+ (WebCore::Image::nativeImageForCurrentFrame):
+ * platform/graphics/cairo/GraphicsContextCairo.cpp: Renaming functions.
+ (WebCore::GraphicsContext::resetPlatformCTM):
+ (WebCore::GraphicsContext::getPlatformCTM):
+ (WebCore::GraphicsContext::translatePlatformCTM):
+ (WebCore::GraphicsContext::concatPlatformCTM):
+ (WebCore::GraphicsContext::setPlatformCTM):
+ (WebCore::GraphicsContext::rotatePlatformCTM):
+ (WebCore::GraphicsContext::scalePlatformCTM):
+ (WebCore::GraphicsContext::getCTM): Deleted.
+ (WebCore::GraphicsContext::translate): Deleted.
+ (WebCore::GraphicsContext::concatCTM): Deleted.
+ (WebCore::GraphicsContext::setCTM): Deleted.
+ (WebCore::GraphicsContext::rotate): Deleted.
+ (WebCore::GraphicsContext::scale): Deleted.
+ * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
+ Renaming functions.
+ (WebCore::GraphicsContextPlatformPrivate::save):
+ (WebCore::GraphicsContextPlatformPrivate::restore):
+ (WebCore::GraphicsContextPlatformPrivate::flush):
+ (WebCore::GraphicsContextPlatformPrivate::clip):
+ (WebCore::GraphicsContextPlatformPrivate::scalePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::rotatePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::translatePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::concatPlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::setPlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::scale): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::rotate): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::translate): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::concatCTM): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::setCTM): Deleted.
+ * platform/graphics/cg/GraphicsContextCG.cpp: Renaming functions. Also,
+ migrate CTM setters to go through GraphicsContext.
+ (WebCore::GraphicsContext::resetPlatformCTM):
+ (WebCore::GraphicsContext::platformInit):
+ (WebCore::GraphicsContext::drawNativeImage):
+ (WebCore::GraphicsContext::drawPattern):
+ (WebCore::GraphicsContext::fillPath):
+ (WebCore::GraphicsContext::scalePlatformCTM):
+ (WebCore::GraphicsContext::rotatePlatformCTM):
+ (WebCore::GraphicsContext::translatePlatformCTM):
+ (WebCore::GraphicsContext::concatPlatformCTM):
+ (WebCore::GraphicsContext::setPlatformCTM):
+ (WebCore::GraphicsContext::getPlatformCTM):
+ (WebCore::GraphicsContext::scale): Deleted.
+ (WebCore::GraphicsContext::rotate): Deleted.
+ (WebCore::GraphicsContext::translate): Deleted.
+ (WebCore::GraphicsContext::concatCTM): Deleted.
+ (WebCore::GraphicsContext::setCTM): Deleted.
+ (WebCore::GraphicsContext::getCTM): Deleted.
+ * platform/graphics/cg/GraphicsContextPlatformPrivateCG.h:
+ (WebCore::GraphicsContextPlatformPrivate::save):
+ (WebCore::GraphicsContextPlatformPrivate::restore):
+ (WebCore::GraphicsContextPlatformPrivate::flush):
+ (WebCore::GraphicsContextPlatformPrivate::clip):
+ (WebCore::GraphicsContextPlatformPrivate::scalePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::rotatePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::translatePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::concatPlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::setPlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::scale): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::rotate): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::translate): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::concatCTM): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::setCTM): Deleted.
+ * platform/graphics/transforms/AffineTransform.h:
+ (WebCore::AffineTransform::isEssentiallyEqualTo): Equality comparison on floats
+ is not a good idea. Instead, this function is more valuable. (However, note that
+ it is expected for values in a CTM to hold values close to 0, which means that
+ this function might erroneously return false (similar to operator=()).
+ * platform/graphics/win/GraphicsContextWin.cpp:
+ (WebCore::GraphicsContextPlatformPrivate::scalePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::rotatePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::translatePlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::concatPlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::setPlatformCTM):
+ (WebCore::GraphicsContextPlatformPrivate::scale): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::rotate): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::translate): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::concatCTM): Deleted.
+ (WebCore::GraphicsContextPlatformPrivate::setCTM): Deleted.
+ * platform/mac/DragImageMac.mm:
+ (WebCore::drawAtPoint):
+ * platform/spi/cg/CoreGraphicsSPI.h:
+
2015-10-19 Tim Horton <timothy_hor...@apple.com>
Remove unused support for long presses from WebKit
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (191323 => 191324)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2015-10-20 00:36:03 UTC (rev 191324)
@@ -142,6 +142,87 @@
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())
@@ -295,6 +376,8 @@
{
beginPlatformTransparencyLayer(opacity);
++m_transparencyCount;
+
+ resetPlatformCTM();
}
void GraphicsContext::endTransparencyLayer()
@@ -654,7 +737,8 @@
void GraphicsContext::applyDeviceScaleFactor(float deviceScaleFactor)
{
- scale(FloatSize(deviceScaleFactor, deviceScaleFactor));
+ scale(deviceScaleFactor, deviceScaleFactor);
+
platformApplyDeviceScaleFactor(deviceScaleFactor);
}
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (191323 => 191324)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2015-10-20 00:36:03 UTC (rev 191324)
@@ -156,6 +156,9 @@
CompositeOperator compositeOperator { CompositeSourceOver };
BlendMode blendMode { BlendModeNormal };
+ AffineTransform userToDeviceSpaceCTM;
+ AffineTransform ctm;
+
bool shouldAntialias : 1;
bool shouldSmoothFonts : 1;
bool antialiasedFontDilationEnabled : 1;
@@ -420,18 +423,25 @@
void canvasClip(const Path&, WindRule = RULE_EVENODD);
void clipOut(const Path&);
- WEBCORE_EXPORT void scale(const FloatSize&);
+ WEBCORE_EXPORT void scale(const FloatSize& size) { scale(size.width(), size.height()); }
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 includeScale = PossiblyIncludeDeviceScale) const;
+ AffineTransform getCTM(IncludeDeviceScale = PossiblyIncludeDeviceScale) const;
#if ENABLE(3D_TRANSFORMS) && USE(TEXTURE_MAPPER)
// This is needed when using accelerated-compositing in software mode, like in TextureMapper.
@@ -545,6 +555,13 @@
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 (191323 => 191324)
--- trunk/Source/WebCore/platform/graphics/Image.h 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2015-10-20 00:36:03 UTC (rev 191324)
@@ -133,7 +133,7 @@
enum TileRule { StretchTile, RoundTile, SpaceTile, RepeatTile };
- virtual PassNativeImagePtr nativeImageForCurrentFrame() { return 0; }
+ virtual PassNativeImagePtr nativeImageForCurrentFrame() { return nullptr; }
virtual ImageOrientation orientationForCurrentFrame() { return ImageOrientation(); }
// Accessors for native image formats.
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (191323 => 191324)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2015-10-20 00:36:03 UTC (rev 191324)
@@ -194,8 +194,16 @@
delete m_data;
}
-AffineTransform GraphicsContext::getCTM(IncludeDeviceScale) const
+void GraphicsContext::resetPlatformCTM()
{
+ if (platformContext())
+ m_state.ctm = getPlatformCTM();
+ else
+ m_state.ctm.makeIdentity();
+}
+
+AffineTransform GraphicsContext::getPlatformCTM(IncludeDeviceScale) const
+{
if (paintingDisabled())
return AffineTransform();
@@ -711,14 +719,14 @@
return result;
}
-void GraphicsContext::translate(float x, float y)
+void GraphicsContext::translatePlatformCTM(float x, float y)
{
if (paintingDisabled())
return;
cairo_t* cr = platformContext()->cr();
cairo_translate(cr, x, y);
- m_data->translate(x, y);
+ m_data->translatePlatformCTM(x, y);
}
void GraphicsContext::setPlatformFillColor(const Color&, ColorSpace)
@@ -773,7 +781,7 @@
notImplemented();
}
-void GraphicsContext::concatCTM(const AffineTransform& transform)
+void GraphicsContext::concatPlatformCTM(const AffineTransform& transform)
{
if (paintingDisabled())
return;
@@ -781,10 +789,10 @@
cairo_t* cr = platformContext()->cr();
const cairo_matrix_t matrix = cairo_matrix_t(transform);
cairo_transform(cr, &matrix);
- m_data->concatCTM(transform);
+ m_data->concatPlatformCTM(transform);
}
-void GraphicsContext::setCTM(const AffineTransform& transform)
+void GraphicsContext::setPlatformCTM(const AffineTransform& transform)
{
if (paintingDisabled())
return;
@@ -792,7 +800,7 @@
cairo_t* cr = platformContext()->cr();
const cairo_matrix_t matrix = cairo_matrix_t(transform);
cairo_set_matrix(cr, &matrix);
- m_data->setCTM(transform);
+ m_data->setPlatformCTM(transform);
}
void GraphicsContext::setPlatformShadow(FloatSize const& size, float, Color const&, ColorSpace)
@@ -1003,22 +1011,22 @@
cairo_set_fill_rule(cr, savedFillRule);
}
-void GraphicsContext::rotate(float radians)
+void GraphicsContext::rotatePlatformCTM(float radians)
{
if (paintingDisabled())
return;
cairo_rotate(platformContext()->cr(), radians);
- m_data->rotate(radians);
+ m_data->rotatePlatformCTM(radians);
}
-void GraphicsContext::scale(const FloatSize& size)
+void GraphicsContext::scalePlatformCTM(float x, float y)
{
if (paintingDisabled())
return;
- cairo_scale(platformContext()->cr(), size.width(), size.height());
- m_data->scale(size);
+ cairo_scale(platformContext()->cr(), x, y);
+ m_data->scalePlatformCTM(x, y);
}
void GraphicsContext::clipOut(const FloatRect& r)
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h (191323 => 191324)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h 2015-10-20 00:36:03 UTC (rev 191324)
@@ -67,24 +67,24 @@
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 scalePlatformCTM(float, float);
+ void rotatePlatformCTM(float);
+ void translatePlatformCTM(float, float);
+ void concatPlatformCTM(const AffineTransform&);
+ void setPlatformCTM(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 scale(const FloatSize&) {}
- void rotate(float) {}
- void translate(float, float) {}
- void concatCTM(const AffineTransform&) {}
- void setCTM(const AffineTransform&) {}
+ 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 syncContext(cairo_t*) { }
#endif
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (191323 => 191324)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-10-20 00:36:03 UTC (rev 191324)
@@ -104,6 +104,16 @@
}
#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);
@@ -113,6 +123,7 @@
setPlatformFillColor(fillColor(), fillColorSpace());
setPlatformStrokeColor(strokeColor(), strokeColorSpace());
setPlatformStrokeThickness(strokeThickness());
+ resetPlatformCTM();
}
}
@@ -154,7 +165,7 @@
return;
CGContextRef context = platformContext();
- CGContextStateSaver stateSaver(context);
+ GraphicsContextStateSaver stateSaver(*this);
#if PLATFORM(IOS)
// Anti-aliasing is on by default on the iPhone. Need to turn it off when drawing images.
@@ -268,7 +279,7 @@
return;
CGContextRef context = platformContext();
- CGContextStateSaver stateSaver(context);
+ GraphicsContextStateSaver stateSaver(*this);
CGContextClipToRect(context, destRect);
setPlatformCompositeOperation(op, blendMode);
@@ -670,7 +681,7 @@
FloatRect rect = path.fastBoundingRect();
FloatSize layerSize = getCTM().mapSize(rect.size());
- CGLayerRef layer = CGLayerCreateWithContext(context, layerSize, 0);
+ CGLayerRef layer = CGLayerCreateWithContext(context, layerSize, nullptr);
CGContextRef layerContext = CGLayerGetContext(layer);
CGContextScaleCTM(layerContext, layerSize.width() / rect.width(), layerSize.height() / rect.height());
@@ -1253,52 +1264,52 @@
CGContextEOClip(platformContext());
}
-void GraphicsContext::scale(const FloatSize& size)
+void GraphicsContext::scalePlatformCTM(float x, float y)
{
if (paintingDisabled())
return;
- CGContextScaleCTM(platformContext(), size.width(), size.height());
- m_data->scale(size);
+ CGContextScaleCTM(platformContext(), x, y);
+ m_data->scalePlatformCTM(x, y);
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-void GraphicsContext::rotate(float angle)
+void GraphicsContext::rotatePlatformCTM(float angle)
{
if (paintingDisabled())
return;
CGContextRotateCTM(platformContext(), angle);
- m_data->rotate(angle);
+ m_data->rotatePlatformCTM(angle);
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-void GraphicsContext::translate(float x, float y)
+void GraphicsContext::translatePlatformCTM(float x, float y)
{
if (paintingDisabled())
return;
CGContextTranslateCTM(platformContext(), x, y);
- m_data->translate(x, y);
+ m_data->translatePlatformCTM(x, y);
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-void GraphicsContext::concatCTM(const AffineTransform& transform)
+void GraphicsContext::concatPlatformCTM(const AffineTransform& transform)
{
if (paintingDisabled())
return;
CGContextConcatCTM(platformContext(), transform);
- m_data->concatCTM(transform);
+ m_data->concatPlatformCTM(transform);
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-void GraphicsContext::setCTM(const AffineTransform& transform)
+void GraphicsContext::setPlatformCTM(const AffineTransform& transform)
{
if (paintingDisabled())
return;
CGContextSetCTM(platformContext(), transform);
- m_data->setCTM(transform);
+ m_data->setPlatformCTM(transform);
m_data->m_userToDeviceTransformKnownToBeIdentity = false;
}
-AffineTransform GraphicsContext::getCTM(IncludeDeviceScale includeScale) const
+AffineTransform GraphicsContext::getPlatformCTM(IncludeDeviceScale includeScale) const
{
if (paintingDisabled())
return AffineTransform();
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h (191323 => 191324)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h 2015-10-20 00:36:03 UTC (rev 191324)
@@ -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 scale(const FloatSize&) {}
- void rotate(float) {}
- void translate(float, float) {}
- void concatCTM(const AffineTransform&) {}
- void setCTM(const AffineTransform&) {}
+ 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&) { }
#endif
#if PLATFORM(WIN)
@@ -72,11 +72,11 @@
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 scalePlatformCTM(float x, float y);
+ void rotatePlatformCTM(float);
+ void translatePlatformCTM(float, float);
+ void concatPlatformCTM(const AffineTransform&);
+ void setPlatformCTM(const AffineTransform&);
HDC m_hdc;
bool m_shouldIncludeChildWindows;
Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h (191323 => 191324)
--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2015-10-20 00:36:03 UTC (rev 191324)
@@ -30,6 +30,7 @@
#include "PlatformExportMacros.h"
#include <array>
#include <wtf/FastMalloc.h>
+#include <wtf/MathExtras.h>
#if USE(CG)
typedef struct CGAffineTransform CGAffineTransform;
@@ -140,6 +141,7 @@
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]
@@ -152,6 +154,21 @@
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 (191323 => 191324)
--- trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp 2015-10-20 00:36:03 UTC (rev 191324)
@@ -171,24 +171,24 @@
notImplemented();
}
-void GraphicsContextPlatformPrivate::scale(const FloatSize& size)
+void GraphicsContextPlatformPrivate::scalePlatformCTM(float x, float y)
{
if (!m_hdc)
return;
- XFORM xform = TransformationMatrix().scaleNonUniform(size.width(), size.height());
+ XFORM xform = TransformationMatrix().scaleNonUniform(x, y);
ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
}
static const double deg2rad = 0.017453292519943295769; // pi/180
-void GraphicsContextPlatformPrivate::rotate(float degreesAngle)
+void GraphicsContextPlatformPrivate::rotatePlatformCTM(float degreesAngle)
{
XFORM xform = TransformationMatrix().rotate(degreesAngle);
ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
}
-void GraphicsContextPlatformPrivate::translate(float x , float y)
+void GraphicsContextPlatformPrivate::translatePlatformCTM(float x , float y)
{
if (!m_hdc)
return;
@@ -197,7 +197,7 @@
ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
}
-void GraphicsContextPlatformPrivate::concatCTM(const AffineTransform& transform)
+void GraphicsContextPlatformPrivate::concatPlatformCTM(const AffineTransform& transform)
{
if (!m_hdc)
return;
@@ -206,7 +206,7 @@
ModifyWorldTransform(m_hdc, &xform, MWT_LEFTMULTIPLY);
}
-void GraphicsContextPlatformPrivate::setCTM(const AffineTransform& transform)
+void GraphicsContextPlatformPrivate::setPlatformCTM(const AffineTransform& transform)
{
if (!m_hdc)
return;
Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (191323 => 191324)
--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-10-20 00:36:03 UTC (rev 191324)
@@ -216,12 +216,13 @@
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 (191323 => 191324)
--- trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2015-10-20 00:17:17 UTC (rev 191323)
+++ trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2015-10-20 00:36:03 UTC (rev 191324)
@@ -143,6 +143,8 @@
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);
