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

Commit 856848e4 authored by Kevin Lubick's avatar Kevin Lubick
Browse files

Fix includes of SkRRect and other Skia headers 

I would like to (re-)land https://skia-review.googlesource.com/c/skia/+/512158
which tidies up includes around SkRRect. I searched for all
places in libs/hwui that used SkRRect and made sure they either
forward declared it or included it, as appropriate.

While going through these files, I fixed a few other includes that
stood out to me, e.g. SkPaint, SkCanvas, etc to make sure the files
that use the symbols are the ones including them (and lessening
transitive dependencies).

Change-Id: I44792a6b9f06a54d052cefa4cbc9342f46ab2a4f
parent 8edab3cc

libs/hwui/RecordingCanvas.cpp

+4 −0
Original line number Diff line number Diff line
@@ -29,10 +29,14 @@ 
#include "SkDrawShadowInfo.h"

#include "SkImage.h"

#include "SkImageFilter.h"

#include "SkImageInfo.h"

#include "SkLatticeIter.h"

#include "SkMath.h"

#include "SkPaint.h"

#include "SkPicture.h"

#include "SkRRect.h"

#include "SkRSXform.h"

#include "SkRect.h"

#include "SkRegion.h"

#include "SkTextBlob.h"

#include "SkVertices.h"

libs/hwui/RecordingCanvas.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#include <SkRuntimeEffect.h>

#include <vector>



class SkRRect;



namespace android {

namespace uirenderer {

libs/hwui/SkiaCanvas.cpp

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


#include <SkAndroidFrameworkUtils.h>

#include <SkAnimatedImage.h>

#include <SkBitmap.h>

#include <SkCanvasPriv.h>

#include <SkCanvasStateUtils.h>

#include <SkColorFilter.h>
@@ -36,8 +37,13 @@ 
#include <SkGraphics.h>

#include <SkImage.h>

#include <SkImagePriv.h>

#include <SkMatrix.h>

#include <SkPaint.h>

#include <SkPicture.h>

#include <SkRSXform.h>

#include <SkRRect.h>

#include <SkRect.h>

#include <SkRefCnt.h>

#include <SkShader.h>

#include <SkTemplates.h>

#include <SkTextBlob.h>

libs/hwui/SkiaCanvas.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#include <cassert>

#include <optional>



class SkRRect;



namespace android {



// Holds an SkCanvas reference plus additional native data.

libs/hwui/canvas/CanvasOps.h

+9 −3
Original line number Diff line number Diff line
@@ -17,13 +17,19 @@ 
#pragma once



#include <SkAndroidFrameworkUtils.h>

#include <SkBlendMode.h>

#include <SkCanvas.h>

#include <SkPath.h>

#include <SkRegion.h>

#include <SkVertices.h>

#include <SkClipOp.h>

#include <SkImage.h>

#include <SkPaint.h>

#include <SkPath.h>

#include <SkPicture.h>

#include <SkRRect.h>

#include <SkRect.h>

#include <SkRegion.h>

#include <SkRuntimeEffect.h>

#include <SkSamplingOptions.h>

#include <SkVertices.h>



#include <log/log.h>