Chromium Code Reviews| Index: content/browser/web_contents/web_contents_impl.cc |
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
| index b3b4e822ba2b0739870141f28e0dc31c20681428..2d68bea548a35a007a8c56b22045457eff2e4e47 100644 |
| --- a/content/browser/web_contents/web_contents_impl.cc |
| +++ b/content/browser/web_contents/web_contents_impl.cc |
| @@ -3280,18 +3280,17 @@ void WebContentsImpl::DidFinishNavigation(NavigationHandle* navigation_handle) { |
| void WebContentsImpl::DidStartProvisionalLoad( |
| RenderFrameHostImpl* render_frame_host, |
| const GURL& validated_url, |
| - bool is_error_page, |
| - bool is_iframe_srcdoc) { |
| + bool is_error_page) { |
| // Notify observers about the start of the provisional load. |
| for (auto& observer : observers_) { |
| observer.DidStartProvisionalLoadForFrame(render_frame_host, validated_url, |
| - is_error_page, is_iframe_srcdoc); |
| + is_error_page); |
| } |
| // Notify accessibility if this is a reload. |
| NavigationEntry* entry = controller_.GetVisibleEntry(); |
| - if (entry && ui::PageTransitionCoreTypeIs( |
| - entry->GetTransitionType(), ui::PAGE_TRANSITION_RELOAD)) { |
| + if (entry && ui::PageTransitionCoreTypeIs(entry->GetTransitionType(), |
| + ui::PAGE_TRANSITION_RELOAD)) { |
| FrameTreeNode* ftn = render_frame_host->frame_tree_node(); |
| BrowserAccessibilityManager* manager = |
| ftn->current_frame_host()->browser_accessibility_manager(); |
| @@ -3562,7 +3561,8 @@ void WebContentsImpl::OnDidFinishLoad(const GURL& url) { |
| GURL validated_url(url); |
| RenderProcessHost* render_process_host = |
| render_frame_message_source_->GetProcess(); |
| - render_process_host->FilterURL(false, &validated_url); |
| + if (validated_url != GURL(content::kAboutSrcDocURL)) |
|
nasko
2016/11/15 17:15:23
Remove check.
arthursonzogni
2016/11/17 17:04:58
Done.
|
| + render_process_host->FilterURL(false, &validated_url); |
| RenderFrameHostImpl* rfh = |
| static_cast<RenderFrameHostImpl*>(render_frame_message_source_); |