summaryrefslogtreecommitdiff
path: root/libs/hwui/FrameBuilder.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2016-03-17 17:05:14 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-03-17 17:05:15 +0000
commitaefcb2bd39867a287e52232d2f8a119caba644b0 (patch)
tree076498f5aa0d878b7e513d2cc1a8cea73e2aa964 /libs/hwui/FrameBuilder.cpp
parentb1088718204a74334f8d257df79e64baaab38afc (diff)
parent7c02cab0b1c7db0fb786893240ec6f00f16c2cee (diff)
Merge "Account for text op stroke in bounds calculation" into nyc-dev
Diffstat (limited to 'libs/hwui/FrameBuilder.cpp')
-rw-r--r--libs/hwui/FrameBuilder.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp
index fd5856a1c1de..50b21a40d7c3 100644
--- a/libs/hwui/FrameBuilder.cpp
+++ b/libs/hwui/FrameBuilder.cpp
@@ -646,7 +646,9 @@ static batchid_t textBatchId(const SkPaint& paint) {
}
void FrameBuilder::deferTextOp(const TextOp& op) {
- BakedOpState* bakedState = tryBakeOpState(op);
+ BakedOpState* bakedState = BakedOpState::tryStrokeableOpConstruct(
+ mAllocator, *mCanvasState.writableSnapshot(), op,
+ BakedOpState::StrokeBehavior::StyleDefined);
if (!bakedState) return; // quick rejected
batchid_t batchId = textBatchId(*(op.paint));