diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/loader/DocumentLoader.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/loader/DocumentLoader.h')
| -rw-r--r-- | Source/WebCore/loader/DocumentLoader.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h index 8e9ab8f..1f88272 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -31,6 +31,7 @@ #include "DocumentLoadTiming.h" #include "DocumentWriter.h" +#include "IconDatabaseBase.h" #include "NavigationAction.h" #include "ResourceError.h" #include "ResourceRequest.h" @@ -182,7 +183,7 @@ namespace WebCore { String clientRedirectDestinationForHistory() const { return urlForHistory(); } void setClientRedirectSourceForHistory(const String& clientedirectSourceForHistory) { m_clientRedirectSourceForHistory = clientedirectSourceForHistory; } - String serverRedirectSourceForHistory() const { return urlForHistory() == url() ? String() : urlForHistory(); } // null if no server redirect occurred. + String serverRedirectSourceForHistory() const { return urlForHistory() == url() ? String() : urlForHistory().string(); } // null if no server redirect occurred. String serverRedirectDestinationForHistory() const { return url(); } bool didCreateGlobalHistoryEntry() const { return m_didCreateGlobalHistoryEntry; } @@ -193,8 +194,14 @@ namespace WebCore { bool startLoadingMainResource(unsigned long identifier); void cancelMainResourceLoad(const ResourceError&); + // Support iconDatabase in synchronous mode. void iconLoadDecisionAvailable(); + // Support iconDatabase in asynchronous mode. + void continueIconLoadWithDecision(IconLoadDecision); + void getIconLoadDecisionForIconURL(const String&); + void getIconDataForIconURL(const String&); + bool isLoadingMainResource() const; bool isLoadingSubresources() const; bool isLoadingPlugIns() const; @@ -326,6 +333,9 @@ namespace WebCore { bool m_didCreateGlobalHistoryEntry; DocumentLoadTiming m_documentLoadTiming; + + RefPtr<IconLoadDecisionCallback> m_iconLoadDecisionCallback; + RefPtr<IconDataCallback> m_iconDataCallback; #if ENABLE(OFFLINE_WEB_APPLICATIONS) friend class ApplicationCacheHost; // for substitute resource delivery |