Use gfx::ColorSpace instead of SkColorSpace in 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 "cc/resources/texture_mailbox.h"
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/ImageBufferSurface.h"
 #include "platform/graphics/paint/PaintRecorder.h"
 #include "platform/graphics/paint/PaintSurface.h"
 #include "public/platform/WebExternalTextureLayer.h"
 #include "public/platform/WebThread.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
+#include "ui/gfx/color_space.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>
 
 class SkImage;
 struct SkImageInfo;
 
 namespace gpu {
 namespace gles2 {
 class GLES2Interface;
 }
 }
@@ skipping 31 matching lines @@
     DisableAcceleration,
     EnableAcceleration,
     ForceAccelerationForTesting,
   };
 
   Canvas2DLayerBridge(std::unique_ptr<WebGraphicsContext3DProvider>,
                       const IntSize&,
                       int msaaSampleCount,
                       OpacityMode,
                       AccelerationMode,
-                      sk_sp<SkColorSpace>,
+                      const gfx::ColorSpace&,
+                      bool skSurfacesUseColorSpace,
                       SkColorType);
 
   ~Canvas2DLayerBridge() override;
 
   // cc::TextureLayerClient implementation.
   bool PrepareTextureMailbox(
       cc::TextureMailbox* outMailbox,
       std::unique_ptr<cc::SingleReleaseCallback>* outReleaseCallback) override;
 
   // Callback for mailboxes given to the compositor from PrepareTextureMailbox.
@@ skipping 26 matching lines @@
   void prepareSurfaceForPaintingIfNeeded();
   bool isHidden() { return m_isHidden; }
   OpacityMode opacityMode() { return m_opacityMode; }
   void dontUseIdleSchedulingForTesting() {
     m_dontUseIdleSchedulingForTesting = true;
   }
 
   void beginDestruction();
   void hibernate();
   bool isHibernating() const { return m_hibernationImage.get(); }
-  sk_sp<SkColorSpace> colorSpace() const { return m_colorSpace; }
+  sk_sp<SkColorSpace> skSurfaceColorSpace() const;
   SkColorType colorType() const { return m_colorType; }
 
   bool hasRecordedDrawCommands() { return m_haveRecordedDrawCommands; }
 
   sk_sp<SkImage> newImageSnapshot(AccelerationHint, SnapshotReason);
 
   // The values of the enum entries must not change because they are used for
   // usage metrics histograms. New values can be added to the end.
   enum HibernationEvent {
     HibernationScheduled = 0,
@@ skipping 127 matching lines @@
     // but sometimes we may have three due to the async nature of mailbox
     // handling.
     MaxActiveMailboxes = 3,
   };
 
   Deque<MailboxInfo, MaxActiveMailboxes> m_mailboxes;
   GLenum m_lastFilter;
   AccelerationMode m_accelerationMode;
   OpacityMode m_opacityMode;
   const IntSize m_size;
-  sk_sp<SkColorSpace> m_colorSpace;
+  // The color space that the compositor is to use. This will always be
+  // defined.
+  gfx::ColorSpace m_colorSpace;
+  bool m_skSurfacesUseColorSpace = false;
   SkColorType m_colorType;
   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<RefPtr<ImageInfo>> m_imageInfoCache;
 #endif  // USE_IOSURFACE_FOR_2D_CANVAS
 };
 
 }  // namespace blink
 
 #endif