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

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index 56619e311285df3bc84cb4858f117d5a55c5e954..b03b0a1f66c12e576b4d0799a149fc2538d0bb92 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -201,6 +201,7 @@
 #include "public/web/WebFindOptions.h"
 #include "public/web/WebFormElement.h"
 #include "public/web/WebFrameClient.h"
+#include "public/web/WebFrameOwnerProperties.h"
 #include "public/web/WebHistoryItem.h"
 #include "public/web/WebIconURL.h"
 #include "public/web/WebInputElement.h"
@@ -1755,7 +1756,8 @@ PassRefPtrWillBeRawPtr<LocalFrame> WebLocalFrameImpl::createChildFrame(const Fra
     WebTreeScopeType scope = frame()->document() == ownerElement->treeScope()
         ? WebTreeScopeType::Document
         : WebTreeScopeType::Shadow;
-    WebLocalFrameImpl* webframeChild = toWebLocalFrameImpl(m_client->createChildFrame(this, scope, name, static_cast<WebSandboxFlags>(ownerElement->sandboxFlags())));
+    WebFrameOwnerProperties ownerProperties(ownerElement->scrollingMode(), ownerElement->marginWidth(), ownerElement->marginHeight());
+    WebLocalFrameImpl* webframeChild = toWebLocalFrameImpl(m_client->createChildFrame(this, scope, name, static_cast<WebSandboxFlags>(ownerElement->sandboxFlags()), ownerProperties));
     if (!webframeChild)
         return nullptr;
 
@@ -1995,18 +1997,24 @@ static void ensureFrameLoaderHasCommitted(FrameLoader& frameLoader)
     frameLoader.stateMachine()->advanceTo(FrameLoaderStateMachine::CommittedMultipleRealLoads);
 }
 
-void WebLocalFrameImpl::initializeToReplaceRemoteFrame(WebRemoteFrame* oldWebFrame, const WebString& name, WebSandboxFlags flags)
+void WebLocalFrameImpl::initializeToReplaceRemoteFrame(WebRemoteFrame* oldWebFrame, const WebString& name, WebSandboxFlags flags, const WebFrameOwnerProperties& frameOwnerProperties)
 {
     Frame* oldFrame = toCoreFrame(oldWebFrame);
     // Note: this *always* temporarily sets a frame owner, even for main frames!
     // When a core Frame is created with no owner, it attempts to set itself as
     // the main frame of the Page. However, this is a provisional frame, and may
     // disappear, so Page::m_mainFrame can't be updated just yet.
-    OwnPtrWillBeRawPtr<FrameOwner> tempOwner = RemoteBridgeFrameOwner::create(nullptr, SandboxNone);
+    OwnPtrWillBeRawPtr<FrameOwner> tempOwner = RemoteBridgeFrameOwner::create(nullptr, SandboxNone, WebFrameOwnerProperties());
     RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(m_frameLoaderClientImpl.get(), oldFrame->host(), tempOwner.get());
     frame->setOwner(oldFrame->owner());
-    if (frame->owner() && !frame->owner()->isLocal())
-        toRemoteBridgeFrameOwner(frame->owner())->setSandboxFlags(static_cast<SandboxFlags>(flags));
+    if (frame->owner() && !frame->owner()->isLocal()) {
+        RemoteBridgeFrameOwner* remoteOwner = toRemoteBridgeFrameOwner(frame->owner());

[dcheng, 2015/10/14 07:20:43]

Maybe this should just call WebFrame::setReplicatedFrameOwnerProperties?

[dcheng, 2015/10/14 07:57:08]

Also, can we add a comment as to why this is necessary? I assume that this is
because a remote frame doesn't get the notifications that would update these
flags/properties, so we need to sync it up?

If that's the case, then how do we ensure these are still in sync when the frame
is actually swapped in before committing the provisional load?

[lazyboy, 2015/10/14 20:05:29]

Yes.
in A-embed B-embed C scenario, if we navigate C to A's site instance, then
in A's process during remote->local, it doesn't have any idea about the frame
owner properties for the frame. This will ensure we have them right.
Added comment.
Can you elaborate this one?

[lazyboy, 2015/10/14 20:05:29]

WebFrame::setFrameOwnerProperties needs core Frame for |frame| which is not set
until line 2021, causes a crash.

[dcheng, 2015/10/15 06:06:53]

We prepare a local frame when we have a provisional navigation. Between the time
the local frame is prepared and the time it's actually committed, a lot of other
stuff can run. If these properties are changed between these two times, then it
seems like we wouldn't get the correct properties.
Can we move this block to line 2022 then?

[lazyboy, 2015/10/15 16:56:38]

OK.
If I understand correctly, if these properties are dynamically
set using JavaScript during that time, we'll be off, right?
Now since these properties currently do not take effect immediately
and we actually have to navigate the frame to see its effect, we
should be fine IMO. Note that this is true for non --site-per-process
too.
Moved, I'll ask Alex if it's OK to move setSandboxFlags there too.

[alexmos, 2015/10/16 17:17:01]

I think this should be ok.  This needs to happens before
Document::initSecurityContext gets called, which shouldn't happen before
frame->init().

+        remoteOwner->setSandboxFlags(static_cast<SandboxFlags>(flags));
+        remoteOwner->setScrollingMode(frameOwnerProperties.scrollingMode);
+        remoteOwner->setMarginWidth(frameOwnerProperties.marginWidth);
+        remoteOwner->setMarginHeight(frameOwnerProperties.marginHeight);
+    }
+
     frame->tree().setName(name);
     setParent(oldWebFrame->parent());
     setOpener(oldWebFrame->opener());