Changeset 49067 in webkit

Timestamp:

Oct 3, 2009 5:17:08 PM (15 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Sam Weinig.

Factor back-forward list methods out of FrameLoader
​https://bugs.webkit.org/show_bug.cgi?id=30037

This change moves these back-forward related methods from FrameLoader
to Page. It's possible we should move these methods into some kind of
"page controller" object, but we can figure that out in a future patch.

• loader/FrameLoader.cpp:
• loader/FrameLoader.h:
• loader/RedirectScheduler.cpp: (WebCore::RedirectScheduler::timerFired):
• page/ContextMenuController.cpp: (WebCore::ContextMenuController::contextMenuItemSelected):
• page/DOMWindow.cpp: (WebCore::DOMWindow::close):
• page/History.cpp: (WebCore::History::length):
• page/Page.cpp: (WebCore::Page::canGoBackOrForward): (WebCore::Page::goBackOrForward): (WebCore::Page::getHistoryLength):
• page/Page.h:
• platform/ContextMenu.cpp: (WebCore::ContextMenu::populate): (WebCore::ContextMenu::checkOrEnableIfNeeded):

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

Reviewed by Sam Weinig.

Factor PageController out of FrameLoader and Page
​https://bugs.webkit.org/show_bug.cgi?id=30037

• webkit/webkitwebview.cpp: (webkit_web_view_can_go_back_or_forward):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (2 diffs)
• WebCore/loader/FrameLoader.h (modified) (1 diff)
• WebCore/loader/RedirectScheduler.cpp (modified) (1 diff)
• WebCore/page/ContextMenuController.cpp (modified) (1 diff)
• WebCore/page/DOMWindow.cpp (modified) (1 diff)
• WebCore/page/History.cpp (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (2 diffs)
• WebCore/page/Page.h (modified) (1 diff)
• WebCore/platform/ContextMenu.cpp (modified) (2 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-03  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Sam Weinig.
+
+        Factor back-forward list methods out of FrameLoader
+        https://bugs.webkit.org/show_bug.cgi?id=30037
+
+        This change moves these back-forward related methods from FrameLoader
+        to Page.  It's possible we should move these methods into some kind of
+        "page controller" object, but we can figure that out in a future patch.
+
+        * loader/FrameLoader.cpp:
+        * loader/FrameLoader.h:
+        * loader/RedirectScheduler.cpp:
+        (WebCore::RedirectScheduler::timerFired):
+        * page/ContextMenuController.cpp:
+        (WebCore::ContextMenuController::contextMenuItemSelected):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::close):
+        * page/History.cpp:
+        (WebCore::History::length):
+        * page/Page.cpp:
+        (WebCore::Page::canGoBackOrForward):
+        (WebCore::Page::goBackOrForward):
+        (WebCore::Page::getHistoryLength):
+        * page/Page.h:
+        * platform/ContextMenu.cpp:
+        (WebCore::ContextMenu::populate):
+        (WebCore::ContextMenu::checkOrEnableIfNeeded):
+
 2009-10-02  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -1271 +1271 @@
 }
 
-void FrameLoader::goBackOrForward(int distance)
-{
-    if (distance == 0)
-        return;
-        
-    Page* page = m_frame->page();
-    if (!page)
-        return;
-    BackForwardList* list = page->backForwardList();
-    if (!list)
-        return;
-    
-    HistoryItem* item = list->itemAtIndex(distance);
-    if (!item) {
-        if (distance > 0) {
-            int forwardListCount = list->forwardListCount();
-            if (forwardListCount > 0) 
-                item = list->itemAtIndex(forwardListCount);
-        } else {
-            int backListCount = list->backListCount();
-            if (backListCount > 0)
-                item = list->itemAtIndex(-backListCount);
-        }
-    }
-    
-    ASSERT(item); // we should not reach this line with an empty back/forward list
-    if (item)
-        page->goToItem(item, FrameLoadTypeIndexedBackForward);
-}
-
 void FrameLoader::loadURLIntoChildFrame(const KURL& url, const String& referer, Frame* childFrame)
 {
@@ -3956 +3926 @@
 
     return false;
-}
-
-bool FrameLoader::canGoBackOrForward(int distance) const
-{
-    if (Page* page = m_frame->page()) {
-        if (distance == 0)
-            return true;
-        if (distance > 0 && distance <= page->backForwardList()->forwardListCount())
-            return true;
-        if (distance < 0 && -distance <= page->backForwardList()->backListCount())
-            return true;
-    }
-    return false;
-}
-
-int FrameLoader::getHistoryLength()
-{
-    if (Page* page = m_frame->page())
-        return page->backForwardList()->backListCount() + 1;
-    return 0;
 }
 

trunk/WebCore/loader/FrameLoader.h

@@ -239 +239 @@
         KURL baseURL() const;
 
-        bool canGoBackOrForward(int distance) const;
-        void goBackOrForward(int distance);
-        int getHistoryLength();
-
         void begin();
         void begin(const KURL&, bool dispatchWindowObjectAvailable = true, SecurityOrigin* forcedSecurityOrigin = 0);

trunk/WebCore/loader/RedirectScheduler.cpp

@@ -283 +283 @@
             // go(i!=0) from a frame navigates into the history of the frame only,
             // in both IE and NS (but not in Mozilla). We can't easily do that.
-            if (loader->canGoBackOrForward(redirection->historySteps))
-                loader->goBackOrForward(redirection->historySteps);
+            if (m_frame->page()->canGoBackOrForward(redirection->historySteps))
+                m_frame->page()->goBackOrForward(redirection->historySteps);
             return;
         case ScheduledRedirection::formSubmission:

trunk/WebCore/page/ContextMenuController.cpp

@@ -167 +167 @@
         break;
     case ContextMenuItemTagGoBack:
-        frame->loader()->goBackOrForward(-1);
+        if (Page* page = frame->page())
+            page->goBackOrForward(-1);
         break;
     case ContextMenuItemTagGoForward:
-        frame->loader()->goBackOrForward(1);
+        if (Page* page = frame->page())
+            page->goBackOrForward(1);
         break;
     case ContextMenuItemTagStop:

trunk/WebCore/page/DOMWindow.cpp

@@ -744 +744 @@
 
     if (m_frame->loader()->openedByDOM()
-        || m_frame->loader()->getHistoryLength() <= 1
+        || page->getHistoryLength() <= 1
         || allowScriptsToCloseWindows)
         m_frame->scheduleClose();

trunk/WebCore/page/History.cpp

@@ -51 +51 @@
     if (!m_frame)
         return 0;
-    return m_frame->loader()->getHistoryLength();
+    if (!m_frame->page())
+        return 0;
+    return m_frame->page()->getHistoryLength();
 }
 

