Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(695)

Unified Diff: Source/WebCore/history/HistoryItem.h

Issue 12092048: Merge 140748 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/bindings/v8/custom/V8HistoryCustom.cpp ('k') | Source/WebCore/loader/FrameLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/history/HistoryItem.h
===================================================================
--- Source/WebCore/history/HistoryItem.h (revision 141135)
+++ Source/WebCore/history/HistoryItem.h (working copy)
@@ -28,6 +28,7 @@
#define HistoryItem_h
#include "IntPoint.h"
+#include "SerializedScriptValue.h"
#include <wtf/HashMap.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
@@ -58,7 +59,6 @@
class Image;
class KURL;
class ResourceRequest;
-class SerializedScriptValue;
typedef Vector<RefPtr<HistoryItem> > HistoryItemVector;
@@ -145,7 +145,7 @@
void setIsTargetItem(bool);
void setStateObject(PassRefPtr<SerializedScriptValue> object);
- SerializedScriptValue* stateObject() const { return m_stateObject.get(); }
+ PassRefPtr<SerializedScriptValue> stateObject() const { return m_stateObject; }
void setItemSequenceNumber(long long number) { m_itemSequenceNumber = number; }
long long itemSequenceNumber() const { return m_itemSequenceNumber; }
« no previous file with comments | « Source/WebCore/bindings/v8/custom/V8HistoryCustom.cpp ('k') | Source/WebCore/loader/FrameLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698