| Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| index 9bf96ddcd733106da3f6ae343384375306b4939f..b498b010d20dcd151648dfd55ade1647521d0210 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| @@ -714,9 +714,7 @@ void FrameLoader::updateForSameDocumentNavigation(
|
| HistoryCommitType historyCommitType = loadTypeToCommitType(type);
|
| if (!m_currentItem)
|
| historyCommitType = HistoryInertCommit;
|
| - if (m_frame->settings()->getHistoryEntryRequiresUserGesture() &&
|
| - initiatingDocument &&
|
| - !initiatingDocument->frame()->hasReceivedUserGesture()) {
|
| + if (initiatingDocument && !initiatingDocument->canCreateHistoryEntry()) {
|
| historyCommitType = HistoryInertCommit;
|
| }
|
|
|
| @@ -860,9 +858,8 @@ FrameLoadType FrameLoader::determineFrameLoadType(
|
| m_documentLoader->loadType() == FrameLoadTypeReload)
|
| return FrameLoadTypeReload;
|
|
|
| - if (m_frame->settings()->getHistoryEntryRequiresUserGesture() &&
|
| - request.originDocument() &&
|
| - !request.originDocument()->frame()->hasReceivedUserGesture())
|
| + if (request.originDocument() &&
|
| + !request.originDocument()->canCreateHistoryEntry())
|
| return FrameLoadTypeReplaceCurrentItem;
|
|
|
| return FrameLoadTypeStandard;
|
|
|