| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index b1dfbf11a00a9b902bc14fb8fdd748b826634f04..c9d8b6964d2c22790443d65d0657728c48c30358 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -3484,7 +3484,6 @@
|
| info.isClientRedirect = pending_navigation_info_->client_redirect;
|
| info.isCacheDisabled = pending_navigation_info_->cache_disabled;
|
| info.form = pending_navigation_info_->form;
|
| - info.sourceLocation = pending_navigation_info_->source_location;
|
|
|
| pending_navigation_info_.reset(nullptr);
|
|
|
| @@ -5754,16 +5753,15 @@
|
| }
|
|
|
| void RenderFrameImpl::OnMixedContentFound(
|
| - const FrameMsg_MixedContentFound_Params& params) {
|
| - blink::WebSourceLocation source_location;
|
| - source_location.url = WebString::fromLatin1(params.source_location.url);
|
| - source_location.lineNumber = params.source_location.line_number;
|
| - source_location.columnNumber = params.source_location.column_number;
|
| - auto request_context = static_cast<blink::WebURLRequest::RequestContext>(
|
| - params.request_context_type);
|
| - frame_->mixedContentFound(params.main_resource_url, params.mixed_content_url,
|
| - request_context, params.was_allowed,
|
| - params.had_redirect, source_location);
|
| + const GURL& main_resource_url,
|
| + const GURL& mixed_content_url,
|
| + RequestContextType request_context_type,
|
| + bool was_allowed,
|
| + bool had_redirect) {
|
| + auto request_context =
|
| + static_cast<blink::WebURLRequest::RequestContext>(request_context_type);
|
| + frame_->mixedContentFound(main_resource_url, mixed_content_url,
|
| + request_context, was_allowed, had_redirect);
|
| }
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -6926,16 +6924,4 @@
|
| #endif
|
| }
|
|
|
| -RenderFrameImpl::PendingNavigationInfo::PendingNavigationInfo(
|
| - const NavigationPolicyInfo& info)
|
| - : navigation_type(info.navigationType),
|
| - policy(info.defaultPolicy),
|
| - replaces_current_history_item(info.replacesCurrentHistoryItem),
|
| - history_navigation_in_new_child_frame(
|
| - info.isHistoryNavigationInNewChildFrame),
|
| - client_redirect(info.isClientRedirect),
|
| - cache_disabled(info.isCacheDisabled),
|
| - form(info.form),
|
| - source_location(info.sourceLocation) {}
|
| -
|
| } // namespace content
|
|
|