summaryrefslogtreecommitdiffstats
path: root/WebKit/win/WebHistory.h
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-05 14:34:32 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-05 14:34:32 -0800
commit635860845790a19bf50bbc51ba8fb66a96dde068 (patch)
treeef6ad9ff73a5b57f65249d4232a202fa77e6a140 /WebKit/win/WebHistory.h
parent8e35f3cfc7fba1d1c829dc557ebad6409cbe16a2 (diff)
downloadexternal_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.zip
external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.gz
external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.bz2
auto import from //depot/cupcake/@136594
Diffstat (limited to 'WebKit/win/WebHistory.h')
-rw-r--r--WebKit/win/WebHistory.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/WebKit/win/WebHistory.h b/WebKit/win/WebHistory.h
index a49f320..111f6ae 100644
--- a/WebKit/win/WebHistory.h
+++ b/WebKit/win/WebHistory.h
@@ -42,7 +42,7 @@ namespace WebCore {
class WebPreferences;
-class WebHistory : public IWebHistory {
+class WebHistory : public IWebHistory, public IWebHistoryPrivate {
public:
static WebHistory* createInstance();
private:
@@ -107,9 +107,16 @@ public:
virtual HRESULT STDMETHODCALLTYPE historyAgeInDaysLimit(
/* [retval][out] */ int* limit);
+ // IWebHistoryPrivate
+
+ virtual HRESULT STDMETHODCALLTYPE allItems(
+ /* [out][in] */ int* count,
+ /* [retval][out] */ IWebHistoryItem** items);
+
// WebHistory
static WebHistory* sharedHistory();
- void addItem(const WebCore::KURL&, const WebCore::String&);
+ void visitedURL(const WebCore::KURL&, const WebCore::String& title, const WebCore::String& httpMethod, bool wasFailure, const WebCore::KURL& serverRedirectURL, bool isClientRedirect);
+ void visitedURLForRedirectWithoutHistoryItem(const WebCore::KURL&);
void addVisitedLinksToPageGroup(WebCore::PageGroup&);
private:
@@ -127,7 +134,7 @@ private:
HRESULT saveHistoryGuts(CFURLRef url, IWebError** error);
HRESULT postNotification(NotificationType notifyType, IPropertyBag* userInfo = 0);
HRESULT removeItem(IWebHistoryItem* entry);
- HRESULT addItem(IWebHistoryItem* entry);
+ HRESULT addItem(IWebHistoryItem* entry, bool discardDuplicate, bool* added);
HRESULT removeItemForURLString(CFStringRef urlString);
HRESULT addItemToDateCaches(IWebHistoryItem* entry);
HRESULT removeItemFromDateCaches(IWebHistoryItem* entry);
@@ -144,6 +151,7 @@ private:
RetainPtr<CFMutableArrayRef> m_datesWithEntries;
RetainPtr<CFMutableArrayRef> m_entriesByDate;
COMPtr<WebPreferences> m_preferences;
+ COMPtr<WebHistoryItem> m_lastVisitedEntry;
};
#endif