WebCore:
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Jan 2009 08:05:59 +0000 (08:05 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Jan 2009 08:05:59 +0000 (08:05 +0000)
2009-01-27  Brady Eidson  <beidson@apple.com>

        Reviewed by Dan Bernstein

        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage

        * WebCore.base.exp:
        * history/CachedPage.cpp:
        * history/CachedPage.h:
        (WebCore::CachedPage::cachedMainFrame):

        * loader/EmptyClients.h:
        (WebCore::EmptyFrameLoaderClient::savePlatformDataToCachedFrame):
        (WebCore::EmptyFrameLoaderClient::transitionToCommittedFromCachedFrame):

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::restoreDocumentState):
        (WebCore::FrameLoader::commitProvisionalLoad):
        (WebCore::FrameLoader::transitionToCommitted):
        (WebCore::FrameLoader::cachePageForHistoryItem):
        * loader/FrameLoaderClient.h:

WebKit/gtk:

2009-01-27  Brady Eidson  <beidson@apple.com>

        Reviewed by Dan Bernstein

        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage

        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::savePlatformDataToCachedFrame):
        (WebKit::FrameLoaderClient::transitionToCommittedFromCachedFrame):
        * WebCoreSupport/FrameLoaderClientGtk.h:

WebKit/mac:

2009-01-27  Brady Eidson  <beidson@apple.com>

        Reviewed by Dan Bernstein

        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage

        * History/WebHistoryItem.mm:

        * WebCoreSupport/WebFrameLoaderClient.h:
        * WebCoreSupport/WebFrameLoaderClient.mm:
        (WebFrameLoaderClient::savePlatformDataToCachedFrame):
        (WebFrameLoaderClient::transitionToCommittedFromCachedFrame):
        * WebKit.order:

WebKit/qt:

2009-01-27  Brady Eidson  <beidson@apple.com>

        Reviewed by Dan Bernstein

        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage

        * WebCoreSupport/FrameLoaderClientQt.cpp:
        (WebCore::FrameLoaderClientQt::savePlatformDataToCachedFrame):
        (WebCore::FrameLoaderClientQt::transitionToCommittedFromCachedFrame):
        * WebCoreSupport/FrameLoaderClientQt.h:

WebKit/win:

2009-01-27  Brady Eidson  <beidson@apple.com>

        Reviewed by Dan Bernstein

        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage

        * WebCoreSupport/WebFrameLoaderClient.cpp:
        (WebFrameLoaderClient::savePlatformDataToCachedFrame):
        (WebFrameLoaderClient::transitionToCommittedFromCachedFrame):
        * WebCoreSupport/WebFrameLoaderClient.h:

        * WebFrame.cpp:
        * WebFrame.h:

WebKit/wx:

2009-01-27  Brady Eidson  <beidson@apple.com>

        Reviewed by Dan Bernstein

        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage

        * WebKitSupport/FrameLoaderClientWx.cpp:
        (WebCore::FrameLoaderClientWx::savePlatformDataToCachedFrame):
        (WebCore::FrameLoaderClientWx::transitionToCommittedFromCachedFrame):
        * WebKitSupport/FrameLoaderClientWx.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@40289 268f45cc-cd09-0410-ab3c-d52691b4dbfc

26 files changed:
WebCore/ChangeLog
WebCore/WebCore.base.exp
WebCore/history/CachedPage.cpp
WebCore/history/CachedPage.h
WebCore/loader/EmptyClients.h
WebCore/loader/FrameLoader.cpp
WebCore/loader/FrameLoaderClient.h
WebKit/gtk/ChangeLog
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
WebKit/mac/ChangeLog
WebKit/mac/History/WebHistoryItem.mm
WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
WebKit/mac/WebKit.order
WebKit/qt/ChangeLog
WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
WebKit/win/ChangeLog
WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
WebKit/win/WebFrame.cpp
WebKit/win/WebFrame.h
WebKit/wx/ChangeLog
WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
WebKit/wx/WebKitSupport/FrameLoaderClientWx.h

