From 4637c8e0da38570924c193a34f807c9451d9172b Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Fri, 14 Jul 2023 13:53:07 +0000 Subject: [PATCH 1/2] Add missing Skia #includes --- display_list/display_list_unittests.cc | 1 + display_list/effects/dl_image_filter_unittests.cc | 3 +++ display_list/skia/dl_sk_conversions_unittests.cc | 3 ++- display_list/skia/dl_sk_types.h | 4 ++++ display_list/testing/dl_rendering_unittests.cc | 1 + flow/rtree_unittests.cc | 1 + 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/display_list/display_list_unittests.cc b/display_list/display_list_unittests.cc index c726fd9757297..0b4763895579a 100644 --- a/display_list/display_list_unittests.cc +++ b/display_list/display_list_unittests.cc @@ -21,6 +21,7 @@ #include "flutter/testing/display_list_testing.h" #include "flutter/testing/testing.h" +#include "third_party/skia/include/core/SkBBHFactory.h" #include "third_party/skia/include/core/SkPictureRecorder.h" #include "third_party/skia/include/core/SkRSXform.h" #include "third_party/skia/include/core/SkSurface.h" diff --git a/display_list/effects/dl_image_filter_unittests.cc b/display_list/effects/dl_image_filter_unittests.cc index 77b8deb14c07a..422cb28dbb454 100644 --- a/display_list/effects/dl_image_filter_unittests.cc +++ b/display_list/effects/dl_image_filter_unittests.cc @@ -12,6 +12,9 @@ #include "flutter/display_list/utils/dl_comparable.h" #include "gtest/gtest.h" +#include "third_party/skia/include/core/SkBlendMode.h" +#include "third_party/skia/include/core/SkColorFilter.h" +#include "third_party/skia/include/core/SkSamplingOptions.h" #include "third_party/skia/include/effects/SkImageFilters.h" namespace flutter { diff --git a/display_list/skia/dl_sk_conversions_unittests.cc b/display_list/skia/dl_sk_conversions_unittests.cc index f330cc4f94adc..dae99690c91d5 100644 --- a/display_list/skia/dl_sk_conversions_unittests.cc +++ b/display_list/skia/dl_sk_conversions_unittests.cc @@ -10,7 +10,8 @@ #include "flutter/display_list/dl_tile_mode.h" #include "flutter/display_list/dl_vertices.h" #include "gtest/gtest.h" -#include "include/core/SkSamplingOptions.h" +#include "third_party/skia/include/core/SkSamplingOptions.h" +#include "third_party/skia/include/core/SkTileMode.h" namespace flutter { namespace testing { diff --git a/display_list/skia/dl_sk_types.h b/display_list/skia/dl_sk_types.h index b8737f5d1d336..bd359b64f5b34 100644 --- a/display_list/skia/dl_sk_types.h +++ b/display_list/skia/dl_sk_types.h @@ -7,8 +7,10 @@ #include "flutter/fml/macros.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "third_party/skia/include/core/SkBlendMode.h" #include "third_party/skia/include/core/SkBlurTypes.h" #include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/skia/include/core/SkClipOp.h" #include "third_party/skia/include/core/SkColorFilter.h" #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkImageFilter.h" @@ -21,8 +23,10 @@ #include "third_party/skia/include/core/SkRRect.h" #include "third_party/skia/include/core/SkRSXform.h" #include "third_party/skia/include/core/SkRect.h" +#include "third_party/skia/include/core/SkSamplingOptions.h" #include "third_party/skia/include/core/SkShader.h" #include "third_party/skia/include/core/SkTextBlob.h" +#include "third_party/skia/include/core/SkTileMode.h" #include "third_party/skia/include/core/SkVertices.h" #include "third_party/skia/include/effects/SkCornerPathEffect.h" #include "third_party/skia/include/effects/SkDashPathEffect.h" diff --git a/display_list/testing/dl_rendering_unittests.cc b/display_list/testing/dl_rendering_unittests.cc index d894044e9663d..dfcf4d8757d41 100644 --- a/display_list/testing/dl_rendering_unittests.cc +++ b/display_list/testing/dl_rendering_unittests.cc @@ -17,6 +17,7 @@ #include "flutter/testing/display_list_testing.h" #include "flutter/testing/testing.h" +#include "third_party/skia/include/core/SkBBHFactory.h" #include "third_party/skia/include/core/SkColorFilter.h" #include "third_party/skia/include/core/SkPictureRecorder.h" #include "third_party/skia/include/core/SkSurface.h" diff --git a/flow/rtree_unittests.cc b/flow/rtree_unittests.cc index 873b5e398a49c..d1af5bb235d4c 100644 --- a/flow/rtree_unittests.cc +++ b/flow/rtree_unittests.cc @@ -6,6 +6,7 @@ #include "flutter/testing/testing.h" #include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/skia/include/core/SkPicture.h" #include "third_party/skia/include/core/SkPictureRecorder.h" namespace flutter { From c9a4c99f2f7e11aad8a1dc95287087ab151d27a5 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Fri, 14 Jul 2023 14:50:18 +0000 Subject: [PATCH 2/2] a few more colorfilters --- display_list/display_list_unittests.cc | 1 + display_list/skia/dl_sk_canvas.cc | 2 ++ display_list/skia/dl_sk_conversions.cc | 1 + display_list/skia/dl_sk_paint_dispatcher.cc | 2 ++ 4 files changed, 6 insertions(+) diff --git a/display_list/display_list_unittests.cc b/display_list/display_list_unittests.cc index 28f3c005d488a..4c16f6e4438dc 100644 --- a/display_list/display_list_unittests.cc +++ b/display_list/display_list_unittests.cc @@ -22,6 +22,7 @@ #include "flutter/testing/testing.h" #include "third_party/skia/include/core/SkBBHFactory.h" +#include "third_party/skia/include/core/SkColorFilter.h" #include "third_party/skia/include/core/SkPictureRecorder.h" #include "third_party/skia/include/core/SkSurface.h" diff --git a/display_list/skia/dl_sk_canvas.cc b/display_list/skia/dl_sk_canvas.cc index 7f73e0515cf6e..3a5cb3bdc7736 100644 --- a/display_list/skia/dl_sk_canvas.cc +++ b/display_list/skia/dl_sk_canvas.cc @@ -8,6 +8,8 @@ #include "flutter/display_list/skia/dl_sk_dispatcher.h" #include "flutter/fml/trace_event.h" +#include "third_party/skia/include/core/SkColorFilter.h" + namespace flutter { // clang-format off diff --git a/display_list/skia/dl_sk_conversions.cc b/display_list/skia/dl_sk_conversions.cc index 5c3a1263fe071..4a4264269fd1f 100644 --- a/display_list/skia/dl_sk_conversions.cc +++ b/display_list/skia/dl_sk_conversions.cc @@ -4,6 +4,7 @@ #include "flutter/display_list/skia/dl_sk_conversions.h" +#include "third_party/skia/include/core/SkColorFilter.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "third_party/skia/include/effects/SkImageFilters.h" diff --git a/display_list/skia/dl_sk_paint_dispatcher.cc b/display_list/skia/dl_sk_paint_dispatcher.cc index 7737e3c7f9830..80970cc9ee14b 100644 --- a/display_list/skia/dl_sk_paint_dispatcher.cc +++ b/display_list/skia/dl_sk_paint_dispatcher.cc @@ -12,6 +12,8 @@ #include "flutter/display_list/skia/dl_sk_conversions.h" #include "flutter/fml/logging.h" +#include "third_party/skia/include/core/SkColorFilter.h" + namespace flutter { // clang-format off