diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-11-03 22:30:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-03 22:30:11 +0000 |
| commit | eea591b08e3ee53f7994dfa5de72e52f5061dd6e (patch) | |
| tree | ba2a4704a25cc8c44ebbd6e12db6ea2207ad5508 /libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | |
| parent | b2dc39c09edebb52e21d2f02b6bc64c0f249406c (diff) | |
| parent | 2f06e8ad1a1c4d0866bb66854d2759e275898635 (diff) | |
Merge "Fix RenderNodeDrawable to draw nonzero Z nodes when needed"
Diffstat (limited to 'libs/hwui/pipeline/skia/RenderNodeDrawable.cpp')
| -rw-r--r-- | libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp index b971856c6e73..accbabda5a2f 100644 --- a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp +++ b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp @@ -49,8 +49,9 @@ const RenderProperties& RenderNodeDrawable::getNodeProperties() const { } void RenderNodeDrawable::onDraw(SkCanvas* canvas) { - //negative and positive Z order are drawn out of order - if (MathUtils::isZero(mRenderNode->properties().getZ())) { + //negative and positive Z order are drawn out of order, if this render node drawable is in + //a reordering section + if ((!mInReorderingSection) || MathUtils::isZero(mRenderNode->properties().getZ())) { this->forceDraw(canvas); } } |