index 21c21a5529e5630af896832b88edc9143a2d8321..48b82ef5d493eec82a7238eda84c20ed2e553fdb 100644 (file)
@@ -1,3 +1,25 @@
+2009-01-27  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Dan Bernstein
+
+        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage
+
+        * WebCore.base.exp:
+        * history/CachedPage.cpp:
+        * history/CachedPage.h:
+        (WebCore::CachedPage::cachedMainFrame):
+
+        * loader/EmptyClients.h:
+        (WebCore::EmptyFrameLoaderClient::savePlatformDataToCachedFrame):
+        (WebCore::EmptyFrameLoaderClient::transitionToCommittedFromCachedFrame):
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::restoreDocumentState):
+        (WebCore::FrameLoader::commitProvisionalLoad):
+        (WebCore::FrameLoader::transitionToCommitted):
+        (WebCore::FrameLoader::cachePageForHistoryItem):
+        * loader/FrameLoaderClient.h:
+
 2009-01-26  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Dave Hyatt
index 004a1568d5dd72b3dde9814d6c3ebb33344773a0..f1afc161b1ceda86a46debd0e144cb1e1ab01cf6 100644 (file)
@@ -124,8 +124,6 @@ _WebCoreSetShouldUseFontSmoothing
 _WebCoreShouldUseFontSmoothing
 _WebCoreTextFloatWidth
 __Z26ReportBlockedObjCExceptionP11NSException
-__ZN7WebCore10CachedPage23cachedFramePlatformDataEv
-__ZN7WebCore10CachedPage26setCachedFramePlatformDataEPNS_23CachedFramePlatformDataE
 __ZN7WebCore10MouseEventC1ERKNS_12AtomicStringEbbN3WTF10PassRefPtrINS_9DOMWindowEEEiiiiibbbbtNS5_INS_15EventTargetNodeEEENS5_INS_9ClipboardEEEb
 __ZN7WebCore10ScrollView17setScrollbarModesENS_13ScrollbarModeES1_
 __ZN7WebCore10ScrollView20setCanHaveScrollbarsEb
@@ -134,6 +132,8 @@ __ZN7WebCore10StringImpl7replaceEtt
 __ZN7WebCore10StringImpl8endsWithEPS0_b
 __ZN7WebCore10StringImplD1Ev
 __ZN7WebCore10StringImplcvP8NSStringEv
+__ZN7WebCore11CachedFrame23cachedFramePlatformDataEv
+__ZN7WebCore11CachedFrame26setCachedFramePlatformDataEPNS_23CachedFramePlatformDataE
 __ZN7WebCore11ContextMenu22setPlatformDescriptionEP14NSMutableArray
 __ZN7WebCore11EditCommand7reapplyEv
 __ZN7WebCore11EditCommand7unapplyEv
index d001e9983aeef4518df4431c233b8d13109b1841..7167275273561b9f8cbaa869cb6b3241e93103d9 100644 (file)
@@ -83,14 +83,4 @@ void CachedPage::clear()
     m_cachedMainFrame.clear();
 }
 
-void CachedPage::setCachedFramePlatformData(CachedFramePlatformData* data)
-{
-    m_cachedMainFrame.setCachedFramePlatformData(data);
-}
-
-CachedFramePlatformData* CachedPage::cachedFramePlatformData()
-{
-    return m_cachedMainFrame.cachedFramePlatformData();
-}
-
 } // namespace WebCore
index 5e1c24ffaebdb543306d2e7f6e7f9fa9d7472147..a9cf71cc9a2c7da73ef732c930f6bc32c28c3673 100644 (file)
@@ -56,9 +56,8 @@ public:
     DOMWindow* domWindow() const { return m_cachedMainFrame.domWindow(); }
 
     double timeStamp() const { return m_timeStamp; }
-
-    void setCachedFramePlatformData(CachedFramePlatformData*);
-    CachedFramePlatformData* cachedFramePlatformData();
+    
+    CachedFrame* cachedMainFrame() { return &m_cachedMainFrame; }
 
 private:
     CachedPage(Page*);
index 88c16806f9d1f5a1ef466195c1310f4804c13e42..fdb225ce967d04aa4ac48df041d1959d3557e4a5 100644 (file)
@@ -239,8 +239,8 @@ public:
 
     virtual String userAgent(const KURL&) { return ""; }
 
