Add ColorBehavior to blink::Image draw methods

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 246 matching lines @@
 String BitmapImage::filenameExtension() const {
   return m_source.filenameExtension();
 }
 
 void BitmapImage::draw(
     SkCanvas* canvas,
     const SkPaint& paint,
     const FloatRect& dstRect,
     const FloatRect& srcRect,
     RespectImageOrientationEnum shouldRespectImageOrientation,
-    ImageClampingMode clampMode) {
+    ImageClampingMode clampMode,
+    const ColorBehavior& colorBehavior) {
   TRACE_EVENT0("skia", "BitmapImage::draw");
 
-  sk_sp<SkImage> image = imageForCurrentFrame();
+  sk_sp<SkImage> image = imageForCurrentFrame(colorBehavior);
   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 82 matching lines @@
   return m_source.frameIsCompleteAtIndex(index);
 }
 
 float BitmapImage::frameDurationAtIndex(size_t index) const {
   if (index < m_frames.size() && m_frames[index].m_haveMetadata)
     return m_frames[index].m_duration;
 
   return m_source.frameDurationAtIndex(index);
 }
 
-sk_sp<SkImage> BitmapImage::imageForCurrentFrame() {
-  // TODO(ccameron): Allow the caller of imageForCurrentFrame to specify the
-  // the desired ColorBehavior.
-  // https://crbug.com/667420
-  const ColorBehavior& colorBehavior = m_cachedFrameColorBehavior;
+sk_sp<SkImage> BitmapImage::imageForCurrentFrame(
+    const ColorBehavior& colorBehavior) {
   return frameAtIndex(currentFrame(), colorBehavior);
 }
 
 PassRefPtr<Image> BitmapImage::imageForDefaultFrame() {
   // TODO(ccameron): Determine the appropriate ColorBehavior for this situation.
   // https://crbug.com/667420
   const ColorBehavior& colorBehavior = m_cachedFrameColorBehavior;
   if (frameCount() > 1) {
     sk_sp<SkImage> firstFrame = frameAtIndex(0, colorBehavior);
     if (firstFrame)
@@ skipping 265 matching lines @@
     getImageObserver()->animationAdvanced(this);
 
   return true;
 }
 
 void BitmapImage::notifyObserversOfAnimationAdvance(TimerBase*) {
   getImageObserver()->animationAdvanced(this);
 }
 
 }  // namespace blink