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

Unified Diff: Source/core/loader/FrameLoader.cpp

Issue 1159653004: Build fix after r196549 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index 8802ef2a1bde820983b60631b8d41e5f44abf058..7ce56910952b3eb0cfa3e876f173e62dd6093446 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -290,7 +290,10 @@ void FrameLoader::replaceDocumentWhileExecutingJavaScriptURL(const String& sourc
void FrameLoader::setHistoryItemStateForCommit(HistoryCommitType historyCommitType, HistoryNavigationType navigationType)
{
RefPtrWillBeRawPtr<HistoryItem> oldItem = m_currentItem;
- m_currentItem = historyCommitType == BackForwardCommit ? RawPtr<HistoryItem>(m_provisionalItem.release()) : HistoryItem::create();
+ if (historyCommitType == BackForwardCommit)
+ m_currentItem = m_provisionalItem.release();
+ else
+ m_currentItem = HistoryItem::create();
m_currentItem->setURL(m_documentLoader->urlForHistory());
m_currentItem->setDocumentState(m_frame->document()->formElementsState());
m_currentItem->setTarget(m_frame->tree().uniqueName());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698