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

Unified Diff: components/html_viewer/replicated_frame_state.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, 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: components/html_viewer/replicated_frame_state.cc
diff --git a/components/html_viewer/replicated_frame_state.cc b/components/html_viewer/replicated_frame_state.cc
index c514ad2673a64178b93a698bab98b9fd46297c24..34dd0214167a8078bd6408ede9a7ac201e8c2e07 100644
--- a/components/html_viewer/replicated_frame_state.cc
+++ b/components/html_viewer/replicated_frame_state.cc
@@ -31,6 +31,12 @@ void SetReplicatedFrameStateFromClientProperties(
&(state->tree_scope))) {
state->tree_scope = blink::WebTreeScopeType::Document;
}
+ if (!FrameOwnerPropertiesFromClientProperty(
+ GetValueFromClientProperties(kPropertyFrameOwnerProperties,
+ properties),
+ &(state->owner_properties))) {
+ state->owner_properties = blink::WebFrameOwnerProperties();
+ }
}
void ClientPropertiesFromReplicatedFrameState(
@@ -46,6 +52,10 @@ void ClientPropertiesFromReplicatedFrameState(
kPropertyFrameSandboxFlags,
FrameSandboxFlagsToClientProperty(state.sandbox_flags).Pass(),
properties);
+ AddToClientPropertiesIfValid(
+ kPropertyFrameOwnerProperties,
+ FrameOwnerPropertiesToClientProperty(state.owner_properties).Pass(),
+ properties);
}
} // namespace html_viewer

Powered by Google App Engine
This is Rietveld 408576698