drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev

Browse Source
This commit is contained in:
Derek Sollenberger
2013-05-09 18:23:56 +00:00
committed by Android (Google) Code Review
parent dde8e539c3 708144e828
commit bee78812d0
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android/graphics/Canvas.cpp
View File

@ -968,12 +968,6 @@ static void doDrawTextDecorations(SkCanvas* canvas, jfloat x, jfloat y, jfloat l
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);

7
graphics/java/android/graphics/Canvas.java
View File

@ -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.
*/