-    virtual void savePlatformDataToCachedPage(CachedPage*) { }
-    virtual void transitionToCommittedFromCachedPage(CachedPage*) { }
+    virtual void savePlatformDataToCachedFrame(CachedFrame*) { }
+    virtual void transitionToCommittedFromCachedFrame(CachedFrame*) { }
     virtual void transitionToCommittedForNewPage() { }    
 
     virtual void updateGlobalHistory() { }
index 1a682c1790a98dfba73b11736c8d5f040df93b8a..37dc67966db9422081269899981636abfc9ed905 100644 (file)
@@ -1214,7 +1214,8 @@ void FrameLoader::restoreDocumentState()
     
     if (!itemToRestore)
         return;
-        
+
+    LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame->tree()->name().string().utf8().data(), itemToRestore);
     doc->setStateForNewFormElements(itemToRestore->documentState());
 }
 
@@ -2841,7 +2842,9 @@ void FrameLoader::commitProvisionalLoad(PassRefPtr<CachedPage> prpCachedPage)
 {
     RefPtr<CachedPage> cachedPage = prpCachedPage;
     RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader;
-    
+
+    LOG(Loading, "WebCoreLoading %s: About to commit provisional load from previous URL %s", m_frame->tree()->name().string().utf8().data(), m_URL.string().utf8().data());
+
     // Check to see if we need to cache the page we are navigating away from into the back/forward cache.
     // We are doing this here because we know for sure that a new page is about to be loaded.
     if (canCachePage() && !m_currentHistoryItem->isInPageCache()) {
@@ -2879,6 +2882,9 @@ void FrameLoader::commitProvisionalLoad(PassRefPtr<CachedPage> prpCachedPage)
 
         didOpenURL(url);
     }
+
+    LOG(Loading, "WebCoreLoading %s: Finished committing provisional load to URL %s", m_frame->tree()->name().string().utf8().data(), m_URL.string().utf8().data());
+
     opened();
 }
 
@@ -2929,7 +2935,7 @@ void FrameLoader::transitionToCommitted(PassRefPtr<CachedPage> cachedPage)
                         DocumentLoader* cachedDocumentLoader = cachedPage->documentLoader();
                         ASSERT(cachedDocumentLoader);
                         cachedDocumentLoader->setFrame(m_frame);
-                        m_client->transitionToCommittedFromCachedPage(cachedPage.get());
+                        m_client->transitionToCommittedFromCachedFrame(cachedPage->cachedMainFrame());
                         
                     } else
                         m_client->transitionToCommittedForNewPage();
