Changeset 104372 in webkit

Timestamp:

Jan 6, 2012 7:12:01 PM (12 years ago)

Author:

abarth@webkit.org

Message:

DOMWindow should be a FrameDestructionObserver
​https://bugs.webkit.org/show_bug.cgi?id=75697

Reviewed by Alexey Proskuryakov.

DOMWindow plays exactly the role of a FrameDestructionObserver, just
with special-case code. It should just use the general-case code.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::DOMWindow):
(WebCore::DOMWindow::~DOMWindow):
(WebCore::DOMWindow::frameDestroyed):

• page/DOMWindow.h:
• page/Frame.cpp:

(WebCore::Frame::~Frame):
(WebCore::Frame::clearDOMWindow):
(WebCore::Frame::setDOMWindow):

• page/Frame.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DOMWindow.cpp (modified) (3 diffs)
• page/DOMWindow.h (modified) (5 diffs)
• page/Frame.cpp (modified) (4 diffs)
• page/Frame.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-06  Adam Barth  <abarth@webkit.org>
+
+        DOMWindow should be a FrameDestructionObserver
+        https://bugs.webkit.org/show_bug.cgi?id=75697
+
+        Reviewed by Alexey Proskuryakov.
+
+        DOMWindow plays exactly the role of a FrameDestructionObserver, just
+        with special-case code.  It should just use the general-case code.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::DOMWindow):
+        (WebCore::DOMWindow::~DOMWindow):
+        (WebCore::DOMWindow::frameDestroyed):
+        * page/DOMWindow.h:
+        * page/Frame.cpp:
+        (WebCore::Frame::~Frame):
+        (WebCore::Frame::clearDOMWindow):
+        (WebCore::Frame::setDOMWindow):
+        * page/Frame.h:
+
 2012-01-06  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -398 +398 @@
 
 DOMWindow::DOMWindow(Frame* frame)
-    : m_shouldPrintWhenFinishedLoading(false)
-    , m_frame(frame)
+    : FrameDestructionObserver(frame)
+    , m_shouldPrintWhenFinishedLoading(false)
 {
 }
@@ -405 +405 @@
 DOMWindow::~DOMWindow()
 {
-    if (m_frame)
-        m_frame->clearFormerDOMWindow(this);
-
     ASSERT(!m_screen);
     ASSERT(!m_selection);
@@ -474 +471 @@
 }
 
-void DOMWindow::disconnectFrame()
-{
-    m_frame = 0;
+void DOMWindow::frameDestroyed()
+{
+    FrameDestructionObserver::frameDestroyed();
     clear();
 }

trunk/Source/WebCore/page/DOMWindow.h

@@ -29 +29 @@
 
 #include "EventTarget.h"
+#include "FrameDestructionObserver.h"
 #include "KURL.h"
 
@@ -81 +82 @@
     enum SetLocationLocking { LockHistoryBasedOnGestureState, LockHistoryAndBackForwardList };
 
-    class DOMWindow : public RefCounted<DOMWindow>, public EventTarget {
+    class DOMWindow : public RefCounted<DOMWindow>, public EventTarget, public FrameDestructionObserver {
     public:
         static PassRefPtr<DOMWindow> create(Frame* frame) { return adoptRef(new DOMWindow(frame)); }
@@ -91 +92 @@
         virtual DOMWindow* toDOMWindow();
 
-        Frame* frame() const { return m_frame; }
-        void disconnectFrame();
+        virtual void frameDestroyed() OVERRIDE;
 
         void clear();
@@ -416 +416 @@
 
     private:
-        DOMWindow(Frame*);
+        explicit DOMWindow(Frame*);
 
         // FIXME: When this DOMWindow is no longer the active DOMWindow (i.e.,
@@ -438 +438 @@
 
         bool m_shouldPrintWhenFinishedLoading;
-        Frame* m_frame;
         mutable RefPtr<Screen> m_screen;
         mutable RefPtr<DOMSelection> m_selection;

trunk/Source/WebCore/page/Frame.cpp

@@ -220 +220 @@
     disconnectOwnerElement();
 
-    if (m_domWindow)
-        m_domWindow->disconnectFrame();
-
-    HashSet<DOMWindow*>::iterator end = m_liveFormerWindows.end();
-    for (HashSet<DOMWindow*>::iterator it = m_liveFormerWindows.begin(); it != end; ++it)
-        (*it)->disconnectFrame();
-
     HashSet<FrameDestructionObserver*>::iterator stop = m_destructionObservers.end();
     for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObservers.begin(); it != stop; ++it)
@@ -577 +570 @@
 void Frame::clearDOMWindow()
 {
-    if (m_domWindow) {
-        m_liveFormerWindows.add(m_domWindow.get());
+    if (m_domWindow)
         m_domWindow->clear();
-    }
     m_domWindow = 0;
 }
@@ -645 +636 @@
 void Frame::setDOMWindow(DOMWindow* domWindow)
 {
-    if (m_domWindow) {
-        m_liveFormerWindows.add(m_domWindow.get());
+    if (m_domWindow)
         m_domWindow->clear();
-    }
     m_domWindow = domWindow;
 }
@@ -668 +657 @@
 
     return m_domWindow.get();
-}
-
-void Frame::clearFormerDOMWindow(DOMWindow* window)
-{
-    m_liveFormerWindows.remove(window);
 }
 

trunk/Source/WebCore/page/Frame.h

@@ -134 +134 @@
         DOMWindow* existingDOMWindow() { return m_domWindow.get(); }
         void setDOMWindow(DOMWindow*);
-        void clearFormerDOMWindow(DOMWindow*);
         void clearDOMWindow();
 
@@ -213 +212 @@
 
         mutable RefPtr<DOMWindow> m_domWindow;
-        HashSet<DOMWindow*> m_liveFormerWindows;
 
         HTMLFrameOwnerElement* m_ownerElement;