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

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

Issue 1316863009: OOPIF: Call setCoreFrame on remote-to-local swaps. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/web/WebLocalFrameImpl.cpp ('K') | « Source/web/WebLocalFrameImpl.cpp ('k') | no next file » | no next file with comments »
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 4a3f112917626400b361734eda6193e2b88165a5..418560efdcac9bdb4acd30535ba5368341a4d031 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -7815,6 +7815,32 @@ TEST_P(ParameterizedWebFrameTest, SendBeaconFromChildWithRemoteMainFrame)
view->close();
}
+// See https://crbug.com/525285.
+TEST_P(ParameterizedWebFrameTest, RemoteToLocalSwapOnMainFrameInitializesCoreFrame)
+{
+ FrameTestHelpers::TestWebViewClient viewClient;
+ FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
+ WebView* view = WebView::create(&viewClient);
+ view->setMainFrame(remoteClient.frame());
+ WebRemoteFrame* remoteRoot = view->mainFrame()->toWebRemoteFrame();
+ remoteRoot->setReplicatedOrigin(SecurityOrigin::createUnique());
+
+ FrameTestHelpers::TestWebFrameClient localFrameClient;
+ remoteRoot->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &localFrameClient, nullptr);
+
+ // 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);
+ remoteRoot->swap(localRoot);
+
+ // Load a page with a child frame in the new root to make sure this doesn't
+ // crash when the child frame invokes setCoreFrame.
+ FrameTestHelpers::loadFrame(localRoot, "data:text/html,<iframe></iframe>");
+
+ view->close();
+}
+
class OverscrollWebViewClient : public FrameTestHelpers::TestWebViewClient {
public:
MOCK_METHOD4(didOverscroll, void(const WebFloatSize&, const WebFloatSize&, const WebFloatPoint&, const WebFloatSize&));
« Source/web/WebLocalFrameImpl.cpp ('K') | « Source/web/WebLocalFrameImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698