Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(425)

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: consolidate render->browser ipcs into one Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1629 matching lines...) Expand 10 before | Expand all | Expand 10 after
1640 renderer_scheduler_->OnRendererBackgrounded(); 1640 renderer_scheduler_->OnRendererBackgrounded();
1641 else 1641 else
1642 renderer_scheduler_->OnRendererForegrounded(); 1642 renderer_scheduler_->OnRendererForegrounded();
1643 } 1643 }
1644 1644
1645 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { 1645 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) {
1646 CompositorDependencies* compositor_deps = this; 1646 CompositorDependencies* compositor_deps = this;
1647 RenderFrameImpl::CreateFrame( 1647 RenderFrameImpl::CreateFrame(
1648 params.routing_id, params.proxy_routing_id, params.opener_routing_id, 1648 params.routing_id, params.proxy_routing_id, params.opener_routing_id,
1649 params.parent_routing_id, params.previous_sibling_routing_id, 1649 params.parent_routing_id, params.previous_sibling_routing_id,
1650 params.replication_state, compositor_deps, params.widget_params); 1650 params.replication_state, compositor_deps, params.widget_params,
1651 params.frame_owner_properties);
1651 } 1652 }
1652 1653
1653 void RenderThreadImpl::OnCreateNewFrameProxy( 1654 void RenderThreadImpl::OnCreateNewFrameProxy(
1654 int routing_id, 1655 int routing_id,
1655 int render_view_routing_id, 1656 int render_view_routing_id,
1656 int opener_routing_id, 1657 int opener_routing_id,
1657 int parent_routing_id, 1658 int parent_routing_id,
1658 const FrameReplicationState& replicated_state) { 1659 const FrameReplicationState& replicated_state) {
1659 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, 1660 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id,
1660 opener_routing_id, parent_routing_id, 1661 opener_routing_id, parent_routing_id,
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
1976 } 1977 }
1977 1978
1978 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 1979 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
1979 size_t erased = 1980 size_t erased =
1980 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 1981 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
1981 routing_id_); 1982 routing_id_);
1982 DCHECK_EQ(1u, erased); 1983 DCHECK_EQ(1u, erased);
1983 } 1984 }
1984 1985
1985 } // namespace content 1986 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698