| Index: third_party/WebKit/Source/core/frame/LocalFrame.h
|
| diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.h b/third_party/WebKit/Source/core/frame/LocalFrame.h
|
| index 2165cca6ed38af5fcb3e928034ec644c8e86fc94..7c5a2f347aeec1a8580409926b3b5af512b5149d 100644
|
| --- a/third_party/WebKit/Source/core/frame/LocalFrame.h
|
| +++ b/third_party/WebKit/Source/core/frame/LocalFrame.h
|
| @@ -41,7 +41,6 @@
|
| #include "platform/heap/Handle.h"
|
| #include "platform/scroll/ScrollTypes.h"
|
| #include "wtf/HashSet.h"
|
| -#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -155,8 +154,8 @@ public:
|
| void deviceScaleFactorChanged();
|
| double devicePixelRatio() const;
|
|
|
| - std::unique_ptr<DragImage> nodeImage(Node&);
|
| - std::unique_ptr<DragImage> dragImageForSelection(float opacity);
|
| + PassOwnPtr<DragImage> nodeImage(Node&);
|
| + PassOwnPtr<DragImage> dragImageForSelection(float opacity);
|
|
|
| String selectedText() const;
|
| String selectedTextForClipboard() const;
|
| @@ -213,7 +212,7 @@ private:
|
| const Member<EventHandler> m_eventHandler;
|
| const Member<FrameConsole> m_console;
|
| const Member<InputMethodController> m_inputMethodController;
|
| - std::unique_ptr<WebFrameScheduler> m_frameScheduler;
|
| + OwnPtr<WebFrameScheduler> m_frameScheduler;
|
|
|
| int m_navigationDisableCount;
|
|
|
|
|