diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-17 04:15:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-17 04:15:07 -0700 |
| commit | e9ad5c47c4280945f60b4525ce59316dbe6501cc (patch) | |
| tree | 22c6087684d4f8869a292c1dec495ba364c5d612 /WebCore/platform/graphics | |
| parent | 475b74acddb33a28347804dbb02a585517595f31 (diff) | |
| parent | 0bb9b5e0e9c736593741f15859b612c4294b790b (diff) | |
| download | external_webkit-e9ad5c47c4280945f60b4525ce59316dbe6501cc.zip external_webkit-e9ad5c47c4280945f60b4525ce59316dbe6501cc.tar.gz external_webkit-e9ad5c47c4280945f60b4525ce59316dbe6501cc.tar.bz2 | |
Merge change 21481 into master-webkit-merge
* changes:
Fix some errors in platform/graphics/android.
Diffstat (limited to 'WebCore/platform/graphics')
4 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/platform/graphics/FloatPoint.h b/WebCore/platform/graphics/FloatPoint.h index 157c1e7..0c97c49 100644 --- a/WebCore/platform/graphics/FloatPoint.h +++ b/WebCore/platform/graphics/FloatPoint.h @@ -90,7 +90,7 @@ public: operator QPointF() const; #endif -#if PLATFORM(SKIA) +#if (PLATFORM(SKIA) || PLATFORM(SGL)) operator SkPoint() const; FloatPoint(const SkPoint&); #endif diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp index b112230..c1a94b9 100644 --- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp @@ -898,7 +898,7 @@ void GraphicsContext::setAlpha(float alpha) void GraphicsContext::setCompositeOperation(CompositeOperator op) { - m_data->mState->mMode = WebCoreCompositeToSkiaMode(op); + m_data->mState->mMode = WebCoreCompositeToSkiaComposite(op); } void GraphicsContext::clearRect(const FloatRect& rect) diff --git a/WebCore/platform/graphics/android/ImageAndroid.cpp b/WebCore/platform/graphics/android/ImageAndroid.cpp index 3561796..93aacbc 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.setXfermodeMode(WebCoreCompositeToSkiaMode(compositeOp)); + paint.setXfermodeMode(WebCoreCompositeToSkiaComposite(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.setXfermodeMode(WebCoreCompositeToSkiaMode(compositeOp)); + paint.setXfermodeMode(WebCoreCompositeToSkiaComposite(compositeOp)); paint.setFilterBitmap(true); SkMatrix matrix(patternTransform); diff --git a/WebCore/platform/graphics/skia/SkiaUtils.cpp b/WebCore/platform/graphics/skia/SkiaUtils.cpp index acb3669..662ea5c 100644 --- a/WebCore/platform/graphics/skia/SkiaUtils.cpp +++ b/WebCore/platform/graphics/skia/SkiaUtils.cpp @@ -64,7 +64,7 @@ static const struct CompositOpToSkiaMode { { CompositePlusLighter, SkXfermode::kPlus_Mode } }; -SkXfermode::Mode WebCoreCompositeToSkiaMode(CompositeOperator op) +SkXfermode::Mode WebCoreCompositeToSkiaCOmposite(CompositeOperator op) { const CompositOpToSkiaMode* table = gMapCompositOpsToSkiaModes; |