trunk/WebCore/page/Page.cpp

@@ -229 +229 @@
 }
 
+bool Page::canGoBackOrForward(int distance) const
+{
+    if (distance == 0)
+        return true;
+    if (distance > 0 && distance <= m_backForwardList->forwardListCount())
+        return true;
+    if (distance < 0 && -distance <= m_backForwardList->backListCount())
+        return true;
+    return false;
+}
+
+void Page::goBackOrForward(int distance)
+{
+    if (distance == 0)
+        return;
+
+    HistoryItem* item = m_backForwardList->itemAtIndex(distance);
+    if (!item) {
+        if (distance > 0) {
+            int forwardListCount = m_backForwardList->forwardListCount();
+            if (forwardListCount > 0) 
+                item = m_backForwardList->itemAtIndex(forwardListCount);
+        } else {
+            int backListCount = m_backForwardList->backListCount();
+            if (backListCount > 0)
+                item = m_backForwardList->itemAtIndex(-backListCount);
+        }
+    }
+
+    ASSERT(item); // we should not reach this line with an empty back/forward list
+    if (item)
+        goToItem(item, FrameLoadTypeIndexedBackForward);
+}
+
 void Page::goToItem(HistoryItem* item, FrameLoadType type)
 {
@@ -246 +280 @@
     m_mainFrame->loader()->stopAllLoaders(databasePolicy);
     m_mainFrame->loader()->goToItem(item, type);
+}
+
+int Page::getHistoryLength()
+{
+    return m_backForwardList->backListCount() + 1;
 }
 

trunk/WebCore/page/Page.h

@@ -112 +112 @@
         bool goBack();
         bool goForward();
+        bool canGoBackOrForward(int distance) const;
+        void goBackOrForward(int distance);
         void goToItem(HistoryItem*, FrameLoadType);
+        int getHistoryLength();
 
         HistoryItem* globalHistoryItem() const { return m_globalHistoryItem.get(); }

trunk/WebCore/platform/ContextMenu.cpp

@@ -362 +362 @@
                 appendItem(ReloadItem);
 #else
-                if (loader->canGoBackOrForward(-1))
+                if (frame->page() && frame->page()->canGoBackOrForward(-1))
                     appendItem(BackItem);
 
-                if (loader->canGoBackOrForward(1))
+                if (frame->page() && frame->page()->canGoBackOrForward(1))
                     appendItem(ForwardItem);
 
@@ -722 +722 @@
 #if PLATFORM(GTK)
         case ContextMenuItemTagGoBack:
-            shouldEnable = frame->loader()->canGoBackOrForward(-1);
+            shouldEnable = frame->page() && frame->page()->canGoBackOrForward(-1);
             break;
         case ContextMenuItemTagGoForward:
-            shouldEnable = frame->loader()->canGoBackOrForward(1);
+            shouldEnable = frame->page() && frame->page()->canGoBackOrForward(1);
             break;
         case ContextMenuItemTagStop:

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-10-03  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Sam Weinig.
+
+        Factor PageController out of FrameLoader and Page
+        https://bugs.webkit.org/show_bug.cgi?id=30037
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_can_go_back_or_forward):
+
 2009-10-01  Xan Lopez  <xlopez@igalia.com>
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -2880 +2880 @@
     g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
 
-    Frame* frame = core(webView)->mainFrame();
-    return frame->loader()->canGoBackOrForward(steps);
+    return core(webView)->goBackOrForward(steps);
 }