Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.h

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 19 matching lines @@
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/ImageBufferSurface.h"
 #include "public/platform/WebExternalTextureLayer.h"
 #include "public/platform/WebExternalTextureLayerClient.h"
 #include "public/platform/WebExternalTextureMailbox.h"
 #include "public/platform/WebThread.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "wtf/Allocator.h"
 #include "wtf/Deque.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/WeakPtr.h"
-#include <memory>
 
 class SkImage;
 struct SkImageInfo;
 class SkPictureRecorder;
 
 namespace gpu {
 namespace gles2 {
 class GLES2Interface;
 }
 }
@@ skipping 84 matching lines @@
         HibernationEventCount = 12,
     };
 
     class PLATFORM_EXPORT Logger {
     public:
         virtual void reportHibernationEvent(HibernationEvent);
         virtual void didStartHibernating() { }
         virtual ~Logger() { }
     };
 
-    void setLoggerForTesting(std::unique_ptr<Logger>);
+    void setLoggerForTesting(PassOwnPtr<Logger>);
 
 private:
 #if USE_IOSURFACE_FOR_2D_CANVAS
     // All information associated with a CHROMIUM image.
     struct ImageInfo {
         ImageInfo() {}
         ImageInfo(GLuint imageId, GLuint textureId, GLint gpuMemoryBufferId);
 
         // Whether this structure holds references to a CHROMIUM image.
         bool empty();
@@ skipping 18 matching lines @@
 #if USE_IOSURFACE_FOR_2D_CANVAS
         // If this mailbox wraps an IOSurface-backed texture, the ids of the
         // CHROMIUM image and the texture.
         ImageInfo m_imageInfo;
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 
         MailboxInfo(const MailboxInfo&);
         MailboxInfo() {}
     };
 
-    Canvas2DLayerBridge(std::unique_ptr<WebGraphicsContext3DProvider>, const IntSize&, int msaaSampleCount, OpacityMode, AccelerationMode);
+    Canvas2DLayerBridge(PassOwnPtr<WebGraphicsContext3DProvider>, const IntSize&, int msaaSampleCount, OpacityMode, AccelerationMode);
     gpu::gles2::GLES2Interface* contextGL();
     void startRecording();
     void skipQueuedDrawCommands();
     void flushRecordingOnly();
     void unregisterTaskObserver();
     void reportSurfaceCreationFailure();
 
     // WebThread::TaskOberver implementation
     void willProcessTask() override;
     void didProcessTask() override;
@@ skipping 27 matching lines @@
     void createMailboxInfo();
 
     // Returns whether the mailbox was successfully prepared from the SkImage.
     // The mailbox is an out parameter only populated on success.
     bool prepareMailboxFromImage(PassRefPtr<SkImage>, WebExternalTextureMailbox*);
 
     // Resets Skia's texture bindings. This method should be called after
     // changing texture bindings.
     void resetSkiaTextureBinding();
 
-    std::unique_ptr<SkPictureRecorder> m_recorder;
+    OwnPtr<SkPictureRecorder> m_recorder;
     RefPtr<SkSurface> m_surface;
     RefPtr<SkImage> m_hibernationImage;
     int m_initialSurfaceSaveCount;
-    std::unique_ptr<WebExternalTextureLayer> m_layer;
-    std::unique_ptr<WebGraphicsContext3DProvider> m_contextProvider;
-    std::unique_ptr<SharedContextRateLimiter> m_rateLimiter;
-    std::unique_ptr<Logger> m_logger;
+    OwnPtr<WebExternalTextureLayer> m_layer;
+    OwnPtr<WebGraphicsContext3DProvider> m_contextProvider;
+    OwnPtr<SharedContextRateLimiter> m_rateLimiter;
+    OwnPtr<Logger> m_logger;
     WeakPtrFactory<Canvas2DLayerBridge> m_weakPtrFactory;
     ImageBuffer* m_imageBuffer;
     int m_msaaSampleCount;
     size_t m_bytesAllocated;
     bool m_haveRecordedDrawCommands;
     bool m_destructionInProgress;
     SkFilterQuality m_filterQuality;
     bool m_isHidden;
     bool m_isDeferralEnabled;
     bool m_isRegisteredTaskObserver;
@@ skipping 23 matching lines @@
     // Each element in this vector represents an IOSurface backed texture that
     // is ready to be reused.
     // Elements in this vector can safely be purged in low memory conditions.
     Vector<ImageInfo> m_imageInfoCache;
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 };
 
 } // namespace blink
 
 #endif