| Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| index 7572bd3b716dd3e9dd9e32d8defa9598ab1300ca..7a3cfb4f7bf081b928af2c6143fac2c545b74fc5 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| @@ -57,10 +57,12 @@
|
| #include "wtf/HashMap.h"
|
| #include "wtf/HashSet.h"
|
| #include "wtf/MathExtras.h"
|
| +#include "wtf/PtrUtil.h"
|
| #include "wtf/text/StringUTF8Adaptor.h"
|
| #include "wtf/text/WTFString.h"
|
| #include <algorithm>
|
| #include <cmath>
|
| +#include <memory>
|
| #include <utility>
|
|
|
| #ifndef NDEBUG
|
| @@ -107,9 +109,9 @@ static PaintInvalidationTrackingMap& paintInvalidationTrackingMap()
|
| return map;
|
| }
|
|
|
| -PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
|
| +std::unique_ptr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
|
| {
|
| - return adoptPtr(new GraphicsLayer(client));
|
| + return wrapUnique(new GraphicsLayer(client));
|
| }
|
|
|
| GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client)
|
| @@ -148,8 +150,8 @@ GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client)
|
| m_client->verifyNotPainting();
|
| #endif
|
|
|
| - m_contentLayerDelegate = adoptPtr(new ContentLayerDelegate(this));
|
| - m_layer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(m_contentLayerDelegate.get()));
|
| + m_contentLayerDelegate = wrapUnique(new ContentLayerDelegate(this));
|
| + m_layer = wrapUnique(Platform::current()->compositorSupport()->createContentLayer(m_contentLayerDelegate.get()));
|
| m_layer->layer()->setDrawsContent(m_drawsContent && m_contentsVisible);
|
| m_layer->layer()->setLayerClient(this);
|
| }
|
| @@ -1155,7 +1157,7 @@ void GraphicsLayer::setContentsToImage(Image* image, RespectImageOrientationEnum
|
|
|
| if (image && skImage) {
|
| if (!m_imageLayer) {
|
| - m_imageLayer = adoptPtr(Platform::current()->compositorSupport()->createImageLayer());
|
| + m_imageLayer = wrapUnique(Platform::current()->compositorSupport()->createImageLayer());
|
| registerContentsLayer(m_imageLayer->layer());
|
| }
|
| m_imageLayer->setImage(skImage.get());
|
| @@ -1178,14 +1180,14 @@ WebLayer* GraphicsLayer::platformLayer() const
|
|
|
| void GraphicsLayer::setFilters(const FilterOperations& filters)
|
| {
|
| - OwnPtr<CompositorFilterOperations> compositorFilters = CompositorFilterOperations::create();
|
| + std::unique_ptr<CompositorFilterOperations> compositorFilters = CompositorFilterOperations::create();
|
| SkiaImageFilterBuilder::buildFilterOperations(filters, compositorFilters.get());
|
| m_layer->layer()->setFilters(compositorFilters->asFilterOperations());
|
| }
|
|
|
| void GraphicsLayer::setBackdropFilters(const FilterOperations& filters)
|
| {
|
| - OwnPtr<CompositorFilterOperations> compositorFilters = CompositorFilterOperations::create();
|
| + std::unique_ptr<CompositorFilterOperations> compositorFilters = CompositorFilterOperations::create();
|
| SkiaImageFilterBuilder::buildFilterOperations(filters, compositorFilters.get());
|
| m_layer->layer()->setBackgroundFilters(compositorFilters->asFilterOperations());
|
| }
|
|
|