diff options
Diffstat (limited to 'WebCore/platform/graphics/skia/SkiaUtils.h')
| -rw-r--r-- | WebCore/platform/graphics/skia/SkiaUtils.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/WebCore/platform/graphics/skia/SkiaUtils.h b/WebCore/platform/graphics/skia/SkiaUtils.h index a210cd3..681dcd5 100644 --- a/WebCore/platform/graphics/skia/SkiaUtils.h +++ b/WebCore/platform/graphics/skia/SkiaUtils.h @@ -36,24 +36,14 @@ #include <wtf/MathExtras.h> #include "GraphicsContext.h" #include "SkPath.h" -#ifdef MANUAL_MERGE_REQUIRED -#include "SkPorterDuff.h" #include "SkXfermode.h" -#else // MANUAL_MERGE_REQUIRED -#include "SkXfermode.h" -#endif // MANUAL_MERGE_REQUIRED class SkCanvas; class SkRegion; namespace WebCore { -#ifdef MANUAL_MERGE_REQUIRED -SkXfermode::Mode WebCoreCompositeToSkiaMode(CompositeOperator); -SkPorterDuff::Mode WebCoreCompositeToSkiaComposite(CompositeOperator); -#else // MANUAL_MERGE_REQUIRED SkXfermode::Mode WebCoreCompositeToSkiaComposite(CompositeOperator); -#endif // MANUAL_MERGE_REQUIRED // move this guy into SkColor.h SkColor SkPMColorToColor(SkPMColor); |