diff options
Diffstat (limited to 'WebCore/loader/FrameLoader.h')
-rw-r--r-- | WebCore/loader/FrameLoader.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h index 70e4b9f..a04937d 100644 --- a/WebCore/loader/FrameLoader.h +++ b/WebCore/loader/FrameLoader.h @@ -248,8 +248,6 @@ public: KURL baseURL() const; - void tokenizerProcessedData(); - void handledOnloadEvents(); String userAgent(const KURL&) const; @@ -311,7 +309,7 @@ public: void setTitle(const String&); void setIconURL(const String&); - void commitProvisionalLoad(PassRefPtr<CachedPage>); + void commitProvisionalLoad(); bool isLoadingFromCachedPage() const { return m_loadingFromCachedPage; } bool committingFirstRealLoad() const { return !m_creatingInitialEmptyDocument && !m_committedFirstRealDocumentLoad; } @@ -355,7 +353,9 @@ public: bool isDisplayingInitialEmptyDocument() const { return m_isDisplayingInitialEmptyDocument; } void clear(bool clearWindowProperties = true, bool clearScriptObjects = true, bool clearFrameView = true); - + + bool quickRedirectComing() const { return m_quickRedirectComing; } + bool shouldClose(); private: @@ -376,8 +376,7 @@ private: void navigateWithinDocument(HistoryItem*); void navigateToDifferentDocument(HistoryItem*, FrameLoadType); - bool loadProvisionalItemFromCachedPage(); - void cachePageForHistoryItem(HistoryItem*); + void loadProvisionalItemFromCachedPage(); void pageHidden(); void receivedFirstData(); @@ -418,7 +417,7 @@ private: void setState(FrameState); void closeOldDataSources(); - void open(CachedPage&); + void prepareForCachedPageRestore(); void updateHistoryAfterClientRedirect(); |