Fix the linear-rgb canvas color space so that it renders

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 77 matching lines @@
     DisableAcceleration,
     EnableAcceleration,
     ForceAccelerationForTesting,
   };
 
   Canvas2DLayerBridge(std::unique_ptr<WebGraphicsContext3DProvider>,
                       const IntSize&,
                       int msaaSampleCount,
                       OpacityMode,
                       AccelerationMode,
-                      sk_sp<SkColorSpace>);
+                      sk_sp<SkColorSpace>,
+                      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.
   void mailboxReleased(const gpu::Mailbox&,
@@ skipping 26 matching lines @@
   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; }
+  SkColorType colorType() const { return m_colorType; }

[xidachen, 2016/10/18 15:40:37]

I think we should be consistent here. Either call is colorSpace() and
colorType(), or skColorSpace() and skColorType(), to match the CRC class.

 
   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,
     HibernationAbortedDueToDestructionWhileHibernatePending = 1,
     HibernationAbortedDueToPendingDestruction = 2,
     HibernationAbortedDueToVisibilityChange = 3,
@@ skipping 123 matching lines @@
     // 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;
+  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