Propagate scrolling/marginwidth/marginheight property values to child frame.

content/common/frame_messages.h

Index: content/common/frame_messages.h
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index 28f27db5245bbcb1507885ac71efa58a66915e4e..ece008a5daa867b1bdbb1df1d8ad48a991decaa2 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -26,6 +26,7 @@
 #include "content/public/common/resource_response.h"
 #include "content/public/common/transition_element.h"
 #include "ipc/ipc_message_macros.h"
+#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
 #include "third_party/WebKit/public/web/WebTreeScopeType.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 #include "url/gurl.h"
@@ -50,6 +51,8 @@ IPC_ENUM_TRAITS_MAX_VALUE(blink::WebContextMenuData::MediaType,
                           blink::WebContextMenuData::MediaTypeLast)
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebContextMenuData::InputFieldType,
                           blink::WebContextMenuData::InputFieldTypeLast)
+IPC_ENUM_TRAITS_MAX_VALUE(blink::WebFrameOwnerProperties::ScrollingMode,
+                          blink::WebFrameOwnerProperties::ScrollingModeLast)
 IPC_ENUM_TRAITS(blink::WebSandboxFlags)  // Bitmask.
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebTreeScopeType,
                           blink::WebTreeScopeType::Last)
@@ -107,6 +110,12 @@ IPC_STRUCT_TRAITS_BEGIN(content::CustomContextMenuContext)
   IPC_STRUCT_TRAITS_MEMBER(link_followed)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(blink::WebFrameOwnerProperties)
+  IPC_STRUCT_TRAITS_MEMBER(scrollingMode)
+  IPC_STRUCT_TRAITS_MEMBER(marginWidth)
+  IPC_STRUCT_TRAITS_MEMBER(marginHeight)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(content::TransitionElement)
   IPC_STRUCT_TRAITS_MEMBER(id)
   IPC_STRUCT_TRAITS_MEMBER(rect)
@@ -342,6 +351,8 @@ IPC_STRUCT_BEGIN(FrameMsg_NewFrame_Params)
   // the new frame's sandbox flags.
   IPC_STRUCT_MEMBER(content::FrameReplicationState, replication_state)
 
+  IPC_STRUCT_MEMBER(blink::WebFrameOwnerProperties, frame_owner_properties)
+
   // Specifies properties for a new RenderWidget that will be attached to the
   // new RenderFrame (if one is needed).
   IPC_STRUCT_MEMBER(FrameMsg_NewFrame_WidgetParams, widget_params)
@@ -664,12 +675,14 @@ IPC_MESSAGE_ROUTED4(FrameHostMsg_AddMessageToConsole,
 //
 // Each of these messages will have a corresponding FrameHostMsg_Detach message
 // sent when the frame is detached from the DOM.
-IPC_SYNC_MESSAGE_CONTROL4_1(FrameHostMsg_CreateChildFrame,
-                            int32 /* parent_routing_id */,
-                            blink::WebTreeScopeType /* scope */,
-                            std::string /* frame_name */,
-                            blink::WebSandboxFlags /* sandbox flags */,
-                            int32 /* new_routing_id */)
+IPC_SYNC_MESSAGE_CONTROL5_1(
+    FrameHostMsg_CreateChildFrame,
+    int32 /* parent_routing_id */,
+    blink::WebTreeScopeType /* scope */,
+    std::string /* frame_name */,
+    blink::WebSandboxFlags /* sandbox flags */,
+    blink::WebFrameOwnerProperties /* frame_owner_properties */,
+    int32 /* new_routing_id */)
 
 // Sent by the renderer to the parent RenderFrameHost when a child frame is
 // detached from the DOM.
@@ -762,6 +775,25 @@ IPC_MESSAGE_ROUTED2(FrameHostMsg_DidChangeSandboxFlags,
                     int32 /* subframe_routing_id */,
                     blink::WebSandboxFlags /* updated_flags */)
 
+// Notifies the browser that "scrolling" property has changed for a subframe of
+// this frame.
+IPC_MESSAGE_ROUTED2(
+    FrameHostMsg_DidChangeScrollingMode,
+    int32 /* subframe_routing_id */,
+    blink::WebFrameOwnerProperties::ScrollingMode /* scrolling_mode */)
+
+// Notifies the browser that "marginwidth" property has changed for a subframe
+// of this frame.
+IPC_MESSAGE_ROUTED2(FrameHostMsg_DidChangeMarginWidth,
+                    int32 /* subframe_routing_id */,
+                    int /* margin_width */)
+
+// Notifies the browser that "marginheight" property has changed for a subframe
+// of this frame.
+IPC_MESSAGE_ROUTED2(FrameHostMsg_DidChangeMarginHeight,
+                    int32 /* subframe_routing_id */,
+                    int /* margin_height */)
+
 // Changes the title for the page in the UI when the page is navigated or the
 // title changes. Sent for top-level frames.
 IPC_MESSAGE_ROUTED2(FrameHostMsg_UpdateTitle,