commit 63c7b24645d94c92dc6dc32d57c23b5167950c8b
author Chris Craik <ccraik@google.com> Thu Dec 11 22:43:16 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 11 22:43:18 2014 +0000
tree b4ddc30659c38aaa05c6e6f08327362a90aac6ce
parent 72b047c6c37ddf860be15b159b9a143be36d7425
parent c2379070a46f208bce490b938e0673ba00373e2e

Merge "Correct layer size formatting in trace" into lmp-mr1-dev

libs/hwui/RenderNode.cpp

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 810e487..787ee62 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -429,9 +429,9 @@
                 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,