Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.h

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/GraphicsTypes3D.h"
 #include "platform/graphics/gpu/WebGLImageConversion.h"
 #include "public/platform/WebExternalTextureLayerClient.h"
 #include "public/platform/WebExternalTextureMailbox.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #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 {
 class GLES2Interface;
 }
 }
 
 namespace WTF {
 class ArrayBufferContents;
 }
@@ skipping 11 matching lines @@
 // results to a WebLayer for compositing.
 class PLATFORM_EXPORT DrawingBuffer : public RefCounted<DrawingBuffer>, public WebExternalTextureLayerClient  {
     WTF_MAKE_NONCOPYABLE(DrawingBuffer);
 public:
     enum PreserveDrawingBuffer {
         Preserve,
         Discard
     };
 
     static PassRefPtr<DrawingBuffer> create(
-        std::unique_ptr<WebGraphicsContext3DProvider>,
+        PassOwnPtr<WebGraphicsContext3DProvider>,
         const IntSize&,
         bool premultipliedAlpha,
         bool wantAlphaChannel,
         bool wantDepthBuffer,
         bool wantStencilBuffer,
         bool wantAntialiasing,
         PreserveDrawingBuffer);
     static void forceNextDrawingBufferCreationToFail();
 
     ~DrawingBuffer() override;
@@ skipping 126 matching lines @@
     // Bind to m_drawFramebufferBinding or m_readFramebufferBinding if it's not 0.
     // Otherwise, bind to the default FBO.
     void restoreFramebufferBindings();
 
     void restoreTextureBindings();
 
     void addNewMailboxCallback(std::unique_ptr<SameThreadClosure> closure) { m_newMailboxCallback = std::move(closure); }
 
 protected: // For unittests
     DrawingBuffer(
-        std::unique_ptr<WebGraphicsContext3DProvider>,
-        std::unique_ptr<Extensions3DUtil>,
+        PassOwnPtr<WebGraphicsContext3DProvider>,
+        PassOwnPtr<Extensions3DUtil>,
         bool discardFramebufferSupported,
         bool wantAlphaChannel,
         bool premultipliedAlpha,
         PreserveDrawingBuffer,
         bool wantsDepth,
         bool wantsStencil);
 
     bool initialize(const IntSize&, bool useMultisampling);
 
 private:
@@ skipping 124 matching lines @@
     const PreserveDrawingBuffer m_preserveDrawingBuffer;
     bool m_scissorEnabled = false;
     GLuint m_texture2DBinding = 0;
     GLuint m_drawFramebufferBinding = 0;
     GLuint m_readFramebufferBinding = 0;
     GLuint m_renderbufferBinding = 0;
     GLenum m_activeTextureUnit = GL_TEXTURE0;
     GLfloat m_clearColor[4];
     GLboolean m_colorMask[4];
 
-    std::unique_ptr<WebGraphicsContext3DProvider> m_contextProvider;
+    OwnPtr<WebGraphicsContext3DProvider> m_contextProvider;
     // Lifetime is tied to the m_contextProvider.
     gpu::gles2::GLES2Interface* m_gl;
-    std::unique_ptr<Extensions3DUtil> m_extensionsUtil;
+    OwnPtr<Extensions3DUtil> m_extensionsUtil;
     IntSize m_size = { -1, -1 };
     const bool m_discardFramebufferSupported;
     const bool m_wantAlphaChannel;
     const bool m_premultipliedAlpha;
     bool m_hasImplicitStencilBuffer = false;
     struct FrontBufferInfo {
         TextureInfo texInfo;
         WebExternalTextureMailbox mailbox;
     };
     FrontBufferInfo m_frontColorBuffer;
@@ skipping 39 matching lines @@
 
     AntialiasingMode m_antiAliasingMode = None;
 
     int m_maxTextureSize = 0;
     int m_sampleCount = 0;
     int m_packAlignment = 4;
     bool m_destructionInProgress = false;
     bool m_isHidden = false;
     SkFilterQuality m_filterQuality = kLow_SkFilterQuality;
 
-    std::unique_ptr<WebExternalTextureLayer> m_layer;
+    OwnPtr<WebExternalTextureLayer> m_layer;
 
     // All of the mailboxes that this DrawingBuffer has ever created.
     Vector<RefPtr<MailboxInfo>> m_textureMailboxes;
     // Mailboxes that were released by the compositor can be used again by this DrawingBuffer.
     Deque<WebExternalTextureMailbox> m_recycledMailboxQueue;
 
     // If the width and height of the Canvas's backing store don't
     // match those that we were given in the most recent call to
     // reshape(), then we need an intermediate bitmap to read back the
     // frame buffer into. This seems to happen when CSS styles are
     // used to resize the Canvas.
     SkBitmap m_resizingBitmap;
 
     // Used to flip a bitmap vertically.
     Vector<uint8_t> m_scanline;
 };
 
 } // namespace blink
 
 #endif // DrawingBuffer_h