| Index: third_party/WebKit/Source/core/frame/VisualViewport.h
|
| diff --git a/third_party/WebKit/Source/core/frame/VisualViewport.h b/third_party/WebKit/Source/core/frame/VisualViewport.h
|
| index d15d2345bc75053aadaea36228c1a0fb9e6614e1..58b3d7b9df16ff40d285fec0e479cbaaf56371c1 100644
|
| --- a/third_party/WebKit/Source/core/frame/VisualViewport.h
|
| +++ b/third_party/WebKit/Source/core/frame/VisualViewport.h
|
| @@ -40,8 +40,7 @@
|
| #include "platform/scroll/ScrollableArea.h"
|
| #include "public/platform/WebScrollbar.h"
|
| #include "public/platform/WebSize.h"
|
| -#include "wtf/OwnPtr.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
| class WebLayerTreeView;
|
| @@ -248,15 +247,15 @@ private:
|
| }
|
|
|
| Member<FrameHost> m_frameHost;
|
| - OwnPtr<GraphicsLayer> m_rootTransformLayer;
|
| - OwnPtr<GraphicsLayer> m_innerViewportContainerLayer;
|
| - OwnPtr<GraphicsLayer> m_overscrollElasticityLayer;
|
| - OwnPtr<GraphicsLayer> m_pageScaleLayer;
|
| - OwnPtr<GraphicsLayer> m_innerViewportScrollLayer;
|
| - OwnPtr<GraphicsLayer> m_overlayScrollbarHorizontal;
|
| - OwnPtr<GraphicsLayer> m_overlayScrollbarVertical;
|
| - OwnPtr<WebScrollbarLayer> m_webOverlayScrollbarHorizontal;
|
| - OwnPtr<WebScrollbarLayer> m_webOverlayScrollbarVertical;
|
| + std::unique_ptr<GraphicsLayer> m_rootTransformLayer;
|
| + std::unique_ptr<GraphicsLayer> m_innerViewportContainerLayer;
|
| + std::unique_ptr<GraphicsLayer> m_overscrollElasticityLayer;
|
| + std::unique_ptr<GraphicsLayer> m_pageScaleLayer;
|
| + std::unique_ptr<GraphicsLayer> m_innerViewportScrollLayer;
|
| + std::unique_ptr<GraphicsLayer> m_overlayScrollbarHorizontal;
|
| + std::unique_ptr<GraphicsLayer> m_overlayScrollbarVertical;
|
| + std::unique_ptr<WebScrollbarLayer> m_webOverlayScrollbarHorizontal;
|
| + std::unique_ptr<WebScrollbarLayer> m_webOverlayScrollbarVertical;
|
|
|
| // Offset of the visual viewport from the main frame's origin, in CSS pixels.
|
| FloatPoint m_offset;
|
|
|