diff options
| author | 2019-07-31 17:43:57 +0000 | |
|---|---|---|
| committer | 2019-07-31 17:43:57 +0000 | |
| commit | 7bdc19bacb177ba5fbfd6bb5db6fe4543fe2f220 (patch) | |
| tree | 7d32b7e52a9a3f74c5c9dc2852bcf8ca50305e0c /libs | |
| parent | 0cb4053e3be22a9d49a7f5053c145bafb7da71b0 (diff) | |
| parent | 5d0ca63d9c2b15b7a61b5e523790e490d23b7500 (diff) | |
Merge "Isolate the graphics classes into their own static lib"
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 1 | ||||
| -rw-r--r-- | libs/hwui/pipeline/skia/SkiaDisplayList.cpp | 1 | ||||
| -rw-r--r-- | libs/hwui/pipeline/skia/SkiaDisplayList.h | 4 | ||||
| -rw-r--r-- | libs/hwui/renderthread/VulkanManager.h | 1 |
4 files changed, 6 insertions, 1 deletions
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 diff --git a/libs/hwui/pipeline/skia/SkiaDisplayList.cpp b/libs/hwui/pipeline/skia/SkiaDisplayList.cpp index c7d5f3193f45..d7076d4cf424 100644 --- a/libs/hwui/pipeline/skia/SkiaDisplayList.cpp +++ b/libs/hwui/pipeline/skia/SkiaDisplayList.cpp @@ -15,6 +15,7 @@ */ #include "SkiaDisplayList.h" +#include "FunctorDrawable.h" #include "DumpOpsCanvas.h" #ifdef __ANDROID__ // Layoutlib does not support SkiaPipeline diff --git a/libs/hwui/pipeline/skia/SkiaDisplayList.h b/libs/hwui/pipeline/skia/SkiaDisplayList.h index b79103787023..e3c3273a726a 100644 --- a/libs/hwui/pipeline/skia/SkiaDisplayList.h +++ b/libs/hwui/pipeline/skia/SkiaDisplayList.h @@ -16,7 +16,6 @@ #pragma once -#include "FunctorDrawable.h" #include "RecordingCanvas.h" #include "RenderNodeDrawable.h" #include "TreeInfo.h" @@ -34,6 +33,7 @@ class CanvasContext; } class Outline; +struct WebViewSyncData; namespace VectorDrawable { class Tree; @@ -42,6 +42,8 @@ typedef uirenderer::VectorDrawable::Tree VectorDrawableRoot; namespace skiapipeline { +class FunctorDrawable; + class SkiaDisplayList { public: size_t getUsedSize() { return allocator.usedSize() + mDisplayList.usedSize(); } diff --git a/libs/hwui/renderthread/VulkanManager.h b/libs/hwui/renderthread/VulkanManager.h index ec217c0fcbf4..4c6a75504cd0 100644 --- a/libs/hwui/renderthread/VulkanManager.h +++ b/libs/hwui/renderthread/VulkanManager.h @@ -31,6 +31,7 @@ #include "Frame.h" #include "IRenderPipeline.h" #include "VulkanSurface.h" +#include "private/hwui/DrawVkInfo.h" class GrVkExtensions; |