diff options
| -rw-r--r-- | core/jni/android/graphics/Canvas.cpp | 8 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Canvas.java | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 11c7053..eb97a9c 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -964,16 +964,10 @@ static void doDrawTextDecorations(SkCanvas* canvas, jfloat x, jfloat y, jfloat l jobject bounds) { SkRect r; SkIRect ir; - bool result = canvas->getClipBounds(&r); + bool result = canvas->getClipBounds(&r); if (!result) { r.setEmpty(); - } else { - // ensure the clip is not larger than the canvas - SkRect canvasRect; - SkISize deviceSize = canvas->getDeviceSize(); - canvasRect.iset(0, 0, deviceSize.fWidth, deviceSize.fHeight); - r.intersect(canvasRect); } r.round(&ir); diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 79bf54b..c851844 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -781,7 +781,10 @@ public class Canvas { } /** - * Retrieve the clip bounds, returning true if they are non-empty. + * Return the bounds of the current clip (in local coordinates) in the + * bounds parameter, and return true if it is non-empty. This can be useful + * in a way similar to quickReject, in that it tells you that drawing + * outside of these bounds will be clipped out. * * @param bounds Return the clip bounds here. If it is null, ignore it but * still return true if the current clip is non-empty. @@ -792,7 +795,7 @@ public class Canvas { } /** - * Retrieve the clip bounds. + * Retrieve the bounds of the current clip (in local coordinates). * * @return the clip bounds, or [0, 0, 0, 0] if the clip is empty. */ |