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 IPC_MESSAGE_UNHANDLED(handled = false) | 1621 IPC_MESSAGE_UNHANDLED(handled = false) |
1622 IPC_END_MESSAGE_MAP() | 1622 IPC_END_MESSAGE_MAP() |
1623 return handled; | 1623 return handled; |
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.parent_routing_id, | 1629 params.routing_id, params.parent_routing_id, |
1630 params.previous_sibling_routing_id, params.proxy_routing_id, | 1630 params.previous_sibling_routing_id, params.proxy_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); | |
alexmos
2015/09/02 21:42:09
Heads-up: this will conflict with https://coderevi
lazyboy
2015/09/15 19:30:56
Acknowledged.
| |
1632 } | 1633 } |
1633 | 1634 |
1634 void RenderThreadImpl::OnCreateNewFrameProxy( | 1635 void RenderThreadImpl::OnCreateNewFrameProxy( |
1635 int routing_id, | 1636 int routing_id, |
1636 int parent_routing_id, | 1637 int parent_routing_id, |
1637 int render_view_routing_id, | 1638 int render_view_routing_id, |
1638 const FrameReplicationState& replicated_state) { | 1639 const FrameReplicationState& replicated_state) { |
1639 RenderFrameProxy::CreateFrameProxy(routing_id, parent_routing_id, | 1640 RenderFrameProxy::CreateFrameProxy(routing_id, parent_routing_id, |
1640 render_view_routing_id, replicated_state); | 1641 render_view_routing_id, replicated_state); |
1641 } | 1642 } |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1954 } | 1955 } |
1955 | 1956 |
1956 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1957 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1957 size_t erased = | 1958 size_t erased = |
1958 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1959 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1959 routing_id_); | 1960 routing_id_); |
1960 DCHECK_EQ(1u, erased); | 1961 DCHECK_EQ(1u, erased); |
1961 } | 1962 } |
1962 | 1963 |
1963 } // namespace content | 1964 } // namespace content |
OLD | NEW |