Chromium Code Reviews| Index: Source/core/frame/DOMWindow.cpp |
| diff --git a/Source/core/frame/DOMWindow.cpp b/Source/core/frame/DOMWindow.cpp |
| index a9c7d4dbf82096893986cf498a685d28b312a72e..9e418a03940cc3dbbfca65c7072fa25a748eaf5c 100644 |
| --- a/Source/core/frame/DOMWindow.cpp |
| +++ b/Source/core/frame/DOMWindow.cpp |
| @@ -112,9 +112,9 @@ namespace WebCore { |
| class PostMessageTimer FINAL : public SuspendableTimer { |
| public: |
| - PostMessageTimer(DOMWindow& window, PassRefPtr<SerializedScriptValue> message, const String& sourceOrigin, PassRefPtr<DOMWindow> source, PassOwnPtr<MessagePortChannelArray> channels, SecurityOrigin* targetOrigin, PassRefPtr<ScriptCallStack> stackTrace) |
| + PostMessageTimer(DOMWindow& window, PassRefPtr<SerializedScriptValue> message, const String& sourceOrigin, PassRefPtrWillBeRawPtr<DOMWindow> source, PassOwnPtr<MessagePortChannelArray> channels, SecurityOrigin* targetOrigin, PassRefPtr<ScriptCallStack> stackTrace) |
| : SuspendableTimer(window.document()) |
| - , m_window(window) |
| + , m_window(&window) |
|
Mads Ager (chromium)
2014/03/26 07:29:43
We could add constructors to Persistent and Member
sof
2014/03/26 11:51:18
RefPtr<> has an explicit constructor over referenc
|
| , m_message(message) |
| , m_origin(sourceOrigin) |
| , m_source(source) |
| @@ -126,7 +126,7 @@ public: |
| PassRefPtr<MessageEvent> event() |
| { |
| - return MessageEvent::create(m_channels.release(), m_message, m_origin, String(), m_source); |
| + return MessageEvent::create(m_channels.release(), m_message, m_origin, String(), m_source.get()); |
| } |
| SecurityOrigin* targetOrigin() const { return m_targetOrigin.get(); } |
| @@ -139,10 +139,10 @@ private: |
| // This object is deleted now. |
| } |
| - RefPtr<DOMWindow> m_window; |
| + RefPtrWillBePersistent<DOMWindow> m_window; |
| RefPtr<SerializedScriptValue> m_message; |
| String m_origin; |
| - RefPtr<DOMWindow> m_source; |
| + RefPtrWillBePersistent<DOMWindow> m_source; |
| OwnPtr<MessagePortChannelArray> m_channels; |
| RefPtr<SecurityOrigin> m_targetOrigin; |
| RefPtr<ScriptCallStack> m_stackTrace; |
| @@ -506,7 +506,7 @@ DOMWindow::~DOMWindow() |
| removeAllEventListeners(); |
| - ASSERT(m_document->isStopped()); |
| + ASSERT(!m_document || m_document->isStopped()); |
|
haraken
2014/03/26 01:13:32
Do we need !m_document? In this CL, I don't think
sof
2014/03/26 06:36:46
It's not needed -- my bad, will remove. (Forgot to
|
| clearDocument(); |
| } |
| @@ -1760,7 +1760,7 @@ bool DOMWindow::isInsecureScriptAccess(DOMWindow& callingWindow, const String& u |
| return true; |
| } |
| -PassRefPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString, |
| +PassRefPtrWillBeRawPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicString& frameName, const String& windowFeaturesString, |
| DOMWindow* callingWindow, DOMWindow* enteredWindow) |
| { |
| if (!isCurrentlyDisplayedInFrame()) |
| @@ -1866,5 +1866,23 @@ PassOwnPtr<LifecycleNotifier<DOMWindow> > DOMWindow::createLifecycleNotifier() |
| return DOMWindowLifecycleNotifier::create(this); |
| } |
| +void DOMWindow::trace(Visitor* visitor) |
| +{ |
| + visitor->trace(m_screen); |
| + visitor->trace(m_history); |
| + visitor->trace(m_locationbar); |
| + visitor->trace(m_menubar); |
| + visitor->trace(m_personalbar); |
| + visitor->trace(m_scrollbars); |
| + visitor->trace(m_statusbar); |
| + visitor->trace(m_toolbar); |
| + visitor->trace(m_console); |
| + visitor->trace(m_navigator); |
| + visitor->trace(m_location); |
| + visitor->trace(m_sessionStorage); |
| + visitor->trace(m_localStorage); |
| + visitor->trace(m_applicationCache); |
| + visitor->trace(m_performance); |
| +} |
| } // namespace WebCore |