diff options
author | Stan Iliev <stani@google.com> | 2016-11-02 15:29:03 -0400 |
---|---|---|
committer | Stan Iliev <stani@google.com> | 2016-11-03 13:44:41 -0400 |
commit | 2f06e8ad1a1c4d0866bb66854d2759e275898635 (patch) | |
tree | 56c502dddffbc950880729226b8d894807bae97c /libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | |
parent | 500a0c30d4dcd012218c3e44a62926a1c34a259f (diff) |
Fix RenderNodeDrawable to draw nonzero Z nodes when needed
Fix RenderNodeDrawable to draw nonzero Z nodes if not in a reordering
section.
Write an unit test modeled after FrameBuilder zReorder, which
verifies the bug fix.
Test: built and run unit tests on angler-eng.
bug: 32541103
Change-Id: Ifbf2d51f4432f5de3af4abe5987c2a72fed14185
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 f263c490668a..a7fab7e35eae 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); } } |