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