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 1615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1626 IPC_MESSAGE_UNHANDLED(handled = false) | 1626 IPC_MESSAGE_UNHANDLED(handled = false) |
1627 IPC_END_MESSAGE_MAP() | 1627 IPC_END_MESSAGE_MAP() |
1628 return handled; | 1628 return handled; |
1629 } | 1629 } |
1630 | 1630 |
1631 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { | 1631 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { |
1632 CompositorDependencies* compositor_deps = this; | 1632 CompositorDependencies* compositor_deps = this; |
1633 RenderFrameImpl::CreateFrame( | 1633 RenderFrameImpl::CreateFrame( |
1634 params.routing_id, params.parent_routing_id, | 1634 params.routing_id, params.parent_routing_id, |
1635 params.previous_sibling_routing_id, params.proxy_routing_id, | 1635 params.previous_sibling_routing_id, params.proxy_routing_id, |
1636 params.replication_state, compositor_deps, params.widget_params); | 1636 params.opener_routing_id, params.replication_state, compositor_deps, |
| 1637 params.widget_params); |
1637 } | 1638 } |
1638 | 1639 |
1639 void RenderThreadImpl::OnCreateNewFrameProxy( | 1640 void RenderThreadImpl::OnCreateNewFrameProxy( |
1640 int routing_id, | 1641 int routing_id, |
1641 int parent_routing_id, | 1642 int parent_routing_id, |
| 1643 int opener_routing_id, |
1642 int render_view_routing_id, | 1644 int render_view_routing_id, |
1643 const FrameReplicationState& replicated_state) { | 1645 const FrameReplicationState& replicated_state) { |
1644 RenderFrameProxy::CreateFrameProxy(routing_id, parent_routing_id, | 1646 RenderFrameProxy::CreateFrameProxy(routing_id, parent_routing_id, |
1645 render_view_routing_id, replicated_state); | 1647 opener_routing_id, render_view_routing_id, |
| 1648 replicated_state); |
1646 } | 1649 } |
1647 | 1650 |
1648 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, | 1651 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme, |
1649 const std::string& host, | 1652 const std::string& host, |
1650 double zoom_level) { | 1653 double zoom_level) { |
1651 RenderViewZoomer zoomer(scheme, host, zoom_level); | 1654 RenderViewZoomer zoomer(scheme, host, zoom_level); |
1652 RenderView::ForEach(&zoomer); | 1655 RenderView::ForEach(&zoomer); |
1653 } | 1656 } |
1654 | 1657 |
1655 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { | 1658 void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1959 } | 1962 } |
1960 | 1963 |
1961 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1964 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1962 size_t erased = | 1965 size_t erased = |
1963 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1966 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1964 routing_id_); | 1967 routing_id_); |
1965 DCHECK_EQ(1u, erased); | 1968 DCHECK_EQ(1u, erased); |
1966 } | 1969 } |
1967 | 1970 |
1968 } // namespace content | 1971 } // namespace content |
OLD | NEW |