Source/WebCore/page/History.cpp - Issue 12092048: Merge 140748

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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.

Jump to:

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 »