| 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..441287564dc609e5047f1067e98eebb43aa59c01 100644
|
| --- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "web/WebRemoteFrameImpl.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"
|
| @@ -21,10 +23,10 @@
|
| #include "public/web/WebPerformance.h"
|
| #include "public/web/WebRange.h"
|
| #include "public/web/WebTreeScopeType.h"
|
| +#include "v8/include/v8.h"
|
| #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),
|
|
|