Changeset 80310 in webkit

Timestamp:

Mar 3, 2011 7:21:07 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-03-03 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Get rid of Page::globalHistoryItem
​https://bugs.webkit.org/show_bug.cgi?id=55738

• WebCoreSupport/WebFrameLoaderClient.cpp: (WebFrameLoaderClient::updateGlobalHistoryItemForPage): Get the current history item and update it using WebView::setGlobalHistoryItem.

• WebCoreSupport/WebFrameLoaderClient.h:
• WebView.cpp: (WebView::globalHistoryItem): (WebView::setGlobalHistoryItem):
• WebView.h:

2011-03-03 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Get rid of Page::globalHistoryItem
​https://bugs.webkit.org/show_bug.cgi?id=55738

• WebCoreSupport/WebFrameLoaderClient.h:
• WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::updateGlobalHistoryItemForPage): Get the current history item and update it using -[WebView _setGlobalHistoryItem:].

• WebView/WebView.mm: (-[WebView _globalHistoryItem]): (-[WebView _setGlobalHistoryItem:]): Set _globalHistoryItem ivar.

• WebView/WebViewData.h:
• WebView/WebViewData.mm: Add _globalHistoryItem ivar.

2011-03-03 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Get rid of Page::globalHistoryItem
​https://bugs.webkit.org/show_bug.cgi?id=55738

The m_globalHistoryItem is only used by Mac and Windows WebKit1.
Instead of having WebCore updating this member variable, just call out
to a FrameLoaderClient member function and let WebKit keep it up to date.

• loader/EmptyClients.h: (WebCore::EmptyFrameLoaderClient::dispatchDidRemoveBackForwardItem): (WebCore::EmptyFrameLoaderClient::updateGlobalHistoryItemForPage):
• loader/FrameLoader.cpp: (WebCore::FrameLoader::checkLoadCompleteForThisFrame): (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
• loader/FrameLoaderClient.h: (WebCore::FrameLoaderClient::updateGlobalHistoryItemForPage):
• loader/HistoryController.cpp: (WebCore::HistoryController::goToItem): (WebCore::HistoryController::updateForStandardLoad): (WebCore::HistoryController::updateForRedirectWithLockedBackForwardList):
• page/Page.cpp:
• page/Page.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/EmptyClients.h (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (2 diffs)
• WebCore/loader/FrameLoaderClient.h (modified) (1 diff)
• WebCore/loader/HistoryController.cpp (modified) (3 diffs)
• WebCore/page/Page.cpp (modified) (1 diff)
• WebCore/page/Page.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• WebKit/mac/WebView/WebViewData.h (modified) (2 diffs)
• WebKit/mac/WebView/WebViewData.mm (modified) (1 diff)
• WebKit/mac/WebView/WebViewInternal.h (modified) (2 diffs)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (3 diffs)
• WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (2 diffs)
• WebKit/win/WebView.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-03  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Get rid of Page::globalHistoryItem
+        https://bugs.webkit.org/show_bug.cgi?id=55738
+
+        The m_globalHistoryItem is only used by Mac and Windows WebKit1.
+        Instead of having WebCore updating this member variable, just call out
+        to a FrameLoaderClient member function and let WebKit keep it up to date.
+
+        * loader/EmptyClients.h:
+        (WebCore::EmptyFrameLoaderClient::dispatchDidRemoveBackForwardItem):
+        (WebCore::EmptyFrameLoaderClient::updateGlobalHistoryItemForPage):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+        (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
+        * loader/FrameLoaderClient.h:
+        (WebCore::FrameLoaderClient::updateGlobalHistoryItemForPage):
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::goToItem):
+        (WebCore::HistoryController::updateForStandardLoad):
+        (WebCore::HistoryController::updateForRedirectWithLockedBackForwardList):
+        * page/Page.cpp:
+        * page/Page.h:
+
 2011-03-02  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/Source/WebCore/loader/EmptyClients.h

@@ -353 +353 @@
     virtual bool shouldStopLoadingForHistoryItem(HistoryItem*) const { return false; }
     virtual void dispatchDidAddBackForwardItem(HistoryItem*) const { }
-    virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const { };
+    virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const { }
     virtual void dispatchDidChangeBackForwardIndex() const { }
+    virtual void updateGlobalHistoryItemForPage() { }
     virtual void saveViewStateToItem(HistoryItem*) { }
     virtual bool canCachePage() const { return false; }

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2392 +2392 @@
                 if (Page* page = m_frame->page()) {
                     page->backForward()->setCurrentItem(item.get());
-                    Settings* settings = m_frame->settings();
-                    page->setGlobalHistoryItem((!settings || settings->privateBrowsingEnabled()) ? 0 : item.get());
+                    m_frame->loader()->client()->updateGlobalHistoryItemForPage();
                 }
             return;
@@ -2963 +2962 @@
         // problem that we have optimistically moved the b/f cursor already, so move it back.  For sanity, 
         // we only do this when punting a navigation for the target frame or top-level frame.  
-        if ((isTargetItem || isLoadingMainFrame()) && isBackForwardLoadType(policyChecker()->loadType()))
+        if ((isTargetItem || isLoadingMainFrame()) && isBackForwardLoadType(policyChecker()->loadType())) {
             if (Page* page = m_frame->page()) {
                 Frame* mainFrame = page->mainFrame();
                 if (HistoryItem* resetItem = mainFrame->loader()->history()->currentItem()) {
                     page->backForward()->setCurrentItem(resetItem);
-                    Settings* settings = m_frame->settings();
-                    page->setGlobalHistoryItem((!settings || settings->privateBrowsingEnabled()) ? 0 : resetItem);
+                    m_frame->loader()->client()->updateGlobalHistoryItemForPage();
                 }
             }
+        }
         return;
     }

trunk/Source/WebCore/loader/FrameLoaderClient.h

@@ -192 +192 @@
         virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const = 0;
         virtual void dispatchDidChangeBackForwardIndex() const = 0;
+        virtual void updateGlobalHistoryItemForPage() { }
 
         // This frame has displayed inactive content (such as an image) from an

trunk/Source/WebCore/loader/HistoryController.cpp

@@ -251 +251 @@
     RefPtr<HistoryItem> currentItem = page->backForward()->currentItem();
     page->backForward()->setCurrentItem(targetItem);
-    Settings* settings = m_frame->settings();
-    page->setGlobalHistoryItem((!settings || settings->privateBrowsingEnabled()) ? 0 : targetItem);
+    m_frame->loader()->client()->updateGlobalHistoryItemForPage();
 
     // First set the provisional item of any frames that are not actually navigating.
@@ -324 +323 @@
                     frameLoader->client()->updateGlobalHistoryRedirectLinks();
             }
