diff options
author | John Reck <jreck@google.com> | 2015-07-21 21:04:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-21 21:04:45 +0000 |
commit | 9317d0b9904573bdb0d815ec563dd263447f11db (patch) | |
tree | ebc8fe43d6981e62b16e6640343b5ed74022c26c /libs/hwui/RenderNode.cpp | |
parent | cf6500b9bae461107d5c0c58de511df907d19fb3 (diff) | |
parent | 1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7 (diff) | |
download | frameworks_base-9317d0b9904573bdb0d815ec563dd263447f11db.zip frameworks_base-9317d0b9904573bdb0d815ec563dd263447f11db.tar.gz frameworks_base-9317d0b9904573bdb0d815ec563dd263447f11db.tar.bz2 |
am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev
* commit '1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7':
Mark isInUse per-window
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
-rw-r--r-- | libs/hwui/RenderNode.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 80f349a..0951fc1 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -214,10 +214,10 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) { info.renderer->pushLayerUpdate(mLayer); } - if (CC_UNLIKELY(info.canvasContext)) { - // If canvasContext is not null that means there are prefetched layers - // that need to be accounted for. That might be us, so tell CanvasContext - // that this layer is in the tree and should not be destroyed. + if (info.canvasContext) { + // There might be prefetched layers that need to be accounted for. + // That might be us, so tell CanvasContext that this layer is in the + // tree and should not be destroyed. info.canvasContext->markLayerInUse(this); } } @@ -339,7 +339,8 @@ void RenderNode::prepareSubTree(TreeInfo& info, bool functorsNeedLayer, DisplayL TextureCache& cache = Caches::getInstance().textureCache; info.out.hasFunctors |= subtree->functors.size(); for (size_t i = 0; info.prepareTextures && i < subtree->bitmapResources.size(); i++) { - info.prepareTextures = cache.prefetchAndMarkInUse(subtree->bitmapResources[i]); + info.prepareTextures = cache.prefetchAndMarkInUse( + info.canvasContext, subtree->bitmapResources[i]); } for (size_t i = 0; i < subtree->children().size(); i++) { DrawRenderNodeOp* op = subtree->children()[i]; |