| 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 1603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1614 renderer_scheduler_->OnRendererBackgrounded(); | 1614 renderer_scheduler_->OnRendererBackgrounded(); |
| 1615 else | 1615 else |
| 1616 renderer_scheduler_->OnRendererForegrounded(); | 1616 renderer_scheduler_->OnRendererForegrounded(); |
| 1617 } | 1617 } |
| 1618 | 1618 |
| 1619 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { | 1619 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { |
| 1620 CompositorDependencies* compositor_deps = this; | 1620 CompositorDependencies* compositor_deps = this; |
| 1621 RenderFrameImpl::CreateFrame( | 1621 RenderFrameImpl::CreateFrame( |
| 1622 params.routing_id, params.proxy_routing_id, params.opener_routing_id, | 1622 params.routing_id, params.proxy_routing_id, params.opener_routing_id, |
| 1623 params.parent_routing_id, params.previous_sibling_routing_id, | 1623 params.parent_routing_id, params.previous_sibling_routing_id, |
| 1624 params.replication_state, compositor_deps, params.widget_params); | 1624 params.replication_state, compositor_deps, params.widget_params, |
| 1625 params.frame_owner_properties); |
| 1625 } | 1626 } |
| 1626 | 1627 |
| 1627 void RenderThreadImpl::OnCreateNewFrameProxy( | 1628 void RenderThreadImpl::OnCreateNewFrameProxy( |
| 1628 int routing_id, | 1629 int routing_id, |
| 1629 int render_view_routing_id, | 1630 int render_view_routing_id, |
| 1630 int opener_routing_id, | 1631 int opener_routing_id, |
| 1631 int parent_routing_id, | 1632 int parent_routing_id, |
| 1632 const FrameReplicationState& replicated_state) { | 1633 const FrameReplicationState& replicated_state) { |
| 1633 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, | 1634 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, |
| 1634 opener_routing_id, parent_routing_id, | 1635 opener_routing_id, parent_routing_id, |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1984 } | 1985 } |
| 1985 | 1986 |
| 1986 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1987 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 1987 size_t erased = | 1988 size_t erased = |
| 1988 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1989 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 1989 routing_id_); | 1990 routing_id_); |
| 1990 DCHECK_EQ(1u, erased); | 1991 DCHECK_EQ(1u, erased); |
| 1991 } | 1992 } |
| 1992 | 1993 |
| 1993 } // namespace content | 1994 } // namespace content |
| OLD | NEW |