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

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

Issue 1157563004: Revert of Update Blink to use the tree scope info on WebFrame for scoping checks. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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
« no previous file with comments | « Source/web/tests/WebFrameTest.cpp ('k') | public/web/WebFrameClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/WebViewTest.cpp
diff --git a/Source/web/tests/WebViewTest.cpp b/Source/web/tests/WebViewTest.cpp
index a9b46bd045f941b3bb345bf59f4a83282dd114f6..e05799b502520e42bc822be5ba121f7125df4d57 100644
--- a/Source/web/tests/WebViewTest.cpp
+++ b/Source/web/tests/WebViewTest.cpp
@@ -1462,7 +1462,7 @@
TEST_F(WebViewTest, ClientTapHandlingNullWebViewClient)
{
WebViewImpl* webView = WebViewImpl::create(nullptr);
- webView->setMainFrame(WebLocalFrame::create(WebTreeScopeType::Document, nullptr));
+ webView->setMainFrame(WebLocalFrame::create(nullptr));
WebGestureEvent event;
event.type = WebInputEvent::GestureTap;
event.x = 3;
@@ -2051,7 +2051,7 @@
class CreateChildCounterFrameClient : public FrameTestHelpers::TestWebFrameClient {
public:
CreateChildCounterFrameClient() : m_count(0) { }
- virtual WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const WebString& frameName, WebSandboxFlags) override;
+ virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString& frameName, WebSandboxFlags) override;
int count() const { return m_count; }
@@ -2059,10 +2059,10 @@
int m_count;
};
-WebFrame* CreateChildCounterFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& frameName, WebSandboxFlags sandboxFlags)
+WebFrame* CreateChildCounterFrameClient::createChildFrame(WebLocalFrame* parent, const WebString& frameName, WebSandboxFlags sandboxFlags)
{
++m_count;
- return TestWebFrameClient::createChildFrame(parent, scope, frameName, sandboxFlags);
+ return TestWebFrameClient::createChildFrame(parent, frameName, sandboxFlags);
}
TEST_F(WebViewTest, ChangeDisplayMode)
« no previous file with comments | « Source/web/tests/WebFrameTest.cpp ('k') | public/web/WebFrameClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698