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 1545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1556 IPC_MESSAGE_HANDLER(ViewMsg_UpdateScrollbarTheme, OnUpdateScrollbarTheme) | 1556 IPC_MESSAGE_HANDLER(ViewMsg_UpdateScrollbarTheme, OnUpdateScrollbarTheme) |
1557 #endif | 1557 #endif |
1558 #if defined(ENABLE_PLUGINS) | 1558 #if defined(ENABLE_PLUGINS) |
1559 IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache, OnPurgePluginListCache) | 1559 IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache, OnPurgePluginListCache) |
1560 #endif | 1560 #endif |
1561 IPC_MESSAGE_UNHANDLED(handled = false) | 1561 IPC_MESSAGE_UNHANDLED(handled = false) |
1562 IPC_END_MESSAGE_MAP() | 1562 IPC_END_MESSAGE_MAP() |
1563 return handled; | 1563 return handled; |
1564 } | 1564 } |
1565 | 1565 |
1566 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { | 1566 void RenderThreadImpl::OnCreateNewFrame( |
| 1567 int routing_id, |
| 1568 int parent_routing_id, |
| 1569 int proxy_routing_id, |
| 1570 const FrameReplicationState& replicated_state, |
| 1571 FrameMsg_NewFrame_WidgetParams params) { |
1567 CompositorDependencies* compositor_deps = this; | 1572 CompositorDependencies* compositor_deps = this; |
1568 RenderFrameImpl::CreateFrame( | 1573 RenderFrameImpl::CreateFrame(routing_id, parent_routing_id, proxy_routing_id, |
1569 params.routing_id, params.parent_routing_id, | 1574 replicated_state, compositor_deps, params); |
1570 params.previous_sibling_routing_id, params.proxy_routing_id, | |
1571 params.replication_state, compositor_deps, params.widget_params); | |
1572 } | 1575 } |
1573 | 1576 |
1574 void RenderThreadImpl::OnCreateNewFrameProxy( | 1577 void RenderThreadImpl::OnCreateNewFrameProxy( |
1575 int routing_id, | 1578 int routing_id, |
1576 int parent_routing_id, | 1579 int parent_routing_id, |
1577 int render_view_routing_id, | 1580 int render_view_routing_id, |
1578 const FrameReplicationState& replicated_state) { | 1581 const FrameReplicationState& replicated_state) { |
1579 RenderFrameProxy::CreateFrameProxy(routing_id, parent_routing_id, | 1582 RenderFrameProxy::CreateFrameProxy(routing_id, parent_routing_id, |
1580 render_view_routing_id, replicated_state); | 1583 render_view_routing_id, replicated_state); |
1581 } | 1584 } |
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1899 } | 1902 } |
1900 | 1903 |
1901 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1904 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1902 size_t erased = | 1905 size_t erased = |
1903 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1906 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1904 routing_id_); | 1907 routing_id_); |
1905 DCHECK_EQ(1u, erased); | 1908 DCHECK_EQ(1u, erased); |
1906 } | 1909 } |
1907 | 1910 |
1908 } // namespace content | 1911 } // namespace content |
OLD | NEW |