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

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

Issue 2720973002: Switch RemoteWindowProxy to use v8::Context::NewRemoteContext. (Closed)
Patch Set: Rebase after split 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
« no previous file with comments | « third_party/WebKit/Source/web/WebRemoteFrameImpl.h ('k') | third_party/WebKit/public/web/WebRemoteFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3fcba5514d4016c656052ed1c962fa0d90d7a9cf..9b8ed4f370e6ca506e97802716d37cdda9a16b89 100644
--- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
@@ -4,7 +4,8 @@
#include "web/WebRemoteFrameImpl.h"
-#include "bindings/core/v8/RemoteWindowProxy.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"
@@ -213,13 +214,6 @@ v8::Local<v8::Context> WebRemoteFrameImpl::mainWorldScriptContext() const {
return v8::Local<v8::Context>();
}
-v8::Local<v8::Context> WebRemoteFrameImpl::deprecatedMainWorldScriptContext()
- const {
- return static_cast<RemoteWindowProxy*>(
- frame()->windowProxy(DOMWrapperWorld::mainWorld()))
- ->contextIfInitialized();
-}
-
void WebRemoteFrameImpl::reload(WebFrameLoadType) {
NOTREACHED();
}
@@ -529,6 +523,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),
« no previous file with comments | « third_party/WebKit/Source/web/WebRemoteFrameImpl.h ('k') | third_party/WebKit/public/web/WebRemoteFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698