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

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 for tests + merge blink/cr changes. 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 1628 matching lines...) Expand 10 before | Expand all | Expand 10 after
1639 renderer_scheduler_->OnRendererBackgrounded(); 1639 renderer_scheduler_->OnRendererBackgrounded();
1640 else 1640 else
1641 renderer_scheduler_->OnRendererForegrounded(); 1641 renderer_scheduler_->OnRendererForegrounded();
1642 } 1642 }
1643 1643
1644 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { 1644 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) {
1645 CompositorDependencies* compositor_deps = this; 1645 CompositorDependencies* compositor_deps = this;
1646 RenderFrameImpl::CreateFrame( 1646 RenderFrameImpl::CreateFrame(
1647 params.routing_id, params.proxy_routing_id, params.opener_routing_id, 1647 params.routing_id, params.proxy_routing_id, params.opener_routing_id,
1648 params.parent_routing_id, params.previous_sibling_routing_id, 1648 params.parent_routing_id, params.previous_sibling_routing_id,
1649 params.replication_state, compositor_deps, params.widget_params); 1649 params.replication_state, compositor_deps, params.widget_params,
1650 params.frame_owner_properties);
1650 } 1651 }
1651 1652
1652 void RenderThreadImpl::OnCreateNewFrameProxy( 1653 void RenderThreadImpl::OnCreateNewFrameProxy(
1653 int routing_id, 1654 int routing_id,
1654 int render_view_routing_id, 1655 int render_view_routing_id,
1655 int opener_routing_id, 1656 int opener_routing_id,
1656 int parent_routing_id, 1657 int parent_routing_id,
1657 const FrameReplicationState& replicated_state) { 1658 const FrameReplicationState& replicated_state) {
1658 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, 1659 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id,
1659 opener_routing_id, parent_routing_id, 1660 opener_routing_id, parent_routing_id,
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
2009 } 2010 }
2010 2011
2011 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2012 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2012 size_t erased = 2013 size_t erased =
2013 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2014 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2014 routing_id_); 2015 routing_id_);
2015 DCHECK_EQ(1u, erased); 2016 DCHECK_EQ(1u, erased);
2016 } 2017 }
2017 2018
2018 } // namespace content 2019 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698