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

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: move setSandboxFlags call 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 1587 matching lines...) Expand 10 before | Expand all | Expand 10 after
1598 renderer_scheduler_->OnRendererBackgrounded(); 1598 renderer_scheduler_->OnRendererBackgrounded();
1599 else 1599 else
1600 renderer_scheduler_->OnRendererForegrounded(); 1600 renderer_scheduler_->OnRendererForegrounded();
1601 } 1601 }
1602 1602
1603 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) { 1603 void RenderThreadImpl::OnCreateNewFrame(FrameMsg_NewFrame_Params params) {
1604 CompositorDependencies* compositor_deps = this; 1604 CompositorDependencies* compositor_deps = this;
1605 RenderFrameImpl::CreateFrame( 1605 RenderFrameImpl::CreateFrame(
1606 params.routing_id, params.proxy_routing_id, params.opener_routing_id, 1606 params.routing_id, params.proxy_routing_id, params.opener_routing_id,
1607 params.parent_routing_id, params.previous_sibling_routing_id, 1607 params.parent_routing_id, params.previous_sibling_routing_id,
1608 params.replication_state, compositor_deps, params.widget_params); 1608 params.replication_state, compositor_deps, params.widget_params,
1609 params.frame_owner_properties);
1609 } 1610 }
1610 1611
1611 void RenderThreadImpl::OnCreateNewFrameProxy( 1612 void RenderThreadImpl::OnCreateNewFrameProxy(
1612 int routing_id, 1613 int routing_id,
1613 int render_view_routing_id, 1614 int render_view_routing_id,
1614 int opener_routing_id, 1615 int opener_routing_id,
1615 int parent_routing_id, 1616 int parent_routing_id,
1616 const FrameReplicationState& replicated_state) { 1617 const FrameReplicationState& replicated_state) {
1617 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id, 1618 RenderFrameProxy::CreateFrameProxy(routing_id, render_view_routing_id,
1618 opener_routing_id, parent_routing_id, 1619 opener_routing_id, parent_routing_id,
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
1968 } 1969 }
1969 1970
1970 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 1971 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
1971 size_t erased = 1972 size_t erased =
1972 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 1973 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
1973 routing_id_); 1974 routing_id_);
1974 DCHECK_EQ(1u, erased); 1975 DCHECK_EQ(1u, erased);
1975 } 1976 }
1976 1977
1977 } // namespace content 1978 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698