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

Merge "Fix skp on 32-bit"

Browse Source
This commit is contained in:
John Reck
2018-12-06 18:55:27 +00:00
committed by Android (Google) Code Review
parent 2a9d8df05e 7af5b2c653
commit 4f48e9a206
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/hwui/RenderNode.cpp
View File

@@ -454,6 +454,9 @@ const SkPath* RenderNode::getClippedOutline(const SkRect& clipRect) const {
using StringBuffer = FatVector<char, 128>;
template <typename... T>
// TODO:__printflike(2, 3)
// Doesn't work because the warning doesn't understand string_view and doesn't like that
// it's not a C-style variadic function.
static void format(StringBuffer& buffer, const std::string_view& format, T... args) {
buffer.resize(buffer.capacity());
while (1) {
@@ -468,19 +471,20 @@ static void format(StringBuffer& buffer, const std::string_view& format, T... ar
buffer.resize(needed + 1);
return;
}
buffer.resize(buffer.size() * 2);
// If we're doing a heap alloc anyway might as well give it some slop
buffer.resize(needed + 100);
}
}
void RenderNode::markDrawStart(SkCanvas& canvas) {
StringBuffer buffer;
format(buffer, "RenderNode(id=%d, name='%s')", uniqueId(), getName());
format(buffer, "RenderNode(id=%" PRId64 ", name='%s')", uniqueId(), getName());
canvas.drawAnnotation(SkRect::MakeWH(getWidth(), getHeight()), buffer.data(), nullptr);
}
void RenderNode::markDrawEnd(SkCanvas& canvas) {
StringBuffer buffer;
format(buffer, "/RenderNode(id=%d, name='%s')", uniqueId(), getName());
format(buffer, "/RenderNode(id=%" PRId64 ", name='%s')", uniqueId(), getName());
canvas.drawAnnotation(SkRect::MakeWH(getWidth(), getHeight()), buffer.data(), nullptr);
}