summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-10-20 16:28:30 +0100
committerSteve Block <steveblock@google.com>2009-11-10 22:41:15 +0000
commit7e78269225e9e9cee2d8ba12488fb907c2c1db59 (patch)
tree550b99dc400bf0fd19f8d3941ea8ed979ed5f361 /WebCore/platform/graphics/android
parentc05f32f6ac83a4d9467153745a217b636e8c8a60 (diff)
downloadexternal_webkit-7e78269225e9e9cee2d8ba12488fb907c2c1db59.zip
external_webkit-7e78269225e9e9cee2d8ba12488fb907c2c1db59.tar.gz
external_webkit-7e78269225e9e9cee2d8ba12488fb907c2c1db59.tar.bz2
Merge webkit.org at r50258 : Implements new GraphicsContext::canvasClip method for Android.
See http://trac.webkit.org/changeset/49641 Change-Id: I8b1a274623a62f73563988eb1ed120f43e0e4c70
Diffstat (limited to 'WebCore/platform/graphics/android')
-rw-r--r--WebCore/platform/graphics/android/GraphicsContextAndroid.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index a78c155..6a842bb 100644
--- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -759,6 +759,11 @@ void GraphicsContext::addInnerRoundedRectClip(const IntRect& rect, int thickness
GC2Canvas(this)->clipPath(path);
}
+void GraphicsContext::canvasClip(const Path& path)
+{
+ clip(path);
+}
+
void GraphicsContext::clipOut(const IntRect& r)
{
if (paintingDisabled())
@@ -1191,4 +1196,3 @@ SkCanvas* android_gc2canvas(WebCore::GraphicsContext* gc)
{
return gc->platformContext()->mCanvas;
}
-