summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-08-12 02:36:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-12 02:36:29 -0700
commit11d8c63740ed4cc8f20c58d18343953879868d17 (patch)
tree863c16f0f3f0755d22b7e3d29c7569e86071b884 /Source
parente070cc1fb2ad0c2fdc0e5bf26c3692f2a1a91731 (diff)
parent50f5eaa1d1d82147480483db51ca12990995b6ee (diff)
downloadexternal_webkit-11d8c63740ed4cc8f20c58d18343953879868d17.zip
external_webkit-11d8c63740ed4cc8f20c58d18343953879868d17.tar.gz
external_webkit-11d8c63740ed4cc8f20c58d18343953879868d17.tar.bz2
Merge "Force canvas scale factor to 1."
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/html/HTMLCanvasElement.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp
index 764620c..9f51f10 100644
--- a/Source/WebCore/html/HTMLCanvasElement.cpp
+++ b/Source/WebCore/html/HTMLCanvasElement.cpp
@@ -79,7 +79,19 @@ HTMLCanvasElement::HTMLCanvasElement(const QualifiedName& tagName, Document* doc
, m_size(DefaultWidth, DefaultHeight)
, m_rendererIsCanvas(false)
, m_ignoreReset(false)
+#ifdef ANDROID
+ /* In Android we capture the drawing into a displayList, and then
+ replay that list at various scale factors (sometimes zoomed out, other
+ times zoomed in for "normal" reading, yet other times at arbitrary
+ zoom values based on the user's choice). In all of these cases, we do
+ not re-record the displayList, hence it is usually harmful to perform
+ any pre-rounding, since we just don't know the actual drawing resolution
+ at record time.
+ */
+ , m_pageScaleFactor(1)
+#else
, m_pageScaleFactor(document->frame() ? document->frame()->page()->chrome()->scaleFactor() : 1)
+#endif
, m_originClean(true)
, m_hasCreatedImageBuffer(false)
{