Source/WebCore/loader/FrameLoader.h - Issue 9617017: Merge 109480

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/loader/FrameLoader.h

Issue 9617017: Merge 109480 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 years, 9 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:

Index: Source/WebCore/loader/FrameLoader.h

===================================================================

--- Source/WebCore/loader/FrameLoader.h (revision 109935)

+++ Source/WebCore/loader/FrameLoader.h (working copy)

@@ -119,6 +119,7 @@

void open(CachedFrameBase&);

void loadItem(HistoryItem*, FrameLoadType);

+ HistoryItem* requestedHistoryItem() const { return m_requestedHistoryItem.get(); }

static void reportLocalLoadFailed(Frame*, const String& url);

@@ -433,6 +434,7 @@

#endif

KURL m_previousUrl;

+ RefPtr<HistoryItem> m_requestedHistoryItem;

};

// This function is called by createWindow() in JSDOMWindowBase.cpp, for example, for