Chromium Code Reviews| Index: third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp |
| diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp |
| index da76ba78d623c0e4eed0bfba26b55273909777ca..65bae0f56e27f0d04e39ff5969e6a52dca2339dc 100644 |
| --- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp |
| +++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp |
| @@ -53,6 +53,7 @@ |
| #include "core/frame/BarProp.h" |
| #include "core/frame/DOMVisualViewport.h" |
| #include "core/frame/EventHandlerRegistry.h" |
| +#include "core/frame/External.h" |
| #include "core/frame/FrameConsole.h" |
| #include "core/frame/FrameView.h" |
| #include "core/frame/History.h" |
| @@ -1380,6 +1381,19 @@ CustomElementRegistry* LocalDOMWindow::maybeCustomElements() const { |
| return m_customElements; |
| } |
| +External* LocalDOMWindow::external() const { |
|
haraken
2017/02/03 09:03:18
You'll need to rebase this part with ToT.
dcheng
2017/02/03 10:04:26
Done.
|
| + DEFINE_STATIC_LOCAL(Persistent<External>, external, (new External)); |
| + return external; |
| +} |
| + |
| +bool LocalDOMWindow::isSecureContext() const { |
| + if (!frame()) |
| + return false; |
| + |
| + return document()->isSecureContext( |
| + ExecutionContext::StandardSecureContextCheck); |
| +} |
| + |
| void LocalDOMWindow::addedEventListener( |
| const AtomicString& eventType, |
| RegisteredEventListener& registeredListener) { |