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

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: Address comments from dcheng@ Created 5 years, 2 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 1609 matching lines...) Expand 10 before | Expand all | Expand 10 after
1620 renderer_scheduler_->OnRendererBackgrounded(); 1620 renderer_scheduler_->OnRendererBackgrounded();
1621 else 1621 else
1622 renderer_scheduler_->OnRendererForegrounded(); 1622 renderer_scheduler_->OnRendererForegrounded();
1623 } 1623 }
1624 1624
1625 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { 1625 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) {
1626 CompositorDependencies* compositor_deps = this; 1626 CompositorDependencies* compositor_deps = this;
1627 RenderFrameImpl::CreateFrame( 1627 RenderFrameImpl::CreateFrame(
1628 params.routing_id, params.proxy_routing_id, params.opener_routing_id, 1628 params.routing_id, params.proxy_routing_id, params.opener_routing_id,
1629 params.parent_routing_id, params.previous_sibling_routing_id, 1629 params.parent_routing_id, params.previous_sibling_routing_id,
1630 params.replication_state, compositor_deps, params.widget_params); 1630 params.replication_state, compositor_deps, params.widget_params,
1631 params.frame_owner_properties);
1631 } 1632 }
1632 1633
1633 void RenderThreadImpl::OnCreateNewFrameProxy( 1634 void RenderThreadImpl::OnCreateNewFrameProxy(
1634 int routing_id, 1635 int routing_id,
1635 int render_view_routing_id, 1636 int render_view_routing_id,
1636 int opener_routing_id, 1637 int opener_routing_id,
1637 int parent_routing_id, 1638 int parent_routing_id,
1638 const FrameReplicationState& replicated_state) { 1639 const FrameReplicationState& replicated_state) {
1639 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, 1640 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id,
1640 opener_routing_id, parent_routing_id, 1641 opener_routing_id, parent_routing_id,
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
1990 } 1991 }
1991 1992
1992 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 1993 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
1993 size_t erased = 1994 size_t erased =
1994 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 1995 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
1995 routing_id_); 1996 routing_id_);
1996 DCHECK_EQ(1u, erased); 1997 DCHECK_EQ(1u, erased);
1997 } 1998 }
1998 1999
1999 } // namespace content 2000 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698