| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Research In Motion Limited. All rights reserved. | 3 * Copyright (C) 2012 Research In Motion Limited. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 #import <wtf/RetainPtr.h> | 39 #import <wtf/RetainPtr.h> |
| 40 typedef struct objc_object* id; | 40 typedef struct objc_object* id; |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 #if PLATFORM(QT) | 43 #if PLATFORM(QT) |
| 44 #include <QVariant> | 44 #include <QVariant> |
| 45 #include <QByteArray> | 45 #include <QByteArray> |
| 46 #include <QDataStream> | 46 #include <QDataStream> |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 #if PLATFORM(BLACKBERRY) | |
| 50 #include "HistoryItemViewState.h" | |
| 51 #endif | |
| 52 | |
| 53 namespace WebCore { | 49 namespace WebCore { |
| 54 | 50 |
| 55 class CachedPage; | 51 class CachedPage; |
| 56 class Document; | 52 class Document; |
| 57 class FormData; | 53 class FormData; |
| 58 class HistoryItem; | 54 class HistoryItem; |
| 59 class Image; | 55 class Image; |
| 60 class KURL; | 56 class KURL; |
| 61 class ResourceRequest; | 57 class ResourceRequest; |
| 62 | 58 |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 #endif | 195 #endif |
| 200 | 196 |
| 201 #if PLATFORM(QT) | 197 #if PLATFORM(QT) |
| 202 QVariant userData() const { return m_userData; } | 198 QVariant userData() const { return m_userData; } |
| 203 void setUserData(const QVariant& userData) { m_userData = userData; } | 199 void setUserData(const QVariant& userData) { m_userData = userData; } |
| 204 | 200 |
| 205 static PassRefPtr<HistoryItem> restoreState(QDataStream& buffer, int version
); | 201 static PassRefPtr<HistoryItem> restoreState(QDataStream& buffer, int version
); |
| 206 QDataStream& saveState(QDataStream& out, int version) const; | 202 QDataStream& saveState(QDataStream& out, int version) const; |
| 207 #endif | 203 #endif |
| 208 | 204 |
| 209 #if PLATFORM(BLACKBERRY) | |
| 210 HistoryItemViewState& viewState() { return m_viewState; } | |
| 211 #endif | |
| 212 | |
| 213 #ifndef NDEBUG | 205 #ifndef NDEBUG |
| 214 int showTree() const; | 206 int showTree() const; |
| 215 int showTreeWithIndent(unsigned indentLevel) const; | 207 int showTreeWithIndent(unsigned indentLevel) const; |
| 216 #endif | 208 #endif |
| 217 | 209 |
| 218 void adoptVisitCounts(Vector<int>& dailyCounts, Vector<int>& weeklyCounts); | 210 void adoptVisitCounts(Vector<int>& dailyCounts, Vector<int>& weeklyCounts); |
| 219 const Vector<int>& dailyVisitCounts() const { return m_dailyVisitCounts; } | 211 const Vector<int>& dailyVisitCounts() const { return m_dailyVisitCounts; } |
| 220 const Vector<int>& weeklyVisitCounts() const { return m_weeklyVisitCounts; } | 212 const Vector<int>& weeklyVisitCounts() const { return m_weeklyVisitCounts; } |
| 221 | 213 |
| 222 private: | 214 private: |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 RefPtr<CachedPage> m_cachedPage; | 282 RefPtr<CachedPage> m_cachedPage; |
| 291 | 283 |
| 292 #if PLATFORM(MAC) | 284 #if PLATFORM(MAC) |
| 293 RetainPtr<id> m_viewState; | 285 RetainPtr<id> m_viewState; |
| 294 OwnPtr<HashMap<String, RetainPtr<id> > > m_transientProperties; | 286 OwnPtr<HashMap<String, RetainPtr<id> > > m_transientProperties; |
| 295 #endif | 287 #endif |
| 296 | 288 |
| 297 #if PLATFORM(QT) | 289 #if PLATFORM(QT) |
| 298 QVariant m_userData; | 290 QVariant m_userData; |
| 299 #endif | 291 #endif |
| 300 | |
| 301 #if PLATFORM(BLACKBERRY) | |
| 302 HistoryItemViewState m_viewState; | |
| 303 #endif | |
| 304 }; //class HistoryItem | 292 }; //class HistoryItem |
| 305 | 293 |
| 306 } //namespace WebCore | 294 } //namespace WebCore |
| 307 | 295 |
| 308 #ifndef NDEBUG | 296 #ifndef NDEBUG |
| 309 // Outside the WebCore namespace for ease of invocation from gdb. | 297 // Outside the WebCore namespace for ease of invocation from gdb. |
| 310 extern "C" int showTree(const WebCore::HistoryItem*); | 298 extern "C" int showTree(const WebCore::HistoryItem*); |
| 311 #endif | 299 #endif |
| 312 | 300 |
| 313 #endif // HISTORYITEM_H | 301 #endif // HISTORYITEM_H |
| OLD | NEW |