| 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/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1621 renderer_scheduler_->OnRendererBackgrounded(); | 1621 renderer_scheduler_->OnRendererBackgrounded(); |
| 1622 else | 1622 else |
| 1623 renderer_scheduler_->OnRendererForegrounded(); | 1623 renderer_scheduler_->OnRendererForegrounded(); |
| 1624 } | 1624 } |
| 1625 | 1625 |
| 1626 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { | 1626 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { |
| 1627 CompositorDependencies* compositor_deps = this; | 1627 CompositorDependencies* compositor_deps = this; |
| 1628 RenderFrameImpl::CreateFrame( | 1628 RenderFrameImpl::CreateFrame( |
| 1629 params.routing_id, params.proxy_routing_id, params.opener_routing_id, | 1629 params.routing_id, params.proxy_routing_id, params.opener_routing_id, |
| 1630 params.parent_routing_id, params.previous_sibling_routing_id, | 1630 params.parent_routing_id, params.previous_sibling_routing_id, |
| 1631 params.replication_state, compositor_deps, params.widget_params); | 1631 params.replication_state, compositor_deps, params.widget_params, |
| 1632 params.frame_owner_properties); |
| 1632 } | 1633 } |
| 1633 | 1634 |
| 1634 void RenderThreadImpl::OnCreateNewFrameProxy( | 1635 void RenderThreadImpl::OnCreateNewFrameProxy( |
| 1635 int routing_id, | 1636 int routing_id, |
| 1636 int render_view_routing_id, | 1637 int render_view_routing_id, |
| 1637 int opener_routing_id, | 1638 int opener_routing_id, |
| 1638 int parent_routing_id, | 1639 int parent_routing_id, |
| 1639 const FrameReplicationState& replicated_state) { | 1640 const FrameReplicationState& replicated_state) { |
| 1640 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, | 1641 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, |
| 1641 opener_routing_id, parent_routing_id, | 1642 opener_routing_id, parent_routing_id, |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1991 } | 1992 } |
| 1992 | 1993 |
| 1993 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1994 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 1994 size_t erased = | 1995 size_t erased = |
| 1995 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1996 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 1996 routing_id_); | 1997 routing_id_); |
| 1997 DCHECK_EQ(1u, erased); | 1998 DCHECK_EQ(1u, erased); |
| 1998 } | 1999 } |
| 1999 | 2000 |
| 2000 } // namespace content | 2001 } // namespace content |
| OLD | NEW |