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

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

Issue 378743002: Navigation transitions: Place transition page in same process as destination page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 3467 matching lines...) Expand 10 before | Expand all | Expand 10 after
3478 // Ignore this if it comes from a RenderViewHost that we aren't showing. 3478 // Ignore this if it comes from a RenderViewHost that we aren't showing.
3479 if (delegate_ && rvh == GetRenderViewHost()) 3479 if (delegate_ && rvh == GetRenderViewHost())
3480 delegate_->CloseContents(this); 3480 delegate_->CloseContents(this);
3481 } 3481 }
3482 3482
3483 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) { 3483 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) {
3484 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost()) 3484 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost())
3485 delegate_->SwappedOut(this); 3485 delegate_->SwappedOut(this);
3486 } 3486 }
3487 3487
3488 void WebContentsImpl::DidDeferAfterResponseStarted() { 3488 void WebContentsImpl::DidDeferAfterResponseStarted(const GURL& transition_url) {
3489 #if defined(OS_ANDROID) 3489 #if defined(OS_ANDROID)
3490 ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted(); 3490 ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted(
3491 transition_url);
3491 #endif 3492 #endif
3492 } 3493 }
3493 3494
3494 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() { 3495 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() {
3495 #if defined(OS_ANDROID) 3496 #if defined(OS_ANDROID)
3496 return ContentViewCoreImpl::FromWebContents(this)-> 3497 return ContentViewCoreImpl::FromWebContents(this)->
3497 WillHandleDeferAfterResponseStarted(); 3498 WillHandleDeferAfterResponseStarted();
3498 #else 3499 #else
3499 return false; 3500 return false;
3500 #endif 3501 #endif
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
4107 if (new_size != old_size) 4108 if (new_size != old_size)
4108 delegate_->UpdatePreferredSize(this, new_size); 4109 delegate_->UpdatePreferredSize(this, new_size);
4109 } 4110 }
4110 4111
4111 void WebContentsImpl::ResumeResponseDeferredAtStart() { 4112 void WebContentsImpl::ResumeResponseDeferredAtStart() {
4112 FrameTreeNode* node = frame_tree_.root(); 4113 FrameTreeNode* node = frame_tree_.root();
4113 node->render_manager()->ResumeResponseDeferredAtStart(); 4114 node->render_manager()->ResumeResponseDeferredAtStart();
4114 } 4115 }
4115 4116
4116 } // namespace content 4117 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698