Use bounds instead of size for prerender requests

chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.prerender;
 
 import android.app.Application;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Point;
+import android.graphics.Rect;
 import android.view.WindowManager;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.WebContentsFactory;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.content_public.browser.WebContents;
 
 /**
@@ skipping 10 matching lines @@
 
     /**
      * Add a prerender for the given url and given content view dimensions.
      * <p>
      * The generated {@link WebContents} does not actually contain the prerendered contents but
      * must be used as the container that you load the prerendered URL into.
      *
      * @param profile The profile to use for the prerender.
      * @param url The url to prerender.
      * @param referrer The referrer for the prerender request.
-     * @param width The width for the content view (render widget host view) for the prerender.
-     * @param height The height for the content view (render widget host view) for the prerender.
+     * @param bounds The bounds for the content view (render widget host view) for the prerender.
      * @param prerenderOnCellular Whether the prerender should happen if the device has a cellular
      *                            connection.
      * @return The {@link WebContents} that is linked to this prerender. {@code null} if
      *         unsuccessful.
      */
-    public WebContents addPrerender(Profile profile, String url, String referrer, int width,
-            int height, boolean prerenderOnCellular) {
+    public WebContents addPrerender(Profile profile, String url, String referrer,
+            Rect bounds, boolean prerenderOnCellular) {
         WebContents webContents = WebContentsFactory.createWebContents(false, false);
-        if (addPrerender(profile, webContents, url, referrer, width, height, prerenderOnCellular)) {
+        if (addPrerender(profile, webContents, url, referrer, bounds, prerenderOnCellular)) {
             return webContents;
         }
         if (webContents != null) webContents.destroy();
         return null;
     }
 
     /**
      * Adds a prerender for the given URL to an existing {@link WebContents} with the given
      * dimensions.
      *
      * @param profile The profile to use for the prerender.
      * @param webContents The WebContents to add the prerender to.
      * @param url The url to prerender.
      * @param referrer The referrer for the prerender request.
-     * @param width The width for the content view (render widget host view) for the prerender.
-     * @param height The height for the content view (render widget host view) for the prerender.
+     * @param bounds The bounds for the content view (render widget host view) for the prerender.
      * @param prerenderOnCellular Whether the prerender should happen if the device has a cellular
      *                            connection.
      * @return Whether the prerender was successful.
      */
     public boolean addPrerender(Profile profile, WebContents webContents, String url,
-            String referrer, int width, int height, boolean prerenderOnCellular) {
-        return nativeAddPrerender(mNativeExternalPrerenderHandler, profile, webContents,
-                url, referrer, width, height, prerenderOnCellular);
+            String referrer, Rect bounds, boolean prerenderOnCellular) {
+        return nativeAddPrerender(mNativeExternalPrerenderHandler, profile, webContents, url,
+                referrer, bounds.top, bounds.left, bounds.bottom, bounds.right,
+                prerenderOnCellular);
     }
 
     /**
      * Cancel the current prerender action on this {@link ExternalPrerenderHandler}.
      */
     public void cancelCurrentPrerender() {
         nativeCancelCurrentPrerender(mNativeExternalPrerenderHandler);
     }
 
     /**
@@ skipping 55 matching lines @@
             screenSize.x = (int) Math.ceil(screenSize.x / density);
             screenSize.y = (int) Math.ceil(screenSize.y / density);
         }
         return screenSize;
     }
 
     private static native long nativeInit();
     private static native boolean nativeAddPrerender(
             long nativeExternalPrerenderHandlerAndroid, Profile profile,
             WebContents webContents, String url, String referrer,
-            int width, int height, boolean prerenderOnCellular);
+            int top, int left, int bottom, int right, boolean prerenderOnCellular);
     private static native boolean nativeHasPrerenderedUrl(
             Profile profile, String url, WebContents webContents);
     private static native boolean nativeHasPrerenderedAndFinishedLoadingUrl(
             Profile profile, String url, WebContents webContents);
     private static native void nativeCancelCurrentPrerender(
             long nativeExternalPrerenderHandlerAndroid);
 }