diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/history/HistoryItem.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/history/HistoryItem.cpp')
| -rw-r--r-- | Source/WebCore/history/HistoryItem.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/WebCore/history/HistoryItem.cpp b/Source/WebCore/history/HistoryItem.cpp index c698db3..c31aa86 100644 --- a/Source/WebCore/history/HistoryItem.cpp +++ b/Source/WebCore/history/HistoryItem.cpp @@ -85,7 +85,7 @@ HistoryItem::HistoryItem(const String& urlString, const String& title, double ti , m_next(0) , m_prev(0) { - iconDatabase()->retainIconForPageURL(m_urlString); + iconDatabase().retainIconForPageURL(m_urlString); } HistoryItem::HistoryItem(const String& urlString, const String& title, const String& alternateTitle, double time) @@ -104,7 +104,7 @@ HistoryItem::HistoryItem(const String& urlString, const String& title, const Str , m_next(0) , m_prev(0) { - iconDatabase()->retainIconForPageURL(m_urlString); + iconDatabase().retainIconForPageURL(m_urlString); } HistoryItem::HistoryItem(const KURL& url, const String& target, const String& parent, const String& title) @@ -124,13 +124,13 @@ HistoryItem::HistoryItem(const KURL& url, const String& target, const String& pa , m_next(0) , m_prev(0) { - iconDatabase()->retainIconForPageURL(m_urlString); + iconDatabase().retainIconForPageURL(m_urlString); } HistoryItem::~HistoryItem() { ASSERT(!m_cachedPage); - iconDatabase()->releaseIconForPageURL(m_urlString); + iconDatabase().releaseIconForPageURL(m_urlString); #if PLATFORM(ANDROID) if (m_bridge) m_bridge->detachHistoryItem(); @@ -178,7 +178,7 @@ PassRefPtr<HistoryItem> HistoryItem::copy() const void HistoryItem::reset() { - iconDatabase()->releaseIconForPageURL(m_urlString); + iconDatabase().releaseIconForPageURL(m_urlString); m_urlString = String(); m_originalURLString = String(); @@ -232,8 +232,8 @@ const String& HistoryItem::alternateTitle() const Image* HistoryItem::icon() const { - Image* result = iconDatabase()->iconForPageURL(m_urlString, IntSize(16, 16)); - return result ? result : iconDatabase()->defaultIcon(IntSize(16, 16)); + Image* result = iconDatabase().iconForPageURL(m_urlString, IntSize(16, 16)); + return result ? result : iconDatabase().defaultIcon(IntSize(16, 16)); } double HistoryItem::lastVisitedTime() const @@ -275,9 +275,9 @@ void HistoryItem::setAlternateTitle(const String& alternateTitle) void HistoryItem::setURLString(const String& urlString) { if (m_urlString != urlString) { - iconDatabase()->releaseIconForPageURL(m_urlString); + iconDatabase().releaseIconForPageURL(m_urlString); m_urlString = urlString; - iconDatabase()->retainIconForPageURL(m_urlString); + iconDatabase().retainIconForPageURL(m_urlString); } notifyHistoryItemChanged(this); |