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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 868673002: OOPIF: report both original and destination rfh in AboutToNavigateRenderFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 2544 matching lines...) Expand 10 before | Expand all | Expand 10 after
2555 observers_, 2555 observers_,
2556 DidFailLoad(render_frame_host, url, error_code, error_description)); 2556 DidFailLoad(render_frame_host, url, error_code, error_description));
2557 } 2557 }
2558 2558
2559 void WebContentsImpl::NotifyChangedNavigationState( 2559 void WebContentsImpl::NotifyChangedNavigationState(
2560 InvalidateTypes changed_flags) { 2560 InvalidateTypes changed_flags) {
2561 NotifyNavigationStateChanged(changed_flags); 2561 NotifyNavigationStateChanged(changed_flags);
2562 } 2562 }
2563 2563
2564 void WebContentsImpl::AboutToNavigateRenderFrame( 2564 void WebContentsImpl::AboutToNavigateRenderFrame(
2565 RenderFrameHostImpl* render_frame_host) { 2565 RenderFrameHostImpl* old_host,
2566 RenderFrameHostImpl* new_host) {
2566 // Notify observers that we will navigate in this RenderFrame. 2567 // Notify observers that we will navigate in this RenderFrame.
2567 FOR_EACH_OBSERVER( 2568 FOR_EACH_OBSERVER(
2568 WebContentsObserver, 2569 WebContentsObserver,
2569 observers_, 2570 observers_,
2570 AboutToNavigateRenderFrame(render_frame_host)); 2571 AboutToNavigateRenderFrame(old_host, new_host));
2571 } 2572 }
2572 2573
2573 void WebContentsImpl::DidStartNavigationToPendingEntry( 2574 void WebContentsImpl::DidStartNavigationToPendingEntry(
2574 RenderFrameHostImpl* render_frame_host, 2575 RenderFrameHostImpl* render_frame_host,
2575 const GURL& url, 2576 const GURL& url,
2576 NavigationController::ReloadType reload_type) { 2577 NavigationController::ReloadType reload_type) {
2577 // Notify observers about navigation. 2578 // Notify observers about navigation.
2578 FOR_EACH_OBSERVER( 2579 FOR_EACH_OBSERVER(
2579 WebContentsObserver, 2580 WebContentsObserver,
2580 observers_, 2581 observers_,
(...skipping 1867 matching lines...) Expand 10 before | Expand all | Expand 10 after
4448 node->render_manager()->ResumeResponseDeferredAtStart(); 4449 node->render_manager()->ResumeResponseDeferredAtStart();
4449 } 4450 }
4450 4451
4451 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4452 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4452 force_disable_overscroll_content_ = force_disable; 4453 force_disable_overscroll_content_ = force_disable;
4453 if (view_) 4454 if (view_)
4454 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4455 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4455 } 4456 }
4456 4457
4457 } // namespace content 4458 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698