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

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index ef30f2d11bff64a170181158f9e80fc461cf09c5..ff1ddbebce71ef7dee0cf37a5342f2f4b564d6dc 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -33,6 +33,7 @@
 #include "third_party/WebKit/public/web/WebAXObject.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
+#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
 #include "ui/gfx/range/range.h"
@@ -149,14 +150,16 @@ class CONTENT_EXPORT RenderFrameImpl
   // the latter is MSG_ROUTING_NONE.  Note: This is called only when
   // RenderFrame is being created in response to IPC message from the browser
   // process. All other frame creation is driven through Blink and Create.
-  static void CreateFrame(int routing_id,
-                          int proxy_routing_id,
-                          int opener_routing_id,
-                          int parent_routing_id,
-                          int previous_sibling_routing_id,
-                          const FrameReplicationState& replicated_state,
-                          CompositorDependencies* compositor_deps,
-                          const FrameMsg_NewFrame_WidgetParams& params);
+  static void CreateFrame(
+      int routing_id,
+      int proxy_routing_id,
+      int opener_routing_id,
+      int parent_routing_id,
+      int previous_sibling_routing_id,
+      const FrameReplicationState& replicated_state,
+      CompositorDependencies* compositor_deps,
+      const FrameMsg_NewFrame_WidgetParams& params,
+      const blink::WebFrameOwnerProperties& frameOwner_properties);
 
   // Returns the RenderFrameImpl for the given routing ID.
   static RenderFrameImpl* FromRoutingID(int routing_id);
@@ -393,7 +396,8 @@ class CONTENT_EXPORT RenderFrameImpl
       blink::WebLocalFrame* parent,
       blink::WebTreeScopeType scope,
       const blink::WebString& name,
-      blink::WebSandboxFlags sandboxFlags);
+      blink::WebSandboxFlags sandboxFlags,
+      const blink::WebFrameOwnerProperties& frameOwnerProperties);
   virtual void didChangeOpener(blink::WebFrame* frame);
   virtual void frameDetached(blink::WebFrame* frame, DetachType type);
   virtual void frameFocused();
@@ -402,6 +406,13 @@ class CONTENT_EXPORT RenderFrameImpl
                              const blink::WebString& name);
   virtual void didChangeSandboxFlags(blink::WebFrame* child_frame,
                                      blink::WebSandboxFlags flags);
+  virtual void didChangeScrollingMode(
+      blink::WebFrame* child_frame,
+      blink::WebFrameOwnerProperties::ScrollingMode scrolling_mode);
+  virtual void didChangeMarginWidth(blink::WebFrame* child_frame,
+                                    int marginWidth);
+  virtual void didChangeMarginHeight(blink::WebFrame* child_frame,
+                                     int marginHeight);
   virtual void didMatchCSS(
       blink::WebLocalFrame* frame,
       const blink::WebVector<blink::WebString>& newly_matching_selectors,
@@ -696,6 +707,8 @@ class CONTENT_EXPORT RenderFrameImpl
   void OnSnapshotAccessibilityTree(int callback_id);
   void OnUpdateOpener(int opener_routing_id);
   void OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags);
+  void OnSetFrameOwnerProperties(
+      const blink::WebFrameOwnerProperties& frame_owner_properties);
   void OnTextTrackSettingsChanged(
       const FrameMsg_TextTrackSettings_Params& params);
   void OnPostMessageEvent(const FrameMsg_PostMessage_Params& params);
@@ -823,6 +836,8 @@ class CONTENT_EXPORT RenderFrameImpl
   // saved in OnNavigate().
   NavigationState* CreateNavigationStateFromPending();
 
+  void DidChangeFrameOwnerProperties(int frame_routing_id);
+
 #if defined(OS_ANDROID)
   blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
       blink::WebMediaPlayerClient* client,
@@ -1024,6 +1039,8 @@ class CONTENT_EXPORT RenderFrameImpl
   // AccessibilityModeOff.
   RendererAccessibility* renderer_accessibility_;
 
+  blink::WebFrameOwnerProperties frame_owner_properties_;
+
   scoped_ptr<PermissionDispatcher> permission_client_;
 
   scoped_ptr<blink::WebAppBannerClient> app_banner_client_;