Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2126)

Unified Diff: content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java

Issue 1497743005: Allow huge data: URIs only via WebView.loadDataWithBaseUrl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the test Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
index f9108cc5f6e4c46380f983dd5b44175b5df64a86..8f517d05399d727a69c768307aaf14bedfccc3ef 100644
--- a/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
@@ -150,8 +150,8 @@ import org.chromium.content_public.browser.NavigationHistory;
params.getReferrer() != null ? params.getReferrer().getPolicy() : 0,
params.getUserAgentOverrideOption(), params.getExtraHeadersString(),
params.getPostData(), params.getBaseUrl(), params.getVirtualUrlForDataUrl(),
- params.getCanLoadLocalResources(), params.getIsRendererInitiated(),
- params.getShouldReplaceCurrentEntry());
+ params.getDataUrlAsString(), params.getCanLoadLocalResources(),
+ params.getIsRendererInitiated(), params.getShouldReplaceCurrentEntry());
}
}
@@ -310,8 +310,8 @@ import org.chromium.content_public.browser.NavigationHistory;
private native void nativeLoadUrl(long nativeNavigationControllerAndroid, String url,
int loadUrlType, int transitionType, String referrerUrl, int referrerPolicy,
int uaOverrideOption, String extraHeaders, byte[] postData, String baseUrlForDataUrl,
- String virtualUrlForDataUrl, boolean canLoadLocalResources, boolean isRendererInitiated,
- boolean shouldReplaceCurrentEntry);
+ String virtualUrlForDataUrl, String dataUrlAsString, boolean canLoadLocalResources,
+ boolean isRendererInitiated, boolean shouldReplaceCurrentEntry);
private native void nativeClearHistory(long nativeNavigationControllerAndroid);
private native int nativeGetNavigationHistory(long nativeNavigationControllerAndroid,
Object history);

Powered by Google App Engine
This is Rietveld 408576698