Add target color profile to BitmapImage::draw

third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple 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 112 matching lines @@
 }
 
 size_t BitmapImage::totalFrameBytes() {
   const size_t numFrames = frameCount();
   size_t totalBytes = 0;
   for (size_t i = 0; i < numFrames; ++i)
     totalBytes += m_source.frameBytesAtIndex(i);
   return totalBytes;
 }
 
-sk_sp<SkImage> BitmapImage::decodeAndCacheFrame(size_t index) {
+sk_sp<SkImage> BitmapImage::decodeAndCacheFrame(
+    size_t index,
+    sk_sp<SkColorSpace> targetColorSpace) {
   size_t numFrames = frameCount();
   if (m_frames.size() < numFrames)
     m_frames.grow(numFrames);
 
   // We are caching frame snapshots.  This is OK even for partially decoded
   // frames, as they are cleared by dataChanged() when new data arrives.
-  sk_sp<SkImage> image = m_source.createFrameAtIndex(index);
+  sk_sp<SkImage> image = m_source.createFrameAtIndex(index, targetColorSpace);
   m_cachedFrame = image;
   m_cachedFrameIndex = index;
+  m_cachedFrameColorSpace = std::move(targetColorSpace);
 
   m_frames[index].m_orientation = m_source.orientationAtIndex(index);
   m_frames[index].m_haveMetadata = true;
   m_frames[index].m_isComplete = m_source.frameIsCompleteAtIndex(index);
   if (repetitionCount(false) != cAnimationNone)
     m_frames[index].m_duration = m_source.frameDurationAtIndex(index);
   m_frames[index].m_hasAlpha = m_source.frameHasAlphaAtIndex(index);
   m_frames[index].m_frameBytes = m_source.frameBytesAtIndex(index);
 
   notifyMemoryChanged();
@@ skipping 86 matching lines @@
   return m_source.filenameExtension();
 }
 
 void BitmapImage::draw(
     SkCanvas* canvas,
     const SkPaint& paint,
     const FloatRect& dstRect,
     const FloatRect& srcRect,
     RespectImageOrientationEnum shouldRespectImageOrientation,
     ImageClampingMode clampMode) {
+  drawInColorSpace(canvas, paint, dstRect, srcRect,
+                   shouldRespectImageOrientation, clampMode, nullptr);
+}
+
+void BitmapImage::drawInColorSpace(
+    SkCanvas* canvas,
+    const SkPaint& paint,
+    const FloatRect& dstRect,
+    const FloatRect& srcRect,
+    RespectImageOrientationEnum shouldRespectImageOrientation,
+    ImageClampingMode clampMode,
+    sk_sp<SkColorSpace> targetColorSpace) {
   TRACE_EVENT0("skia", "BitmapImage::draw");
 
-  sk_sp<SkImage> image = imageForCurrentFrame();
+  sk_sp<SkImage> image = frameAtIndex(currentFrame(), targetColorSpace);
   if (!image)
     return;  // It's too early and we don't have an image yet.
 
   FloatRect adjustedSrcRect = srcRect;
   adjustedSrcRect.intersect(SkRect::Make(image->bounds()));
 
   if (adjustedSrcRect.isEmpty() || dstRect.isEmpty())
     return;  // Nothing to draw.
 
   ImageOrientation orientation = DefaultImageOrientation;
@@ skipping 55 matching lines @@
   if (m_sizeAvailable && hasVisibleImageSize(size())) {
     BitmapImageMetrics::countDecodedImageType(m_source.filenameExtension());
     if (m_source.filenameExtension() == "jpg")
       BitmapImageMetrics::countImageOrientation(
           m_source.orientationAtIndex(0).orientation());
   }
 
   return m_sizeAvailable;
 }
 
-sk_sp<SkImage> BitmapImage::frameAtIndex(size_t index) {
+sk_sp<SkImage> BitmapImage::frameAtIndex(size_t index,
+                                         sk_sp<SkColorSpace> targetColorSpace) {
   if (index >= frameCount())
     return nullptr;
 
-  if (index == m_cachedFrameIndex && m_cachedFrame)
+  // This should default to the global one with the mode off, otherwise
+  // default to sRGB.
+  if (!targetColorSpace)
+    targetColorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+
+  if (index == m_cachedFrameIndex && m_cachedFrame &&
+      SkColorSpace::Equals(targetColorSpace.get(),
+                           m_cachedFrameColorSpace.get()))
     return m_cachedFrame;
 
-  return decodeAndCacheFrame(index);
+  return decodeAndCacheFrame(index, targetColorSpace);
 }
 
 bool BitmapImage::frameIsCompleteAtIndex(size_t index) const {
   if (index < m_frames.size() && m_frames[index].m_haveMetadata &&
       m_frames[index].m_isComplete)
     return true;
 
   return m_source.frameIsCompleteAtIndex(index);
 }
 
@@ skipping 276 matching lines @@
     getImageObserver()->animationAdvanced(this);
 
   return true;
 }
 
 void BitmapImage::notifyObserversOfAnimationAdvance(TimerBase*) {
   getImageObserver()->animationAdvanced(this);
 }
 
 }  // namespace blink