Merge webkit.org at r58033 : Resolve merge conflicts

- CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f
- CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447
- Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request
- Document.h - Take both, conflicts due to ANDROID_META_SUPPORT
- DragImage.h - Take both, conflict due to Android addition
- EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request
- EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS
- EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909
- FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS
- FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE
- FrameView.cpp - Take both, conflict due to Android frame flattening
- Geolocation.h - Merge conflicts due to Android-specific changes
- Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge
- GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards
- Gradient.h - Take both, conflict due to Android addition
- HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7
- HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element
- JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging
- MediaPlayer.cpp/h - Take both, conflict due to Android-specific change
- PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff
- RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening
- RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code
- Settings.cpp/h - Conflict due to ANDROID_PLUGINS
- TextInputController.h - Take upstream, git got confused
- V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29
- V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards
- WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge
- Widget.h - Take both, conflict due to Android addition
- jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset
- mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request

Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64

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.