summaryrefslogtreecommitdiff
path: root/libs/hwui/RenderNode.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2014-12-12 04:30:44 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-12-12 04:30:44 +0000
commita1c3fdfbc7a8f271f916b89e721e4d371f1dfe8f (patch)
treec38ecf73a9a4c5b64a9ca14e060edfac2d87a555 /libs/hwui/RenderNode.cpp
parent10c9c6681554ab7ae0a322c95ba99574d6917962 (diff)
parent3f454e7d1cf7103e312f67f745f01f00fa49df13 (diff)
am 3f454e7d: am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev automerge: 00905a9
* commit '3f454e7d1cf7103e312f67f745f01f00fa49df13': Correct layer size formatting in trace
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
-rw-r--r--libs/hwui/RenderNode.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index e7cbacd4480d..7931b356bb35 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -430,9 +430,9 @@ void RenderNode::setViewProperties(OpenGLRenderer& renderer, T& handler) {
clipFlags = 0; // all clipping done by saveLayer
}
- ATRACE_FORMAT("%s alpha caused %ssaveLayer %ux%u",
+ ATRACE_FORMAT("%s alpha caused %ssaveLayer %dx%d",
getName(), clipFlags ? "" : "unclipped ",
- layerBounds.getWidth(), layerBounds.getHeight());
+ (int)layerBounds.getWidth(), (int)layerBounds.getHeight());
SaveLayerOp* op = new (handler.allocator()) SaveLayerOp(
layerBounds.left, layerBounds.top, layerBounds.right, layerBounds.bottom,