Source/WebKit/chromium/src/WebFrameImpl.cpp - Issue 10960021: Merge 128972 - [Chromium] Fix crash in WebFrameImpl::loadHistoryItem

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/WebKit/chromium/src/WebFrameImpl.cpp

Issue 10960021: Merge 128972 - [Chromium] Fix crash in WebFrameImpl::loadHistoryItem (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

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

Index: Source/WebKit/chromium/src/WebFrameImpl.cpp

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

--- Source/WebKit/chromium/src/WebFrameImpl.cpp (revision 129176)

+++ Source/WebKit/chromium/src/WebFrameImpl.cpp (working copy)

@@ -1016,7 +1016,7 @@

m_frame->loader()->prepareForHistoryNavigation();

RefPtr<HistoryItem> currentItem = m_frame->loader()->history()->currentItem();

- m_inSameDocumentHistoryLoad = currentItem->shouldDoSameDocumentNavigationTo(historyItem.get());

+ m_inSameDocumentHistoryLoad = currentItem && currentItem->shouldDoSameDocumentNavigationTo(historyItem.get());

m_frame->page()->goToItem(historyItem.get(),

FrameLoadTypeIndexedBackForward);

m_inSameDocumentHistoryLoad = false;

« no previous file with comments | « no previous file | no next file » | no next file with comments »