Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add missing includes of SkBlendMode.h"

Browse Source
This commit is contained in:
Kevin Lubick
2022-12-02 13:03:05 +00:00
committed by Android (Google) Code Review
parent 608f05992b 4e8ce46f9c
commit ac862b92d1
45 changed files with 77 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/hwui/CanvasTransform.cpp
View File

@@ -17,6 +17,7 @@
#include "CanvasTransform.h"
#include <SkAndroidFrameworkUtils.h>
#include <SkBlendMode.h>
#include <SkColorFilter.h>
#include <SkGradientShader.h>
#include <SkHighContrastFilter.h>

1
libs/hwui/DeferredLayerUpdater.h
View File

@@ -16,6 +16,7 @@
#pragma once
#include <SkBlendMode.h>
#include <SkColorFilter.h>
#include <SkImage.h>
#include <SkMatrix.h>

2
libs/hwui/Layer.cpp
View File

@@ -20,6 +20,8 @@
#include "utils/Color.h"
#include "utils/MathUtils.h"
#include <SkBlendMode.h>
#include <log/log.h>
namespace android {

1
libs/hwui/RecordingCanvas.cpp
View File

@@ -22,6 +22,7 @@
#include <experimental/type_traits>
#include "SkAndroidFrameworkUtils.h"
#include "SkBlendMode.h"
#include "SkCanvas.h"
#include "SkCanvasPriv.h"
#include "SkColor.h"

1
libs/hwui/RecordingCanvas.h
View File

@@ -34,6 +34,7 @@
#include <SkRuntimeEffect.h>
#include <vector>
enum class SkBlendMode;
class SkRRect;
namespace android {

1
libs/hwui/SkiaCanvas.h
View File

@@ -33,6 +33,7 @@
#include <cassert>
#include <optional>
enum class SkBlendMode;
class SkRRect;
namespace android {

1
libs/hwui/apex/android_paint.cpp
View File

@@ -19,6 +19,7 @@
#include "TypeCast.h"
#include <hwui/Paint.h>
#include <SkBlendMode.h>
using namespace android;

1
libs/hwui/hwui/Canvas.h
View File

@@ -30,6 +30,7 @@
#include <SkMatrix.h>
class SkAnimatedImage;
enum class SkBlendMode;
class SkCanvasState;
class SkRRect;
class SkRuntimeShaderBuilder;

1
libs/hwui/jni/ColorFilter.cpp
View File

@@ -17,6 +17,7 @@
#include "GraphicsJNI.h"
#include "SkBlendMode.h"
#include "SkColorFilter.h"
#include "SkColorMatrixFilter.h"

1
libs/hwui/jni/RenderEffect.cpp
View File

@@ -15,6 +15,7 @@
*/
#include "Bitmap.h"
#include "GraphicsJNI.h"
#include "SkBlendMode.h"
#include "SkImageFilter.h"
#include "SkImageFilters.h"
#include "graphics_jni_helpers.h"

1
libs/hwui/pipeline/skia/RenderNodeDrawable.h
View File

@@ -18,6 +18,7 @@
#include "SkiaUtils.h"
#include <SkBlendMode.h>
#include <SkCanvas.h>
#include <SkDrawable.h>
#include <SkMatrix.h>

4
libs/hwui/pipeline/skia/StretchMask.cpp
View File

@@ -14,8 +14,10 @@
* limitations under the License.
*/
#include "StretchMask.h"
#include "SkSurface.h"
#include "SkBlendMode.h"
#include "SkCanvas.h"
#include "SkSurface.h"
#include "TransformCanvas.h"
#include "SkiaDisplayList.h"

2
libs/hwui/pipeline/skia/VkInteropFunctorDrawable.cpp
View File

@@ -33,6 +33,8 @@
#include "thread/ThreadBase.h"
#include "utils/TimeUtils.h"
#include <SkBlendMode.h>
namespace android {
namespace uirenderer {
namespace skiapipeline {

2
libs/hwui/tests/common/CallCountingCanvas.h
View File

@@ -19,6 +19,8 @@
#include <SkCanvasVirtualEnforcer.h>
#include <SkNoDrawCanvas.h>
enum class SkBlendMode;
namespace android {
namespace uirenderer {
namespace test {

2
libs/hwui/tests/common/TestListViewSceneBase.cpp
View File

@@ -19,6 +19,8 @@
#include "TestContext.h"
#include "TestUtils.h"
#include <SkBlendMode.h>
#include <utils/Color.h>
namespace android {

1
libs/hwui/tests/common/scenes/BitmapFillrate.cpp
View File

@@ -19,6 +19,7 @@
#include "utils/Color.h"
#include <SkBitmap.h>
#include <SkBlendMode.h>
using namespace android;
using namespace android::uirenderer;

2
libs/hwui/tests/common/scenes/ClippingAnimation.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
class ClippingAnimation;
static TestScene::Registrar _RectGrid(TestScene::Info{

2
libs/hwui/tests/common/scenes/GlyphStressAnimation.cpp
View File

@@ -20,6 +20,8 @@
#include <hwui/Paint.h>
#include <minikin/Layout.h>
#include <SkBlendMode.h>
#include <cstdio>
class GlyphStressAnimation;

1
libs/hwui/tests/common/scenes/HwBitmapInCompositeShader.cpp
View File

@@ -17,6 +17,7 @@
#include "TestSceneBase.h"
#include "utils/Color.h"
#include <SkBlendMode.h>
#include <SkColorSpace.h>
#include <SkGradientShader.h>
#include <SkImagePriv.h>

2
libs/hwui/tests/common/scenes/HwLayerAnimation.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
class HwLayerAnimation;
static TestScene::Registrar _HwLayer(TestScene::Info{

2
libs/hwui/tests/common/scenes/HwLayerSizeAnimation.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
class HwLayerSizeAnimation;
static TestScene::Registrar _HwLayerSize(TestScene::Info{

2
libs/hwui/tests/common/scenes/JankyScene.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
#include <unistd.h>
class JankyScene;

1
libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp
View File

@@ -17,6 +17,7 @@
#include "TestSceneBase.h"
#include "tests/common/TestListViewSceneBase.h"
#include "hwui/Paint.h"
#include <SkBlendMode.h>
#include <SkGradientShader.h>
class ListOfFadedTextAnimation;

2
libs/hwui/tests/common/scenes/OvalAnimation.cpp
View File

@@ -17,6 +17,8 @@
#include "TestSceneBase.h"
#include "utils/Color.h"
#include <SkBlendMode.h>
class OvalAnimation;
static TestScene::Registrar _Oval(TestScene::Info{"oval", "Draws 1 oval.",

2
libs/hwui/tests/common/scenes/PartialDamageAnimation.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
class PartialDamageAnimation;
static TestScene::Registrar _PartialDamage(TestScene::Info{

2
libs/hwui/tests/common/scenes/PathClippingAnimation.cpp
View File

@@ -16,6 +16,8 @@
#include <vector>
#include <SkBlendMode.h>
#include "TestSceneBase.h"
class PathClippingAnimation : public TestScene {

2
libs/hwui/tests/common/scenes/RectGridAnimation.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
class RectGridAnimation;
static TestScene::Registrar _RectGrid(TestScene::Info{

2
libs/hwui/tests/common/scenes/RoundRectClippingAnimation.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
#include <vector>
class RoundRectClippingAnimation : public TestScene {

1
libs/hwui/tests/common/scenes/SaveLayer2Animation.cpp
View File

@@ -16,6 +16,7 @@
#include <hwui/Paint.h>
#include <minikin/Layout.h>
#include <SkBlendMode.h>
#include <string>
#include "TestSceneBase.h"

2
libs/hwui/tests/common/scenes/SaveLayerAnimation.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
class SaveLayerAnimation;
static TestScene::Registrar _SaveLayer(TestScene::Info{

2
libs/hwui/tests/common/scenes/ShadowGrid2Animation.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
class ShadowGrid2Animation;
static TestScene::Registrar _ShadowGrid2(TestScene::Info{

2
libs/hwui/tests/common/scenes/ShadowGridAnimation.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
class ShadowGridAnimation;
static TestScene::Registrar _ShadowGrid(TestScene::Info{

2
libs/hwui/tests/common/scenes/ShadowShaderAnimation.cpp
View File

@@ -16,6 +16,8 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
class ShadowShaderAnimation;
static TestScene::Registrar _ShadowShader(TestScene::Info{

2
libs/hwui/tests/common/scenes/ShapeAnimation.cpp
View File

@@ -17,6 +17,8 @@
#include "TestSceneBase.h"
#include "utils/Color.h"
#include <SkBlendMode.h>
#include <cstdio>
class ShapeAnimation;

1
libs/hwui/tests/common/scenes/SimpleColorMatrixAnimation.cpp
View File

@@ -16,6 +16,7 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
#include <SkColorFilter.h>
#include <SkColorMatrix.h>
#include <SkGradientShader.h>

1
libs/hwui/tests/common/scenes/SimpleGradientAnimation.cpp
View File

@@ -16,6 +16,7 @@
#include "TestSceneBase.h"
#include <SkBlendMode.h>
#include <SkGradientShader.h>
class SimpleGradientAnimation;

1
libs/hwui/tests/common/scenes/StretchyListViewAnimation.cpp
View File

@@ -15,6 +15,7 @@
*/
#include <SkBitmap.h>
#include <SkBlendMode.h>
#include <SkCanvas.h>
#include <SkColor.h>
#include <SkFont.h>

2
libs/hwui/tests/common/scenes/TextAnimation.cpp
View File

@@ -17,6 +17,8 @@
#include "TestSceneBase.h"
#include "hwui/Paint.h"
#include <SkBlendMode.h>
class TextAnimation;
static TestScene::Registrar _Text(TestScene::Info{"text", "Draws a bunch of text.",

2
libs/hwui/tests/microbench/DisplayListCanvasBench.cpp
View File

@@ -22,6 +22,8 @@
#include "pipeline/skia/SkiaDisplayList.h"
#include "tests/common/TestUtils.h"
#include <SkBlendMode.h>
using namespace android;
using namespace android::uirenderer;
using namespace android::uirenderer::skiapipeline;

2
libs/hwui/tests/microbench/RenderNodeBench.cpp
View File

@@ -19,6 +19,8 @@
#include "hwui/Canvas.h"
#include "RenderNode.h"
#include <SkBlendMode.h>
using namespace android;
using namespace android::uirenderer;

1
libs/hwui/tests/unit/CanvasOpTests.cpp
View File

@@ -23,6 +23,7 @@
#include <tests/common/CallCountingCanvas.h>
#include "SkBlendMode.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColor.h"

1
libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
View File

@@ -17,6 +17,7 @@
#include <VectorDrawable.h>
#include <gtest/gtest.h>
#include <SkBlendMode.h>
#include <SkClipStack.h>
#include <SkSurface_Base.h>
#include <string.h>

9
libs/hwui/tests/unit/SkiaCanvasTests.cpp
View File

@@ -17,10 +17,19 @@
#include "tests/common/TestUtils.h"
#include <hwui/Paint.h>
#include <SkAlphaType.h>
#include <SkBitmap.h>
#include <SkBlendMode.h>
#include <SkCanvas.h>
#include <SkCanvasStateUtils.h>
#include <SkColor.h>
#include <SkColorSpace.h>
#include <SkColorType.h>
#include <SkImageInfo.h>
#include <SkPicture.h>
#include <SkPictureRecorder.h>
#include <SkRefCnt.h>
#include <SkSurface.h>
#include <gtest/gtest.h>
using namespace android;

1
libs/hwui/tests/unit/SkiaPipelineTests.cpp
View File

@@ -17,6 +17,7 @@
#include <VectorDrawable.h>
#include <gtest/gtest.h>
#include <SkBlendMode.h>
#include <SkClipStack.h>
#include <SkSurface_Base.h>
#include <string.h>

1
libs/hwui/utils/PaintUtils.h
View File

@@ -19,6 +19,7 @@
#include <GLES2/gl2.h>
#include <utils/Blur.h>
#include <SkBlendMode.h>
#include <SkColorFilter.h>
#include <SkPaint.h>
#include <SkShader.h>