Chromium Code Reviews| Index: content/browser/frame_host/navigation_controller_android.cc |
| diff --git a/content/browser/frame_host/navigation_controller_android.cc b/content/browser/frame_host/navigation_controller_android.cc |
| index a7590fd97a1e5783dffd44e3ce2900327c8a2687..6132a1a513203592375e5fdd0faa0153423d8853 100644 |
| --- a/content/browser/frame_host/navigation_controller_android.cc |
| +++ b/content/browser/frame_host/navigation_controller_android.cc |
| @@ -12,6 +12,7 @@ |
| #include "content/public/browser/navigation_controller.h" |
| #include "content/public/browser/ssl_host_state_delegate.h" |
| #include "jni/NavigationControllerImpl_jni.h" |
| +#include "net/base/data_url.h" |
| #include "ui/gfx/android/java_bitmap.h" |
| using base::android::AttachCurrentThread; |
| @@ -195,6 +196,7 @@ void NavigationControllerAndroid::LoadUrl( |
| const JavaParamRef<jbyteArray>& post_data, |
| const JavaParamRef<jstring>& base_url_for_data_url, |
| const JavaParamRef<jstring>& virtual_url_for_data_url, |
| + const JavaParamRef<jstring>& data_url_as_string, |
| jboolean can_load_local_resources, |
| jboolean is_renderer_initiated, |
| jboolean should_replace_current_entry) { |
| @@ -232,6 +234,24 @@ void NavigationControllerAndroid::LoadUrl( |
| GURL(ConvertJavaStringToUTF8(env, virtual_url_for_data_url)); |
| } |
| + if (data_url_as_string) { |
| + // Treat |data_url_as_string| as if we were intenting to put it into a GURL |
|
Charlie Reis
2015/12/14 20:35:57
nit: intending
mnaganov (inactive)
2015/12/15 18:30:29
Done.
|
| + // field. Note that kMaxURLChars is only enforced when serializing URLs |
| + // for IPC. |
| + GURL data_url = GURL(ConvertJavaStringToUTF8(env, data_url_as_string)); |
| + DCHECK(data_url.SchemeIs(url::kDataScheme)); |
| + DCHECK(params.url.SchemeIs(url::kDataScheme)); |
| +#if DCHECK_IS_ON() |
| + { |
| + std::string mime_type, charset, data; |
| + DCHECK(net::DataURL::Parse(params.url, &mime_type, &charset, &data)); |
| + DCHECK(data.empty()); |
| + } |
| +#endif |
| + std::string s = data_url.spec(); |
| + params.data_url_as_string = base::RefCountedString::TakeString(&s); |
| + } |
| + |
| if (j_referrer_url) { |
| params.referrer = content::Referrer( |
| GURL(ConvertJavaStringToUTF8(env, j_referrer_url)), |