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

components/html_viewer/html_frame.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/html_viewer/html_frame.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 34 matching lines @@
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
+#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
 #include "third_party/WebKit/public/web/WebRemoteFrame.h"
 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 118 matching lines @@
     }
   } else if (!params->is_local_create_child && params->window &&
              id_ == params->window->id()) {
     // Frame represents the local frame, and it isn't the root of the tree.
     HTMLFrame* previous_sibling = GetPreviousSibling(this);
     blink::WebFrame* previous_web_frame =
         previous_sibling ? previous_sibling->web_frame() : nullptr;
     CHECK(!parent_->IsLocal());
     web_frame_ = parent_->web_frame()->toWebRemoteFrame()->createLocalChild(
         state_.tree_scope, state_.name, state_.sandbox_flags, this,
-        previous_web_frame);
+        previous_web_frame,
+        // TODO(lazyboy): Replicate WebFrameOwnerProperties where needed.
+        blink::WebFrameOwnerProperties());
     CreateLocalRootWebWidget(web_frame_->toWebLocalFrame());
   } else if (!parent_->IsLocal()) {
     web_frame_ = parent_->web_frame()->toWebRemoteFrame()->createRemoteChild(
         state_.tree_scope, state_.name, state_.sandbox_flags, this);
   } else {
     CHECK(params->is_local_create_child);
 
     blink::WebLocalFrame* child_web_frame =
         blink::WebLocalFrame::create(state_.tree_scope, this);
     web_frame_ = child_web_frame;
@@ skipping 109 matching lines @@
     blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
     blink::WebContentDecryptionModule* initial_cdm) {
   return global_state()->media_factory()->CreateMediaPlayer(
       frame, url, client, encrypted_client, initial_cdm, GetApp()->shell());
 }
 
 blink::WebFrame* HTMLFrame::createChildFrame(
     blink::WebLocalFrame* parent,
     blink::WebTreeScopeType scope,
     const blink::WebString& frame_name,
-    blink::WebSandboxFlags sandbox_flags) {
+    blink::WebSandboxFlags sandbox_flags,
+    const blink::WebFrameOwnerProperties& frame_owner_properties) {
   DCHECK(IsLocal());  // Can't create children of remote frames.
   DCHECK_EQ(parent, web_frame_);
   DCHECK(window_);  // If we're local we have to have a window.
   // Create the window that will house the frame now. We embed once we know the
   // url (see decidePolicyForNavigation()).
   mus::Window* child_window = window_->connection()->NewWindow();
   ReplicatedFrameState child_state;
   child_state.name = frame_name;
   child_state.tree_scope = scope;
   child_state.sandbox_flags = sandbox_flags;
@@ skipping 334 matching lines @@
   DVLOG(2) << "HTMLFrame::SwapToLocal this=" << this << " id=" << id_;
   CHECK(!IsLocal());
   // It doesn't make sense for the root to swap to local.
   CHECK(parent_);
   delegate_ = delegate;
   SetWindow(window);
   SetReplicatedFrameStateFromClientProperties(properties, &state_);
   blink::WebLocalFrame* local_web_frame =
       blink::WebLocalFrame::create(state_.tree_scope, this);
   local_web_frame->initializeToReplaceRemoteFrame(
-      web_frame_->toWebRemoteFrame(), state_.name, state_.sandbox_flags);
+      web_frame_->toWebRemoteFrame(), state_.name, state_.sandbox_flags,
+      // TODO(lazyboy): Figure out replicating WebFrameOwnerProperties.
+      blink::WebFrameOwnerProperties());
   // The swap() ends up calling to frameDetached() and deleting the old.
   web_frame_->swap(local_web_frame);
   web_frame_ = local_web_frame;
 
   web_layer_.reset();
 }
 
 void HTMLFrame::SwapDelegate(HTMLFrameDelegate* delegate) {
   DCHECK(IsLocal());
   HTMLFrameDelegate* old_delegate = delegate_;
@@ skipping 337 matching lines @@
   if (!surface_layer_)
     return;
 
   surface_layer_->SetSurfaceId(
       cc::SurfaceId(owned_window_->window()->id()),
       global_state()->device_pixel_ratio(),
       owned_window_->window()->bounds().To<gfx::Rect>().size());
 }
 
 }  // namespace mojo