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

Unified Diff: third_party/WebKit/Source/core/frame/DOMWindow.h

Issue 2642643002: Remove CallWith=ScriptState from window/self/frames getters on Window.
Patch Set: Created 3 years, 11 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/core/frame/DOMWindow.h
diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.h b/third_party/WebKit/Source/core/frame/DOMWindow.h
index 44f155ce7800ea51195340ffa6b8df9df8768477..95ff26cdd1a9de177d177843a73a4dbf52483eef 100644
--- a/third_party/WebKit/Source/core/frame/DOMWindow.h
+++ b/third_party/WebKit/Source/core/frame/DOMWindow.h
@@ -41,6 +41,7 @@ class ScriptState;
class ScrollToOptions;
class SerializedScriptValue;
class StyleMedia;
+class WindowProxyManagerBase;
class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
public DOMWindowBase64 {
@@ -118,13 +119,9 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
virtual void setDefaultStatus(const String&) = 0;
// Self-referential attributes
- v8::Local<v8::Object> self(ScriptState*) const;
- v8::Local<v8::Object> window(ScriptState* scriptState) const {
- return self(scriptState);
- }
- v8::Local<v8::Object> frames(ScriptState* scriptState) const {
- return self(scriptState);
- }
+ WindowProxyManagerBase* self() const;
+ WindowProxyManagerBase* window() const { return self(); }
+ WindowProxyManagerBase* frames() const { return self(); }
DOMWindow* opener() const;
DOMWindow* parent() const;
@@ -271,6 +268,7 @@ class CORE_EXPORT DOMWindow : public EventTargetWithInlineData,
private:
Member<Frame> m_frame;
+ const Member<WindowProxyManagerBase> m_windowProxyManager;
mutable Member<Location> m_location;
// Set to true when close() has been called. Needed for

Powered by Google App Engine
This is Rietveld 408576698