Make DrawingBuffer and Canvas2DLayerBridge be cc::TextureLayerClients.

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
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef Canvas2DLayerBridge_h
 #define Canvas2DLayerBridge_h
 
+#include "cc/layers/texture_layer_client.h"
+#include "cc/resources/texture_mailbox.h"
 #include "platform/PlatformExport.h"
 #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/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/WeakPtr.h"
 #include <memory>
@@ skipping 24 matching lines @@
 // IOSurfaces are a primitive only present on OS X.
 #define USE_IOSURFACE_FOR_2D_CANVAS 1
 #else
 #define CANVAS2D_HIBERNATION_ENABLED 1
 #define USE_IOSURFACE_FOR_2D_CANVAS 0
 #endif
 
 // TODO: Fix background rendering and remove this workaround. crbug.com/600386
 #define CANVAS2D_BACKGROUND_RENDER_SWITCH_TO_CPU 0
 
-class PLATFORM_EXPORT Canvas2DLayerBridge : public WebExternalTextureLayerClient, public WebThread::TaskObserver, public RefCounted<Canvas2DLayerBridge> {
+class PLATFORM_EXPORT Canvas2DLayerBridge : public NON_EXPORTED_BASE(cc::TextureLayerClient), public WebThread::TaskObserver, public RefCounted<Canvas2DLayerBridge> {
     WTF_MAKE_NONCOPYABLE(Canvas2DLayerBridge);
 public:
     enum AccelerationMode {
         DisableAcceleration,
         EnableAcceleration,
         ForceAccelerationForTesting,
     };
 
     static PassRefPtr<Canvas2DLayerBridge> create(const IntSize&, int msaaSampleCount, OpacityMode, AccelerationMode);
 
     ~Canvas2DLayerBridge() override;
 
-    // WebExternalTextureLayerClient implementation.
-    bool prepareMailbox(WebExternalTextureMailbox*, WebExternalBitmap*) override;
-    void mailboxReleased(const WebExternalTextureMailbox&, bool lostResource) override;
+    // cc::TextureLayerClient implementation.
+    bool PrepareTextureMailbox(
+        cc::TextureMailbox* outMailbox,
+        std::unique_ptr<cc::SingleReleaseCallback>* outReleaseCallback,
+        bool useSharedMemory) override;
+
+    // Callback for mailboxes given to the compositor from PrepareTextureMailbox.
+    void mailboxReleased(const gpu::Mailbox&, const gpu::SyncToken&,
+        bool lostResource);
 
     // ImageBufferSurface implementation
     void finalizeFrame(const FloatRect &dirtyRect);
     void willWritePixels();
     void willOverwriteAllPixels();
     void willOverwriteCanvas();
     SkCanvas* canvas();
     void disableDeferral(DisableDeferralReason);
     bool checkSurfaceValid();
     bool restoreSurface();
@@ skipping 57 matching lines @@
         // The id of the CHROMIUM image.
         GLuint m_imageId = 0;
 
         // The id of the texture bound to the CHROMIUM image.
         GLuint m_textureId = 0;
     };
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 
     struct MailboxInfo {
         DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
-        WebExternalTextureMailbox m_mailbox;
+        gpu::Mailbox m_mailbox;
         RefPtr<SkImage> m_image;
         RefPtr<Canvas2DLayerBridge> m_parentLayerBridge;
 
 #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() {}
+        MailboxInfo();
     };
 
     Canvas2DLayerBridge(std::unique_ptr<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;
 
     SkSurface* getOrCreateSurface(AccelerationHint = PreferAcceleration);
     bool shouldAccelerate(AccelerationHint) const;
 
     // Returns the GL filter associated with |m_filterQuality|.
     GLenum getGLFilter();
 
 #if USE_IOSURFACE_FOR_2D_CANVAS
     // Creates an IOSurface-backed texture. Copies |image| into the texture.
     // Prepares a mailbox from the texture. The caller must have created a new
     // MailboxInfo, and prepended it to |m_mailboxs|. Returns whether the
     // mailbox was successfully prepared. |mailbox| is an out parameter only
     // populated on success.
-    bool prepareIOSurfaceMailboxFromImage(SkImage*, WebExternalTextureMailbox*);
+    bool prepareIOSurfaceMailboxFromImage(SkImage*, cc::TextureMailbox*);
 
     // Creates an IOSurface-backed texture. Returns an ImageInfo, which is empty
     // on failure. The caller takes ownership of both the texture and the image.
     ImageInfo createIOSurfaceBackedTexture();
 
     // Releases all resources associated with a CHROMIUM image.
     void deleteCHROMIUMImage(ImageInfo);
 
     // Releases all resources in the CHROMIUM image cache.
     void clearCHROMIUMImageCache();
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 
     // Prepends a new MailboxInfo object to |m_mailboxes|.
     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*);
+    bool prepareMailboxFromImage(PassRefPtr<SkImage>, cc::TextureMailbox*);
 
     // Resets Skia's texture bindings. This method should be called after
     // changing texture bindings.
     void resetSkiaTextureBinding();
 
     std::unique_ptr<SkPictureRecorder> m_recorder;
     RefPtr<SkSurface> m_surface;
     RefPtr<SkImage> m_hibernationImage;
     int m_initialSurfaceSaveCount;
     std::unique_ptr<WebExternalTextureLayer> m_layer;
@@ skipping 38 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