| 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 3457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3468 // Ignore this if it comes from a RenderViewHost that we aren't showing. | 3468 // Ignore this if it comes from a RenderViewHost that we aren't showing. |
| 3469 if (delegate_ && rvh == GetRenderViewHost()) | 3469 if (delegate_ && rvh == GetRenderViewHost()) |
| 3470 delegate_->CloseContents(this); | 3470 delegate_->CloseContents(this); |
| 3471 } | 3471 } |
| 3472 | 3472 |
| 3473 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) { | 3473 void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) { |
| 3474 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost()) | 3474 if (delegate_ && rfh->GetRenderViewHost() == GetRenderViewHost()) |
| 3475 delegate_->SwappedOut(this); | 3475 delegate_->SwappedOut(this); |
| 3476 } | 3476 } |
| 3477 | 3477 |
| 3478 void WebContentsImpl::DidDeferAfterResponseStarted() { | 3478 void WebContentsImpl::DidDeferAfterResponseStarted( |
| 3479 const TransitionLayerData& transition_layer_data) { |
| 3479 #if defined(OS_ANDROID) | 3480 #if defined(OS_ANDROID) |
| 3480 ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted(); | 3481 ContentViewCoreImpl::FromWebContents(this)->DidDeferAfterResponseStarted( |
| 3482 transition_layer_data); |
| 3481 #endif | 3483 #endif |
| 3482 } | 3484 } |
| 3483 | 3485 |
| 3484 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() { | 3486 bool WebContentsImpl::WillHandleDeferAfterResponseStarted() { |
| 3485 #if defined(OS_ANDROID) | 3487 #if defined(OS_ANDROID) |
| 3486 return ContentViewCoreImpl::FromWebContents(this)-> | 3488 return ContentViewCoreImpl::FromWebContents(this)-> |
| 3487 WillHandleDeferAfterResponseStarted(); | 3489 WillHandleDeferAfterResponseStarted(); |
| 3488 #else | 3490 #else |
| 3489 return false; | 3491 return false; |
| 3490 #endif | 3492 #endif |
| (...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4097 if (new_size != old_size) | 4099 if (new_size != old_size) |
| 4098 delegate_->UpdatePreferredSize(this, new_size); | 4100 delegate_->UpdatePreferredSize(this, new_size); |
| 4099 } | 4101 } |
| 4100 | 4102 |
| 4101 void WebContentsImpl::ResumeResponseDeferredAtStart() { | 4103 void WebContentsImpl::ResumeResponseDeferredAtStart() { |
| 4102 FrameTreeNode* node = frame_tree_.root(); | 4104 FrameTreeNode* node = frame_tree_.root(); |
| 4103 node->render_manager()->ResumeResponseDeferredAtStart(); | 4105 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4104 } | 4106 } |
| 4105 | 4107 |
| 4106 } // namespace content | 4108 } // namespace content |
| OLD | NEW |