Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1261)

Unified Diff: third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from Kent; merge. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d5345355ef7734d59a371a7860b6dfd4e765c0b9..e6b90684cce12f9320106a509392ebea4048cf8d 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;
@@ -359,8 +358,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,
@@ -370,13 +369,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;

Powered by Google App Engine
This is Rietveld 408576698