Allow data URL > 2MB for loadDataWithBaseURL

content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java

 // Copyright (c) 2012 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.content.browser;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 
 import java.util.Map;
@@ skipping 21 matching lines @@
     // Fields with counterparts in NavigationController::LoadURLParams.
     // Package private so that ContentViewCore.loadUrl can pass them down to
     // native code. Should not be accessed directly anywhere else outside of
     // this class.
     final String mUrl;
     int mLoadUrlType;
     int mTransitionType;
     int mUaOverrideOption;
     private Map<String, String> mExtraHeaders;
     byte[] mPostData;
+    String mDataForDataUrl;
     String mBaseUrlForDataUrl;
     String mVirtualUrlForDataUrl;
     boolean mCanLoadLocalResources;
 
     public LoadUrlParams(String url) {
         // Check initializeConstants was called.
         assert LOAD_TYPE_DEFAULT != LOAD_TYPE_BROWSER_INITIATED_HTTP_POST;
 
         mUrl = url;
         mLoadUrlType = LOAD_TYPE_DEFAULT;
         mTransitionType = PageTransitionTypes.PAGE_TRANSITION_LINK;
         mUaOverrideOption = UA_OVERRIDE_INHERIT;
         mPostData = null;
+        mDataForDataUrl = null;
         mBaseUrlForDataUrl = null;
         mVirtualUrlForDataUrl = null;
     }
 
     /**
      * Helper method to create a LoadUrlParams object for data url.
      * @param data Data to be loaded.
      * @param mimeType Mime type of the data.
      * @param isBase64Encoded True if the data is encoded in Base 64 format.
      */
@@ skipping 60 matching lines @@
      *                Defaults to about:blank if null.
      * @param historyUrl History url for this data load. Note that for WebView compatibility,
      *                   this is ignored if baseUrl is a data: url. Defaults to about:blank
      *                   if null.
      * @param charset The character set for the data. Pass null if the mime type
      *                does not require a special charset.
      */
     public static LoadUrlParams createLoadDataParamsWithBaseUrl(
             String data, String mimeType, boolean isBase64Encoded,
             String baseUrl, String historyUrl, String charset) {
-        LoadUrlParams params = createLoadDataParams(data, mimeType, isBase64Encoded, charset);
-        // For WebView compatibility, when the base URL has the 'data:'
-        // scheme, we treat it as a regular data URL load and skip setting
-        // baseUrl and historyUrl.
-        // TODO(joth): we should just append baseURL and historyURL here, and move the
-        // WebView specific transform up to a wrapper factory function in android_webview/.
-        if (baseUrl == null || !baseUrl.toLowerCase().startsWith("data:")) {
-            params.setBaseUrlForDataUrl(baseUrl != null ? baseUrl : "about:blank");
-            params.setVirtualUrlForDataUrl(historyUrl != null ? historyUrl : "about:blank");
-        }
+        // This method is only used in WebView. For backward compatibility, data: base URLs
+        // should never be passed in here, and instead handled as per loadData() call.
+        assert !baseUrl.startsWith("data:");
+        LoadUrlParams params = createLoadDataParams("", mimeType, isBase64Encoded, charset);
+        params.mDataForDataUrl = data;
+        params.setBaseUrlForDataUrl(baseUrl);
+        params.setVirtualUrlForDataUrl(historyUrl);
         return params;
     }
 
     /**
      * Helper method to create a LoadUrlParams object for an HTTP POST load.
      * @param url URL of the load.
      * @param postData Post data of the load. Can be null.
      */
     public static LoadUrlParams createLoadHttpPostParams(
             String url, byte[] postData) {
@@ skipping 112 matching lines @@
      * defaults to false.
      */
     public void setCanLoadLocalResources(boolean canLoad) {
         mCanLoadLocalResources = canLoad;
     }
 
     public int getLoadUrlType() {
         return mLoadUrlType;
     }
 
-    public boolean isBaseUrlDataScheme() {
-        // If there's no base url set, but this is a data load then
-        // treat the scheme as data:.
-        if (mBaseUrlForDataUrl == null && mLoadUrlType == LOAD_TYPE_DATA) {
-            return true;
-        }
-        return nativeIsDataScheme(mBaseUrlForDataUrl);
-    }
-
     @SuppressWarnings("unused")
     @CalledByNative
     private static void initializeConstants(
             int load_type_default,
             int load_type_browser_initiated_http_post,
             int load_type_data,
             int ua_override_inherit,
             int ua_override_false,
             int ua_override_true) {
         LOAD_TYPE_DEFAULT = load_type_default;
         LOAD_TYPE_BROWSER_INITIATED_HTTP_POST = load_type_browser_initiated_http_post;
         LOAD_TYPE_DATA = load_type_data;
         UA_OVERRIDE_INHERIT = ua_override_inherit;
         UA_OVERRIDE_FALSE = ua_override_false;
         UA_OVERRIDE_TRUE = ua_override_true;
     }
-
-    /**
-     * Parses |url| as a GURL on the native side, and
-     * returns true if it's scheme is data:.
-     */
-    private static native boolean nativeIsDataScheme(String url);
 }