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

am e0b39fc1: Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev

Browse Source 
* commit 'e0b39fc18c10224c4e66f70aa472d8497b1b4621':
  Account for hairlines in quick rejection logic
This commit is contained in:
Chris Craik
2013-04-03 13:50:19 -07:00
committed by Android Git Automerger
parent 7c15eca06f e0b39fc18c
commit 2e24cbf802
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hwui/DisplayListOp.h
View File

@@ -165,7 +165,11 @@ public:
return DeferredDisplayList::kOpBatch_None; return DeferredDisplayList::kOpBatch_None;
} }
float strokeWidthOutset() { return mPaint->getStrokeWidth() * 0.5f; } float strokeWidthOutset() {
float width = mPaint->getStrokeWidth();
if (width == 0) return 0.5f; // account for hairline
return width * 0.5f;
}
protected: protected:
SkPaint* getPaint(OpenGLRenderer& renderer) { SkPaint* getPaint(OpenGLRenderer& renderer) {

1
libs/hwui/PathTessellator.cpp
View File

@@ -61,6 +61,7 @@ void PathTessellator::expandBoundsForStroke(SkRect& bounds, const SkPaint* paint
bool forceExpand) { bool forceExpand) {
if (forceExpand || paint->getStyle() != SkPaint::kFill_Style) { if (forceExpand || paint->getStyle() != SkPaint::kFill_Style) {
float outset = paint->getStrokeWidth() * 0.5f; float outset = paint->getStrokeWidth() * 0.5f;
if (outset == 0) outset = 0.5f; // account for hairline
bounds.outset(outset, outset); bounds.outset(outset, outset);
} }
} }