@@ -4265,7 +4271,7 @@ void FrameLoader::cachePageForHistoryItem(HistoryItem* item)
 {
     if (Page* page = m_frame->page()) {
         RefPtr<CachedPage> cachedPage = CachedPage::create(page);
-        m_client->savePlatformDataToCachedPage(cachedPage.get());
+        m_client->savePlatformDataToCachedFrame(cachedPage->cachedMainFrame());
 
         pageCache()->add(item, cachedPage.release());
     }
index b90cecd24f7fbb0efc580db16b67f11db366c07d..f0ca79e1fd27acfeeeac680a2258acde8a5c4f2b 100644 (file)
@@ -45,7 +45,7 @@ class NSView;
 namespace WebCore {
 
     class AuthenticationChallenge;
-    class CachedPage;
+    class CachedFrame;
     class Color;
     class DocumentLoader;
     class Element;
@@ -181,8 +181,8 @@ namespace WebCore {
 
         virtual String userAgent(const KURL&) = 0;
         
-        virtual void savePlatformDataToCachedPage(CachedPage*) = 0;
-        virtual void transitionToCommittedFromCachedPage(CachedPage*) = 0;
+        virtual void savePlatformDataToCachedFrame(CachedFrame*) = 0;
+        virtual void transitionToCommittedFromCachedFrame(CachedFrame*) = 0;
         virtual void transitionToCommittedForNewPage() = 0;
 
         virtual bool canCachePage() const = 0;
index 9c521461a4bdaa9736685b5c7efb951a1a767761..c205cddf80db8aeff66f1001c4dec508d644ecb1 100644 (file)
@@ -1,3 +1,14 @@
+2009-01-27  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Dan Bernstein
+
+        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::savePlatformDataToCachedFrame):
+        (WebKit::FrameLoaderClient::transitionToCommittedFromCachedFrame):
+        * WebCoreSupport/FrameLoaderClientGtk.h:
+
 2009-01-25  Darin Adler  <darin@apple.com>
 
         Try to fix GTK build.
index 1b410c781db744accb025ca8f721069d55c054a9..33d0fbb7e07e47a280153ad76df6271692a9e524 100644 (file)
@@ -547,11 +547,6 @@ void FrameLoaderClient::detachedFromParent3()
     notImplemented();
 }
 
-void FrameLoaderClient::loadedFromCachedPage()
-{
-    notImplemented();
-}
-
 void FrameLoaderClient::dispatchDidHandleOnloadEvents()
 {
     notImplemented();
@@ -847,11 +842,11 @@ void FrameLoaderClient::updateGlobalHistory()
     notImplemented();
 }
 
-void FrameLoaderClient::savePlatformDataToCachedPage(CachedPage*)
+void FrameLoaderClient::savePlatformDataToCachedFrame(CachedFrame*)
 {
 }
 
-void FrameLoaderClient::transitionToCommittedFromCachedPage(CachedPage*)
+void FrameLoaderClient::transitionToCommittedFromCachedFrame(CachedFrame*)
 {
 }
 
index c6952db5ad8d9f64a1f9537118b02bc255a4278f..b8a66b42f76465cda83ffca19d1d262df07779e3 100644 (file)
@@ -58,8 +58,6 @@ namespace WebKit {
         virtual void detachedFromParent2();
         virtual void detachedFromParent3();
 
-        virtual void loadedFromCachedPage();
-
         virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&);
 
         virtual void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long  identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
@@ -163,8 +161,8 @@ namespace WebKit {
 
         virtual WebCore::String userAgent(const WebCore::KURL&);
 
-        virtual void savePlatformDataToCachedPage(WebCore::CachedPage*);
-        virtual void transitionToCommittedFromCachedPage(WebCore::CachedPage*);
+        virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*);
+        virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*);
         virtual void transitionToCommittedForNewPage();
 
         virtual bool canCachePage() const;
index 9f120ed82998cc42de6509b082c58c4b0f4aa967..3a1853cf7a8ee967bf09aca78c22ca879d82bf26 100644 (file)
@@ -1,3 +1,17 @@
+2009-01-27  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Dan Bernstein
+
+        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage
+
+        * History/WebHistoryItem.mm:
+
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::savePlatformDataToCachedFrame):
+        (WebFrameLoaderClient::transitionToCommittedFromCachedFrame):
+        * WebKit.order:
+
 2009-01-26  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Dan Bernstein.
index ce4bbfc702bd1708888403fc1bad5247c2c42ebe..dd4d0f7ee3c253f75d45136c186a31f2947f70fd 100644 (file)
@@ -42,7 +42,6 @@
 #import "WebNSViewExtras.h"
 #import "WebPluginController.h"
 #import "WebTypesInternal.h"
-#import <WebCore/CachedPage.h>
 #import <WebCore/HistoryItem.h>
 #import <WebCore/Image.h>
 #import <WebCore/KURL.h>
index 6e58f102d975b1e110ea383eda0d2070efc380df..eb384db575b41ad8674660466303324e67078dc6 100644 (file)
@@ -40,7 +40,7 @@
 
 namespace WebCore {
     class AuthenticationChallenge;
-    class CachedPage;
+    class CachedFrame;
     class HistoryItem;
     class String;
     class ResourceLoader;
@@ -154,8 +154,8 @@ private:
 
     virtual WebCore::String userAgent(const WebCore::KURL&);
     
-    virtual void savePlatformDataToCachedPage(WebCore::CachedPage*);
-    virtual void transitionToCommittedFromCachedPage(WebCore::CachedPage*);
+    virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*);
+    virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*);
     virtual void transitionToCommittedForNewPage();
 
     virtual bool canHandleRequest(const WebCore::ResourceRequest&) const;
