diff options
author | Mike Reed <reed@google.com> | 2009-04-29 10:47:10 -0400 |
---|---|---|
committer | Mike Reed <reed@google.com> | 2009-04-29 11:30:19 -0400 |
commit | 8535e17115184dbb5e448b6364b88eb52df34482 (patch) | |
tree | e282875c82ad48dd67a46b0d4efbdcfebcc56ce2 /WebCore/platform/graphics/android/android_graphics.h | |
parent | 6a813290b2f6bb173cda985d26b231d3c539696d (diff) | |
download | external_webkit-8535e17115184dbb5e448b6364b88eb52df34482.zip external_webkit-8535e17115184dbb5e448b6364b88eb52df34482.tar.gz external_webkit-8535e17115184dbb5e448b6364b88eb52df34482.tar.bz2 |
share xfermode and color routines with chrome port
Besides sharing those routines in SkiaUtils.cpp, also remove our (now redundant)
android_setrect, etc. calls, since the type-conversion extras we added earlier
take care of this by using constructors.
Diffstat (limited to 'WebCore/platform/graphics/android/android_graphics.h')
-rw-r--r-- | WebCore/platform/graphics/android/android_graphics.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/WebCore/platform/graphics/android/android_graphics.h b/WebCore/platform/graphics/android/android_graphics.h index e8a190a..0853d85 100644 --- a/WebCore/platform/graphics/android/android_graphics.h +++ b/WebCore/platform/graphics/android/android_graphics.h @@ -26,39 +26,17 @@ #ifndef android_graphics_DEFINED #define android_graphics_DEFINED -#include "Color.h" -#include "Image.h" #include "wtf/Vector.h" -#include "SkColor.h" -#include "SkPorterDuff.h" -#include "SkScalar.h" -#include "SkShader.h" +#include "SkTypes.h" class SkCanvas; -struct SkPoint; -struct SKRect; namespace WebCore { - class FloatRect; - class IntPoint; class IntRect; class GraphicsContext; } -SkPoint* android_setpt(SkPoint* dst, const WebCore::IntPoint& src); -SkPoint* android_setpt(SkPoint* dst, const WebCore::FloatPoint& src); -SkRect* android_setrect(SkRect* dst, const WebCore::IntRect& src); -SkRect* android_setrect(SkRect* dst, const WebCore::FloatRect& src); -SkIRect* android_setrect(SkIRect* dst, const WebCore::IntRect& src); -SkIRect* android_setrect(SkIRect* dst, const WebCore::FloatRect& src); -SkIRect* android_setrect_scaled(SkIRect* dst, const WebCore::FloatRect& src, - float sx, float sy); - -SkPorterDuff::Mode android_convert_compositeOp(WebCore::CompositeOperator); - -WebCore::Color android_SkPMColorToWebCoreColor(SkPMColor pm); - SkCanvas* android_gc2canvas(WebCore::GraphicsContext* gc); // Data and methods for focus rings |