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

Unified Diff: third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.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/bindings/core/v8/WindowProxyManager.h
diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h b/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h
index a70c384d0242296dd1daa1e7f12bc0ca2fe7d931..c23ba54229107ed00067aa63512223774d3c48a5 100644
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h
@@ -35,6 +35,10 @@ class WindowProxyManagerBase : public GarbageCollected<WindowProxyManagerBase> {
setGlobals(const HashMap<DOMWrapperWorld*, v8::Local<v8::Object>>&);
protected:
+ friend v8::Local<v8::Value> ToV8(WindowProxyManagerBase*,
dcheng 2017/01/18 07:02:00 Since this is a temporary hack, I've opted to just
+ v8::Local<v8::Object> creationContext,
+ v8::Isolate*);
+
using IsolatedWorldMap = HeapHashMap<int, Member<WindowProxy>>;
explicit WindowProxyManagerBase(Frame&);
@@ -58,7 +62,6 @@ class WindowProxyManagerImplHelper : public WindowProxyManagerBase {
using Base = WindowProxyManagerBase;
public:
- FrameType* frame() const { return static_cast<FrameType*>(Base::frame()); }
ProxyType* mainWorldProxy() const {
return static_cast<ProxyType*>(Base::mainWorldProxy());
}
@@ -69,6 +72,8 @@ class WindowProxyManagerImplHelper : public WindowProxyManagerBase {
protected:
explicit WindowProxyManagerImplHelper(Frame& frame)
: WindowProxyManagerBase(frame) {}
+
+ FrameType* frame() const { return static_cast<FrameType*>(Base::frame()); }
dcheng 2017/01/18 07:02:00 To avoid DOMWindow from getting frame() from its w
};
class LocalWindowProxyManager

Powered by Google App Engine
This is Rietveld 408576698