diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
| commit | 1edef79f87f9c52c21d69c87c19f8e2b140a9119 (patch) | |
| tree | cad337ef493b0d9710bf3ae478cb87cb534f598d /WebCore/platform/graphics/skia/SkiaUtils.cpp | |
| parent | b83fc086000e27bc227580bd0e35b9d7bee1179a (diff) | |
| parent | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (diff) | |
| download | external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.zip external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.gz external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.bz2 | |
Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
Diffstat (limited to 'WebCore/platform/graphics/skia/SkiaUtils.cpp')
| -rw-r--r-- | WebCore/platform/graphics/skia/SkiaUtils.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/WebCore/platform/graphics/skia/SkiaUtils.cpp b/WebCore/platform/graphics/skia/SkiaUtils.cpp index 55cba37..4242e7d 100644 --- a/WebCore/platform/graphics/skia/SkiaUtils.cpp +++ b/WebCore/platform/graphics/skia/SkiaUtils.cpp @@ -47,7 +47,7 @@ static const struct CompositOpToPorterDuffMode { uint8_t mPorterDuffMode; } gMapCompositOpsToPorterDuffModes[] = { { CompositeClear, SkPorterDuff::kClear_Mode }, - { CompositeCopy, SkPorterDuff::kSrcOver_Mode }, // TODO + { CompositeCopy, SkPorterDuff::kSrc_Mode }, { CompositeSourceOver, SkPorterDuff::kSrcOver_Mode }, { CompositeSourceIn, SkPorterDuff::kSrcIn_Mode }, { CompositeSourceOut, SkPorterDuff::kSrcOut_Mode }, @@ -59,7 +59,7 @@ static const struct CompositOpToPorterDuffMode { { CompositeXOR, SkPorterDuff::kXor_Mode }, { CompositePlusDarker, SkPorterDuff::kDarken_Mode }, { CompositeHighlight, SkPorterDuff::kSrcOver_Mode }, // TODO - { CompositePlusLighter, SkPorterDuff::kLighten_Mode } + { CompositePlusLighter, SkPorterDuff::kAdd_Mode } }; SkPorterDuff::Mode WebCoreCompositeToSkiaComposite(CompositeOperator op) @@ -135,12 +135,7 @@ bool SkPathContainsPoint(SkPath* originalPath, const FloatPoint& point, SkPath:: int scale = 1; SkRect bounds; -#if PLATFORM(SGL) - // this is the API from skia/trunk bounds = originalPath->getBounds(); -#else - originalPath->computeBounds(&bounds, SkPath::kFast_BoundsType); -#endif // We can immediately return false if the point is outside the bounding rect if (!bounds.contains(SkFloatToScalar(point.x()), SkFloatToScalar(point.y()))) |