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 1623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1634 renderer_scheduler_->OnRendererBackgrounded(); | 1634 renderer_scheduler_->OnRendererBackgrounded(); |
1635 else | 1635 else |
1636 renderer_scheduler_->OnRendererForegrounded(); | 1636 renderer_scheduler_->OnRendererForegrounded(); |
1637 } | 1637 } |
1638 | 1638 |
1639 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { | 1639 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { |
1640 CompositorDependencies* compositor_deps = this; | 1640 CompositorDependencies* compositor_deps = this; |
1641 RenderFrameImpl::CreateFrame( | 1641 RenderFrameImpl::CreateFrame( |
1642 params.routing_id, params.proxy_routing_id, params.opener_routing_id, | 1642 params.routing_id, params.proxy_routing_id, params.opener_routing_id, |
1643 params.parent_routing_id, params.previous_sibling_routing_id, | 1643 params.parent_routing_id, params.previous_sibling_routing_id, |
1644 params.replication_state, compositor_deps, params.widget_params); | 1644 params.replication_state, compositor_deps, params.widget_params, |
| 1645 params.frame_owner_properties); |
1645 } | 1646 } |
1646 | 1647 |
1647 void RenderThreadImpl::OnCreateNewFrameProxy( | 1648 void RenderThreadImpl::OnCreateNewFrameProxy( |
1648 int routing_id, | 1649 int routing_id, |
1649 int render_view_routing_id, | 1650 int render_view_routing_id, |
1650 int opener_routing_id, | 1651 int opener_routing_id, |
1651 int parent_routing_id, | 1652 int parent_routing_id, |
1652 const FrameReplicationState& replicated_state) { | 1653 const FrameReplicationState& replicated_state) { |
1653 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, | 1654 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, |
1654 opener_routing_id, parent_routing_id, | 1655 opener_routing_id, parent_routing_id, |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2001 } | 2002 } |
2002 | 2003 |
2003 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2004 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
2004 size_t erased = | 2005 size_t erased = |
2005 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2006 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
2006 routing_id_); | 2007 routing_id_); |
2007 DCHECK_EQ(1u, erased); | 2008 DCHECK_EQ(1u, erased); |
2008 } | 2009 } |
2009 | 2010 |
2010 } // namespace content | 2011 } // namespace content |
OLD | NEW |