Remove color correct rendering flag

This is always on now

R=dcheng (ipc)
TBR=hubbe

Bug: 759215
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I5fa39ba61eae96658fed55a3b38d102a163ebd08
Reviewed-on: https://chromium-review.googlesource.com/695907
Commit-Queue: ccameron chromium <ccameron@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506061}

cc/resources/display_resource_provider.cc

@@ -19,13 +19,11 @@ DisplayResourceProvider::DisplayResourceProvider(
     viz::SharedBitmapManager* shared_bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     bool delegated_sync_points_required,
-    bool enable_color_correct_rasterization,
     const viz::ResourceSettings& resource_settings)
     : ResourceProvider(compositor_context_provider,
                        shared_bitmap_manager,
                        gpu_memory_buffer_manager,
                        delegated_sync_points_required,
-                       enable_color_correct_rasterization,
                        resource_settings) {}
 
 DisplayResourceProvider::~DisplayResourceProvider() {

cc/resources/display_resource_provider.h

@@ -24,7 +24,6 @@ class CC_EXPORT DisplayResourceProvider : public ResourceProvider {
       viz::SharedBitmapManager* shared_bitmap_manager,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       bool delegated_sync_points_required,
-      bool enable_color_correct_rasterization,
       const viz::ResourceSettings& resource_settings);
   ~DisplayResourceProvider() override;
 

cc/resources/layer_tree_resource_provider.cc

@@ -19,13 +19,11 @@ LayerTreeResourceProvider::LayerTreeResourceProvider(
     viz::SharedBitmapManager* shared_bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     bool delegated_sync_points_required,
-    bool enable_color_correct_rasterization,
     const viz::ResourceSettings& resource_settings)
     : ResourceProvider(compositor_context_provider,
                        shared_bitmap_manager,
                        gpu_memory_buffer_manager,
                        delegated_sync_points_required,
-                       enable_color_correct_rasterization,
                        resource_settings) {}
 
 LayerTreeResourceProvider::~LayerTreeResourceProvider() {}

cc/resources/layer_tree_resource_provider.h

@@ -22,7 +22,6 @@ class CC_EXPORT LayerTreeResourceProvider : public ResourceProvider {
       viz::SharedBitmapManager* shared_bitmap_manager,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       bool delegated_sync_points_required,
-      bool enable_color_correct_rasterization,
       const viz::ResourceSettings& resource_settings);
   ~LayerTreeResourceProvider() override;
 
@@ -54,8 +53,6 @@ class CC_EXPORT LayerTreeResourceProvider : public ResourceProvider {
                                    viz::ResourceId resource_id);
     ~ScopedWriteLockGpuMemoryBuffer();
     gfx::GpuMemoryBuffer* GetGpuMemoryBuffer();
-    // Will return the invalid color space unless
-    // |enable_color_correct_rasterization| is true.
     const gfx::ColorSpace& color_space_for_raster() const {
       return color_space_;
     }

cc/resources/resource_provider.cc

@@ -334,15 +334,13 @@ void ResourceProvider::Resource::SetGenerateMipmap() {
 ResourceProvider::Settings::Settings(
     viz::ContextProvider* compositor_context_provider,
     bool delegated_sync_points_required,
-    bool enable_color_correct_rasterization,
     const viz::ResourceSettings& resource_settings)
     : default_resource_type(resource_settings.use_gpu_memory_buffer_resources
                                 ? RESOURCE_TYPE_GPU_MEMORY_BUFFER
                                 : RESOURCE_TYPE_GL_TEXTURE),
       yuv_highbit_resource_format(resource_settings.high_bit_for_testing
                                       ? viz::R16_EXT
                                       : viz::LUMINANCE_8),
-      enable_color_correct_rasterization(enable_color_correct_rasterization),
       delegated_sync_points_required(delegated_sync_points_required) {
   if (!compositor_context_provider) {
     default_resource_type = RESOURCE_TYPE_BITMAP;
@@ -385,11 +383,9 @@ ResourceProvider::ResourceProvider(
     viz::SharedBitmapManager* shared_bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     bool delegated_sync_points_required,
-    bool enable_color_correct_rasterization,
     const viz::ResourceSettings& resource_settings)
     : settings_(compositor_context_provider,
                 delegated_sync_points_required,
-                enable_color_correct_rasterization,
                 resource_settings),
       compositor_context_provider_(compositor_context_provider),
       shared_bitmap_manager_(shared_bitmap_manager),
@@ -820,8 +816,6 @@ ResourceProvider::TextureHint ResourceProvider::GetTextureHint(
 
 gfx::ColorSpace ResourceProvider::GetResourceColorSpaceForRaster(
     const Resource* resource) const {
-  if (!settings_.enable_color_correct_rasterization)
-    return gfx::ColorSpace();
   return resource->color_space;
 }
 

cc/resources/resource_provider.h

@@ -97,7 +97,6 @@ class CC_EXPORT ResourceProvider
                    viz::SharedBitmapManager* shared_bitmap_manager,
                    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
                    bool delegated_sync_points_required,
-                   bool enable_color_correct_rasterization,
                    const viz::ResourceSettings& resource_settings);
   ~ResourceProvider() override;
 
@@ -203,9 +202,6 @@ class CC_EXPORT ResourceProvider
     GLenum target() const { return target_; }
     viz::ResourceFormat format() const { return format_; }
     const gfx::Size& size() const { return size_; }
-
-    // Will return an invalid color space unless
-    // |enable_color_correct_rasterization| is true.
     const gfx::ColorSpace& color_space_for_raster() const {
       return color_space_;
     }
@@ -294,8 +290,6 @@ class CC_EXPORT ResourceProvider
 
     SkBitmap& sk_bitmap() { return sk_bitmap_; }
     bool valid() const { return !!sk_bitmap_.getPixels(); }
-    // Will return the invalid color space unless
-    // |enable_color_correct_rasterization| is true.
     const gfx::ColorSpace& color_space_for_raster() const {
       return color_space_;
     }
@@ -548,8 +542,6 @@ class CC_EXPORT ResourceProvider
                          GLenum unit,
                          GLenum filter);
 
-  // Will return the invalid color space unless
-  // |enable_color_correct_rasterization| is true.
   gfx::ColorSpace GetResourceColorSpaceForRaster(
       const Resource* resource) const;
 
@@ -573,7 +565,6 @@ class CC_EXPORT ResourceProvider
   struct Settings {
     Settings(viz::ContextProvider* compositor_context_provider,
              bool delegated_sync_points_needed,
-             bool enable_color_correct_rasterization,
              const viz::ResourceSettings& resource_settings);
 
     int max_texture_size = 0;
@@ -587,7 +578,6 @@ class CC_EXPORT ResourceProvider
     viz::ResourceFormat yuv_highbit_resource_format = viz::LUMINANCE_8;
     viz::ResourceFormat best_texture_format = viz::RGBA_8888;
     viz::ResourceFormat best_render_buffer_format = viz::RGBA_8888;
-    bool enable_color_correct_rasterization = false;
     bool delegated_sync_points_required = false;
   } const settings_;
 

cc/resources/resource_provider_unittest.cc

@@ -47,7 +47,6 @@ namespace cc {
 namespace {
 
 static const bool kUseGpuMemoryBufferResources = false;
-static const bool kEnableColorCorrectRendering = false;
 static const bool kDelegatedSyncPointsRequired = true;
 
 MATCHER_P(MatchesSyncToken, sync_token, "") {
@@ -459,11 +458,11 @@ class ResourceProviderTest
     resource_provider_ = std::make_unique<DisplayResourceProvider>(
         context_provider_.get(), shared_bitmap_manager_.get(),
         gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-        kEnableColorCorrectRendering, resource_settings);
+        resource_settings);
     child_resource_provider_ = std::make_unique<LayerTreeResourceProvider>(
         child_context_provider_.get(), shared_bitmap_manager_.get(),
         child_gpu_memory_buffer_manager_.get(), child_needs_sync_token,
-        kEnableColorCorrectRendering, resource_settings);
+        resource_settings);
   }
 
   ResourceProviderTest() : ResourceProviderTest(true) {}
@@ -1593,7 +1592,7 @@ TEST_P(ResourceProviderTest, TransferGLToSoftware) {
       std::make_unique<LayerTreeResourceProvider>(
           child_context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   gfx::Size size(1, 1);
   viz::ResourceFormat format = viz::RGBA_8888;
@@ -1865,8 +1864,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {
     std::unique_ptr<LayerTreeResourceProvider> child_resource_provider(
         std::make_unique<LayerTreeResourceProvider>(
             child_context_provider.get(), shared_bitmap_manager.get(), nullptr,
-            kDelegatedSyncPointsRequired, kEnableColorCorrectRendering,
-            resource_settings));
+            kDelegatedSyncPointsRequired, resource_settings));
 
     std::unique_ptr<TextureStateTrackingContext> parent_context_owned(
         new TextureStateTrackingContext);
@@ -1879,8 +1877,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {
     std::unique_ptr<DisplayResourceProvider> parent_resource_provider(
         std::make_unique<DisplayResourceProvider>(
             parent_context_provider.get(), shared_bitmap_manager.get(), nullptr,
-            kDelegatedSyncPointsRequired, kEnableColorCorrectRendering,
-            resource_settings));
+            kDelegatedSyncPointsRequired, resource_settings));
 
     gfx::Size size(1, 1);
     viz::ResourceFormat format = viz::RGBA_8888;
@@ -2334,7 +2331,7 @@ TEST_P(ResourceProviderTest, ScopedSampler) {
       std::make_unique<DisplayResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   gfx::Size size(1, 1);
   viz::ResourceFormat format = viz::RGBA_8888;
@@ -2411,7 +2408,7 @@ TEST_P(ResourceProviderTest, ManagedResource) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   gfx::Size size(1, 1);
   viz::ResourceFormat format = viz::RGBA_8888;
@@ -2452,7 +2449,7 @@ TEST_P(ResourceProviderTest, TextureWrapMode) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   gfx::Size size(1, 1);
   viz::ResourceFormat format = viz::RGBA_8888;
@@ -2495,7 +2492,7 @@ TEST_P(ResourceProviderTest, TextureHint) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   gfx::Size size(1, 1);
   viz::ResourceFormat format = viz::RGBA_8888;
@@ -2548,7 +2545,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_SharedMemory) {
       std::make_unique<DisplayResourceProvider>(
           nullptr, shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   gpu::SyncToken release_sync_token;
   bool lost_resource = false;
@@ -2594,7 +2591,7 @@ class ResourceProviderTestTextureMailboxGLFilters
         std::make_unique<DisplayResourceProvider>(
             context_provider.get(), shared_bitmap_manager,
             gpu_memory_buffer_manager, kDelegatedSyncPointsRequired,
-            kEnableColorCorrectRendering, CreateResourceSettings()));
+            CreateResourceSettings()));
 
     unsigned texture_id = 1;
     gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
@@ -2730,7 +2727,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) {
       std::make_unique<DisplayResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
                             gpu::CommandBufferId::FromUnsafeValue(0x12), 0x34);
@@ -2798,7 +2795,7 @@ TEST_P(ResourceProviderTest,
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
                             gpu::CommandBufferId::FromUnsafeValue(0x12), 0x34);
@@ -2852,7 +2849,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_WaitSyncTokenIfNeeded_NoSyncToken) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   gpu::SyncToken sync_token;
   const GLuint64 current_fence_sync = context->GetNextFenceSync();