-            if (Page* page = m_frame->page())
-                page->setGlobalHistoryItem(needPrivacy ? 0 : page->backForward()->currentItem());
+
+            m_frame->loader()->client()->updateGlobalHistoryItemForPage();
         }
     } else {
@@ -362 +361 @@
                         m_frame->loader()->client()->updateGlobalHistoryRedirectLinks();
                 }
-                if (Page* page = m_frame->page())
-                    page->setGlobalHistoryItem(needPrivacy ? 0 : page->backForward()->currentItem());
+
+                m_frame->loader()->client()->updateGlobalHistoryItemForPage();
             }
         }

trunk/Source/WebCore/page/Page.cpp

@@ -344 +344 @@
 }
 
-void Page::setGlobalHistoryItem(HistoryItem* item)
-{
-    m_globalHistoryItem = item;
-}
-
 void Page::setGroupName(const String& name)
 {

trunk/Source/WebCore/page/Page.h

@@ -148 +148 @@
         void goToItem(HistoryItem*, FrameLoadType);
 
-        HistoryItem* globalHistoryItem() const { return m_globalHistoryItem.get(); }
-        void setGlobalHistoryItem(HistoryItem*);
-
         void setGroupName(const String&);
         const String& groupName() const;
@@ -336 +333 @@
         RefPtr<Frame> m_mainFrame;
 
-        RefPtr<HistoryItem> m_globalHistoryItem;
-
         mutable RefPtr<PluginData> m_pluginData;
 

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-03-03  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Get rid of Page::globalHistoryItem
+        https://bugs.webkit.org/show_bug.cgi?id=55738
+
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::updateGlobalHistoryItemForPage):
+        Get the current history item and update it using -[WebView _setGlobalHistoryItem:].
+    
+        * WebView/WebView.mm:
+        (-[WebView _globalHistoryItem]):
+        (-[WebView _setGlobalHistoryItem:]):
+        Set _globalHistoryItem ivar.
+
+        * WebView/WebViewData.h:
+        * WebView/WebViewData.mm:
+        Add _globalHistoryItem ivar.
+
 2011-03-03  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h

@@ -156 +156 @@
     virtual void dispatchDidRemoveBackForwardItem(WebCore::HistoryItem*) const;
     virtual void dispatchDidChangeBackForwardIndex() const;
+    virtual void updateGlobalHistoryItemForPage();
 
     virtual void didDisplayInsecureContent();

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -76 +76 @@
 #import "WebViewInternal.h"
 #import <WebCore/AuthenticationMac.h>
+#import <WebCore/BackForwardController.h>
 #import <WebCore/BlockExceptions.h>
 #import <WebCore/CachedFrame.h>
@@ -967 +968 @@
 }
 
