2 files changed, 15 insertions, 5 deletions
diff --git a/WebCore/dom/CanvasSurface.cpp b/WebCore/dom/CanvasSurface.cpp
index dc7e4e1..3b0f397 100644
--- a/WebCore/dom/CanvasSurface.cpp
+++ b/WebCore/dom/CanvasSurface.cpp
@@ -47,7 +47,20 @@ const float CanvasSurface::MaxCanvasArea = 32768 * 8192; // Maximum canvas area
 
 CanvasSurface::CanvasSurface(float pageScaleFactor)
     : m_size(DefaultWidth, DefaultHeight)
+#if PLATFORM(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.
+     */
+    // TODO - may be better to move the ifdef to the call site of this
+    // constructor
+    , m_pageScaleFactor(1.0f)
+#else
     , m_pageScaleFactor(pageScaleFactor)
+#endif
     , m_originClean(true)
     , m_hasCreatedImageBuffer(false)
 {
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 98d5764..6ac1f01 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -700,8 +700,8 @@ public:
      * @param content The header value (value of the meta tag's "content" attribute)
      */
     void processHttpEquiv(const String& equiv, const String& content);
-<<<<<<< HEAD
-    
+    void processViewport(const String& features);
+
 #ifdef ANDROID_META_SUPPORT
     /**
      * Handles viewport like <meta name = "viewport" content = "width = device-width">
@@ -709,9 +709,6 @@ public:
      */
     void processMetadataSettings(const String& content);
 #endif
-=======
-    void processViewport(const String& features);
->>>>>>> webkit.org at r58033
 
     // Returns the owning element in the parent document.
     // Returns 0 if this is the top level document.