@@ -2900,7 +2897,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_PrepareSendToParent_NoSyncToken) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   EXPECT_CALL(*context, bindTexture(_, _)).Times(0);
   EXPECT_CALL(*context, waitSyncToken(_)).Times(0);
@@ -3013,7 +3010,7 @@ TEST_P(ResourceProviderTest, TextureAllocation) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   gfx::Size size(2, 2);
   gfx::Vector2d offset(0, 0);
@@ -3109,7 +3106,7 @@ TEST_P(ResourceProviderTest, TextureAllocationHint) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   TestTextureAllocationHint(context_ptr, resource_provider.get());
 }
@@ -3134,7 +3131,7 @@ TEST_P(ResourceProviderTest, TextureAllocationHint_BGRA) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   TestTextureAllocationHint(context_ptr, resource_provider.get());
 }
@@ -3160,7 +3157,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   viz::ResourceId id = resource_provider->CreateGpuMemoryBufferResource(
       gfx::Size(kWidth, kHeight), ResourceProvider::TEXTURE_HINT_DEFAULT,
@@ -3215,7 +3212,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Allocate) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
   int texture_id = 123;
 
   viz::ResourceId id = resource_provider->CreateResource(
@@ -3246,7 +3243,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Upload) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
   int texture_id = 123;
   uint8_t pixels[8];
 
