diff options
| author | Chris Craik <ccraik@google.com> | 2014-11-20 16:38:06 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2014-11-20 16:38:06 -0800 |
| commit | f2235b6a48db2e16b52711570bf2a0d0cb0b0d90 (patch) | |
| tree | 159f121d1330bba957764704de13720e785f3e3b /libs/hwui/RenderNode.cpp | |
| parent | cd24a6d70b54c79605e51fcc6a249313e9c25a51 (diff) | |
| parent | 57b641a2ed87f2827399c363053436cba88bee75 (diff) | |
| download | frameworks_base-f2235b6a48db2e16b52711570bf2a0d0cb0b0d90.zip frameworks_base-f2235b6a48db2e16b52711570bf2a0d0cb0b0d90.tar.gz frameworks_base-f2235b6a48db2e16b52711570bf2a0d0cb0b0d90.tar.bz2 | |
resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index fd5ae72..4814ed3 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -25,7 +25,6 @@ #include <SkCanvas.h> #include <algorithm> -#include <utils/Trace.h> #include "DamageAccumulator.h" #include "Debug.h" @@ -34,6 +33,7 @@ #include "LayerRenderer.h" #include "OpenGLRenderer.h" #include "utils/MathUtils.h" +#include "utils/TraceUtils.h" #include "renderthread/CanvasContext.h" namespace android { @@ -426,6 +426,10 @@ void RenderNode::setViewProperties(OpenGLRenderer& renderer, T& handler) { clipFlags = 0; // all clipping done by saveLayer } + ATRACE_FORMAT("%s alpha caused %ssaveLayer %ux%u", + getName(), clipFlags ? "" : "unclipped ", + layerBounds.getWidth(), layerBounds.getHeight()); + SaveLayerOp* op = new (handler.allocator()) SaveLayerOp( layerBounds.left, layerBounds.top, layerBounds.right, layerBounds.bottom, properties().getAlpha() * 255, saveFlags); |