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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/web/tests/WebFrameTest.cpp

Issue 1319863006: (blink) Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: address comments from Alex 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
« Source/core/html/HTMLFrameOwnerElement.cpp ('K') | « Source/web/tests/FrameTestHelpers.cpp ('k') | Source/web/tests/WebViewTest.cpp » ('j') | public/web/WebFrame.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index 2ea914dcf633bdbefd3dd7fec1a736ce30f1fb0a..9db3d581a5112f8ab27dd19d7d09a7a88aa15871 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -5922,7 +5922,7 @@ public:
int willSendRequestCallCount() const { return m_willSendRequestCallCount; }
int childFrameCreationCount() const { return m_childFrameCreationCount; }
- virtual WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString&, WebSandboxFlags)
+ virtual WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString&, WebSandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
{
ASSERT(m_childClient);
m_childFrameCreationCount++;
@@ -6311,7 +6311,7 @@ class FailCreateChildFrame : public FrameTestHelpers::TestWebFrameClient {
public:
FailCreateChildFrame() : m_callCount(0) { }
- WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& frameName, WebSandboxFlags sandboxFlags) override
+ WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& frameName, WebSandboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties) override
{
++m_callCount;
return 0;
@@ -6973,7 +6973,7 @@ TEST_P(ParameterizedWebFrameTest, EmbedderTriggeredDetachWithRemoteMainFrame)
WebView* view = WebView::create(&viewClient);
view->setMainFrame(remoteClient.frame());
FrameTestHelpers::TestWebFrameClient childFrameClient;
- WebLocalFrame* childFrame = view->mainFrame()->toWebRemoteFrame()->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr);
+ WebLocalFrame* childFrame = view->mainFrame()->toWebRemoteFrame()->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr, WebFrameOwnerProperties());
// Purposely keep the LocalFrame alive so it's the last thing to be destroyed.
RefPtrWillBePersistent<Frame> childCoreFrame = toCoreFrame(childFrame);
@@ -7008,7 +7008,7 @@ TEST_F(WebFrameSwapTest, SwapMainFrame)
FrameTestHelpers::TestWebFrameClient client;
WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, &client);
- localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None);
+ localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None, WebFrameOwnerProperties());
remoteFrame->swap(localFrame);
// Finally, make sure an embedder triggered load in the local frame swapped
@@ -7072,7 +7072,7 @@ TEST_F(WebFrameSwapTest, SwapFirstChild)
FrameTestHelpers::TestWebFrameClient client;
WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, &client);
- localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None);
+ localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None, WebFrameOwnerProperties());
swapAndVerifyFirstChildConsistency("remote->local", mainFrame(), localFrame);
// FIXME: This almost certainly fires more load events on the iframe element
@@ -7111,7 +7111,7 @@ TEST_F(WebFrameSwapTest, SwapMiddleChild)
FrameTestHelpers::TestWebFrameClient client;
WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, &client);
- localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None);
+ localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None, WebFrameOwnerProperties());
swapAndVerifyMiddleChildConsistency("remote->local", mainFrame(), localFrame);
// FIXME: This almost certainly fires more load events on the iframe element
@@ -7147,7 +7147,7 @@ TEST_F(WebFrameSwapTest, SwapLastChild)
FrameTestHelpers::TestWebFrameClient client;
WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, &client);
- localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None);
+ localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None, WebFrameOwnerProperties());
swapAndVerifyLastChildConsistency("remote->local", mainFrame(), localFrame);
// FIXME: This almost certainly fires more load events on the iframe element
@@ -7192,7 +7192,7 @@ TEST_F(WebFrameSwapTest, SwapParentShouldDetachChildren)
FrameTestHelpers::TestWebFrameClient client;
WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, &client);
- localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None);
+ localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None, WebFrameOwnerProperties());
swapAndVerifySubframeConsistency("remote->local", targetFrame, localFrame);
// FIXME: This almost certainly fires more load events on the iframe element
@@ -7236,7 +7236,7 @@ TEST_F(WebFrameSwapTest, SwapPreservesGlobalContext)
// Now check that remote -> local works too, since it goes through a different code path.
FrameTestHelpers::TestWebFrameClient client;
WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, &client);
- localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None);
+ localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None, WebFrameOwnerProperties());
remoteFrame->swap(localFrame);
v8::Local<v8::Value> localWindow = mainFrame()->executeScriptAndReturnValue(WebScriptSource(
"document.querySelector('#frame2').contentWindow;"));
@@ -7270,7 +7270,7 @@ TEST_F(WebFrameSwapTest, SwapInitializesGlobal)
FrameTestHelpers::TestWebFrameClient client;
WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, &client);
- localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None);
+ localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None, WebFrameOwnerProperties());
remoteFrame->swap(localFrame);
v8::Local<v8::Value> localWindowTop = mainFrame()->executeScriptAndReturnValue(WebScriptSource("saved.top"));
EXPECT_TRUE(localWindowTop->IsObject());
@@ -7341,7 +7341,7 @@ TEST_F(WebFrameSwapTest, FramesOfRemoteParentAreIndexable)
remoteParentFrame->setReplicatedOrigin(SecurityOrigin::createUnique());
FrameTestHelpers::TestWebFrameClient childFrameClient;
- WebLocalFrame* childFrame = remoteParentFrame->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr);
+ WebLocalFrame* childFrame = remoteParentFrame->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr, WebFrameOwnerProperties());
FrameTestHelpers::loadFrame(childFrame, m_baseURL + "subframe-hello.html");
v8::Local<v8::Value> window = childFrame->executeScriptAndReturnValue(WebScriptSource("window"));
@@ -7368,7 +7368,7 @@ TEST_F(WebFrameSwapTest, FrameElementInFramesWithRemoteParent)
remoteParentFrame->setReplicatedOrigin(SecurityOrigin::createUnique());
FrameTestHelpers::TestWebFrameClient childFrameClient;
- WebLocalFrame* childFrame = remoteParentFrame->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr);
+ WebLocalFrame* childFrame = remoteParentFrame->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr, WebFrameOwnerProperties());
FrameTestHelpers::loadFrame(childFrame, m_baseURL + "subframe-hello.html");
v8::Local<v8::Value> frameElement = childFrame->executeScriptAndReturnValue(WebScriptSource("window.frameElement"));
@@ -7415,7 +7415,7 @@ TEST_F(WebFrameSwapTest, HistoryCommitTypeAfterNewRemoteToLocalSwap)
RemoteToLocalSwapWebFrameClient client(remoteFrame);
WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, &client);
- localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None);
+ localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None, WebFrameOwnerProperties());
FrameTestHelpers::loadFrame(localFrame, m_baseURL + "subframe-hello.html");
EXPECT_EQ(WebInitialCommitInChildFrame, client.historyCommitType());
@@ -7440,7 +7440,7 @@ TEST_F(WebFrameSwapTest, HistoryCommitTypeAfterExistingRemoteToLocalSwap)
RemoteToLocalSwapWebFrameClient client(remoteFrame);
WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, &client);
- localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None);
+ localFrame->initializeToReplaceRemoteFrame(remoteFrame, "", WebSandboxFlags::None, WebFrameOwnerProperties());
localFrame->setCommittedFirstRealLoad();
FrameTestHelpers::loadFrame(localFrame, m_baseURL + "subframe-hello.html");
EXPECT_EQ(WebStandardCommit, client.historyCommitType());
@@ -7578,7 +7578,7 @@ TEST_F(WebFrameTest, NavigateRemoteToLocalWithOpener)
// Do a remote-to-local swap in the popup.
FrameTestHelpers::TestWebFrameClient popupLocalClient;
WebLocalFrame* popupLocalFrame = WebLocalFrame::create(WebTreeScopeType::Document, &popupLocalClient);
- popupLocalFrame->initializeToReplaceRemoteFrame(popupRemoteFrame, "", WebSandboxFlags::None);
+ popupLocalFrame->initializeToReplaceRemoteFrame(popupRemoteFrame, "", WebSandboxFlags::None, WebFrameOwnerProperties());
popupRemoteFrame->swap(popupLocalFrame);
// The initial document created during the remote-to-local swap should have
@@ -7616,7 +7616,7 @@ TEST_P(ParameterizedWebFrameTest, RemoteFrameInitialCommitType)
// If an iframe has a remote main frame, ensure the inital commit is correctly identified as WebInitialCommitInChildFrame.
CommitTypeWebFrameClient childFrameClient;
- WebLocalFrame* childFrame = view->mainFrame()->toWebRemoteFrame()->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr);
+ WebLocalFrame* childFrame = view->mainFrame()->toWebRemoteFrame()->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr, WebFrameOwnerProperties());
registerMockedHttpURLLoad("foo.html");
FrameTestHelpers::loadFrame(childFrame, m_baseURL + "foo.html");
EXPECT_EQ(WebInitialCommitInChildFrame, childFrameClient.historyCommitType());
@@ -7642,7 +7642,7 @@ TEST_P(ParameterizedWebFrameTest, FrameWidgetTest)
view->setMainFrame(remoteClient.frame());
FrameTestHelpers::TestWebFrameClient childFrameClient;
- WebLocalFrame* childFrame = view->mainFrame()->toWebRemoteFrame()->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr);
+ WebLocalFrame* childFrame = view->mainFrame()->toWebRemoteFrame()->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr, WebFrameOwnerProperties());
GestureEventTestWebViewClient childViewClient;
WebFrameWidget* widget = WebFrameWidget::create(&childViewClient, childFrame);
@@ -7848,10 +7848,10 @@ TEST_P(ParameterizedWebFrameTest, CreateLocalChildWithPreviousSibling)
view->setMainFrame(remoteClient.frame());
WebRemoteFrame* parent = view->mainFrame()->toWebRemoteFrame();
- WebLocalFrameScope secondFrame = parent->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, nullptr, nullptr);
- WebLocalFrameScope fourthFrame = parent->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, nullptr, secondFrame);
- WebLocalFrameScope thirdFrame = parent->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, nullptr, secondFrame);
- WebLocalFrameScope firstFrame = parent->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, nullptr, nullptr);
+ WebLocalFrameScope secondFrame = parent->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, nullptr, nullptr, WebFrameOwnerProperties());
+ WebLocalFrameScope fourthFrame = parent->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, nullptr, secondFrame, WebFrameOwnerProperties());
+ WebLocalFrameScope thirdFrame = parent->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, nullptr, secondFrame, WebFrameOwnerProperties());
+ WebLocalFrameScope firstFrame = parent->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, nullptr, nullptr, WebFrameOwnerProperties());
EXPECT_EQ(firstFrame, parent->firstChild());
EXPECT_EQ(nullptr, firstFrame->previousSibling());
@@ -7886,7 +7886,7 @@ TEST_P(ParameterizedWebFrameTest, SendBeaconFromChildWithRemoteMainFrame)
root->setReplicatedOrigin(SecurityOrigin::createUnique());
FrameTestHelpers::TestWebFrameClient localFrameClient;
- WebLocalFrame* localFrame = root->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &localFrameClient, nullptr);
+ WebLocalFrame* localFrame = root->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &localFrameClient, nullptr, WebFrameOwnerProperties());
// Finally, make sure an embedder triggered load in the local frame swapped
// back in works.
@@ -7908,12 +7908,12 @@ TEST_P(ParameterizedWebFrameTest, RemoteToLocalSwapOnMainFrameInitializesCoreFra
remoteRoot->setReplicatedOrigin(SecurityOrigin::createUnique());
FrameTestHelpers::TestWebFrameClient localFrameClient;
- remoteRoot->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &localFrameClient, nullptr);
+ remoteRoot->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &localFrameClient, nullptr, WebFrameOwnerProperties());
// Do a remote-to-local swap of the top frame.
FrameTestHelpers::TestWebFrameClient localClient;
WebLocalFrame* localRoot = WebLocalFrame::create(WebTreeScopeType::Document, &localClient);
- localRoot->initializeToReplaceRemoteFrame(remoteRoot, "", WebSandboxFlags::None);
+ localRoot->initializeToReplaceRemoteFrame(remoteRoot, "", WebSandboxFlags::None, WebFrameOwnerProperties());
remoteRoot->swap(localRoot);
// Load a page with a child frame in the new root to make sure this doesn't
« Source/core/html/HTMLFrameOwnerElement.cpp ('K') | « Source/web/tests/FrameTestHelpers.cpp ('k') | Source/web/tests/WebViewTest.cpp » ('j') | public/web/WebFrame.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698