Changeset 49196 in webkit

Timestamp:

Oct 6, 2009 11:20:33 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-06 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Move m_openedByDOM to Page
​https://bugs.webkit.org/show_bug.cgi?id=30109

We only need one instance of m_openedByDOM per page, we should move it
to a page-scoped object. Notice that it's only ever touched for the
main frame.

• bindings/js/JSDOMWindowCustom.cpp: (WebCore::createWindow):
• bindings/v8/custom/V8DOMWindowCustom.cpp: (WebCore::createWindow):
• loader/FrameLoader.cpp:
• loader/FrameLoader.h:
• page/DOMWindow.cpp: (WebCore::DOMWindow::close):
• page/Page.cpp: (WebCore::Page::Page): (WebCore::Page::openedByDOM): (WebCore::Page::setOpenedByDOM):
• page/Page.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMWindowCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8DOMWindowCustom.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)
• loader/FrameLoader.h (modified) (1 diff)
• page/DOMWindow.cpp (modified) (1 diff)
• page/Page.cpp (modified) (2 diffs)
• page/Page.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-06  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Move m_openedByDOM to Page
+        https://bugs.webkit.org/show_bug.cgi?id=30109
+
+        We only need one instance of m_openedByDOM per page, we should move it
+        to a page-scoped object.  Notice that it's only ever touched for the
+        main frame.
+
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::createWindow):
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        (WebCore::createWindow):
+        * loader/FrameLoader.cpp:
+        * loader/FrameLoader.h:
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::close):
+        * page/Page.cpp:
+        (WebCore::Page::Page):
+        (WebCore::Page::openedByDOM):
+        (WebCore::Page::setOpenedByDOM):
+        * page/Page.h:
+
 2009-10-06  Carol Szabo  <carol.szabo@nokia.com>
 

trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -771 +771 @@
 
     newFrame->loader()->setOpener(openerFrame);
-    newFrame->loader()->setOpenedByDOM();
+    newFrame->page()->setOpenedByDOM();
 
     JSDOMWindow* newWindow = toJSDOMWindow(newFrame);

trunk/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

@@ -497 +497 @@
 
     newFrame->loader()->setOpener(openerFrame);
-    newFrame->loader()->setOpenedByDOM();
+    newFrame->page()->setOpenedByDOM();
 
     // Set dialog arguments on the global object of the new frame.

trunk/WebCore/loader/FrameLoader.cpp

@@ -1534 +1534 @@
 }
 
-bool FrameLoader::openedByDOM() const
-{
-    return m_openedByDOM;
-}
-
-void FrameLoader::setOpenedByDOM()
-{
-    m_openedByDOM = true;
-}
-
 void FrameLoader::handleFallbackContent()
 {
@@ -3831 +3821 @@
         mainFrame->tree()->setName(frameName);
 
-    mainFrame->loader()->setOpenedByDOM();
+    mainFrame->page()->setOpenedByDOM();
     mainFrame->loader()->m_client->dispatchShow();
     mainFrame->loader()->setOpener(frame.get());

trunk/WebCore/loader/FrameLoader.h

@@ -273 +273 @@
         Frame* opener();
         void setOpener(Frame*);
-        bool openedByDOM() const;
-        void setOpenedByDOM();
 
         bool isProcessingUserGesture();

trunk/WebCore/page/DOMWindow.cpp

@@ -740 +740 @@
 
     Settings* settings = m_frame->settings();
-    bool allowScriptsToCloseWindows =
-        settings && settings->allowScriptsToCloseWindows();
-
-    if (m_frame->loader()->openedByDOM()
-        || page->getHistoryLength() <= 1
-        || allowScriptsToCloseWindows)
+    bool allowScriptsToCloseWindows = settings && settings->allowScriptsToCloseWindows();
+
+    if (page->openedByDOM() || page->getHistoryLength() <= 1 || allowScriptsToCloseWindows)
         m_frame->scheduleClose();
 }

trunk/WebCore/page/Page.cpp

@@ -120 +120 @@
     , m_editorClient(editorClient)
     , m_frameCount(0)
+    , m_openedByDOM(false)
     , m_tabKeyCyclesThroughElements(true)
     , m_defersLoading(false)
@@ -200 +201 @@
     ASSERT(!m_mainFrame); // Should only be called during initialization
     m_mainFrame = mainFrame;
+}
+
+bool Page::openedByDOM() const
+{
+    return m_openedByDOM;
+}
+
+void Page::setOpenedByDOM()
+{
+    m_openedByDOM = true;
 }
 

trunk/WebCore/page/Page.h

@@ -104 +104 @@
         Frame* mainFrame() const { return m_mainFrame.get(); }
 
+        bool openedByDOM() const;
+        void setOpenedByDOM();
+
         BackForwardList* backForwardList();
 
@@ -265 +268 @@
         int m_frameCount;
         String m_groupName;
+        bool m_openedByDOM;
 
         bool m_tabKeyCyclesThroughElements;