+void WebFrameLoaderClient::updateGlobalHistoryItemForPage()
+{
+    HistoryItem* historyItem = 0;
+
+    if (Page* page = core(m_webFrame.get())->page()) {
+        if (!page->settings()->privateBrowsingEnabled())
+            historyItem = page->backForward()->currentItem();
+    }
+
+    WebView *webView = getWebView(m_webFrame.get());
+    [webView _setGlobalHistoryItem:historyItem];
+}
+
 void WebFrameLoaderClient::didDisplayInsecureContent()
 {

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -2253 +2253 @@
 - (WebHistoryItem *)_globalHistoryItem
 {
-    if (!_private->page)
+    if (!_private)
         return nil;
-    return kit(_private->page->globalHistoryItem());
+
+    return kit(_private->_globalHistoryItem.get());
+}
+
+- (void)_setGlobalHistoryItem:(HistoryItem*)historyItem
+{
+    _private->_globalHistoryItem = historyItem;
 }
 

trunk/Source/WebKit/mac/WebView/WebViewData.h

@@ -36 +36 @@
 
 namespace WebCore {
+    class HistoryItem;
     class Page;
 }
@@ -184 +185 @@
     id<WebGeolocationProvider> _geolocationProvider;
     id<WebDeviceOrientationProvider> m_deviceOrientationProvider;
+
+    RefPtr<WebCore::HistoryItem> _globalHistoryItem;
 }
 @end

trunk/Source/WebKit/mac/WebView/WebViewData.mm

@@ -33 +33 @@
 #import "WebPreferenceKeysPrivate.h"
 #import <WebCore/WebCoreObjCExtras.h>
+#import <WebCore/HistoryItem.h>
 #import <objc/objc-auto.h>
 #import <runtime/InitializeThreading.h>

trunk/Source/WebKit/mac/WebView/WebViewInternal.h

@@ -42 +42 @@
     class Element;
     class Frame;
+    class HistoryItem;
     class KURL;
     class KeyboardEvent;
@@ -115 +116 @@
 #ifdef __cplusplus
 - (WebCore::Page*)page;
+- (void)_setGlobalHistoryItem:(WebCore::HistoryItem*)historyItem;
 #endif
 

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2011-03-03  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Get rid of Page::globalHistoryItem
+        https://bugs.webkit.org/show_bug.cgi?id=55738
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::updateGlobalHistoryItemForPage):
+        Get the current history item and update it using WebView::setGlobalHistoryItem.
+        
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebView.cpp:
+        (WebView::globalHistoryItem):
+        (WebView::setGlobalHistoryItem):
+        * WebView.h:
+
 2011-03-03  Brent Fulgham  <bfulgham@webkit.org>
 

trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -51 +51 @@
 #include "WebView.h"
 #pragma warning(push, 0)
+#include <WebCore/BackForwardController.h>
 #include <WebCore/CachedFrame.h>
 #include <WebCore/DocumentLoader.h>
@@ -68 +69 @@
 #include <WebCore/RenderPart.h>
 #include <WebCore/ResourceHandle.h>
+#include <WebCore/Settings.h>
 #pragma warning(pop)
 
@@ -620 +622 @@
 }
 
+void WebFrameLoaderClient::updateGlobalHistoryItemForPage()
+{
+    HistoryItem* historyItem = 0;
+    WebView* webView = m_webFrame->webView();
+
+    if (Page* page = webView->page()) {
+        if (!page->settings()->privateBrowsingEnabled())
+            historyItem = page->backForward()->currentItem();
+    }
+
+    webView->setGlobalHistoryItem(historyItem);
+}
+
 void WebFrameLoaderClient::didDisplayInsecureContent()
 {

trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h

@@ -99 +99 @@
     virtual void dispatchDidRemoveBackForwardItem(WebCore::HistoryItem*) const;
     virtual void dispatchDidChangeBackForwardIndex() const;
+    virtual void updateGlobalHistoryItemForPage();
 
     virtual void didDisplayInsecureContent();

trunk/Source/WebKit/win/WebView.cpp

@@ -5893 +5893 @@
         return E_FAIL;
 
-    if (!m_page->globalHistoryItem()) {
+    if (!m_globalHistoryItem) {
         *item = 0;
         return S_OK;
     }
 
-    *item = WebHistoryItem::createInstance(m_page->globalHistoryItem());
+    *item = WebHistoryItem::createInstance(m_globalHistoryItem);
     return S_OK;
 }
@@ -6634 +6634 @@
     return S_OK;
 }
+
+void WebView::setGlobalHistoryItem(HistoryItem* historyItem)
+{
+    m_globalHistoryItem = historyItem;
+}

trunk/Source/WebKit/win/WebView.h

@@ -48 +48 @@
 }
 #endif
+
+namespace WebCore {
+    class HistoryItem;
+}
 
 class FullscreenVideoController;
@@ -925 +929 @@
     void setLastCursor(HCURSOR cursor) { m_lastSetCursor = cursor; }
 
+    void setGlobalHistoryItem(WebCore::HistoryItem*);
+
 private:
     void setZoomMultiplier(float multiplier, bool isTextOnly);
@@ -1074 +1080 @@
 
     HCURSOR m_lastSetCursor;
+
+    RefPtr<WebCore::HistoryItem> m_globalHistoryItem;
 };