| Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
|
| diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
|
| index b6f703211397897aeec4abb4406285d03d740d18..0b117dc988b72e59f6dc3c59818cfba45a43684b 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
|
| @@ -50,9 +50,8 @@
|
| #include "public/platform/WebImageLayer.h"
|
| #include "public/platform/WebLayerScrollClient.h"
|
| #include "third_party/skia/include/core/SkFilterQuality.h"
|
| -#include "wtf/OwnPtr.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| #include "wtf/Vector.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -72,7 +71,7 @@ typedef Vector<GraphicsLayer*, 64> GraphicsLayerVector;
|
| class PLATFORM_EXPORT GraphicsLayer : public WebLayerScrollClient, public cc::LayerClient, public DisplayItemClient {
|
| WTF_MAKE_NONCOPYABLE(GraphicsLayer); USING_FAST_MALLOC(GraphicsLayer);
|
| public:
|
| - static PassOwnPtr<GraphicsLayer> create(GraphicsLayerClient*);
|
| + static std::unique_ptr<GraphicsLayer> create(GraphicsLayerClient*);
|
|
|
| ~GraphicsLayer() override;
|
|
|
| @@ -357,8 +356,8 @@ private:
|
|
|
| int m_paintCount;
|
|
|
| - OwnPtr<WebContentLayer> m_layer;
|
| - OwnPtr<WebImageLayer> m_imageLayer;
|
| + std::unique_ptr<WebContentLayer> m_layer;
|
| + std::unique_ptr<WebImageLayer> m_imageLayer;
|
| WebLayer* m_contentsLayer;
|
| // We don't have ownership of m_contentsLayer, but we do want to know if a given layer is the
|
| // same as our current layer in setContentsTo(). Since m_contentsLayer may be deleted at this point,
|
| @@ -368,13 +367,13 @@ private:
|
|
|
| Vector<LinkHighlight*> m_linkHighlights;
|
|
|
| - OwnPtr<ContentLayerDelegate> m_contentLayerDelegate;
|
| + std::unique_ptr<ContentLayerDelegate> m_contentLayerDelegate;
|
|
|
| WeakPersistent<ScrollableArea> m_scrollableArea;
|
| GraphicsLayerDebugInfo m_debugInfo;
|
| int m_3dRenderingContext;
|
|
|
| - OwnPtr<PaintController> m_paintController;
|
| + std::unique_ptr<PaintController> m_paintController;
|
|
|
| IntRect m_previousInterestRect;
|
|
|
|
|