Chromium Code Reviews| Index: Source/bindings/core/v8/WindowProxy.cpp |
| diff --git a/Source/bindings/core/v8/WindowProxy.cpp b/Source/bindings/core/v8/WindowProxy.cpp |
| index 44baffed81bc8b03d4943d49d24d797c9b1043d0..8d06f9c5b8d119e095fcaa864a1eda5fe4118c1a 100644 |
| --- a/Source/bindings/core/v8/WindowProxy.cpp |
| +++ b/Source/bindings/core/v8/WindowProxy.cpp |
| @@ -74,9 +74,9 @@ static void checkDocumentWrapper(v8::Handle<v8::Object> wrapper, Document* docum |
| ASSERT(!document->isHTMLDocument() || (V8Document::toImpl(v8::Handle<v8::Object>::Cast(wrapper->GetPrototype())) == document)); |
| } |
| -PassOwnPtr<WindowProxy> WindowProxy::create(LocalFrame* frame, DOMWrapperWorld& world, v8::Isolate* isolate) |
| +PassOwnPtrWillBeRawPtr<WindowProxy> WindowProxy::create(LocalFrame* frame, DOMWrapperWorld& world, v8::Isolate* isolate) |
| { |
| - return adoptPtr(new WindowProxy(frame, &world, isolate)); |
| + return adoptPtrWillBeNoop(new WindowProxy(frame, &world, isolate)); |
| } |
| WindowProxy::WindowProxy(LocalFrame* frame, PassRefPtr<DOMWrapperWorld> world, v8::Isolate* isolate) |
| @@ -86,6 +86,17 @@ WindowProxy::WindowProxy(LocalFrame* frame, PassRefPtr<DOMWrapperWorld> world, v |
| { |
| } |
| +WindowProxy::~WindowProxy() |
| +{ |
| + // WindowProxy::clearForClose() must be invoked before destruction starts. |
|
haraken
2014/10/05 23:37:26
WindowProxy::clearForClose() => WindowProxy::clear
sof
2014/10/06 07:34:40
Thanks, updated.
|
| + ASSERT(!isContextInitialized()); |
| +} |
| + |
| +void WindowProxy::trace(Visitor* visitor) |
| +{ |
| + visitor->trace(m_frame); |
| +} |
| + |
| void WindowProxy::disposeContext(GlobalDetachmentBehavior behavior) |
| { |
| if (!isContextInitialized()) |