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

Commit 08409e23 authored by Kevin Lubick's avatar Kevin Lubick
Browse files

Fix Skia includes around codecs 

In https://skia-review.googlesource.com/c/skia/+/642658 we are
cleaning up Skia includes. These changes are necessary to address
issues from that CL or are pre-emptive for future include refactoring.

Change-Id: I8af0c7979d62f779df74065d5dd548bbc2ce31b5
parent ab3b2e35

libs/hwui/hwui/ImageDecoder.cpp

+12 −0
Original line number Diff line number Diff line
@@ -17,13 +17,25 @@ 
#include "ImageDecoder.h"



#include <Gainmap.h>

#include <SkAlphaType.h>

#include <SkAndroidCodec.h>

#include <SkBitmap.h>

#include <SkBlendMode.h>

#include <SkCanvas.h>

#include <SkCodec.h>

#include <SkCodecAnimation.h>

#include <SkColorSpace.h>

#include <SkColorType.h>

#include <SkEncodedOrigin.h>

#include <SkImageInfo.h>

#include <SkGainmapInfo.h>

#include <SkMatrix.h>

#include <SkPaint.h>

#include <SkPngChunkReader.h>

#include <SkRect.h>

#include <SkRefCnt.h>

#include <SkSamplingOptions.h>

#include <SkSize.h>

#include <SkStream.h>

#include <hwui/Bitmap.h>

#include <log/log.h>

libs/hwui/jni/ImageDecoder.cpp

+5 −0
Original line number Diff line number Diff line
@@ -18,11 +18,16 @@ 


#include <FrontBufferedStream.h>

#include <HardwareBitmapUploader.h>

#include <SkAlphaType.h>

#include <SkAndroidCodec.h>

#include <SkBitmap.h>

#include <SkCodec.h>

#include <SkCodecAnimation.h>

#include <SkColorSpace.h>

#include <SkColorType.h>

#include <SkImageInfo.h>

#include <SkRect.h>

#include <SkSize.h>

#include <SkStream.h>

#include <SkString.h>

#include <androidfw/Asset.h>

native/graphics/jni/imagedecoder.cpp

+4 −0
Original line number Diff line number Diff line
@@ -25,10 +25,14 @@ 
#include <hwui/ImageDecoder.h>

#include <log/log.h>

#include <SkAndroidCodec.h>

#include <SkAlphaType.h>

#include <SkCodec.h>

#include <SkCodecAnimation.h>

#include <SkColorSpace.h>

#include <SkColorType.h>

#include <SkImageInfo.h>

#include <SkRect.h>

#include <SkRefCnt.h>

#include <SkSize.h>

#include <SkStream.h>

#include <utils/Color.h>