index 88714bd8f2860cf71d9ea5895176bfd8ca1e77e7..b3cd6df7ddc28eee33dbe02cbc56cdf25d027bc6 100644 (file)
@@ -73,7 +73,7 @@
 #import <WebKitSystemInterface.h>
 #import <WebCore/AuthenticationMac.h>
 #import <WebCore/BlockExceptions.h>
-#import <WebCore/CachedPage.h>
+#import <WebCore/CachedFrame.h>
 #import <WebCore/Chrome.h>
 #import <WebCore/Document.h>
 #import <WebCore/DocumentLoader.h>
@@ -988,19 +988,19 @@ void WebFrameLoaderClient::setTitle(const String& title, const KURL& URL)
     [[[WebHistory optionalSharedHistory] itemForURL:nsURL] setTitle:titleNSString];
 }
 
-void WebFrameLoaderClient::savePlatformDataToCachedPage(CachedPage* cachedPage)
+void WebFrameLoaderClient::savePlatformDataToCachedFrame(CachedFrame* cachedFrame)
 {
     WebCachedFramePlatformData* webPlatformData = new WebCachedFramePlatformData([m_webFrame->_private->webFrameView documentView]);
-    cachedPage->setCachedFramePlatformData(webPlatformData);
+    cachedFrame->setCachedFramePlatformData(webPlatformData);
 }
 
-void WebFrameLoaderClient::transitionToCommittedFromCachedPage(CachedPage* cachedPage)
+void WebFrameLoaderClient::transitionToCommittedFromCachedFrame(CachedFrame* cachedFrame)
 {
-    WebCachedFramePlatformData* platformData = reinterpret_cast<WebCachedFramePlatformData*>(cachedPage->cachedFramePlatformData());
+    WebCachedFramePlatformData* platformData = reinterpret_cast<WebCachedFramePlatformData*>(cachedFrame->cachedFramePlatformData());
     NSView <WebDocumentView> *cachedView = platformData->webDocumentView();
     ASSERT(cachedView != nil);
-    ASSERT(cachedPage->documentLoader());
-    [cachedView setDataSource:dataSource(cachedPage->documentLoader())];
+    ASSERT(cachedFrame->documentLoader());
+    [cachedView setDataSource:dataSource(cachedFrame->documentLoader())];
     
     // clean up webkit plugin instances before WebHTMLView gets freed.
     WebView *webView = getWebView(m_webFrame.get());
index 1610e859bfadbb0c77a2c5a61faaa30930cff0ba..59e3255cde4dfa49d2a17e6f3214731ad38e2f8f 100644 (file)
@@ -530,7 +530,6 @@ __ZNK20WebFrameLoaderClient12canCachePageEv
 __ZN20WebFrameLoaderClient19windowObjectClearedEv
 -[WebFrameBridge windowObjectCleared]
 -[WebView(WebPendingPublic) scriptDebugDelegate]
-__ZN20WebFrameLoaderClient28savePlatformDataToCachedPageEPN7WebCore10CachedPageE
 -[WebHistoryItem hash]
 __ZNK20WebFrameLoaderClient25didPerformFirstNavigationEv
 -[WebPreferences(WebPrivate) automaticallyDetectsCacheModel]
@@ -990,7 +989,6 @@ __ZN20WebFrameLoaderClient38dispatchDidLoadResourceFromMemoryCacheEPN7WebCore14D
 __Z24CallResourceLoadDelegatePFP11objc_objectS0_P13objc_selectorzEP7WebViewS2_S0_S0_S0_S0_
 __Z12CallDelegatePFP11objc_objectS0_P13objc_selectorzEP7WebViewS0_S2_S0_S0_S0_S0_
 -[WebViewFactory inputElementAltText]
-__ZN20WebFrameLoaderClient35transitionToCommittedFromCachedPageEPN7WebCore10CachedPageE
 __ZN20WebFrameLoaderClient11forceLayoutEv
 -[WebHTMLView setNeedsToApplyStyles:]
 _WKDrawBezeledTextArea
index 2df5e5b508f966cf6e9339d729540d94ff64dc7a..5fbd08544880f4492dcbd6c3593ed499a524e84e 100644 (file)
@@ -1,3 +1,14 @@
+2009-01-27  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Dan Bernstein
+
+        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::savePlatformDataToCachedFrame):
+        (WebCore::FrameLoaderClientQt::transitionToCommittedFromCachedFrame):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+
 2009-01-26  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by David Hyatt