@@ -3300,7 +3297,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
     std::unique_ptr<LayerTreeResourceProvider> resource_provider(
         std::make_unique<LayerTreeResourceProvider>(
             context_provider.get(), shared_bitmap_manager.get(), nullptr,
-            kDelegatedSyncPointsRequired, kEnableColorCorrectRendering,
+            kDelegatedSyncPointsRequired,
             CreateResourceSettings(kTextureAllocationChunkSize)));
 
     viz::ResourceId id = resource_provider->CreateResource(
@@ -3318,7 +3315,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
     std::unique_ptr<LayerTreeResourceProvider> resource_provider(
         std::make_unique<LayerTreeResourceProvider>(
             context_provider.get(), shared_bitmap_manager.get(), nullptr,
-            kDelegatedSyncPointsRequired, kEnableColorCorrectRendering,
+            kDelegatedSyncPointsRequired,
             CreateResourceSettings(kTextureAllocationChunkSize)));
 
     viz::ResourceId id = resource_provider->CreateResource(
@@ -3380,7 +3377,7 @@ TEST_P(ResourceProviderTest, ScopedWriteLockGL) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   viz::ResourceId id = resource_provider->CreateResource(
       gfx::Size(kWidth, kHeight), ResourceProvider::TEXTURE_HINT_DEFAULT,
@@ -3429,7 +3426,7 @@ TEST_P(ResourceProviderTest, ScopedWriteLockGL_GpuMemoryBuffer) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   viz::ResourceId id = resource_provider->CreateGpuMemoryBufferResource(
       gfx::Size(kWidth, kHeight), ResourceProvider::TEXTURE_HINT_DEFAULT,
@@ -3481,7 +3478,7 @@ TEST_P(ResourceProviderTest, ScopedWriteLockGL_Mailbox) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   viz::ResourceId id = resource_provider->CreateResource(
       gfx::Size(kWidth, kHeight), ResourceProvider::TEXTURE_HINT_DEFAULT,
@@ -3565,7 +3562,7 @@ TEST_P(ResourceProviderTest, ScopedWriteLockGL_GpuMemoryBuffer_Mailbox) {
       std::make_unique<LayerTreeResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
           gpu_memory_buffer_manager_.get(), kDelegatedSyncPointsRequired,
-          kEnableColorCorrectRendering, CreateResourceSettings()));
+          CreateResourceSettings()));
 
   viz::ResourceId id = resource_provider->CreateGpuMemoryBufferResource(
       gfx::Size(kWidth, kHeight), ResourceProvider::TEXTURE_HINT_DEFAULT,