Remove ColorBehavior argument to Image::imageForCurrentFrame

third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. 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.
@@ skipping 500 matching lines @@
     }
   }
 
   if (listenerNeedsNewFrameCapture) {
     SourceImageStatus status;
     RefPtr<Image> sourceImage = getSourceImageForCanvas(
         &status, PreferNoAcceleration, SnapshotReasonCanvasListenerCapture,
         FloatSize());
     if (status != NormalSourceImageStatus)
       return;
-    // TODO(ccameron): Canvas should produce sRGB images.
-    // https://crbug.com/672299
-    sk_sp<SkImage> image = sourceImage->imageForCurrentFrame(
-        ColorBehavior::transformToGlobalTarget());
+    sk_sp<SkImage> image = sourceImage->imageForCurrentFrame();
     for (CanvasDrawListener* listener : m_listeners) {
       if (listener->needsNewFrame()) {
         listener->sendNewFrame(image);
       }
     }
   }
 }
 
 void HTMLCanvasElement::paint(GraphicsContext& context, const LayoutRect& r) {
   // FIXME: crbug.com/438240; there is a bug with the new CSS blending and
@@ skipping 110 matching lines @@
 
   if ((!m_context || !imageData) && !placeholderFrame())
     return imageData;
 
   DCHECK((m_context && m_context->is2d()) || placeholderFrame());
   sk_sp<SkImage> snapshot;
   if (hasImageBuffer()) {
     snapshot = buffer()->newSkImageSnapshot(PreferNoAcceleration, reason);
   } else if (placeholderFrame()) {
     DCHECK(placeholderFrame()->originClean());
-    // TODO(ccameron): Canvas should produce sRGB images.
-    // https://crbug.com/672299
-    snapshot = placeholderFrame()->imageForCurrentFrame(
-        ColorBehavior::transformToGlobalTarget());
+    snapshot = placeholderFrame()->imageForCurrentFrame();
   }
 
   if (snapshot) {
     SkImageInfo imageInfo = SkImageInfo::Make(
         width(), height(), kRGBA_8888_SkColorType, kUnpremul_SkAlphaType);
     snapshot->readPixels(imageInfo, imageData->data()->data(),
                          imageInfo.minRowBytes(), 0, 0);
   }
 
   return imageData;
@@ skipping 611 matching lines @@
   } else {
     if (ExpensiveCanvasHeuristicParameters::
             DisableAccelerationToAvoidReadbacks &&
         !RuntimeEnabledFeatures::canvas2dFixedRenderingModeEnabled() &&
         hint == PreferNoAcceleration && m_context->isAccelerated() &&
         hasImageBuffer()) {
       buffer()->disableAcceleration();
     }
     RefPtr<Image> image = renderingContext()->getImage(hint, reason);
     if (image) {
-      skImage =
-          image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget());
+      skImage = image->imageForCurrentFrame();
     } else {
       skImage = createTransparentSkImage(size());
     }
   }
 
   if (skImage) {
     *status = NormalSourceImageStatus;
     return StaticBitmapImage::create(std::move(skImage));
   }
 
@@ skipping 154 matching lines @@
     // Creates a placeholder layer first before Surface is created.
     m_surfaceLayerBridge->createSolidColorLayer();
   }
 }
 
 void HTMLCanvasElement::OnWebLayerReplaced() {
   setNeedsCompositingUpdate();
 }
 
 }  // namespace blink