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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2923053002: Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame. (Closed)
Patch Set: Rebasing... Created 3 years, 6 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
« extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc ('K') | « third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp ('k') | third_party/WebKit/public/web/WebFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index 9beb924389e40bca45f2a3807f3ad1254bed17af..2ec047e6babf496663f50b645157ebd07b1117db 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -403,14 +403,15 @@ TEST_P(ParameterizedWebFrameTest, FrameForEnteredContext) {
web_view_helper.InitializeAndLoad(base_url_ + "iframes_test.html", true);
v8::HandleScope scope(v8::Isolate::GetCurrent());
- EXPECT_EQ(
- web_view_helper.WebView()->MainFrame(),
- WebLocalFrame::FrameForContext(
- web_view_helper.WebView()->MainFrame()->MainWorldScriptContext()));
+ EXPECT_EQ(web_view_helper.WebView()->MainFrame(),
+ WebLocalFrame::FrameForContext(web_view_helper.WebView()
+ ->MainFrameImpl()
+ ->MainWorldScriptContext()));
EXPECT_EQ(web_view_helper.WebView()->MainFrame()->FirstChild(),
WebLocalFrame::FrameForContext(web_view_helper.WebView()
->MainFrame()
->FirstChild()
+ ->ToWebLocalFrame()
->MainWorldScriptContext()));
}
@@ -451,7 +452,7 @@ TEST_P(ParameterizedWebFrameTest, RequestExecuteScript) {
v8::HandleScope scope(v8::Isolate::GetCurrent());
ScriptExecutionCallbackHelper callback_helper(
- web_view_helper.WebView()->MainFrame()->MainWorldScriptContext());
+ web_view_helper.WebView()->MainFrameImpl()->MainWorldScriptContext());
web_view_helper.WebView()
->MainFrameImpl()
->RequestExecuteScriptAndReturnValue(
@@ -470,7 +471,7 @@ TEST_P(ParameterizedWebFrameTest, SuspendedRequestExecuteScript) {
v8::HandleScope scope(v8::Isolate::GetCurrent());
ScriptExecutionCallbackHelper callback_helper(
- web_view_helper.WebView()->MainFrame()->MainWorldScriptContext());
+ web_view_helper.WebView()->MainFrameImpl()->MainWorldScriptContext());
// Suspend scheduled tasks so the script doesn't run.
web_view_helper.WebView()
@@ -505,7 +506,7 @@ TEST_P(ParameterizedWebFrameTest, RequestExecuteV8Function) {
v8::HandleScope scope(v8::Isolate::GetCurrent());
v8::Local<v8::Context> context =
- web_view_helper.WebView()->MainFrame()->MainWorldScriptContext();
+ web_view_helper.WebView()->MainFrameImpl()->MainWorldScriptContext();
ScriptExecutionCallbackHelper callback_helper(context);
v8::Local<v8::Function> function =
v8::Function::New(context, callback).ToLocalChecked();
@@ -532,7 +533,7 @@ TEST_P(ParameterizedWebFrameTest, RequestExecuteV8FunctionWhileSuspended) {
v8::HandleScope scope(v8::Isolate::GetCurrent());
v8::Local<v8::Context> context =
- web_view_helper.WebView()->MainFrame()->MainWorldScriptContext();
+ web_view_helper.WebView()->MainFrameImpl()->MainWorldScriptContext();
// Suspend scheduled tasks so the script doesn't run.
WebLocalFrameBase* main_frame = web_view_helper.WebView()->MainFrameImpl();
@@ -572,7 +573,7 @@ TEST_P(ParameterizedWebFrameTest,
v8::HandleScope scope(v8::Isolate::GetCurrent());
v8::Local<v8::Context> context =
- web_view_helper.WebView()->MainFrame()->MainWorldScriptContext();
+ web_view_helper.WebView()->MainFrameImpl()->MainWorldScriptContext();
std::unique_ptr<UserGestureIndicator> indicator =
WTF::WrapUnique(new UserGestureIndicator(
@@ -602,7 +603,7 @@ TEST_P(ParameterizedWebFrameTest, IframeScriptRemovesSelf) {
v8::HandleScope scope(v8::Isolate::GetCurrent());
ScriptExecutionCallbackHelper callback_helper(
- web_view_helper.WebView()->MainFrame()->MainWorldScriptContext());
+ web_view_helper.WebView()->MainFrameImpl()->MainWorldScriptContext());
web_view_helper.WebView()
->MainFrame()
->FirstChild()
@@ -4572,7 +4573,7 @@ TEST_P(ParameterizedWebFrameTest, ContextNotificationsLoadUnload) {
web_view_helper.InitializeAndLoad(
base_url_ + "context_notifications_test.html", true, &web_frame_client);
- WebFrame* main_frame = web_view_helper.WebView()->MainFrame();
+ WebLocalFrameBase* main_frame = web_view_helper.WebView()->MainFrameImpl();
WebFrame* child_frame = main_frame->FirstChild();
ASSERT_EQ(2u, create_notifications.size());
@@ -4587,7 +4588,7 @@ TEST_P(ParameterizedWebFrameTest, ContextNotificationsLoadUnload) {
EXPECT_EQ(0, first_create_notification->world_id);
EXPECT_EQ(child_frame, second_create_notification->frame);
- EXPECT_EQ(child_frame->MainWorldScriptContext(),
+ EXPECT_EQ(child_frame->ToWebLocalFrame()->MainWorldScriptContext(),
second_create_notification->context);
EXPECT_EQ(0, second_create_notification->world_id);
@@ -4636,7 +4637,7 @@ TEST_P(ParameterizedWebFrameTest, ContextNotificationsReload) {
// The last two create notifications should be for the current frames and
// context.
- WebFrame* main_frame = web_view_helper.WebView()->MainFrame();
+ WebLocalFrameBase* main_frame = web_view_helper.WebView()->MainFrameImpl();
WebFrame* child_frame = main_frame->FirstChild();
auto& first_refresh_notification = create_notifications[2];
auto& second_refresh_notification = create_notifications[3];
@@ -4647,7 +4648,7 @@ TEST_P(ParameterizedWebFrameTest, ContextNotificationsReload) {
EXPECT_EQ(0, first_refresh_notification->world_id);
EXPECT_EQ(child_frame, second_refresh_notification->frame);
- EXPECT_EQ(child_frame->MainWorldScriptContext(),
+ EXPECT_EQ(child_frame->ToWebLocalFrame()->MainWorldScriptContext(),
second_refresh_notification->context);
EXPECT_EQ(0, second_refresh_notification->world_id);
}
@@ -4686,8 +4687,9 @@ TEST_P(ParameterizedWebFrameTest, ContextNotificationsIsolatedWorlds) {
// We don't have an API to enumarate isolated worlds for a frame, but we can
// at least assert that the context we got is *not* the main world's context.
- ASSERT_NE(web_view_helper.WebView()->MainFrame()->MainWorldScriptContext(),
- v8::Local<v8::Context>::New(isolate, notification->context));
+ ASSERT_NE(
+ web_view_helper.WebView()->MainFrameImpl()->MainWorldScriptContext(),
+ v8::Local<v8::Context>::New(isolate, notification->context));
web_view_helper.Reset();
@@ -9940,7 +9942,7 @@ class DeviceEmulationTest : public ParameterizedWebFrameTest {
String code = "dumpSize('" + id + "')";
v8::HandleScope scope(v8::Isolate::GetCurrent());
ScriptExecutionCallbackHelper callback_helper(
- web_view_helper_.WebView()->MainFrame()->MainWorldScriptContext());
+ web_view_helper_.WebView()->MainFrameImpl()->MainWorldScriptContext());
web_view_helper_.WebView()
->MainFrameImpl()
->RequestExecuteScriptAndReturnValue(WebScriptSource(WebString(code)),
« extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc ('K') | « third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp ('k') | third_party/WebKit/public/web/WebFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698