diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/loader/DocumentLoader.h | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/loader/DocumentLoader.h')
| -rw-r--r-- | WebCore/loader/DocumentLoader.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/loader/DocumentLoader.h b/WebCore/loader/DocumentLoader.h index 440cfc4..1beed10 100644 --- a/WebCore/loader/DocumentLoader.h +++ b/WebCore/loader/DocumentLoader.h @@ -111,6 +111,7 @@ namespace WebCore { bool isLoadingInAPISense() const; void setPrimaryLoadComplete(bool); void setTitle(const String&); + void setIconURL(const String&); const String& overrideEncoding() const { return m_overrideEncoding; } #if PLATFORM(MAC) @@ -154,6 +155,7 @@ namespace WebCore { void stopRecordingResponses(); const String& title() const { return m_pageTitle; } + const String& iconURL() const { return m_pageIconURL; } KURL urlForHistory() const; bool urlForHistoryReflectsFailure() const; @@ -261,6 +263,7 @@ namespace WebCore { bool m_isClientRedirect; String m_pageTitle; + String m_pageIconURL; String m_overrideEncoding; |