From b7c2eb98fbc75e616abc8c101ab1dcebdc8e2091 Mon Sep 17 00:00:00 2001 From: Fedor Kudasov Date: Mon, 24 Jun 2019 15:24:57 +0100 Subject: Remove redundant header Bug: 117921091 Test: all tests should pass Change-Id: I6a3ddd9b5f24bc3ed4d7862493c0c72e79b4410d --- libs/hwui/RenderNode.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'libs/hwui/RenderNode.cpp') diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index b73347b233d7..a833f7ef98c9 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -20,7 +20,6 @@ #include "Debug.h" #include "TreeInfo.h" #include "VectorDrawable.h" -#include "renderstate/RenderState.h" #include "renderthread/CanvasContext.h" #include "utils/FatVector.h" #include "utils/MathUtils.h" -- cgit v1.2.3 From 86bd214059cd6150304888a285941bf74af5b687 Mon Sep 17 00:00:00 2001 From: Fedor Kudasov Date: Tue, 18 Jun 2019 15:51:57 +0100 Subject: Enable RenderNode and RecordingCanvas for layoutlib Bug: 117921091 Test: all tests should pass Change-Id: I574b12a5f7a6a54cbbcb17c35a3884368fd404e6 --- libs/hwui/RenderNode.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libs/hwui/RenderNode.cpp') diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index a833f7ef98c9..8aee8f5b1848 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -20,7 +20,12 @@ #include "Debug.h" #include "TreeInfo.h" #include "VectorDrawable.h" +#ifdef __ANDROID__ #include "renderthread/CanvasContext.h" +#else +#include "DamageAccumulator.h" +#include "pipeline/skia/SkiaDisplayList.h" +#endif #include "utils/FatVector.h" #include "utils/MathUtils.h" #include "utils/StringUtils.h" @@ -160,6 +165,7 @@ void RenderNode::prepareLayer(TreeInfo& info, uint32_t dirtyMask) { } void RenderNode::pushLayerUpdate(TreeInfo& info) { +#ifdef __ANDROID__ // Layoutlib does not support CanvasContext and Layers LayerType layerType = properties().effectiveLayerType(); // If we are not a layer OR we cannot be rendered (eg, view was detached) // we need to destroy any Layers we may have had previously @@ -188,6 +194,7 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) { // That might be us, so tell CanvasContext that this layer is in the // tree and should not be destroyed. info.canvasContext.markLayerInUse(this); +#endif } /** -- cgit v1.2.3 From 5d0ca63d9c2b15b7a61b5e523790e490d23b7500 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Fri, 19 Jul 2019 16:17:12 -0400 Subject: Isolate the graphics classes into their own static lib Update additional headers to include-what-you-use to resolve compiler errors related to moving include paths. Test: CtsUiRenderingTestCases Change-Id: I230408a53610ad1926f9e46d5aff66f52fec4a3a --- libs/hwui/RenderNode.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'libs/hwui/RenderNode.cpp') diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 8aee8f5b1848..8eb5e3d3dfbc 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -20,6 +20,7 @@ #include "Debug.h" #include "TreeInfo.h" #include "VectorDrawable.h" +#include "private/hwui/WebViewFunctor.h" #ifdef __ANDROID__ #include "renderthread/CanvasContext.h" #else -- cgit v1.2.3 From 183e1380cef0f63610497abed01e16036a2ea2d4 Mon Sep 17 00:00:00 2001 From: John Reck Date: Wed, 9 Oct 2019 13:41:18 -0700 Subject: Improve dumping of display list memory usage The first step of improving is measuring. So measure better. Bug: 138856108 Test: dump Change-Id: I076b904a1f0dfb209622c76bcb8778a10cd2b7db --- libs/hwui/RenderNode.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'libs/hwui/RenderNode.cpp') diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 8eb5e3d3dfbc..6761435a8171 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -108,7 +108,7 @@ void RenderNode::output(std::ostream& output, uint32_t level) { output << std::endl; } -int RenderNode::getDebugSize() { +int RenderNode::getUsageSize() { int size = sizeof(RenderNode); if (mStagingDisplayList) { size += mStagingDisplayList->getUsedSize(); @@ -119,6 +119,18 @@ int RenderNode::getDebugSize() { return size; } +int RenderNode::getAllocatedSize() { + int size = sizeof(RenderNode); + if (mStagingDisplayList) { + size += mStagingDisplayList->getAllocatedSize(); + } + if (mDisplayList && mDisplayList != mStagingDisplayList) { + size += mDisplayList->getAllocatedSize(); + } + return size; +} + + void RenderNode::prepareTree(TreeInfo& info) { ATRACE_CALL(); LOG_ALWAYS_FATAL_IF(!info.damageAccumulator, "DamageAccumulator missing"); -- cgit v1.2.3 From 0865f2e7b22ceab8d1cc28092b8e361990882c78 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Tue, 4 Feb 2020 22:23:16 -0800 Subject: hwui: remove FatVector FatVector now lives in fw/native/libs/ui. Test: builds, boots, works Bug: 149096186 Change-Id: I09dc2fddd2a238ef47d7853b64b0bfbf74d3f71f --- libs/hwui/RenderNode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/hwui/RenderNode.cpp') diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 6761435a8171..31e45558139d 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -27,7 +27,6 @@ #include "DamageAccumulator.h" #include "pipeline/skia/SkiaDisplayList.h" #endif -#include "utils/FatVector.h" #include "utils/MathUtils.h" #include "utils/StringUtils.h" #include "utils/TraceUtils.h" @@ -37,6 +36,7 @@ #include #include #include +#include namespace android { namespace uirenderer { -- cgit v1.2.3 From 894f132ba056b9d85598068e77d9050ad8963624 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Mon, 24 Feb 2020 21:30:20 +0000 Subject: Revert "hwui: remove FatVector" Revert "libui: rewrite Region with FatVector" Revert submission 10248126-fatvector-region Reason for revert: b/149254345 Reverted Changes: I09dc2fddd:hwui: remove FatVector I265c6c831:libui: rewrite Region with FatVector also fix wrong license in FatVector.h Test: boots Bug: 149254345 Change-Id: I8ac66acb8b635324051edd41c5d4092c223157ff --- libs/hwui/RenderNode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/hwui/RenderNode.cpp') diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 31e45558139d..6761435a8171 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -27,6 +27,7 @@ #include "DamageAccumulator.h" #include "pipeline/skia/SkiaDisplayList.h" #endif +#include "utils/FatVector.h" #include "utils/MathUtils.h" #include "utils/StringUtils.h" #include "utils/TraceUtils.h" @@ -36,7 +37,6 @@ #include #include #include -#include namespace android { namespace uirenderer { -- cgit v1.2.3 From b624af3dca0f80a8b6e924920d6c6054bbffdd31 Mon Sep 17 00:00:00 2001 From: Jagadeesh Pakaravoor Date: Fri, 1 May 2020 00:01:40 +0000 Subject: Revert^2 "hwui: remove FatVector" Revert submission 10449863-revert-fatvector Reason for revert: b/149254345 Original change (of introducing FatVector) was reverted as a stop-gap solution to fix the aforementioned bug. The bug was caused by an ABI lock between Surface's definition (that changed with Region) and lib-imsvt prebuilt. Enabling this change now as we have re-compiled the prebuilt with the change enabled. Doing that via a revert of the revert. Reverted Changes: I8ac66acb8:Revert "hwui: remove FatVector" Ib60dbf3ef:Revert "libui: rewrite Region with FatVector" Original changes: I09dc2fddd:hwui: remove FatVector I265c6c831:libui: rewrite Region with FatVector bug: 149254345 Change-Id: I9fb5e8908434abb9a763992e922445a2dc37e865 --- libs/hwui/RenderNode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/hwui/RenderNode.cpp') diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 6761435a8171..31e45558139d 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -27,7 +27,6 @@ #include "DamageAccumulator.h" #include "pipeline/skia/SkiaDisplayList.h" #endif -#include "utils/FatVector.h" #include "utils/MathUtils.h" #include "utils/StringUtils.h" #include "utils/TraceUtils.h" @@ -37,6 +36,7 @@ #include #include #include +#include namespace android { namespace uirenderer { -- cgit v1.2.3