[wip] image color correction

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 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/graphics/BitmapImage.h"
 
 #include "platform/Timer.h"
 #include "platform/TraceEvent.h"
 #include "platform/geometry/FloatRect.h"
+#include "platform/graphics/ColorSpaceFilter.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/skia/NativeImageSkia.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
@@ skipping 194 matching lines @@
     // Feed all the data we've seen so far to the image decoder.
     m_allDataReceived = allDataReceived;
     ASSERT(data());
     m_source.setData(*data(), allDataReceived);
 
     m_haveFrameCount = false;
     m_hasUniformFrameSize = true;
     return isSizeAvailable();
 }
 
-bool BitmapImage::isAllDataReceived() const
-{
-    return m_allDataReceived;
-}
-
-bool BitmapImage::hasColorProfile() const
-{
-    return m_source.hasColorProfile();
-}
-
 String BitmapImage::filenameExtension() const
 {
     return m_source.filenameExtension();
 }
 
 void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator compositeOp, blink::WebBlendMode blendMode)
 {
     draw(ctxt, dstRect, srcRect, compositeOp, blendMode, DoNotRespectImageOrientation);
 }
 
 void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator compositeOp, blink::WebBlendMode blendMode, RespectImageOrientationEnum shouldRespectImageOrientation)
 {
     // Spin the animation to the correct frame before we try to draw it, so we
     // don't draw an old frame and then immediately need to draw a newer one,
     // causing flicker and wasting CPU.
     startAnimation();
 
-    RefPtr<NativeImageSkia> bm = nativeImageForCurrentFrame();
-    if (!bm)
+    RefPtr<NativeImageSkia> bitmap = nativeImageForCurrentFrame();
+    if (!bitmap)
         return; // It's too early and we don't have an image yet.
 
     FloatRect normDstRect = adjustForNegativeSize(dstRect);
     FloatRect normSrcRect = adjustForNegativeSize(srcRect);
-    normSrcRect.intersect(FloatRect(0, 0, bm->bitmap().width(), bm->bitmap().height()));
+    normSrcRect.intersect(FloatRect(0, 0, bitmap->bitmap().width(), bitmap->bitmap().height()));
 
     if (normSrcRect.isEmpty() || normDstRect.isEmpty())
         return; // Nothing to draw.
 
     ImageOrientation orientation = DefaultImageOrientation;
     if (shouldRespectImageOrientation == RespectImageOrientation)
         orientation = frameOrientationAtIndex(m_currentFrame);
 
     GraphicsContextStateSaver saveContext(*ctxt, false);
     if (orientation != DefaultImageOrientation) {
         saveContext.save();
 
         // ImageOrientation expects the origin to be at (0, 0)
         ctxt->translate(normDstRect.x(), normDstRect.y());
         normDstRect.setLocation(FloatPoint());
 
         ctxt->concatCTM(orientation.transformFromDefault(normDstRect.size()));
 
         if (orientation.usesWidthAsHeight()) {
             // The destination rect will have it's width and height already reversed for the orientation of
             // the image, as it was needed for page layout, so we need to reverse it back here.
             normDstRect = FloatRect(normDstRect.x(), normDstRect.y(), normDstRect.height(), normDstRect.width());
         }
     }
 
-    bm->draw(ctxt, normSrcRect, normDstRect, WebCoreCompositeToSkiaComposite(compositeOp, blendMode));
+    // Tagged images (those that have a color profile) are drawn color-correct on supported platforms.
+
+    if (RefPtr<ColorSpaceProfile> source = colorProfile()) {
+        RefPtr<ColorSpaceProfile> screen = screenColorProfile(currentScreenId());
+
+        RefPtr<SkColorFilter> colorTransform = createColorSpaceFilter(source.get(), screen.get());

[sugoi1, 2014/08/29 18:51:11]

Note: If you put "RefPtr<SkColorFilter> colorTransform;" above the if statement
(and still assign it here), you could add the colorTransform argument at line
315 and remove lines 303 to 308 to avoid duplicating code.

[Noel Gordon, 2014/09/01 16:48:39]

Yeah possible. I wrote it this way because colorProfile() inlines a nullptr in
the "if" for ports that don't support color profiles, so the compiler could
optimize the if-clause out on those ports.

+        bitmap->draw(ctxt, normSrcRect, normDstRect, WebCoreCompositeToSkiaComposite(compositeOp, blendMode), colorTransform);
+
+        if (ImageObserver* observer = imageObserver())
+            observer->didDraw(this);
+
+        return;
+    }
+
+    // FIXME: untagged images should be drawn from sRGB color space, per CSS2.1 onwards, a change that
+    // would also require that all CSS content, including <canvas>, be drawn from sRGB space to match,
+    // and the same for plugins (Flash, NaCl), which don't define their color space at all.
+
+    bitmap->draw(ctxt, normSrcRect, normDstRect, WebCoreCompositeToSkiaComposite(compositeOp, blendMode));
 
     if (ImageObserver* observer = imageObserver())
         observer->didDraw(this);
 }
 
+void BitmapImage::drawPattern(GraphicsContext* ctxt, const FloatRect& srcRect, const FloatSize& scale,
+    const FloatPoint& phase, CompositeOperator compositeOp, const FloatRect& destRect, blink::WebBlendMode blendMode, const IntSize& repeatSpacing)
+{
+    TRACE_EVENT0("skia", "Image::drawPattern");
+
+    RefPtr<NativeImageSkia> bitmap = nativeImageForCurrentFrame();
+    if (!bitmap)
+        return;
+
+    // Tagged images (those that have a color profile) are drawn color-correct on supported platforms.
+
+    if (RefPtr<ColorSpaceProfile> source = colorProfile()) {
+        RefPtr<ColorSpaceProfile> screen = screenColorProfile(currentScreenId());
+
+        RefPtr<SkColorFilter> colorTransform = createColorSpaceFilter(source.get(), screen.get());

[sugoi1, 2014/08/29 18:51:11]

Same here

+        bitmap->drawPattern(ctxt, adjustForNegativeSize(srcRect), scale, phase, compositeOp, destRect, blendMode, repeatSpacing, colorTransform);
+
+        return;
+    }
+
+    // FIXME: untagged images should be drawn from sRGB color space, per CSS2.1 onwards, a change that
+    // would also require that all CSS content, including <canvas>, be drawn from sRGB space to match,
+    // and the same for plugins (Flash, NaCl), which don't define their color space at all.
+
+    bitmap->drawPattern(ctxt, adjustForNegativeSize(srcRect), scale, phase, compositeOp, destRect, blendMode, repeatSpacing);
+}
+
+void BitmapImage::resetDecoder()
+{
+    m_source.resetDecoder();
+}
+
 size_t BitmapImage::frameCount()
 {
     if (!m_haveFrameCount) {
         m_frameCount = m_source.frameCount();
         // If decoder is not initialized yet, m_source.frameCount() returns 0.
         if (m_frameCount) {
             m_haveFrameCount = true;
         }
     }
     return m_frameCount;
@@ skipping 302 matching lines @@
     }
     return m_isSolidColor && !m_currentFrame;
 }
 
 Color BitmapImage::solidColor() const
 {
     return m_solidColor;
 }
 
 }