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

Unified Diff: third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

Issue 2626183003: Switch RemoteWindowProxy to use v8::Context::NewRemoteContext. (Closed)
Patch Set: rebase Created 3 years, 10 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/WebRemoteFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
index 3cb385991a22641af04526cd8fc0445b91c6569b..07216f8ca5c8fce3be2c6f94ff289f90f6e7dbf5 100644
--- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
@@ -4,6 +4,9 @@
#include "web/WebRemoteFrameImpl.h"
+#include <v8/include/v8.h>
+#include "bindings/core/v8/DOMWrapperWorld.h"
+#include "bindings/core/v8/WindowProxy.h"
#include "core/dom/Fullscreen.h"
#include "core/dom/RemoteSecurityContext.h"
#include "core/dom/SecurityContext.h"
@@ -24,7 +27,6 @@
#include "web/RemoteFrameOwner.h"
#include "web/WebLocalFrameImpl.h"
#include "web/WebViewImpl.h"
-#include <v8/include/v8.h>
namespace blink {
@@ -212,11 +214,6 @@ v8::Local<v8::Context> WebRemoteFrameImpl::mainWorldScriptContext() const {
return v8::Local<v8::Context>();
}
-v8::Local<v8::Context> WebRemoteFrameImpl::deprecatedMainWorldScriptContext()
- const {
- return toV8Context(frame(), DOMWrapperWorld::mainWorld());
-}
-
void WebRemoteFrameImpl::reload(WebFrameLoadType) {
NOTREACHED();
}
@@ -530,6 +527,12 @@ void WebRemoteFrameImpl::setHasReceivedUserGesture() {
frame()->setDocumentHasReceivedUserGesture();
}
+v8::Local<v8::Object> WebRemoteFrameImpl::globalProxy() const {
+ return frame()
+ ->windowProxy(DOMWrapperWorld::mainWorld())
+ ->globalIfNotDetached();
+}
+
WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope,
WebRemoteFrameClient* client)
: WebRemoteFrame(scope),

Powered by Google App Engine
This is Rietveld 408576698