| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 314fe7b9680c88b36795064d54a473db8a7139e7..b31065b8746792b9e299dd57e90cdb56395aea48 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -542,8 +542,8 @@ CommonNavigationParams MakeCommonNavigationParams(
|
| return CommonNavigationParams(
|
| request->url(), referrer, extra_data->transition_type(),
|
| FrameMsg_Navigate_Type::NORMAL, true, should_replace_current_entry,
|
| - ui_timestamp, report_type, GURL(), GURL(), LOFI_UNSPECIFIED,
|
| - base::TimeTicks::Now());
|
| + ui_timestamp, report_type, GURL(), GURL(), std::string(),
|
| + LOFI_UNSPECIFIED, base::TimeTicks::Now());
|
| }
|
|
|
| #if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
|
| @@ -3369,7 +3369,7 @@ void RenderFrameImpl::showContextMenu(const blink::WebContextMenuData& data) {
|
| // in the context menu.
|
| // TODO(jcivelli): http://crbug.com/45160 This prevents us from saving large
|
| // data encoded images. We should have a way to save them.
|
| - if (params.src_url.spec().size() > GetMaxURLChars())
|
| + if (params.src_url.spec().size() > kMaxURLChars)
|
| params.src_url = GURL();
|
| context_menu_node_ = data.node;
|
|
|
| @@ -5131,7 +5131,10 @@ void RenderFrameImpl::LoadDataURL(const CommonNavigationParams& params,
|
| blink::WebFrameLoadType load_type) {
|
| // A loadData request with a specified base URL.
|
| std::string mime_type, charset, data;
|
| - if (net::DataURL::Parse(params.url, &mime_type, &charset, &data)) {
|
| + if (net::DataURL::Parse(params.data_url_as_string.empty()
|
| + ? params.url
|
| + : GURL(params.data_url_as_string),
|
| + &mime_type, &charset, &data)) {
|
| const GURL base_url = params.base_url_for_data_url.is_empty() ?
|
| params.url : params.base_url_for_data_url;
|
| bool replace = load_type == blink::WebFrameLoadType::ReloadFromOrigin ||
|
|
|