From e2e53a7079733694bd52dbce665e9ceff21e9727 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Wed, 28 Oct 2015 15:55:40 -0700 Subject: Simplify TreeInfo Change-Id: I8f05e9046236d607016b6c2bb77a333cfb47ba47 --- libs/hwui/RenderNode.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libs/hwui/RenderNode.cpp') diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 351fbaa86a2a..18d86122a1c9 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -250,7 +250,8 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) { bool transformUpdateNeeded = false; if (!mLayer) { - mLayer = LayerRenderer::createRenderLayer(info.renderState, getWidth(), getHeight()); + mLayer = LayerRenderer::createRenderLayer( + info.canvasContext.getRenderState(), getWidth(), getHeight()); applyLayerPropertiesToLayer(info); damageSelf(info); transformUpdateNeeded = true; @@ -293,12 +294,10 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) { info.renderer->pushLayerUpdate(mLayer); } - 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); - } + // 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); } /** @@ -419,7 +418,8 @@ void RenderNode::prepareSubTree(TreeInfo& info, bool functorsNeedLayer, DisplayL TextureCache& cache = Caches::getInstance().textureCache; info.out.hasFunctors |= subtree->getFunctors().size(); for (auto&& bitmapResource : subtree->getBitmapResources()) { - info.prepareTextures = cache.prefetchAndMarkInUse(info.canvasContext, bitmapResource); + void* ownerToken = &info.canvasContext; + info.prepareTextures = cache.prefetchAndMarkInUse(ownerToken, bitmapResource); } for (auto&& op : subtree->getChildren()) { RenderNode* childNode = op->renderNode; -- cgit v1.2.3-59-g8ed1b