Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 844516c4 authored by John Reck's avatar John Reck
Browse files

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
parent dc1a696f

libs/hwui/DisplayList.h

+2 −3
Original line number Diff line number Diff line
@@ -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;



/**

libs/hwui/RecordingCanvas.h

+5 −1
Original line number Diff line number Diff line
@@ -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"

libs/hwui/WebViewFunctorManager.h

+2 −2
Original line number Diff line number Diff line
@@ -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>

libs/hwui/tests/microbench/RenderNodeBench.cpp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include <benchmark/benchmark.h>



#include "hwui/Canvas.h"

#include "RenderNode.h"



using namespace android;