color: Set GpuMemoryBuffer color spaces for Canvas

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 141 matching lines @@
         virtual void reportHibernationEvent(HibernationEvent);
         virtual void didStartHibernating() { }
         virtual ~Logger() { }
     };
 
     void setLoggerForTesting(std::unique_ptr<Logger>);
 
 private:
 #if USE_IOSURFACE_FOR_2D_CANVAS
     // All information associated with a CHROMIUM image.
-    struct ImageInfo {
-        ImageInfo() {}
-        ImageInfo(GLuint imageId, GLuint textureId);
-
-        // Whether this structure holds references to a CHROMIUM image.
-        bool empty();
-
-        // The id of the CHROMIUM image.
-        GLuint m_imageId = 0;
-
-        // The id of the texture bound to the CHROMIUM image.
-        GLuint m_textureId = 0;
-    };
+    struct ImageInfo;
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 
     struct MailboxInfo {
         DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
         gpu::Mailbox m_mailbox;
         sk_sp<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;
+        RefPtr<ImageInfo> m_imageInfo;

[ccameron, 2016/09/27 19:53:14]

This could reasonably be expected to be a std::unique_ptr, but that will involve
refactoring all instances of MailboxInfo to also be move-correct (and likely
std::unique_ptr as well).

 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 
         MailboxInfo(const MailboxInfo&);
         MailboxInfo();
     };
 
     gpu::gles2::GLES2Interface* contextGL();
     void startRecording();
     void skipQueuedDrawCommands();
     void flushRecordingOnly();
@@ skipping 13 matching lines @@
 #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*, 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();
+    RefPtr<ImageInfo> createIOSurfaceBackedTexture();
 
     // Releases all resources associated with a CHROMIUM image.
-    void deleteCHROMIUMImage(ImageInfo);
+    void deleteCHROMIUMImage(RefPtr<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.
@@ skipping 43 matching lines @@
     AccelerationMode m_accelerationMode;
     OpacityMode m_opacityMode;
     const IntSize m_size;
     sk_sp<SkColorSpace> m_colorSpace;
     int m_recordingPixelCount;
 
 #if USE_IOSURFACE_FOR_2D_CANVAS
     // 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;
+    Vector<RefPtr<ImageInfo>> m_imageInfoCache;
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 };
 
 } // namespace blink
 
 #endif