| 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 439b0f3ce3629bf94b0d90afc256dd150c45742b..294c9789ffe5eded62c3d074482a60db2ce64188 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h
|
| @@ -19,10 +19,9 @@ class ScriptState;
|
| class SecurityOrigin;
|
| class WindowProxy;
|
|
|
| -class CORE_EXPORT WindowProxyManager final : public NoBaseWillBeGarbageCollectedFinalized<WindowProxyManager> {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(WindowProxyManager);
|
| +class CORE_EXPORT WindowProxyManager final : public GarbageCollectedFinalized<WindowProxyManager> {
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<WindowProxyManager> create(Frame&);
|
| + static RawPtr<WindowProxyManager> create(Frame&);
|
|
|
| ~WindowProxyManager();
|
| DECLARE_TRACE();
|
| @@ -44,14 +43,14 @@ public:
|
| void setGlobals(const HashMap<DOMWrapperWorld*, v8::Local<v8::Object>>&);
|
|
|
| private:
|
| - typedef WillBeHeapHashMap<int, OwnPtrWillBeMember<WindowProxy>> IsolatedWorldMap;
|
| + typedef HeapHashMap<int, Member<WindowProxy>> IsolatedWorldMap;
|
|
|
| explicit WindowProxyManager(Frame&);
|
|
|
| - RawPtrWillBeMember<Frame> m_frame;
|
| + Member<Frame> m_frame;
|
| v8::Isolate* const m_isolate;
|
|
|
| - const OwnPtrWillBeMember<WindowProxy> m_windowProxy;
|
| + const Member<WindowProxy> m_windowProxy;
|
| IsolatedWorldMap m_isolatedWorlds;
|
| };
|
|
|
|
|