index 40f635743a4bc8dd99d82dc6c0fcbd363eebd1cd..b692d9ad5b718e1ab720d45ed73855d09b03b4a9 100644 (file)
@@ -198,12 +198,12 @@ bool FrameLoaderClientQt::hasWebView() const
     return true;
 }
 
-void FrameLoaderClientQt::savePlatformDataToCachedPage(CachedPage*) 
+void FrameLoaderClientQt::savePlatformDataToCachedFrame(CachedFrame*) 
 {
     notImplemented();
 }
 
-void FrameLoaderClientQt::transitionToCommittedFromCachedPage(CachedPage*)
+void FrameLoaderClientQt::transitionToCommittedFromCachedFrame(CachedFrame*)
 {
 }
 
index c743c233bd4947a382650cd237576d43833f9c30..91e39b6d19302fbd1adac681b46b4b79164060ae 100644 (file)
@@ -177,8 +177,8 @@ namespace WebCore {
 
         virtual String userAgent(const WebCore::KURL&);
 
-        virtual void savePlatformDataToCachedPage(WebCore::CachedPage*);
-        virtual void transitionToCommittedFromCachedPage(WebCore::CachedPage*);
+        virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*);
+        virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*);
         virtual void transitionToCommittedForNewPage();
 
         virtual bool canCachePage() const;
index 14efcbe50783cf62d4bade77f05e77493f671008..5554680b2e54a557a0f049cb4c6025086e99b271 100644 (file)
@@ -1,3 +1,17 @@
+2009-01-27  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Dan Bernstein
+
+        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::savePlatformDataToCachedFrame):
+        (WebFrameLoaderClient::transitionToCommittedFromCachedFrame):
+        * WebCoreSupport/WebFrameLoaderClient.h:
+
+        * WebFrame.cpp:
+        * WebFrame.h:
+
 2009-01-26  Adam Roben  <aroben@apple.com>
 
         Fix an assertion failure when Safari loads an error page
index 5afef612de095db9e5387cf1245cbb88750a1723..a3b8cd8e8b457347efd09fd40ebf2ff073ee4efe 100644 (file)
@@ -48,7 +48,7 @@
 #include "WebURLResponse.h"
 #include "WebView.h"
 #pragma warning(push, 0)
-#include <WebCore/CachedPage.h>
+#include <WebCore/CachedFrame.h>
 #include <WebCore/DocumentLoader.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameTree.h>
@@ -499,22 +499,26 @@ void WebFrameLoaderClient::setTitle(const String& title, const KURL& url)
     itemPrivate->setTitle(BString(title));
 }
 
-void WebFrameLoaderClient::savePlatformDataToCachedPage(CachedPage* cachedPage)
+void WebFrameLoaderClient::savePlatformDataToCachedFrame(CachedFrame* cachedFrame)
 {
 #if USE(CFNETWORK)
     Frame* coreFrame = core(m_webFrame);
     if (!coreFrame)
         return;
 
-    ASSERT(coreFrame->loader()->documentLoader() == cachedPage->documentLoader());
+    ASSERT(coreFrame->loader()->documentLoader() == cachedFrame->documentLoader());
 
     WebCachedFramePlatformData* webPlatformData = new WebCachedFramePlatformData(static_cast<IWebDataSource*>(getWebDataSource(coreFrame->loader()->documentLoader())));
-    cachedPage->setCachedFramePlatformData(webPlatformData);
+    cachedFrame->setCachedFramePlatformData(webPlatformData);
 #else
     notImplemented();
 #endif
 }
 
