| OLD | NEW |
| 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 3584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3595 if (delegate_ && rvh == GetRenderViewHost()) | 3595 if (delegate_ && rvh == GetRenderViewHost()) |
| 3596 delegate_->CloseContents(this); | 3596 delegate_->CloseContents(this); |
| 3597 } | 3597 } |
| 3598 | 3598 |
| 3599 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) { | 3599 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) { |
| 3600 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost()) | 3600 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost()) |
| 3601 delegate_->SwappedOut(this); | 3601 delegate_->SwappedOut(this); |
| 3602 } | 3602 } |
| 3603 | 3603 |
| 3604 void WebContentsImpl::DidDeferAfterResponseStarted( | 3604 void WebContentsImpl::DidDeferAfterResponseStarted( |
| 3605 const scoped_refptr<net::HttpResponseHeaders>& headers, | 3605 const TransitionLayerData& transition_data) { |
| 3606 const GURL& url) { | |
| 3607 #if defined(OS_ANDROID) | 3606 #if defined(OS_ANDROID) |
| 3608 ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted( | 3607 ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted( |
| 3609 headers, url); | 3608 transition_data); |
| 3610 #endif | 3609 #endif |
| 3611 } | 3610 } |
| 3612 | 3611 |
| 3613 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() { | 3612 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() { |
| 3614 #if defined(OS_ANDROID) | 3613 #if defined(OS_ANDROID) |
| 3615 return ContentViewCoreImpl::FromWebContents(this)-> | 3614 return ContentViewCoreImpl::FromWebContents(this)-> |
| 3616 WillHandleDeferAfterResponseStarted(); | 3615 WillHandleDeferAfterResponseStarted(); |
| 3617 #else | 3616 #else |
| 3618 return false; | 3617 return false; |
| 3619 #endif | 3618 #endif |
| (...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4224 if (new_size != old_size) | 4223 if (new_size != old_size) |
| 4225 delegate_->UpdatePreferredSize(this, new_size); | 4224 delegate_->UpdatePreferredSize(this, new_size); |
| 4226 } | 4225 } |
| 4227 | 4226 |
| 4228 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4227 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
| 4229 FrameTreeNode* node = frame_tree_.root(); | 4228 FrameTreeNode* node = frame_tree_.root(); |
| 4230 node->render_manager()->ResumeResponseDeferredAtStart(); | 4229 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4231 } | 4230 } |
| 4232 | 4231 |
| 4233 } // namespace content | 4232 } // namespace content |
| OLD | NEW |