| Index: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| index 5b8b0654e78eb10ef558300e1352531057ca82be..f4c83cddb21457c89230e6b0d516a08e79a0c785 100644
|
| --- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| @@ -61,8 +61,6 @@
|
| #include "web/WebPluginContainerImpl.h"
|
| #include "web/WebRemoteFrameImpl.h"
|
| #include "web/WebViewFrameWidget.h"
|
| -#include "wtf/PtrUtil.h"
|
| -#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -346,7 +344,7 @@ WebInputEventResult WebFrameWidgetImpl::handleInputEvent(const WebInputEvent& in
|
| if (inputEvent.type == WebInputEvent::MouseUp)
|
| mouseCaptureLost();
|
|
|
| - std::unique_ptr<UserGestureIndicator> gestureIndicator;
|
| + OwnPtr<UserGestureIndicator> gestureIndicator;
|
|
|
| AtomicString eventType;
|
| switch (inputEvent.type) {
|
| @@ -358,12 +356,12 @@ WebInputEventResult WebFrameWidgetImpl::handleInputEvent(const WebInputEvent& in
|
| break;
|
| case WebInputEvent::MouseDown:
|
| eventType = EventTypeNames::mousedown;
|
| - gestureIndicator = wrapUnique(new UserGestureIndicator(DefinitelyProcessingNewUserGesture));
|
| + gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingNewUserGesture));
|
| m_mouseCaptureGestureToken = gestureIndicator->currentToken();
|
| break;
|
| case WebInputEvent::MouseUp:
|
| eventType = EventTypeNames::mouseup;
|
| - gestureIndicator = wrapUnique(new UserGestureIndicator(m_mouseCaptureGestureToken.release()));
|
| + gestureIndicator = adoptPtr(new UserGestureIndicator(m_mouseCaptureGestureToken.release()));
|
| break;
|
| default:
|
| NOTREACHED();
|
|
|