| Index: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h
|
| index a6680350d17d92cea89b525c1c8ab603f8fc67be..9a93b5095cdbb3e6f113b78527bc3966471f9cd6 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.h
|
| @@ -30,6 +30,7 @@
|
| #include "core/layout/compositing/CompositingReasonFinder.h"
|
| #include "platform/graphics/GraphicsLayerClient.h"
|
| #include "wtf/HashMap.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -218,7 +219,7 @@ private:
|
| Scrollbar* graphicsLayerToScrollbar(const GraphicsLayer*) const;
|
|
|
| LayoutView& m_layoutView;
|
| - OwnPtr<GraphicsLayer> m_rootContentLayer;
|
| + std::unique_ptr<GraphicsLayer> m_rootContentLayer;
|
|
|
| CompositingReasonFinder m_compositingReasonFinder;
|
|
|
| @@ -243,16 +244,16 @@ private:
|
| RootLayerAttachment m_rootLayerAttachment;
|
|
|
| // Enclosing container layer, which clips for iframe content
|
| - OwnPtr<GraphicsLayer> m_containerLayer;
|
| - OwnPtr<GraphicsLayer> m_scrollLayer;
|
| + std::unique_ptr<GraphicsLayer> m_containerLayer;
|
| + std::unique_ptr<GraphicsLayer> m_scrollLayer;
|
|
|
| // Enclosing layer for overflow controls and the clipping layer
|
| - OwnPtr<GraphicsLayer> m_overflowControlsHostLayer;
|
| + std::unique_ptr<GraphicsLayer> m_overflowControlsHostLayer;
|
|
|
| // Layers for overflow controls
|
| - OwnPtr<GraphicsLayer> m_layerForHorizontalScrollbar;
|
| - OwnPtr<GraphicsLayer> m_layerForVerticalScrollbar;
|
| - OwnPtr<GraphicsLayer> m_layerForScrollCorner;
|
| + std::unique_ptr<GraphicsLayer> m_layerForHorizontalScrollbar;
|
| + std::unique_ptr<GraphicsLayer> m_layerForVerticalScrollbar;
|
| + std::unique_ptr<GraphicsLayer> m_layerForScrollCorner;
|
| };
|
|
|
| } // namespace blink
|
|
|