[wip] image color correction

Source/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  */
 
 #include "config.h"
 
 #include "platform/graphics/GraphicsLayer.h"
 
 #include "SkImageFilter.h"
 #include "SkMatrix44.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/LayoutRect.h"
+#include "platform/graphics/BitmapImage.h"
+#include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayerFactory.h"
 #include "platform/graphics/Image.h"
+#include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
 #include "platform/graphics/skia/NativeImageSkia.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/text/TextStream.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebAnimation.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebFilterOperations.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebFloatRect.h"
@@ skipping 956 matching lines @@
 }
 
 void GraphicsLayer::setContentsToImage(Image* image)
 {
     RefPtr<NativeImageSkia> nativeImage = image ? image->nativeImageForCurrentFrame() : nullptr;
     if (nativeImage) {
         if (!m_imageLayer) {
             m_imageLayer = adoptPtr(Platform::current()->compositorSupport()->createImageLayer());
             registerContentsLayer(m_imageLayer->layer());
         }
-        m_imageLayer->setBitmap(nativeImage->bitmap());
-        m_imageLayer->layer()->setOpaque(image->currentFrameKnownToBeOpaque());
+        bool opaque = image->currentFrameKnownToBeOpaque();
+        if (image->isBitmapImage() && toBitmapImage(image)->colorProfile()) {
+            // FIXME: paint-time color-correction is assumed here, and note that image
+            // layers are the pathway to the GPU-based color correction.
+            OwnPtr<ImageBuffer> buffer = ImageBuffer::create(image->size(), opaque ? Opaque : NonOpaque);

[Stephen White, 2014/07/03 18:38:17]

Rather than create an ImageBuffer here (incurring another draw pass, and not
necessarily being GPU-friendly), I think another way to accomplish this would be
to create an SkColorFilterImageFilter to wrap your color profile colorfilter,
create a WebFilterOperations for it, and call appendReferenceFilter() on that
with your SkColorFilterImageFilter.

Of course, things might be a bit trickier if the layer already has a filter of
its own. In that case, you might have to insert the color transformation at the
head of the list as part of GraphicsLayer::setFilters().

+            buffer->context()->drawImage(image, IntPoint());
+            m_imageLayer->setBitmap(buffer->bitmap());
+        } else {
+            m_imageLayer->setBitmap(nativeImage->bitmap());
+        }
+        m_imageLayer->layer()->setOpaque(opaque);
         updateContentsRect();
+        setContentsTo(m_imageLayer->layer());
     } else {
         if (m_imageLayer) {
             unregisterContentsLayer(m_imageLayer->layer());
             m_imageLayer.clear();
+            setContentsTo(0);
         }
     }
-
-    setContentsTo(m_imageLayer ? m_imageLayer->layer() : 0);
 }
 
 void GraphicsLayer::setContentsToNinePatch(Image* image, const IntRect& aperture)
 {
     if (m_ninePatchLayer) {
         unregisterContentsLayer(m_ninePatchLayer->layer());
         m_ninePatchLayer.clear();
     }
     RefPtr<NativeImageSkia> nativeImage = image ? image->nativeImageForCurrentFrame() : nullptr;
     if (nativeImage) {
@@ skipping 166 matching lines @@
         m_layer->layer()->setScrollClient(0);
     else
         m_layer->layer()->setScrollClient(this);
 }
 
 void GraphicsLayer::paint(GraphicsContext& context, const IntRect& clip)
 {
     paintGraphicsLayerContents(context, clip);
 }
 
-
 void GraphicsLayer::notifyAnimationStarted(double monotonicTime, WebAnimation::TargetProperty)
 {
     if (m_client)
         m_client->notifyAnimationStarted(this, monotonicTime);
 }
 
 void GraphicsLayer::notifyAnimationFinished(double, WebAnimation::TargetProperty)
 {
     // Do nothing.
 }
 
 void GraphicsLayer::didScroll()
 {
     if (m_scrollableArea)
         m_scrollableArea->scrollToOffsetWithoutAnimation(m_scrollableArea->minimumScrollPosition() + toIntSize(m_layer->layer()->scrollPosition()));
 }
 
 } // namespace WebCore
 
 #ifndef NDEBUG
 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer)
 {
     if (!layer)
         return;
 
     String output = layer->layerTreeAsText(WebCore::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif