Add an API to set the ColorFilter on a Paint object.

sky/engine/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google 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 325 matching lines @@
     if (contextDisabled())
         return;
     mutableState()->setCompositeOperation(compositeOperation, blendMode);
 }
 
 SkColorFilter* GraphicsContext::colorFilter() const
 {
     return immutableState()->colorFilter();
 }
 
-void GraphicsContext::setColorFilter(ColorFilter colorFilter)
+void GraphicsContext::setColorFilter(ColorFilterObsolete colorFilter)
 {
     GraphicsContextState* stateToSet = mutableState();
 
     // We only support one active color filter at the moment. If (when) this becomes a problem,
     // we should switch to using color filter chains (Skia work in progress).
     ASSERT(!stateToSet->colorFilter());
     stateToSet->setColorFilter(WebCoreColorFilterToSkiaColorFilter(colorFilter));
 }
 
 bool GraphicsContext::readPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, int x, int y)
@@ skipping 25 matching lines @@
     realizeCanvasSave();
 
     m_canvas->concat(matrix);
 }
 
 void GraphicsContext::beginTransparencyLayer(float opacity, const FloatRect* bounds)
 {
     beginLayer(opacity, immutableState()->compositeOperator(), bounds);
 }
 
-void GraphicsContext::beginLayer(float opacity, CompositeOperator op, const FloatRect* bounds, ColorFilter colorFilter, ImageFilter* imageFilter)
+void GraphicsContext::beginLayer(float opacity, CompositeOperator op, const FloatRect* bounds, ColorFilterObsolete colorFilter, ImageFilter* imageFilter)
 {
     if (contextDisabled())
         return;
 
     SkPaint layerPaint;
     layerPaint.setAlpha(static_cast<unsigned char>(opacity * 255));
     layerPaint.setXfermodeMode(WebCoreCompositeToSkiaComposite(op, m_paintState->blendMode()));
     layerPaint.setColorFilter(WebCoreColorFilterToSkiaColorFilter(colorFilter).get());
     layerPaint.setImageFilter(imageFilter);
 
@@ skipping 1169 matching lines @@
     radii[SkRRect::kUpperLeft_Corner].set(SkIntToScalar(topLeft.width()),
         SkIntToScalar(topLeft.height()));
     radii[SkRRect::kUpperRight_Corner].set(SkIntToScalar(topRight.width()),
         SkIntToScalar(topRight.height()));
     radii[SkRRect::kLowerRight_Corner].set(SkIntToScalar(bottomRight.width()),
         SkIntToScalar(bottomRight.height()));
     radii[SkRRect::kLowerLeft_Corner].set(SkIntToScalar(bottomLeft.width()),
         SkIntToScalar(bottomLeft.height()));
 }
 
-PassRefPtr<SkColorFilter> GraphicsContext::WebCoreColorFilterToSkiaColorFilter(ColorFilter colorFilter)
+PassRefPtr<SkColorFilter> GraphicsContext::WebCoreColorFilterToSkiaColorFilter(ColorFilterObsolete colorFilter)
 {
     // FIXME(sky): Remove
     return nullptr;
 }
 
 void GraphicsContext::draw2xMarker(SkBitmap* bitmap, int index)
 {
     const SkPMColor lineColor = lineColors(index);
     const SkPMColor antiColor1 = antiColors1(index);
     const SkPMColor antiColor2 = antiColors2(index);
@@ skipping 127 matching lines @@
         // FIXME: This is to not break tests (it results in the filter bitmap flag
         // being set to true). We need to decide if we respect InterpolationNone
         // being returned from computeInterpolationQuality.
         resampling = InterpolationLow;
     }
     resampling = limitInterpolationQuality(this, resampling);
     paint->setFilterQuality(static_cast<SkFilterQuality>(resampling));
 }
 
 } // namespace blink