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 0ccd54c0bd9be58881825a7099d224f9018e6fd4..95cf7561a60ea90e1bca722432ec0f74133ff826 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 { |
@@ -219,7 +220,7 @@ private: |
Scrollbar* graphicsLayerToScrollbar(const GraphicsLayer*) const; |
LayoutView& m_layoutView; |
- OwnPtr<GraphicsLayer> m_rootContentLayer; |
+ std::unique_ptr<GraphicsLayer> m_rootContentLayer; |
CompositingReasonFinder m_compositingReasonFinder; |
@@ -244,16 +245,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 |