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 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1641 renderer_scheduler_->OnRendererBackgrounded(); | 1641 renderer_scheduler_->OnRendererBackgrounded(); |
1642 else | 1642 else |
1643 renderer_scheduler_->OnRendererForegrounded(); | 1643 renderer_scheduler_->OnRendererForegrounded(); |
1644 } | 1644 } |
1645 | 1645 |
1646 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { | 1646 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { |
1647 CompositorDependencies* compositor_deps = this; | 1647 CompositorDependencies* compositor_deps = this; |
1648 RenderFrameImpl::CreateFrame( | 1648 RenderFrameImpl::CreateFrame( |
1649 params.routing_id, params.proxy_routing_id, params.opener_routing_id, | 1649 params.routing_id, params.proxy_routing_id, params.opener_routing_id, |
1650 params.parent_routing_id, params.previous_sibling_routing_id, | 1650 params.parent_routing_id, params.previous_sibling_routing_id, |
1651 params.replication_state, compositor_deps, params.widget_params); | 1651 params.replication_state, compositor_deps, params.widget_params, |
| 1652 params.frame_owner_properties); |
1652 } | 1653 } |
1653 | 1654 |
1654 void RenderThreadImpl::OnCreateNewFrameProxy( | 1655 void RenderThreadImpl::OnCreateNewFrameProxy( |
1655 int routing_id, | 1656 int routing_id, |
1656 int render_view_routing_id, | 1657 int render_view_routing_id, |
1657 int opener_routing_id, | 1658 int opener_routing_id, |
1658 int parent_routing_id, | 1659 int parent_routing_id, |
1659 const FrameReplicationState& replicated_state) { | 1660 const FrameReplicationState& replicated_state) { |
1660 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, | 1661 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, |
1661 opener_routing_id, parent_routing_id, | 1662 opener_routing_id, parent_routing_id, |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1978 } | 1979 } |
1979 | 1980 |
1980 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1981 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1981 size_t erased = | 1982 size_t erased = |
1982 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1983 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1983 routing_id_); | 1984 routing_id_); |
1984 DCHECK_EQ(1u, erased); | 1985 DCHECK_EQ(1u, erased); |
1985 } | 1986 } |
1986 | 1987 |
1987 } // namespace content | 1988 } // namespace content |
OLD | NEW |