| 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 3605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3616 if (delegate_ && rvh == GetRenderViewHost()) | 3616 if (delegate_ && rvh == GetRenderViewHost()) |
| 3617 delegate_->CloseContents(this); | 3617 delegate_->CloseContents(this); |
| 3618 } | 3618 } |
| 3619 | 3619 |
| 3620 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) { | 3620 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) { |
| 3621 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost()) | 3621 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost()) |
| 3622 delegate_->SwappedOut(this); | 3622 delegate_->SwappedOut(this); |
| 3623 } | 3623 } |
| 3624 | 3624 |
| 3625 void WebContentsImpl::DidDeferAfterResponseStarted( | 3625 void WebContentsImpl::DidDeferAfterResponseStarted( |
| 3626 const scoped_refptr<net::HttpResponseHeaders>& headers, | 3626 const TransitionLayerData& transition_data) { |
| 3627 const GURL& url) { | |
| 3628 #if defined(OS_ANDROID) | 3627 #if defined(OS_ANDROID) |
| 3629 ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted( | 3628 ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted( |
| 3630 headers, url); | 3629 transition_data); |
| 3631 #endif | 3630 #endif |
| 3632 } | 3631 } |
| 3633 | 3632 |
| 3634 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() { | 3633 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() { |
| 3635 #if defined(OS_ANDROID) | 3634 #if defined(OS_ANDROID) |
| 3636 return ContentViewCoreImpl::FromWebContents(this)-> | 3635 return ContentViewCoreImpl::FromWebContents(this)-> |
| 3637 WillHandleDeferAfterResponseStarted(); | 3636 WillHandleDeferAfterResponseStarted(); |
| 3638 #else | 3637 #else |
| 3639 return false; | 3638 return false; |
| 3640 #endif | 3639 #endif |
| (...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4245 if (new_size != old_size) | 4244 if (new_size != old_size) |
| 4246 delegate_->UpdatePreferredSize(this, new_size); | 4245 delegate_->UpdatePreferredSize(this, new_size); |
| 4247 } | 4246 } |
| 4248 | 4247 |
| 4249 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4248 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
| 4250 FrameTreeNode* node = frame_tree_.root(); | 4249 FrameTreeNode* node = frame_tree_.root(); |
| 4251 node->render_manager()->ResumeResponseDeferredAtStart(); | 4250 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4252 } | 4251 } |
| 4253 | 4252 |
| 4254 } // namespace content | 4253 } // namespace content |
| OLD | NEW |