diff options
| author | Steve Block <steveblock@google.com> | 2009-12-09 15:40:02 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:13 +0000 |
| commit | 81d7a8e20f14dc502cc38f8d654adf1334a2833c (patch) | |
| tree | adecb0e58dac4f48328bd23738a88724855b2e09 /WebCore/platform/graphics/android | |
| parent | 888fd09c906f3c3a24a303a859c4c5adc04643f4 (diff) | |
| download | external_webkit-81d7a8e20f14dc502cc38f8d654adf1334a2833c.zip external_webkit-81d7a8e20f14dc502cc38f8d654adf1334a2833c.tar.gz external_webkit-81d7a8e20f14dc502cc38f8d654adf1334a2833c.tar.bz2 | |
Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.
See http://trac.webkit.org/changeset/51212
Change-Id: I276253611ffe7518733fc7af51b0dfcc5f5d8691
Diffstat (limited to 'WebCore/platform/graphics/android')
| -rw-r--r-- | WebCore/platform/graphics/android/ImageAndroid.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/ImageAndroid.cpp b/WebCore/platform/graphics/android/ImageAndroid.cpp index 831c6f3..486200d 100644 --- a/WebCore/platform/graphics/android/ImageAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageAndroid.cpp @@ -186,7 +186,8 @@ static inline void fixPaintForBitmapsThatMaySeam(SkPaint* paint) { } void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, - const FloatRect& srcRect, CompositeOperator compositeOp) + const FloatRect& srcRect, ColorSpace, + CompositeOperator compositeOp) { startAnimation(); @@ -249,8 +250,8 @@ void BitmapImage::setURL(const String& str) void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& srcRect, const TransformationMatrix& patternTransform, - const FloatPoint& phase, CompositeOperator compositeOp, - const FloatRect& destRect) + const FloatPoint& phase, ColorSpace, + CompositeOperator compositeOp, const FloatRect& destRect) { SkBitmapRef* image = this->nativeImageForCurrentFrame(); if (!image) { // If it's too early we won't have an image yet. |