From 844516c4946fa200afab9575cb154a962779b74f Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 13 Jan 2021 10:59:10 -0500
Subject: [PATCH] Remove forward-decleration of SkiaDisplayList

Enables DisplayList to be a wrapper around SkiaDisplayList
instead of a type-alias by having the full include of
SkiaDisplayList available

Test: builds
Change-Id: Ie906e6288530134840bee81af3a89871ed6a7d25
---
 libs/hwui/DisplayList.h                        | 5 ++---
 libs/hwui/RecordingCanvas.h                    | 6 +++++-
 libs/hwui/WebViewFunctorManager.h              | 4 ++--
 libs/hwui/tests/microbench/RenderNodeBench.cpp | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index dd2476313b19c..dc63e5db4a707 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -16,15 +16,14 @@
 
 #pragma once
 
+#include "pipeline/skia/SkiaDisplayList.h"
+
 namespace android {
 namespace uirenderer {
 
 namespace VectorDrawable {
 class Tree;
 };
-namespace skiapipeline {
-class SkiaDisplayList;
-}
 typedef uirenderer::VectorDrawable::Tree VectorDrawableRoot;
 
 /**
diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h
index 89e3df7718090..c4189da995633 100644
--- a/libs/hwui/RecordingCanvas.h
+++ b/libs/hwui/RecordingCanvas.h
@@ -18,7 +18,6 @@
 
 #include "CanvasTransform.h"
 #include "hwui/Bitmap.h"
-#include "hwui/Canvas.h"
 #include "utils/Macros.h"
 #include "utils/TypeLogic.h"
 
@@ -40,6 +39,11 @@ namespace skiapipeline {
 class FunctorDrawable;
 }
 
+namespace VectorDrawable {
+class Tree;
+}
+typedef uirenderer::VectorDrawable::Tree VectorDrawableRoot;
+
 enum class DisplayListOpType : uint8_t {
 #define X(T) T,
 #include "DisplayListOps.in"
diff --git a/libs/hwui/WebViewFunctorManager.h b/libs/hwui/WebViewFunctorManager.h
index 737d60525aa9c..17b936ade45cd 100644
--- a/libs/hwui/WebViewFunctorManager.h
+++ b/libs/hwui/WebViewFunctorManager.h
@@ -19,11 +19,11 @@
 #include <private/hwui/WebViewFunctor.h>
 #ifdef __ANDROID__ // Layoutlib does not support render thread
 #include <renderthread/RenderProxy.h>
-#else
-#include <utils/Log.h>
 #endif
 
 #include <utils/LightRefBase.h>
+#include <utils/Log.h>
+#include <utils/StrongPointer.h>
 #include <mutex>
 #include <vector>
 
diff --git a/libs/hwui/tests/microbench/RenderNodeBench.cpp b/libs/hwui/tests/microbench/RenderNodeBench.cpp
index 011939a6e4b2b..618988fd04d4e 100644
--- a/libs/hwui/tests/microbench/RenderNodeBench.cpp
+++ b/libs/hwui/tests/microbench/RenderNodeBench.cpp
@@ -16,6 +16,7 @@
 
 #include <benchmark/benchmark.h>
 
+#include "hwui/Canvas.h"
 #include "RenderNode.h"
 
 using namespace android;