1 files changed, 15 insertions, 10 deletions
diff --git a/WebKit/chromium/public/WebHistoryItem.h b/WebKit/chromium/public/WebHistoryItem.h
index e248a61..1b4863e 100644
--- a/WebKit/chromium/public/WebHistoryItem.h
+++ b/WebKit/chromium/public/WebHistoryItem.h
@@ -32,17 +32,17 @@
 #define WebHistoryItem_h
 
 #include "WebCommon.h"
+#include "WebPrivatePtr.h"
+
+// FIXME: Remove this once Chromium starts using itemSequenceNumber.
+#define WEBKIT_BUG_40451_IS_FIXED
 
-#if WEBKIT_IMPLEMENTATION
 namespace WebCore { class HistoryItem; }
-namespace WTF { template <typename T> class PassRefPtr; }
-#endif
 
 namespace WebKit {
-
-class WebHistoryItemPrivate;
 class WebHTTPBody;
 class WebString;
+class WebSerializedScriptValue;
 struct WebPoint;
 template <typename T> class WebVector;
 
@@ -55,8 +55,8 @@ class WebHistoryItem {
 public:
     ~WebHistoryItem() { reset(); }
 
-    WebHistoryItem() : m_private(0) { }
-    WebHistoryItem(const WebHistoryItem& h) : m_private(0) { assign(h); }
+    WebHistoryItem() { }
+    WebHistoryItem(const WebHistoryItem& h) { assign(h); }
     WebHistoryItem& operator=(const WebHistoryItem& h)
     {
         assign(h);
@@ -67,7 +67,7 @@ public:
     WEBKIT_API void reset();
     WEBKIT_API void assign(const WebHistoryItem&);
 
-    bool isNull() const { return !m_private; }
+    bool isNull() const { return m_private.isNull(); }
 
     WEBKIT_API WebString urlString() const;
     WEBKIT_API void setURLString(const WebString&);
@@ -105,9 +105,15 @@ public:
     WEBKIT_API WebVector<WebString> documentState() const;
     WEBKIT_API void setDocumentState(const WebVector<WebString>&);
 
+    WEBKIT_API long long itemSequenceNumber() const;
+    WEBKIT_API void setItemSequenceNumber(long long);
+
     WEBKIT_API long long documentSequenceNumber() const;
     WEBKIT_API void setDocumentSequenceNumber(long long);
 
+    WEBKIT_API WebSerializedScriptValue stateObject() const;
+    WEBKIT_API void setStateObject(const WebSerializedScriptValue&);
+
     WEBKIT_API WebString httpContentType() const;
     WEBKIT_API void setHTTPContentType(const WebString&);
 
@@ -125,9 +131,8 @@ public:
 #endif
 
 private:
-    void assign(WebHistoryItemPrivate*);
     void ensureMutable();
-    WebHistoryItemPrivate* m_private;
+    WebPrivatePtr<WebCore::HistoryItem> m_private;
 };
 
 } // namespace WebKit