| Index: third_party/WebKit/Source/bindings/core/v8/ScriptController.h
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
|
| index 83a4cc93e740033095de3925ec0a64ba4a55f749..747bea01e12b952305134034d9bd0c4f8714bba2 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
|
| @@ -52,7 +52,6 @@ class Element;
|
| class KURL;
|
| class ScriptSourceCode;
|
| class SecurityOrigin;
|
| -class WindowProxy;
|
| class Widget;
|
|
|
| typedef WTF::Vector<v8::Extension*> V8Extensions;
|
| @@ -80,7 +79,7 @@ class CORE_EXPORT ScriptController final
|
|
|
| // This returns an initialized window proxy. (If the window proxy is not
|
| // yet initialized, it's implicitly initialized at the first access.)
|
| - WindowProxy* windowProxy(DOMWrapperWorld&);
|
| + LocalWindowProxy* windowProxy(DOMWrapperWorld&);
|
|
|
| // Evaluate JavaScript in the main world.
|
| void executeScriptInMainWorld(
|
| @@ -148,22 +147,20 @@ class CORE_EXPORT ScriptController final
|
|
|
| v8::Isolate* isolate() const { return m_windowProxyManager->isolate(); }
|
|
|
| - WindowProxyManager* getWindowProxyManager() const {
|
| + LocalWindowProxyManager* getWindowProxyManager() const {
|
| return m_windowProxyManager.get();
|
| }
|
|
|
| private:
|
| explicit ScriptController(LocalFrame*);
|
|
|
| - LocalFrame* frame() const {
|
| - return toLocalFrame(m_windowProxyManager->frame());
|
| - }
|
| + LocalFrame* frame() const { return m_windowProxyManager->frame(); }
|
|
|
| v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&,
|
| AccessControlStatus,
|
| ExecuteScriptPolicy);
|
|
|
| - Member<WindowProxyManager> m_windowProxyManager;
|
| + Member<LocalWindowProxyManager> m_windowProxyManager;
|
| };
|
|
|
| } // namespace blink
|
|
|