Oilpan: move DOMWindow object to the oilpan heap.

Source/core/frame/DOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 94 matching lines @@
 #include "wtf/text/WTFString.h"
 #include <algorithm>
 
 using std::min;
 using std::max;
 
 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 that take references. That
has apparently been done for RefPtr. I personally prefer to have the & here so
it is explicit that we are taking the address of the address. But I would be OK
with adding reference constructors as well.

[sof, 2014/03/26 11:51:18]

RefPtr<> has an explicit constructor over references.

I haven't run into the lack of it that often, but it would be consistent to
provide such a version for Persistent&Member also. Unless there are objections,
I/we can address that separately.

         , m_message(message)
         , m_origin(sourceOrigin)
         , m_source(source)
         , m_channels(channels)
         , m_targetOrigin(targetOrigin)
         , m_stackTrace(stackTrace)
     {
     }
 
     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(); }
     ScriptCallStack* stackTrace() const { return m_stackTrace.get(); }
 
 private:
     virtual void fired() OVERRIDE
     {
         m_window->postMessageTimerFired(adoptPtr(this));
         // 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;
 };
 
 static void disableSuddenTermination()
 {
     blink::Platform::current()->suddenTerminationChanged(false);
 }
 
@@ skipping 343 matching lines @@
     ASSERT(!m_location);
     ASSERT(!m_media);
     ASSERT(!m_sessionStorage);
     ASSERT(!m_localStorage);
     ASSERT(!m_applicationCache);
 
     reset();
 
     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 we need it because DOMWindow
keeps a RefPtr to the document.

In the future, m_document will become Member<Document>. At that point, we won't
be able to check m_document->isStopped() anyway since we're not allowed to touch
m_document in DOMWindow's destructor.

[sof, 2014/03/26 06:36:46]

It's not needed -- my bad, will remove. (Forgot to remove it as part of
investigating why/how DOMWindows were leaking with the aforementioned use of
persistent handles on the wrapper.)

     clearDocument();
 }
 
 const AtomicString& DOMWindow::interfaceName() const
 {
     return EventTargetNames::DOMWindow;
 }
 
 ExecutionContext* DOMWindow::executionContext() const
 {
@@ skipping 1233 matching lines @@
         // FIXME: The name canAccess seems to be a roundabout way to ask "can execute script".
         // Can we name the SecurityOrigin function better to make this more clear?
         if (callingWindow.document()->securityOrigin()->canAccess(document()->securityOrigin()))
             return false;
     }
 
     printErrorMessage(crossDomainAccessErrorMessage(&callingWindow));
     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())
         return nullptr;
     Document* activeDocument = callingWindow->document();
     if (!activeDocument)
         return nullptr;
     LocalFrame* firstFrame = enteredWindow->frame();
     if (!firstFrame)
         return nullptr;
@@ skipping 85 matching lines @@
 DOMWindowLifecycleNotifier& DOMWindow::lifecycleNotifier()
 {
     return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<DOMWindow>::lifecycleNotifier());
 }
 
 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