Raster: Allow a RasterSource to specify its color space

cc/raster/gpu_raster_buffer_provider.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/raster/gpu_raster_buffer_provider.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
@@ skipping 67 matching lines @@
   canvas->restore();
   return recorder.finishRecordingAsPicture();
 }
 
 static void RasterizePicture(SkPicture* picture,
                              ContextProvider* context_provider,
                              ResourceProvider::ScopedWriteLockGL* resource_lock,
                              bool async_worker_context_enabled,
                              bool use_distance_field_text,
                              bool can_use_lcd_text,
+                             bool ignore_resource_color_space,
                              int msaa_sample_count,
                              ImageDecodeController* image_decode_controller,
                              bool use_image_hijack_canvas) {
   ScopedGpuRaster gpu_raster(context_provider);
 
   ResourceProvider::ScopedSkSurfaceProvider scoped_surface(
       context_provider, resource_lock, async_worker_context_enabled,
-      use_distance_field_text, can_use_lcd_text, msaa_sample_count);
+      use_distance_field_text, can_use_lcd_text, ignore_resource_color_space,
+      msaa_sample_count);
   SkSurface* sk_surface = scoped_surface.sk_surface();
   // Allocating an SkSurface will fail after a lost context.  Pretend we
   // rasterized, as the contents of the resource don't matter anymore.
   if (!sk_surface)
     return;
 
   // As we did not use the image hijack canvas during the initial playback to
   // |picture| (see PlaybackToPicture), we must enable it here if requested.
   SkCanvas* canvas = sk_surface->getCanvas();
   std::unique_ptr<ImageHijackCanvas> hijack_canvas;
@@ skipping 157 matching lines @@
       raster_source, resource_has_previous_content, resource_lock->size(),
       raster_full_rect, raster_dirty_rect, scales, playback_settings);
 
   // Turn on distance fields for layers that have ever animated.
   bool use_distance_field_text =
       use_distance_field_text_ ||
       raster_source->ShouldAttemptToUseDistanceFieldText();
 
   RasterizePicture(picture.get(), worker_context_provider_, resource_lock,
                    async_worker_context_enabled_, use_distance_field_text,
-                   raster_source->CanUseLCDText(), msaa_sample_count_,
+                   raster_source->CanUseLCDText(),
+                   raster_source->HasImpliedColorSpace(), msaa_sample_count_,
                    raster_source->image_decode_controller(),
                    playback_settings.use_image_hijack_canvas);
 
   const uint64_t fence_sync = gl->InsertFenceSyncCHROMIUM();
 
   // Barrier to sync worker context output to cc context.
   gl->OrderingBarrierCHROMIUM();
 
   // Generate sync token after the barrier for cross context synchronization.
   gpu::SyncToken resource_sync_token;
   gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, resource_sync_token.GetData());
   resource_lock->set_sync_token(resource_sync_token);
   resource_lock->set_synchronized(!async_worker_context_enabled_);
 }
 
 }  // namespace cc