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

Unified Diff: third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp

Issue 2389493002: Revert of Require WebLocalFrame to be created with a non-null client (Closed)
Patch Set: Created 4 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
Index: third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp b/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
index c71def645ddb9b39147d06dc66c70c4343f3e72d..9c35a868abefa99f7ced46cde68dff5a25019f97 100644
--- a/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
@@ -77,7 +77,8 @@
void SetUp() override
{
m_webView = toWebViewImpl(WebView::create(&m_webViewClient, WebPageVisibilityStateVisible));
- m_webView->setMainFrame(WebLocalFrame::create(WebTreeScopeType::Document, &m_webFrameClient));
+ m_mainFrame = WebLocalFrame::create(WebTreeScopeType::Document, &m_webFrameClient);
+ m_webView->setMainFrame(m_mainFrame);
m_chromeClientImpl = toChromeClientImpl(&m_webView->page()->chromeClient());
m_result = WebNavigationPolicyIgnore;
}
@@ -85,6 +86,7 @@
void TearDown() override
{
m_webView->close();
+ m_mainFrame->close();
}
WebNavigationPolicy getNavigationPolicyWithMouseEvent(int modifiers, WebMouseEvent::Button button, bool asPopup)
@@ -110,6 +112,7 @@
WebNavigationPolicy m_result;
TestWebViewClient m_webViewClient;
WebViewImpl* m_webView;
+ WebFrame* m_mainFrame;
FrameTestHelpers::TestWebFrameClient m_webFrameClient;
Persistent<ChromeClientImpl> m_chromeClientImpl;
};
@@ -278,11 +281,12 @@
void TearDown() override
{
m_webView->close();
+ m_mainFrame->close();
}
ViewCreatingClient m_webViewClient;
WebViewImpl* m_webView;
- WebLocalFrame* m_mainFrame;
+ WebFrame* m_mainFrame;
FrameTestHelpers::TestWebFrameClient m_webFrameClient;
Persistent<ChromeClientImpl> m_chromeClientImpl;
};
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.cpp ('k') | third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698