Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly pre-clip paths when recording display lists

Browse Source 
Bug #6836448
External bug: http://code.google.com/p/android/issues/detail?id=34946

DO NOT MERGE

DisplayListRenderer::drawPath was not invoking quickReject() properly,
passing x,y,width,height instead of left,top,right,bottom. A path
could thus get rejected when it should be drawn instead.

While working on this change I found a similar issue with another
drawing command, drawBitmapData().

Change-Id: I8306faf72db14d71b54ecb7de295c9a6957d9494
This commit is contained in:
Romain Guy
2012-07-17 17:46:03 -07:00
parent 634ccf7eb8
commit 3409e728e2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/hwui/DisplayListRenderer.cpp
View File

@@ -1541,7 +1541,7 @@ status_t DisplayListRenderer::drawBitmap(SkBitmap* bitmap, float srcLeft, float
status_t DisplayListRenderer::drawBitmapData(SkBitmap* bitmap, float left, float top, status_t DisplayListRenderer::drawBitmapData(SkBitmap* bitmap, float left, float top,
SkPaint* paint) { SkPaint* paint) {
const bool reject = quickReject(left, top, left + bitmap->width(), bitmap->height()); const bool reject = quickReject(left, top, left + bitmap->width(), top + bitmap->height());
uint32_t* location = addOp(DisplayList::DrawBitmapData, reject); uint32_t* location = addOp(DisplayList::DrawBitmapData, reject);
addBitmapData(bitmap); addBitmapData(bitmap);
addPoint(left, top); addPoint(left, top);
@@ -1643,7 +1643,10 @@ status_t DisplayListRenderer::drawPath(SkPath* path, SkPaint* paint) {
uint32_t width, height; uint32_t width, height;
computePathBounds(path, paint, left, top, offset, width, height); computePathBounds(path, paint, left, top, offset, width, height);
const bool reject = quickReject(left - offset, top - offset, width, height); left -= offset;
top -= offset;
const bool reject = quickReject(left, top, left + width, top + height);
uint32_t* location = addOp(DisplayList::DrawPath, reject); uint32_t* location = addOp(DisplayList::DrawPath, reject);
addPath(path); addPath(path);
addPaint(paint); addPaint(paint);