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

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

Issue 1144463003: Remove Navigation Transitions from Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed TransitionPageHelper. Created 5 years, 7 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
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/child/runtime_features.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 SetAccessibilityMode(RemoveAccessibilityModeFrom(accessibility_mode_, mode)); 720 SetAccessibilityMode(RemoveAccessibilityModeFrom(accessibility_mode_, mode));
721 } 721 }
722 722
723 void WebContentsImpl::RequestAXTreeSnapshot(AXTreeSnapshotCallback callback) { 723 void WebContentsImpl::RequestAXTreeSnapshot(AXTreeSnapshotCallback callback) {
724 // TODO(dmazzoni): http://crbug.com/475608 This only returns the 724 // TODO(dmazzoni): http://crbug.com/475608 This only returns the
725 // accessibility tree from the main frame and everything in the 725 // accessibility tree from the main frame and everything in the
726 // same site instance. 726 // same site instance.
727 GetMainFrame()->RequestAXTreeSnapshot(callback); 727 GetMainFrame()->RequestAXTreeSnapshot(callback);
728 } 728 }
729 729
730 void WebContentsImpl::ClearNavigationTransitionData() {
731 FrameTreeNode* node = frame_tree_.root();
732 node->render_manager()->ClearNavigationTransitionData();
733 }
734
735 WebUI* WebContentsImpl::CreateWebUI(const GURL& url) { 730 WebUI* WebContentsImpl::CreateWebUI(const GURL& url) {
736 WebUIImpl* web_ui = new WebUIImpl(this); 731 WebUIImpl* web_ui = new WebUIImpl(this);
737 WebUIController* controller = WebUIControllerFactoryRegistry::GetInstance()-> 732 WebUIController* controller = WebUIControllerFactoryRegistry::GetInstance()->
738 CreateWebUIControllerForURL(web_ui, url); 733 CreateWebUIControllerForURL(web_ui, url);
739 if (controller) { 734 if (controller) {
740 web_ui->AddMessageHandler(new GenericHandler()); 735 web_ui->AddMessageHandler(new GenericHandler());
741 web_ui->SetController(controller); 736 web_ui->SetController(controller);
742 return web_ui; 737 return web_ui;
743 } 738 }
744 739
(...skipping 1835 matching lines...) Expand 10 before | Expand all | Expand 10 after
2580 if (entry && ui::PageTransitionCoreTypeIs( 2575 if (entry && ui::PageTransitionCoreTypeIs(
2581 entry->GetTransitionType(), ui::PAGE_TRANSITION_RELOAD)) { 2576 entry->GetTransitionType(), ui::PAGE_TRANSITION_RELOAD)) {
2582 FrameTreeNode* ftn = render_frame_host->frame_tree_node(); 2577 FrameTreeNode* ftn = render_frame_host->frame_tree_node();
2583 BrowserAccessibilityManager* manager = 2578 BrowserAccessibilityManager* manager =
2584 ftn->current_frame_host()->browser_accessibility_manager(); 2579 ftn->current_frame_host()->browser_accessibility_manager();
2585 if (manager) 2580 if (manager)
2586 manager->UserIsReloading(); 2581 manager->UserIsReloading();
2587 } 2582 }
2588 } 2583 }
2589 2584
2590 void WebContentsImpl::DidStartNavigationTransition(
2591 RenderFrameHostImpl* render_frame_host) {
2592 #if defined(OS_ANDROID)
2593 int render_frame_id = render_frame_host->GetRoutingID();
2594 GetWebContentsAndroid()->DidStartNavigationTransitionForFrame(
2595 render_frame_id);
2596 #endif
2597 }
2598
2599 void WebContentsImpl::DidFailProvisionalLoadWithError( 2585 void WebContentsImpl::DidFailProvisionalLoadWithError(
2600 RenderFrameHostImpl* render_frame_host, 2586 RenderFrameHostImpl* render_frame_host,
2601 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 2587 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
2602 GURL validated_url(params.url); 2588 GURL validated_url(params.url);
2603 FOR_EACH_OBSERVER(WebContentsObserver, 2589 FOR_EACH_OBSERVER(WebContentsObserver,
2604 observers_, 2590 observers_,
2605 DidFailProvisionalLoad(render_frame_host, 2591 DidFailProvisionalLoad(render_frame_host,
2606 validated_url, 2592 validated_url,
2607 params.error_code, 2593 params.error_code,
2608 params.error_description)); 2594 params.error_description));
(...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after
3700 // Ignore this if it comes from a RenderViewHost that we aren't showing. 3686 // Ignore this if it comes from a RenderViewHost that we aren't showing.
3701 if (delegate_ && rvh == GetRenderViewHost()) 3687 if (delegate_ && rvh == GetRenderViewHost())
3702 delegate_->CloseContents(this); 3688 delegate_->CloseContents(this);
3703 } 3689 }
3704 3690
3705 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) { 3691 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) {
3706 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost()) 3692 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost())
3707 delegate_->SwappedOut(this); 3693 delegate_->SwappedOut(this);
3708 } 3694 }
3709 3695
3710 void WebContentsImpl::DidDeferAfterResponseStarted(
3711 const TransitionLayerData& transition_data) {
3712 #if defined(OS_ANDROID)
3713 GetWebContentsAndroid()->DidDeferAfterResponseStarted(transition_data);
3714 #endif
3715 }
3716
3717 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() {
3718 #if defined(OS_ANDROID)
3719 return GetWebContentsAndroid()->WillHandleDeferAfterResponseStarted();
3720 #else
3721 return false;
3722 #endif
3723 }
3724
3725 void WebContentsImpl::RequestMove(const gfx::Rect& new_bounds) { 3696 void WebContentsImpl::RequestMove(const gfx::Rect& new_bounds) {
3726 if (delegate_ && delegate_->IsPopupOrPanel(this)) 3697 if (delegate_ && delegate_->IsPopupOrPanel(this))
3727 delegate_->MoveContents(this, new_bounds); 3698 delegate_->MoveContents(this, new_bounds);
3728 } 3699 }
3729 3700
3730 void WebContentsImpl::DidStartLoading(FrameTreeNode* frame_tree_node, 3701 void WebContentsImpl::DidStartLoading(FrameTreeNode* frame_tree_node,
3731 bool to_different_document) { 3702 bool to_different_document) {
3732 SetIsLoading(true, to_different_document, nullptr); 3703 SetIsLoading(true, to_different_document, nullptr);
3733 3704
3734 // Notify accessibility that the user is navigating away from the 3705 // Notify accessibility that the user is navigating away from the
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
4419 void WebContentsImpl::RemoveAllMediaPlayerEntries( 4390 void WebContentsImpl::RemoveAllMediaPlayerEntries(
4420 RenderFrameHost* render_frame_host, 4391 RenderFrameHost* render_frame_host,
4421 ActiveMediaPlayerMap* player_map) { 4392 ActiveMediaPlayerMap* player_map) {
4422 ActiveMediaPlayerMap::iterator it = 4393 ActiveMediaPlayerMap::iterator it =
4423 player_map->find(reinterpret_cast<uintptr_t>(render_frame_host)); 4394 player_map->find(reinterpret_cast<uintptr_t>(render_frame_host));
4424 if (it == player_map->end()) 4395 if (it == player_map->end())
4425 return; 4396 return;
4426 player_map->erase(it); 4397 player_map->erase(it);
4427 } 4398 }
4428 4399
4429 void WebContentsImpl::ResumeResponseDeferredAtStart() {
4430 FrameTreeNode* node = frame_tree_.root();
4431 node->render_manager()->ResumeResponseDeferredAtStart();
4432 }
4433
4434 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4400 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4435 force_disable_overscroll_content_ = force_disable; 4401 force_disable_overscroll_content_ = force_disable;
4436 if (view_) 4402 if (view_)
4437 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4403 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4438 } 4404 }
4439 4405
4440 } // namespace content 4406 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/child/runtime_features.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698