diff options
| author | Mike Reed <reed@google.com> | 2009-06-24 08:59:06 -0400 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2009-06-24 08:59:06 -0400 |
| commit | 7e5b8af62326898bfa0ff666dfe3ab4f0593a1ec (patch) | |
| tree | 03176ea45f6bd19d1281a52e6aeaab55ecd15925 /WebCore/platform/graphics/android | |
| parent | 8611fc4db278833abc9e6691ea03248c0ae7b9b0 (diff) | |
| download | external_webkit-7e5b8af62326898bfa0ff666dfe3ab4f0593a1ec.zip external_webkit-7e5b8af62326898bfa0ff666dfe3ab4f0593a1ec.tar.gz external_webkit-7e5b8af62326898bfa0ff666dfe3ab4f0593a1ec.tar.bz2 | |
rename setXfermode(Mode) to setXfermodeMode(...) for clarity
Diffstat (limited to 'WebCore/platform/graphics/android')
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsContextAndroid.cpp | 6 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/ImageAndroid.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp index 0358a54..b112230 100644 --- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp @@ -137,7 +137,7 @@ public: if (mShadow.mBlur > 0) { paint->setAntiAlias(true); paint->setDither(true); - paint->setXfermode(mMode); + paint->setXfermodeMode(mMode); paint->setColor(mShadow.mColor); paint->setMaskFilter(SkBlurMaskFilter::Create(mShadow.mBlur, SkBlurMaskFilter::kNormal_BlurStyle))->unref(); @@ -225,7 +225,7 @@ public: void setup_paint_common(SkPaint* paint) const { paint->setAntiAlias(mState->mUseAA); paint->setDither(true); - paint->setXfermode(mState->mMode); + paint->setXfermodeMode(mState->mMode); if (mState->mShadow.mBlur > 0) { SkDrawLooper* looper = new SkBlurDrawLooper(mState->mShadow.mBlur, mState->mShadow.mDx, @@ -909,7 +909,7 @@ void GraphicsContext::clearRect(const FloatRect& rect) SkPaint paint; m_data->setup_paint_fill(&paint); - paint.setXfermode(SkXfermode::kClear_Mode); + paint.setXfermodeMode(SkXfermode::kClear_Mode); GC2Canvas(this)->drawRect(rect, paint); } diff --git a/WebCore/platform/graphics/android/ImageAndroid.cpp b/WebCore/platform/graphics/android/ImageAndroid.cpp index f0b36fb..3561796 100644 --- a/WebCore/platform/graphics/android/ImageAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageAndroid.cpp @@ -213,7 +213,7 @@ void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect, ctxt->setupFillPaint(&paint); // need global alpha among other things paint.setFilterBitmap(true); - paint.setXfermode(WebCoreCompositeToSkiaMode(compositeOp)); + paint.setXfermodeMode(WebCoreCompositeToSkiaMode(compositeOp)); canvas->drawBitmapRect(bitmap, &srcR, dstR, &paint); #ifdef TRACE_SUBSAMPLED_BITMAPS @@ -285,7 +285,7 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& srcRect, SkShader::kRepeat_TileMode); paint.setShader(shader)->unref(); // now paint is the only owner of shader - paint.setXfermode(WebCoreCompositeToSkiaMode(compositeOp)); + paint.setXfermodeMode(WebCoreCompositeToSkiaMode(compositeOp)); paint.setFilterBitmap(true); SkMatrix matrix(patternTransform); |