summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-24 20:00:38 +0100
committerBen Murdoch <benm@google.com>2011-06-02 10:37:21 +0100
commit98be889dd4fae67dbbdaa7d65a7113229e35529d (patch)
treeee5307841ba0e84e5200743bb7b4553d2efaf0b1
parentc2a132734701e9acb0c0b0c4b3bf37f505a5b538 (diff)
downloadexternal_webkit-98be889dd4fae67dbbdaa7d65a7113229e35529d.zip
external_webkit-98be889dd4fae67dbbdaa7d65a7113229e35529d.tar.gz
external_webkit-98be889dd4fae67dbbdaa7d65a7113229e35529d.tar.bz2
Merge WebKit at r80534: Fix GraphicsContextAndroid.cpp
Need to provide an Android implementation of new setCTM() function. See http://trac.webkit.org/changeset/78704 Change-Id: Iefd0225495bec6f4945f02660a450018e4270593
-rw-r--r--Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index 4656354..3e20a75 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -1195,6 +1195,14 @@ AffineTransform GraphicsContext::getCTM() const
SkScalarToDouble(m.getTranslateY())); // f
}
+void GraphicsContext::setCTM(const AffineTransform& transform)
+{
+ if (paintingDisabled())
+ return;
+
+ GC2CANVAS(this)->setMatrix(transform);
+}
+
///////////////////////////////////////////////////////////////////////////////
void GraphicsContext::fillPath(const Path& pathToFill)