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

Unified Diff: Source/WebCore/page/History.cpp

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/page/History.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/History.cpp
===================================================================
--- Source/WebCore/page/History.cpp (revision 141135)
+++ Source/WebCore/page/History.cpp (working copy)
@@ -55,13 +55,13 @@
return m_frame->page()->backForward()->count();
}
-SerializedScriptValue* History::state()
+PassRefPtr<SerializedScriptValue> History::state()
{
m_lastStateObjectRequested = stateInternal();
return m_lastStateObjectRequested;
}
-SerializedScriptValue* History::stateInternal() const
+PassRefPtr<SerializedScriptValue> History::stateInternal() const
{
if (!m_frame)
return 0;
« no previous file with comments | « Source/WebCore/page/History.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698