| 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 aa2836e14ac36870b5874b7c3069b564b3ef1d9d..bf8c559ca340b6a14efdaacae00d9d845957da2b 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| @@ -816,7 +816,8 @@ void FrameLoader::updateForSameDocumentNavigation(
|
| if (!m_currentItem)
|
| historyCommitType = HistoryInertCommit;
|
| if (m_frame->settings()->getHistoryEntryRequiresUserGesture() &&
|
| - initiatingDocument && !initiatingDocument->hasReceivedUserGesture()) {
|
| + initiatingDocument &&
|
| + !initiatingDocument->frame()->hasReceivedUserGesture()) {
|
| historyCommitType = HistoryInertCommit;
|
| }
|
|
|
| @@ -962,7 +963,7 @@ FrameLoadType FrameLoader::determineFrameLoadType(
|
|
|
| if (m_frame->settings()->getHistoryEntryRequiresUserGesture() &&
|
| request.originDocument() &&
|
| - !request.originDocument()->hasReceivedUserGesture())
|
| + !request.originDocument()->frame()->hasReceivedUserGesture())
|
| return FrameLoadTypeReplaceCurrentItem;
|
|
|
| return FrameLoadTypeStandard;
|
|
|