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

Unified Diff: content/browser/frame_host/render_frame_message_filter.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: Sync 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_message_filter.cc
diff --git a/content/browser/frame_host/render_frame_message_filter.cc b/content/browser/frame_host/render_frame_message_filter.cc
index d7e9d9e605ba6a43af0ec920b37f004bdfc1c8a7..579ec28a32303c454aba20dd5924dabb73cfeefd 100644
--- a/content/browser/frame_host/render_frame_message_filter.cc
+++ b/content/browser/frame_host/render_frame_message_filter.cc
@@ -39,12 +39,14 @@ namespace {
const int kPluginsRefreshThresholdInSeconds = 3;
#endif
-void CreateChildFrameOnUI(int process_id,
- int parent_routing_id,
- blink::WebTreeScopeType scope,
- const std::string& frame_name,
- blink::WebSandboxFlags sandbox_flags,
- int new_routing_id) {
+void CreateChildFrameOnUI(
+ int process_id,
+ int parent_routing_id,
+ blink::WebTreeScopeType scope,
+ const std::string& frame_name,
+ blink::WebSandboxFlags sandbox_flags,
+ const blink::WebFrameOwnerProperties& frame_owner_properties,
+ int new_routing_id) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
RenderFrameHostImpl* render_frame_host =
RenderFrameHostImpl::FromID(process_id, parent_routing_id);
@@ -52,7 +54,8 @@ void CreateChildFrameOnUI(int process_id,
// processing a subframe creation message.
if (render_frame_host) {
render_frame_host->OnCreateChildFrame(new_routing_id, scope, frame_name,
- sandbox_flags);
+ sandbox_flags,
+ frame_owner_properties);
}
}
@@ -317,12 +320,14 @@ void RenderFrameMessageFilter::OnCreateChildFrame(
blink::WebTreeScopeType scope,
const std::string& frame_name,
blink::WebSandboxFlags sandbox_flags,
+ const blink::WebFrameOwnerProperties& frame_owner_properties,
int* new_routing_id) {
*new_routing_id = render_widget_helper_->GetNextRoutingID();
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
base::Bind(&CreateChildFrameOnUI, render_process_id_, parent_routing_id,
- scope, frame_name, sandbox_flags, *new_routing_id));
+ scope, frame_name, sandbox_flags, frame_owner_properties,
+ *new_routing_id));
}
void RenderFrameMessageFilter::OnSetCookie(int render_frame_id,

Powered by Google App Engine
This is Rietveld 408576698