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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/gin_browsertest.cc

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
« no previous file with comments | « content/renderer/dom_automation_controller.cc ('k') | content/renderer/gpu/gpu_benchmarking_extension.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gin_browsertest.cc
diff --git a/content/renderer/gin_browsertest.cc b/content/renderer/gin_browsertest.cc
index a8639a15318a3bec80db6c226260135b3aefeb0a..097dfe2fb1c6e6869bebc57ce80d2f4361627bb0 100644
--- a/content/renderer/gin_browsertest.cc
+++ b/content/renderer/gin_browsertest.cc
@@ -11,8 +11,8 @@
#include "gin/per_isolate_data.h"
#include "gin/wrappable.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebKit.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebView.h"
namespace content {
@@ -65,8 +65,7 @@ TEST_F(GinBrowserTest, GinAndGarbageCollection) {
{
v8::Isolate* isolate = blink::MainThreadIsolate();
v8::HandleScope handle_scope(isolate);
- v8::Context::Scope context_scope(
- view_->GetWebView()->MainFrame()->MainWorldScriptContext());
+ v8::Context::Scope context_scope(GetMainFrame()->MainWorldScriptContext());
// We create the object inside a scope so it's not kept alive by a handle
// on the stack.
« no previous file with comments | « content/renderer/dom_automation_controller.cc ('k') | content/renderer/gpu/gpu_benchmarking_extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698