+void WebFrameLoaderClient::transitionToCommittedFromCachedFrame(CachedFrame*)
+{
+}
+
 void WebFrameLoaderClient::transitionToCommittedForNewPage()
 {
     WebView* view = m_webFrame->webView();
index e223318ecd2d7e6a72cd62975c2da922266b4029..6dad0a74db0d382a70f9aa02d1e687425cf1f690 100644 (file)
@@ -91,7 +91,8 @@ public:
     virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
     virtual void setTitle(const WebCore::String& title, const WebCore::KURL&);
 
-    virtual void savePlatformDataToCachedPage(WebCore::CachedPage*);
+    virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*);
+    virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*);
     virtual void transitionToCommittedForNewPage();
 
     virtual bool canCachePage() const;
index a1dd1a7c8131bea43b548c6d2185fa87cba9f40c..c36282dbce4beb6cca35299e2a6fe046d11fe289 100644 (file)
@@ -1326,10 +1326,6 @@ String WebFrame::userAgent(const KURL& url)
     return d->webView->userAgentForKURL(url);
 }
 
-void WebFrame::transitionToCommittedFromCachedPage(CachedPage*)
-{
-}
-
 void WebFrame::saveViewStateToItem(HistoryItem*)
 {
 }
index 1bd747827962b05ca7c51dcb9788389a1300d5ad..bf234d35906222a3a02f31313a9764bcd6d30eb7 100644 (file)
@@ -260,7 +260,6 @@ public:
     virtual void didFinishLoad();
     virtual void prepareForDataSourceReplacement();
     virtual WebCore::String userAgent(const WebCore::KURL&);
-    virtual void transitionToCommittedFromCachedPage(WebCore::CachedPage*);
     virtual void saveViewStateToItem(WebCore::HistoryItem *);
     virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
     virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
index 7e12612516ced52e13594d0f5e23ab29456d9c1e..a7212f0a72265c0f8924471a971aa24ac4735616 100644 (file)
@@ -1,3 +1,14 @@
+2009-01-27  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Dan Bernstein
+
+        Rework FrameLoaderClient to work on a CachedFrame basis instead of CachedPage
+
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::savePlatformDataToCachedFrame):
+        (WebCore::FrameLoaderClientWx::transitionToCommittedFromCachedFrame):
+        * WebKitSupport/FrameLoaderClientWx.h:
+
 2009-01-23  Kevin Ollivier  <kevino@theolliviers.com>
 
         wx build fix, add missing include dir.
index 38f9a1d028f48438dcddff9979a0472b0486808a..a34576da7793eff04aac8f047fdf8d8eb6489ec4 100644 (file)
@@ -227,13 +227,6 @@ void FrameLoaderClientWx::detachedFromParent3()
     notImplemented();
 }
 
-
-void FrameLoaderClientWx::loadedFromCachedPage()
-{
-    notImplemented();
-}
-
-
 void FrameLoaderClientWx::dispatchDidHandleOnloadEvents()
 {
     if (m_webView) {
@@ -844,12 +837,12 @@ void FrameLoaderClientWx::registerForIconNotification(bool listen)
     notImplemented();
 }
 
-void FrameLoaderClientWx::savePlatformDataToCachedPage(CachedPage*)
+void FrameLoaderClientWx::savePlatformDataToCachedFrame(CachedFrame*)
 { 
     notImplemented();
 }
 
-void FrameLoaderClientWx::transitionToCommittedFromCachedPage(CachedPage*)
+void FrameLoaderClientWx::transitionToCommittedFromCachedFrame(CachedFrame*)
 { 
     notImplemented();
 }
index c8111558bbea65c1a849b797d27f9ad436ba6a43..9ad4ddc7a568d6f7022d44b3b56f271fcca9fa20 100644 (file)
@@ -90,8 +90,6 @@ namespace WebCore {
         virtual void detachedFromParent2();
         virtual void detachedFromParent3();
 
-        virtual void loadedFromCachedPage();
-
         virtual void frameLoaderDestroyed();
         virtual bool canHandleRequest(const ResourceRequest&) const;
 
@@ -146,8 +144,8 @@ namespace WebCore {
 
         virtual String userAgent(const KURL&);
 
-        virtual void savePlatformDataToCachedPage(WebCore::CachedPage*);
-        virtual void transitionToCommittedFromCachedPage(WebCore::CachedPage*);
+        virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*);
+        virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*);
         virtual void transitionToCommittedForNewPage();
         
         virtual void updateGlobalHistory();