| Index: third_party/WebKit/Source/core/loader/NavigationScheduler.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp b/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp
|
| index bbb14295b3fe3bd628c879cd079b6e42f0622320..f687976bd5b4edf730cdd2b44f742219810c934b 100644
|
| --- a/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/NavigationScheduler.cpp
|
| @@ -55,6 +55,8 @@
|
| #include "public/platform/WebCachePolicy.h"
|
| #include "public/platform/WebScheduler.h"
|
| #include "wtf/CurrentTime.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -120,11 +122,11 @@ public:
|
| Document* originDocument() const { return m_originDocument.get(); }
|
| bool replacesCurrentItem() const { return m_replacesCurrentItem; }
|
| bool isLocationChange() const { return m_isLocationChange; }
|
| - PassOwnPtr<UserGestureIndicator> createUserGestureIndicator()
|
| + std::unique_ptr<UserGestureIndicator> createUserGestureIndicator()
|
| {
|
| if (m_wasUserGesture && m_userGestureToken)
|
| - return adoptPtr(new UserGestureIndicator(m_userGestureToken));
|
| - return adoptPtr(new UserGestureIndicator(DefinitelyNotProcessingUserGesture));
|
| + return wrapUnique(new UserGestureIndicator(m_userGestureToken));
|
| + return wrapUnique(new UserGestureIndicator(DefinitelyNotProcessingUserGesture));
|
| }
|
|
|
| DEFINE_INLINE_VIRTUAL_TRACE()
|
| @@ -157,7 +159,7 @@ protected:
|
|
|
| void fire(LocalFrame* frame) override
|
| {
|
| - OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| + std::unique_ptr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| FrameLoadRequest request(originDocument(), m_url, "_self", m_shouldCheckMainWorldContentSecurityPolicy);
|
| request.setReplacesCurrentItem(replacesCurrentItem());
|
| request.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
|
| @@ -185,7 +187,7 @@ public:
|
|
|
| void fire(LocalFrame* frame) override
|
| {
|
| - OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| + std::unique_ptr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| FrameLoadRequest request(originDocument(), url(), "_self");
|
| request.setReplacesCurrentItem(replacesCurrentItem());
|
| if (equalIgnoringFragmentIdentifier(frame->document()->url(), request.resourceRequest().url()))
|
| @@ -224,7 +226,7 @@ public:
|
|
|
| void fire(LocalFrame* frame) override
|
| {
|
| - OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| + std::unique_ptr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| ResourceRequest resourceRequest = frame->loader().resourceRequestForReload(FrameLoadTypeReload, KURL(), ClientRedirectPolicy::ClientRedirect);
|
| if (resourceRequest.isNull())
|
| return;
|
| @@ -250,7 +252,7 @@ public:
|
|
|
| void fire(LocalFrame* frame) override
|
| {
|
| - OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| + std::unique_ptr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| SubstituteData substituteData(SharedBuffer::create(), "text/plain", "UTF-8", KURL(), ForceSynchronousLoad);
|
| FrameLoadRequest request(originDocument(), url(), substituteData);
|
| request.setReplacesCurrentItem(true);
|
| @@ -275,7 +277,7 @@ public:
|
|
|
| void fire(LocalFrame* frame) override
|
| {
|
| - OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| + std::unique_ptr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| FrameLoadRequest frameRequest = m_submission->createFrameLoadRequest(originDocument());
|
| frameRequest.setReplacesCurrentItem(replacesCurrentItem());
|
| maybeLogScheduledNavigationClobber(ScheduledNavigationType::ScheduledFormSubmission, frame, frameRequest, gestureIndicator.get());
|
|
|