Index: third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.h |
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.h b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.h |
index b0a31dfd4fac4507089b22facb285866e845287b..da8806472caa181eed605e3fe078e6c170c49f7c 100644 |
--- a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.h |
+++ b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.h |
@@ -41,9 +41,8 @@ |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "wtf/Deque.h" |
#include "wtf/Noncopyable.h" |
-#include "wtf/OwnPtr.h" |
-#include "wtf/PassOwnPtr.h" |
#include "wtf/RefCounted.h" |
+#include <memory> |
namespace gpu { |
namespace gles2 { |
@@ -75,7 +74,7 @@ public: |
}; |
static PassRefPtr<DrawingBuffer> create( |
- PassOwnPtr<WebGraphicsContext3DProvider>, |
+ std::unique_ptr<WebGraphicsContext3DProvider>, |
const IntSize&, |
bool premultipliedAlpha, |
bool wantAlphaChannel, |
@@ -222,8 +221,8 @@ public: |
protected: // For unittests |
DrawingBuffer( |
- PassOwnPtr<WebGraphicsContext3DProvider>, |
- PassOwnPtr<Extensions3DUtil>, |
+ std::unique_ptr<WebGraphicsContext3DProvider>, |
+ std::unique_ptr<Extensions3DUtil>, |
bool discardFramebufferSupported, |
bool wantAlphaChannel, |
bool premultipliedAlpha, |
@@ -368,10 +367,10 @@ private: |
GLfloat m_clearColor[4]; |
GLboolean m_colorMask[4]; |
- OwnPtr<WebGraphicsContext3DProvider> m_contextProvider; |
+ std::unique_ptr<WebGraphicsContext3DProvider> m_contextProvider; |
// Lifetime is tied to the m_contextProvider. |
gpu::gles2::GLES2Interface* m_gl; |
- OwnPtr<Extensions3DUtil> m_extensionsUtil; |
+ std::unique_ptr<Extensions3DUtil> m_extensionsUtil; |
IntSize m_size = { -1, -1 }; |
const bool m_discardFramebufferSupported; |
const bool m_wantAlphaChannel; |
@@ -431,7 +430,7 @@ private: |
bool m_isHidden = false; |
SkFilterQuality m_filterQuality = kLow_SkFilterQuality; |
- OwnPtr<WebExternalTextureLayer> m_layer; |
+ std::unique_ptr<WebExternalTextureLayer> m_layer; |
// All of the mailboxes that this DrawingBuffer has ever created. |
Vector<RefPtr<MailboxInfo>> m_textureMailboxes; |