diff --git a/engine/flutter/flow/compositor_context.cc b/engine/flutter/flow/compositor_context.cc index 8c0d7f63c6c2cc6a726e669bbc58ec4babcb1712..6fa3933bb622749ae66d85005f718d458dde87b1 100644 --- a/engine/flutter/flow/compositor_context.cc +++ b/engine/flutter/flow/compositor_context.cc @@ -5,7 +5,7 @@ #include "flutter/flow/compositor_context.h" #include "flutter/flow/layers/layer_tree.h" -#include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" namespace flutter { diff --git a/engine/flutter/flow/compositor_context.h b/engine/flutter/flow/compositor_context.h index bba4a76a1f5f96b7d39405bc8ccece74d8915c06..9aa6d5b2987d343551044f34bcecefe3dae3517e 100644 --- a/engine/flutter/flow/compositor_context.h +++ b/engine/flutter/flow/compositor_context.h @@ -14,8 +14,8 @@ #include "flutter/flow/texture.h" #include "flutter/fml/gpu_thread_merger.h" #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkPictureRecorder.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkPictureRecorder.h" namespace flutter { diff --git a/engine/flutter/flow/debug_print.cc b/engine/flutter/flow/debug_print.cc index 965c3c2c786147282bfabd3c2fcf3f878d7ad036..fc6341f4e5e6ed58d7fc54ab2f65982e59604dfc 100644 --- a/engine/flutter/flow/debug_print.cc +++ b/engine/flutter/flow/debug_print.cc @@ -6,7 +6,7 @@ #include -#include "third_party/skia/include/core/SkString.h" +#include "third_party/flutter/skia/include/core/SkString.h" std::ostream& operator<<(std::ostream& os, const flutter::MatrixDecomposition& m) { diff --git a/engine/flutter/flow/debug_print.h b/engine/flutter/flow/debug_print.h index f8e0d239c8c86b4ac7efefccdf3bacbf44da452a..456f4de24a35777a493d7ffeebc0d63da55d1248 100644 --- a/engine/flutter/flow/debug_print.h +++ b/engine/flutter/flow/debug_print.h @@ -8,10 +8,10 @@ #include "flutter/flow/matrix_decomposition.h" #include "flutter/flow/raster_cache_key.h" #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkMatrix.h" -#include "third_party/skia/include/core/SkMatrix44.h" -#include "third_party/skia/include/core/SkPoint3.h" -#include "third_party/skia/include/core/SkRRect.h" +#include "third_party/flutter/skia/include/core/SkMatrix.h" +#include "third_party/flutter/skia/include/core/SkMatrix44.h" +#include "third_party/flutter/skia/include/core/SkPoint3.h" +#include "third_party/flutter/skia/include/core/SkRRect.h" #define DEF_PRINTER(x) std::ostream& operator<<(std::ostream&, const x&); diff --git a/engine/flutter/flow/embedded_views.h b/engine/flutter/flow/embedded_views.h index afaf9037a1cc0647ba44f71b60f103f3dfab88c3..f295de34e9b1a1eab98bde7e328140910a993877 100644 --- a/engine/flutter/flow/embedded_views.h +++ b/engine/flutter/flow/embedded_views.h @@ -9,13 +9,13 @@ #include "flutter/fml/gpu_thread_merger.h" #include "flutter/fml/memory/ref_counted.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkPath.h" -#include "third_party/skia/include/core/SkPoint.h" -#include "third_party/skia/include/core/SkRRect.h" -#include "third_party/skia/include/core/SkRect.h" -#include "third_party/skia/include/core/SkSize.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/core/SkPoint.h" +#include "third_party/flutter/skia/include/core/SkRRect.h" +#include "third_party/flutter/skia/include/core/SkRect.h" +#include "third_party/flutter/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { diff --git a/engine/flutter/flow/instrumentation.cc b/engine/flutter/flow/instrumentation.cc index 19270dc6a40f91445d984a18640a70c3e3912be3..749caf9fed17286e0576de4c3621bfe965eb6bfc 100644 --- a/engine/flutter/flow/instrumentation.cc +++ b/engine/flutter/flow/instrumentation.cc @@ -7,8 +7,8 @@ #include #include -#include "third_party/skia/include/core/SkPath.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { diff --git a/engine/flutter/flow/instrumentation.h b/engine/flutter/flow/instrumentation.h index aae76cc81989cdef416a57aa99d413d0e9eb978f..0aeacb11cf84eb51ea705e77ef3a16db6fbd1b58 100644 --- a/engine/flutter/flow/instrumentation.h +++ b/engine/flutter/flow/instrumentation.h @@ -10,7 +10,7 @@ #include "flutter/fml/macros.h" #include "flutter/fml/time/time_delta.h" #include "flutter/fml/time/time_point.h" -#include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" namespace flutter { diff --git a/engine/flutter/flow/layers/backdrop_filter_layer.h b/engine/flutter/flow/layers/backdrop_filter_layer.h index ede9ceeef41f88711f88c9151d2d07a3dc787ec9..669c61e0ea363658583711474af7e9d35b370aa8 100644 --- a/engine/flutter/flow/layers/backdrop_filter_layer.h +++ b/engine/flutter/flow/layers/backdrop_filter_layer.h @@ -7,7 +7,7 @@ #include "flutter/flow/layers/container_layer.h" -#include "third_party/skia/include/core/SkImageFilter.h" +#include "third_party/flutter/skia/include/core/SkImageFilter.h" namespace flutter { diff --git a/engine/flutter/flow/layers/color_filter_layer.h b/engine/flutter/flow/layers/color_filter_layer.h index cf1de4cb610fcef08cb3f4ca4665f1c76c03c3eb..12f2186fcdc140eec1bb7cc4502852f404981d2e 100644 --- a/engine/flutter/flow/layers/color_filter_layer.h +++ b/engine/flutter/flow/layers/color_filter_layer.h @@ -7,7 +7,7 @@ #include "flutter/flow/layers/container_layer.h" -#include "third_party/skia/include/core/SkColorFilter.h" +#include "third_party/flutter/skia/include/core/SkColorFilter.h" namespace flutter { diff --git a/engine/flutter/flow/layers/filter_layer.h b/engine/flutter/flow/layers/filter_layer.h index ec3f863789ecb384c6668b510f7ebf244f4efc5f..aa45c394fba956705d2cef2a9cfe863481386433 100644 --- a/engine/flutter/flow/layers/filter_layer.h +++ b/engine/flutter/flow/layers/filter_layer.h @@ -7,7 +7,7 @@ #include "flutter/flow/layers/container_layer.h" -#include "third_party/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" namespace flutter { diff --git a/engine/flutter/flow/layers/layer.cc b/engine/flutter/flow/layers/layer.cc index b729f582a0a9a118929a7663129a5ba220d9a22c..9c93dad17a9efcd708f04026ca72356420ec5c2b 100644 --- a/engine/flutter/flow/layers/layer.cc +++ b/engine/flutter/flow/layers/layer.cc @@ -5,7 +5,7 @@ #include "flutter/flow/layers/layer.h" #include "flutter/flow/paint_utils.h" -#include "third_party/skia/include/core/SkColorFilter.h" +#include "third_party/flutter/skia/include/core/SkColorFilter.h" namespace flutter { diff --git a/engine/flutter/flow/layers/layer.h b/engine/flutter/flow/layers/layer.h index da2dcd8b21ce3235616f3b40cd451eed52e9e23e..7b5204c3dcc7d8b82f9fe3ae27877824e37c2881 100644 --- a/engine/flutter/flow/layers/layer.h +++ b/engine/flutter/flow/layers/layer.h @@ -17,15 +17,15 @@ #include "flutter/fml/logging.h" #include "flutter/fml/macros.h" #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkColorFilter.h" -#include "third_party/skia/include/core/SkMatrix.h" -#include "third_party/skia/include/core/SkPath.h" -#include "third_party/skia/include/core/SkPicture.h" -#include "third_party/skia/include/core/SkRRect.h" -#include "third_party/skia/include/core/SkRect.h" -#include "third_party/skia/include/utils/SkNWayCanvas.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkColor.h" +#include "third_party/flutter/skia/include/core/SkColorFilter.h" +#include "third_party/flutter/skia/include/core/SkMatrix.h" +#include "third_party/flutter/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/core/SkPicture.h" +#include "third_party/flutter/skia/include/core/SkRRect.h" +#include "third_party/flutter/skia/include/core/SkRect.h" +#include "third_party/flutter/skia/include/utils/SkNWayCanvas.h" #if defined(OS_FUCHSIA) diff --git a/engine/flutter/flow/layers/layer_tree.cc b/engine/flutter/flow/layers/layer_tree.cc index b031ebf8cb8bdc087252bb54512219c4a12c9176..ab4624dd528837a3eef8dcafe1e28a617b121a55 100644 --- a/engine/flutter/flow/layers/layer_tree.cc +++ b/engine/flutter/flow/layers/layer_tree.cc @@ -6,8 +6,8 @@ #include "flutter/flow/layers/layer.h" #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/core/SkPictureRecorder.h" -#include "third_party/skia/include/utils/SkNWayCanvas.h" +#include "third_party/flutter/skia/include/core/SkPictureRecorder.h" +#include "third_party/flutter/skia/include/utils/SkNWayCanvas.h" namespace flutter { diff --git a/engine/flutter/flow/layers/layer_tree.h b/engine/flutter/flow/layers/layer_tree.h index 920fd166db93b6f21a4a5836fb1fd3bda477b1c4..a6145cc1e9e530905d5cee22ede5fcfb4bf3c22f 100644 --- a/engine/flutter/flow/layers/layer_tree.h +++ b/engine/flutter/flow/layers/layer_tree.h @@ -13,8 +13,8 @@ #include "flutter/flow/layers/layer.h" #include "flutter/fml/macros.h" #include "flutter/fml/time/time_delta.h" -#include "third_party/skia/include/core/SkPicture.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkPicture.h" +#include "third_party/flutter/skia/include/core/SkSize.h" namespace flutter { diff --git a/engine/flutter/flow/layers/mask_layer.cc b/engine/flutter/flow/layers/mask_layer.cc index a35b4072c757d4686282bee9aa904e58cb8d22d6..68deba8681e4d263126c1f6e3cd1a57282401f14 100644 --- a/engine/flutter/flow/layers/mask_layer.cc +++ b/engine/flutter/flow/layers/mask_layer.cc @@ -4,8 +4,8 @@ #include "flutter/flow/layers/mask_layer.h" -#include "third_party/skia/include/core/SkMaskFilter.h" -#include "third_party/skia/include/effects/SkLumaColorFilter.h" +#include "third_party/flutter/skia/include/core/SkMaskFilter.h" +#include "third_party/flutter/skia/include/effects/SkLumaColorFilter.h" namespace flutter { diff --git a/engine/flutter/flow/layers/mask_layer.h b/engine/flutter/flow/layers/mask_layer.h index feefede9f2f57f7cb42e8ac5151e54f37bdfebaf..2073a0485a019055ca7e6301774989bae6c2474f 100644 --- a/engine/flutter/flow/layers/mask_layer.h +++ b/engine/flutter/flow/layers/mask_layer.h @@ -8,8 +8,8 @@ #include "flutter/flow/layers/container_layer.h" #include "experimental/svg/model/SkSVGDOM.h" -#include "third_party/skia/include/core/SkPaint.h" -#include "third_party/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkPath.h" namespace flutter { diff --git a/engine/flutter/flow/layers/performance_overlay_layer.cc b/engine/flutter/flow/layers/performance_overlay_layer.cc index ebb279c9668661e6edc67939a1ccdb748ff24329..8ac9c8c455a9abbaec7b5decd2a1d31a35cff2cf 100644 --- a/engine/flutter/flow/layers/performance_overlay_layer.cc +++ b/engine/flutter/flow/layers/performance_overlay_layer.cc @@ -7,7 +7,7 @@ #include #include "flutter/flow/layers/performance_overlay_layer.h" -#include "third_party/skia/include/core/SkFont.h" +#include "third_party/flutter/skia/include/core/SkFont.h" namespace flutter { namespace { diff --git a/engine/flutter/flow/layers/performance_overlay_layer_unittests.cc b/engine/flutter/flow/layers/performance_overlay_layer_unittests.cc index c34d5b96bde78b25fb473501cd9b93d1513145ec..16f564536b62db371e6a12dccf16a22060d63628 100644 --- a/engine/flutter/flow/layers/performance_overlay_layer_unittests.cc +++ b/engine/flutter/flow/layers/performance_overlay_layer_unittests.cc @@ -7,8 +7,8 @@ #include "flutter/flow/raster_cache.h" #include "flutter/fml/build_config.h" -#include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/utils/SkBase64.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/utils/SkBase64.h" #include "gtest/gtest.h" diff --git a/engine/flutter/flow/layers/physical_shape_layer.cc b/engine/flutter/flow/layers/physical_shape_layer.cc index 21c9265ce00dd51327ecfd962cbfa916f0b1d349..0e7e1ca986841c7fb70b832834b003d12507a251 100644 --- a/engine/flutter/flow/layers/physical_shape_layer.cc +++ b/engine/flutter/flow/layers/physical_shape_layer.cc @@ -5,7 +5,7 @@ #include "flutter/flow/layers/physical_shape_layer.h" #include "flutter/flow/paint_utils.h" -#include "third_party/skia/include/utils/SkShadowUtils.h" +#include "third_party/flutter/skia/include/utils/SkShadowUtils.h" namespace flutter { diff --git a/engine/flutter/flow/layers/platform_view_layer.h b/engine/flutter/flow/layers/platform_view_layer.h index 7ce7ccb58a85617d582417a7272e9de6631f6e70..775674f78816e8236a3e664ecac3b186088e274a 100644 --- a/engine/flutter/flow/layers/platform_view_layer.h +++ b/engine/flutter/flow/layers/platform_view_layer.h @@ -6,8 +6,8 @@ #define FLUTTER_FLOW_LAYERS_PLATFORM_VIEW_LAYER_H_ #include "flutter/flow/layers/layer.h" -#include "third_party/skia/include/core/SkPoint.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkPoint.h" +#include "third_party/flutter/skia/include/core/SkSize.h" namespace flutter { diff --git a/engine/flutter/flow/layers/shader_mask_layer.h b/engine/flutter/flow/layers/shader_mask_layer.h index 01836f4f2fb54e33e4bb1cb65f98db610fbd5655..432c585f0b78d0d2bc8d8863a423a42f0c0079f3 100644 --- a/engine/flutter/flow/layers/shader_mask_layer.h +++ b/engine/flutter/flow/layers/shader_mask_layer.h @@ -7,7 +7,7 @@ #include "flutter/flow/layers/container_layer.h" -#include "third_party/skia/include/core/SkShader.h" +#include "third_party/flutter/skia/include/core/SkShader.h" namespace flutter { diff --git a/engine/flutter/flow/layers/texture_layer.h b/engine/flutter/flow/layers/texture_layer.h index 9f4fd1bc43470c65e0a0c28fead4d2dd75fdc5f0..71bc0b46d6a8010a8a654848399ee8825bdc8394 100644 --- a/engine/flutter/flow/layers/texture_layer.h +++ b/engine/flutter/flow/layers/texture_layer.h @@ -6,8 +6,8 @@ #define FLUTTER_FLOW_LAYERS_TEXTURE_LAYER_H_ #include "flutter/flow/layers/layer.h" -#include "third_party/skia/include/core/SkPoint.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkPoint.h" +#include "third_party/flutter/skia/include/core/SkSize.h" namespace flutter { diff --git a/engine/flutter/flow/matrix_decomposition.h b/engine/flutter/flow/matrix_decomposition.h index 81794c2fe589f1ea57cc00a2ffd940cb32c64c7c..e9f83f7d6277d7bacfad7a519089aeb996967b47 100644 --- a/engine/flutter/flow/matrix_decomposition.h +++ b/engine/flutter/flow/matrix_decomposition.h @@ -6,9 +6,9 @@ #define FLUTTER_FLOW_MATRIX_DECOMPOSITION_H_ #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkMatrix.h" -#include "third_party/skia/include/core/SkMatrix44.h" -#include "third_party/skia/include/core/SkPoint3.h" +#include "third_party/flutter/skia/include/core/SkMatrix.h" +#include "third_party/flutter/skia/include/core/SkMatrix44.h" +#include "third_party/flutter/skia/include/core/SkPoint3.h" namespace flutter { diff --git a/engine/flutter/flow/ohos_layers/backdrop_filter_layer.cpp b/engine/flutter/flow/ohos_layers/backdrop_filter_layer.cpp index 8f26cfe9efaf9dd4de127234a8f172817665e503..361fff7f73f78eec2211fc3e8941080e1342b5c5 100644 --- a/engine/flutter/flow/ohos_layers/backdrop_filter_layer.cpp +++ b/engine/flutter/flow/ohos_layers/backdrop_filter_layer.cpp @@ -7,7 +7,7 @@ #include "flutter/flow/ohos_layers/backdrop_filter_layer.h" -#include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" #include "flutter/flow/ohos_layers/paint_context.h" diff --git a/engine/flutter/flow/ohos_layers/backdrop_filter_layer.h b/engine/flutter/flow/ohos_layers/backdrop_filter_layer.h index 8600eee714a1026b052dc398b33d65923585894d..d8149a35ecd561c3c7aab6b3112937910e728228 100644 --- a/engine/flutter/flow/ohos_layers/backdrop_filter_layer.h +++ b/engine/flutter/flow/ohos_layers/backdrop_filter_layer.h @@ -8,8 +8,8 @@ #ifndef FLUTTER_FLOW_OHOS_LAYERS_BACKDROP_FILTER_LAYER_H #define FLUTTER_FLOW_OHOS_LAYERS_BACKDROP_FILTER_LAYER_H -#include "third_party/skia/include/core/SkImageFilter.h" -#include "third_party/skia/include/core/SkRefCnt.h" +#include "third_party/flutter/skia/include/core/SkImageFilter.h" +#include "third_party/flutter/skia/include/core/SkRefCnt.h" #include "flutter/flow/ohos_layers/container_layer.h" diff --git a/engine/flutter/flow/ohos_layers/clip_path_layer.h b/engine/flutter/flow/ohos_layers/clip_path_layer.h index c3ff27dc18ad4901024b522123157b6442eff533..134277234c07eb74af68520f79c0c96447d74213 100644 --- a/engine/flutter/flow/ohos_layers/clip_path_layer.h +++ b/engine/flutter/flow/ohos_layers/clip_path_layer.h @@ -8,7 +8,7 @@ #ifndef FLUTTER_FLOW_OHOS_LAYERS_CLIP_PATH_LAYER_H #define FLUTTER_FLOW_OHOS_LAYERS_CLIP_PATH_LAYER_H -#include "third_party/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/core/SkPath.h" #include "flutter/flow/ohos_layers/container_layer.h" diff --git a/engine/flutter/flow/ohos_layers/clip_rect_layer.cpp b/engine/flutter/flow/ohos_layers/clip_rect_layer.cpp index 158d3ee7c3fc6a1b713d4f70c12d0804c43c10bd..ac73e61618f012db1ed17a8e5311364072a826c4 100644 --- a/engine/flutter/flow/ohos_layers/clip_rect_layer.cpp +++ b/engine/flutter/flow/ohos_layers/clip_rect_layer.cpp @@ -7,8 +7,8 @@ #include "flutter/flow/ohos_layers/clip_rect_layer.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkRRect.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkRRect.h" #include "flutter/flow/ohos_layers/paint_context.h" diff --git a/engine/flutter/flow/ohos_layers/clip_rrect_layer.cpp b/engine/flutter/flow/ohos_layers/clip_rrect_layer.cpp index 63be9953f21f127e732ee1ca53adee11d061f7e0..7c16df069b9910fa2612c26f676db084b78b0adf 100644 --- a/engine/flutter/flow/ohos_layers/clip_rrect_layer.cpp +++ b/engine/flutter/flow/ohos_layers/clip_rrect_layer.cpp @@ -7,8 +7,8 @@ #include "flutter/flow/ohos_layers/clip_rrect_layer.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkRRect.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkRRect.h" #include "flutter/flow/ohos_layers/paint_context.h" diff --git a/engine/flutter/flow/ohos_layers/clip_rrect_layer.h b/engine/flutter/flow/ohos_layers/clip_rrect_layer.h index 2384109e3cef0a97118adf6db98935e98827adc1..99f618279ea70a77be291573a92ebd57cd316735 100644 --- a/engine/flutter/flow/ohos_layers/clip_rrect_layer.h +++ b/engine/flutter/flow/ohos_layers/clip_rrect_layer.h @@ -8,7 +8,7 @@ #ifndef FLUTTER_FLOW_OHOS_LAYERS_CLIP_RRECT_LAYER_H #define FLUTTER_FLOW_OHOS_LAYERS_CLIP_RRECT_LAYER_H -#include "third_party/skia/include/core/SkRRect.h" +#include "third_party/flutter/skia/include/core/SkRRect.h" #include "flutter/flow/ohos_layers/container_layer.h" #include "flutter/flow/ohos_layers/layer.h" diff --git a/engine/flutter/flow/ohos_layers/filter_layer.h b/engine/flutter/flow/ohos_layers/filter_layer.h index 34670d67059d21640054f136d8e9caf00245e4f3..eb0ba8a45924b1b6d3a0674a20d6a6fbd6d8a2d4 100644 --- a/engine/flutter/flow/ohos_layers/filter_layer.h +++ b/engine/flutter/flow/ohos_layers/filter_layer.h @@ -6,7 +6,7 @@ #ifndef FLUTTER_FLOW_OHOS_LAYERS_FILTER_LAYER_H #define FLUTTER_FLOW_OHOS_LAYERS_FILTER_LAYER_H -#include "third_party/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" #include "flutter/flow/ohos_layers/container_layer.h" diff --git a/engine/flutter/flow/ohos_layers/layer.h b/engine/flutter/flow/ohos_layers/layer.h index 4d4485059c1c82d89b06183e5e2b112e4d4373d7..ea10bb818f95796c7d9b66df7dd0da315782b94b 100644 --- a/engine/flutter/flow/ohos_layers/layer.h +++ b/engine/flutter/flow/ohos_layers/layer.h @@ -8,8 +8,8 @@ #ifndef FLUTTER_FLOW_OHOS_LAYERS_LAYER_H #define FLUTTER_FLOW_OHOS_LAYERS_LAYER_H -#include "third_party/skia/include/core/SkRRect.h" -#include "third_party/skia/include/core/SkRect.h" +#include "third_party/flutter/skia/include/core/SkRRect.h" +#include "third_party/flutter/skia/include/core/SkRect.h" #include "flutter/fml/macros.h" diff --git a/engine/flutter/flow/ohos_layers/layer_tree.cpp b/engine/flutter/flow/ohos_layers/layer_tree.cpp index 0238cb27454cdd40d1880665ef3fe97ad5ab0c8d..3363e0be11f48c6ff96b751ac33b501bf8e1d1b9 100644 --- a/engine/flutter/flow/ohos_layers/layer_tree.cpp +++ b/engine/flutter/flow/ohos_layers/layer_tree.cpp @@ -7,7 +7,7 @@ #include "flutter/flow/ohos_layers/layer_tree.h" -#include "third_party/skia/include/core/SkMatrix.h" +#include "third_party/flutter/skia/include/core/SkMatrix.h" namespace flutter::OHOS { diff --git a/engine/flutter/flow/ohos_layers/layer_tree.h b/engine/flutter/flow/ohos_layers/layer_tree.h index fcd059b2d08da5b1fdd945fca974a051153bc364..fe8f0c4575a5b415c83a9076f46ddaf42a20938f 100644 --- a/engine/flutter/flow/ohos_layers/layer_tree.h +++ b/engine/flutter/flow/ohos_layers/layer_tree.h @@ -11,8 +11,8 @@ #include #include -#include "third_party/skia/include/core/SkPicture.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkPicture.h" +#include "third_party/flutter/skia/include/core/SkSize.h" #include "flutter/flow/ohos_layers/layer.h" diff --git a/engine/flutter/flow/ohos_layers/layer_tree_builder.cpp b/engine/flutter/flow/ohos_layers/layer_tree_builder.cpp index 14b45babdfc40fbfdd6ad7ff3a6e23bdc8a44ce3..82ff11740d55609e9e84cd3d620fb295e1c1289d 100644 --- a/engine/flutter/flow/ohos_layers/layer_tree_builder.cpp +++ b/engine/flutter/flow/ohos_layers/layer_tree_builder.cpp @@ -7,12 +7,12 @@ #include "flutter/flow/ohos_layers/layer_tree_builder.h" -#include "third_party/skia/include/core/SkBlendMode.h" -#include "third_party/skia/include/core/SkColorFilter.h" -#include "third_party/skia/include/core/SkMatrix.h" -#include "third_party/skia/include/core/SkPoint.h" -#include "third_party/skia/include/core/SkRefCnt.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkBlendMode.h" +#include "third_party/flutter/skia/include/core/SkColorFilter.h" +#include "third_party/flutter/skia/include/core/SkMatrix.h" +#include "third_party/flutter/skia/include/core/SkPoint.h" +#include "third_party/flutter/skia/include/core/SkRefCnt.h" +#include "third_party/flutter/skia/include/core/SkSize.h" #include "flutter/flow/ohos_layers/backdrop_filter_layer.h" #include "flutter/flow/ohos_layers/clip_path_layer.h" diff --git a/engine/flutter/flow/ohos_layers/layer_tree_builder.h b/engine/flutter/flow/ohos_layers/layer_tree_builder.h index 04b74511e02494012a08ec0bb733da9b88991b59..e3ee1aa0902033eec8b9cbde78d5b010a31a367f 100644 --- a/engine/flutter/flow/ohos_layers/layer_tree_builder.h +++ b/engine/flutter/flow/ohos_layers/layer_tree_builder.h @@ -13,12 +13,12 @@ #include #include "experimental/svg/model/SkSVGDOM.h" -#include "third_party/skia/include/core/SkImageFilter.h" -#include "third_party/skia/include/core/SkPath.h" -#include "third_party/skia/include/core/SkPaint.h" -#include "third_party/skia/include/core/SkPicture.h" -#include "third_party/skia/include/core/SkRRect.h" -#include "third_party/skia/include/core/SkShader.h" +#include "third_party/flutter/skia/include/core/SkImageFilter.h" +#include "third_party/flutter/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkPicture.h" +#include "third_party/flutter/skia/include/core/SkRRect.h" +#include "third_party/flutter/skia/include/core/SkShader.h" #include "flutter/flow/ohos_layers/container_layer.h" #include "flutter/flow/ohos_layers/layer.h" diff --git a/engine/flutter/flow/ohos_layers/mask_layer.cpp b/engine/flutter/flow/ohos_layers/mask_layer.cpp index 83a91176976021e11a00a3db3a5e4344022e991d..d063b0b8e8e1987353e358536b2aace66002cb95 100644 --- a/engine/flutter/flow/ohos_layers/mask_layer.cpp +++ b/engine/flutter/flow/ohos_layers/mask_layer.cpp @@ -5,9 +5,9 @@ #include "flutter/flow/ohos_layers/mask_layer.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkMaskFilter.h" -#include "third_party/skia/include/effects/SkLumaColorFilter.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkMaskFilter.h" +#include "third_party/flutter/skia/include/effects/SkLumaColorFilter.h" #include "flutter/flow/ohos_layers/paint_context.h" diff --git a/engine/flutter/flow/ohos_layers/mask_layer.h b/engine/flutter/flow/ohos_layers/mask_layer.h index b83da5c7105f452468f5a4c9aad92c18ad745320..1ea6979768d53486db2b45f9cf988f4487f06fe4 100644 --- a/engine/flutter/flow/ohos_layers/mask_layer.h +++ b/engine/flutter/flow/ohos_layers/mask_layer.h @@ -7,9 +7,9 @@ #define FLUTTER_FLOW_OHOS_LAYERS_MASK_LAYER_H #include "experimental/svg/model/SkSVGDOM.h" -#include "third_party/skia/include/core/SkPaint.h" -#include "third_party/skia/include/core/SkPath.h" -#include "third_party/skia/include/core/SkStream.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/core/SkStream.h" #include "flutter/flow/ohos_layers/container_layer.h" #include "flutter/flow/ohos_layers/layer.h" diff --git a/engine/flutter/flow/ohos_layers/opacity_layer.h b/engine/flutter/flow/ohos_layers/opacity_layer.h index f9e4432f4b9b2d53b6304ff00029cce62860cedc..4299faab831f7480eea2f3c36472e414c327e65c 100644 --- a/engine/flutter/flow/ohos_layers/opacity_layer.h +++ b/engine/flutter/flow/ohos_layers/opacity_layer.h @@ -8,7 +8,7 @@ #ifndef FLUTTER_FLOW_OHOS_LAYERS_OPACITY_LAYER_H #define FLUTTER_FLOW_OHOS_LAYERS_OPACITY_LAYER_H -#include "third_party/skia/include/core/SkPoint.h" +#include "third_party/flutter/skia/include/core/SkPoint.h" #include "flutter/flow/ohos_layers/container_layer.h" diff --git a/engine/flutter/flow/ohos_layers/paint_context.h b/engine/flutter/flow/ohos_layers/paint_context.h index 1496bb811aa113809d4413857a4aabe744b27e2c..a02f7ece63910ec7c3ee69b592643d760e68a972 100644 --- a/engine/flutter/flow/ohos_layers/paint_context.h +++ b/engine/flutter/flow/ohos_layers/paint_context.h @@ -8,8 +8,8 @@ #ifndef FLUTTER_FLOW_OHOS_LAYERS_PAINT_CONTEXT_H #define FLUTTER_FLOW_OHOS_LAYERS_PAINT_CONTEXT_H -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkPoint.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkPoint.h" #include "flutter/flow/ohos_layers/texture_register.h" diff --git a/engine/flutter/flow/ohos_layers/picture_layer.h b/engine/flutter/flow/ohos_layers/picture_layer.h index 7156ea1534abd6e4d86476a9257c0940a1a4425a..5c5f0ed4c4480d558d108d131d608d9ec4f7ad41 100644 --- a/engine/flutter/flow/ohos_layers/picture_layer.h +++ b/engine/flutter/flow/ohos_layers/picture_layer.h @@ -10,7 +10,7 @@ #include -#include "third_party/skia/include/core/SkPicture.h" +#include "third_party/flutter/skia/include/core/SkPicture.h" #include "flutter/flow/ohos_layers/layer.h" diff --git a/engine/flutter/flow/ohos_layers/shader_mask_layer.h b/engine/flutter/flow/ohos_layers/shader_mask_layer.h index 44a12f08ddb113c7de6bdae29a4dac679e6da29d..77426288ae40a12d2cb74c6fd65ea2107b9ac41e 100644 --- a/engine/flutter/flow/ohos_layers/shader_mask_layer.h +++ b/engine/flutter/flow/ohos_layers/shader_mask_layer.h @@ -8,8 +8,8 @@ #ifndef FLUTTER_FLOW_OHOS_LAYERS_SHADER_MASK_LAYER_H #define FLUTTER_FLOW_OHOS_LAYERS_SHADER_MASK_LAYER_H -#include "third_party/skia/include/core/SkBlendMode.h" -#include "third_party/skia/include/core/SkShader.h" +#include "third_party/flutter/skia/include/core/SkBlendMode.h" +#include "third_party/flutter/skia/include/core/SkShader.h" #include "flutter/flow/ohos_layers/container_layer.h" diff --git a/engine/flutter/flow/ohos_layers/texture_layer.h b/engine/flutter/flow/ohos_layers/texture_layer.h index 0f2bea461b8d7b834d3ee33b2f3ab7b53cb38109..fce1792494ad6fce630d2235e6a4865460f048b9 100644 --- a/engine/flutter/flow/ohos_layers/texture_layer.h +++ b/engine/flutter/flow/ohos_layers/texture_layer.h @@ -8,8 +8,8 @@ #ifndef FLUTTER_FLOW_OHOS_LAYERS_TEXTURE_LAYER_H #define FLUTTER_FLOW_OHOS_LAYERS_TEXTURE_LAYER_H -#include "third_party/skia/include/core/SkPoint.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkPoint.h" +#include "third_party/flutter/skia/include/core/SkSize.h" #include "flutter/flow/ohos_layers/layer.h" diff --git a/engine/flutter/flow/ohos_layers/transform_layer.h b/engine/flutter/flow/ohos_layers/transform_layer.h index 21d6753ceda6d0fe4153658eb6354943f9b0678d..a542e61cd69ec2f787a610669081f455e2c117ca 100644 --- a/engine/flutter/flow/ohos_layers/transform_layer.h +++ b/engine/flutter/flow/ohos_layers/transform_layer.h @@ -8,7 +8,7 @@ #ifndef FLUTTER_FLOW_OHOS_LAYERS_TRANSFORM_LAYER_H #define FLUTTER_FLOW_OHOS_LAYERS_TRANSFORM_LAYER_H -#include "third_party/skia/include/core/SkMatrix.h" +#include "third_party/flutter/skia/include/core/SkMatrix.h" #include "flutter/flow/ohos_layers/container_layer.h" diff --git a/engine/flutter/flow/paint_utils.cc b/engine/flutter/flow/paint_utils.cc index ba8309eea25fe23f4f4d9d8bdc6e0932162f9f69..2a16f7fc2a84c9487232950fd8b7eed4e97b1cfd 100644 --- a/engine/flutter/flow/paint_utils.cc +++ b/engine/flutter/flow/paint_utils.cc @@ -6,9 +6,9 @@ #include -#include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/skia/include/core/SkPaint.h" -#include "third_party/skia/include/core/SkShader.h" +#include "third_party/flutter/skia/include/core/SkBitmap.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkShader.h" namespace flutter { diff --git a/engine/flutter/flow/paint_utils.h b/engine/flutter/flow/paint_utils.h index c6bfccedbd31717d5670d52aceae5310267197ca..f5184f2a5ce132683cb5cec5ddef6b27aa40cd13 100644 --- a/engine/flutter/flow/paint_utils.h +++ b/engine/flutter/flow/paint_utils.h @@ -5,9 +5,9 @@ #ifndef FLUTTER_FLOW_PAINT_UTILS_H_ #define FLUTTER_FLOW_PAINT_UTILS_H_ -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkRect.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkColor.h" +#include "third_party/flutter/skia/include/core/SkRect.h" namespace flutter { diff --git a/engine/flutter/flow/raster_cache.cc b/engine/flutter/flow/raster_cache.cc index e0ed193d69082dc0d4ac6eadf77d51dcdf9dd33e..fa2fc93b6a492d4c1236c776f42aab906b9e538d 100644 --- a/engine/flutter/flow/raster_cache.cc +++ b/engine/flutter/flow/raster_cache.cc @@ -10,10 +10,10 @@ #include "flutter/flow/paint_utils.h" #include "flutter/fml/logging.h" #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkImage.h" -#include "third_party/skia/include/core/SkPicture.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkImage.h" +#include "third_party/flutter/skia/include/core/SkPicture.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { diff --git a/engine/flutter/flow/raster_cache.h b/engine/flutter/flow/raster_cache.h index f008f2459cc308c0f04fd71ee0b73b7cb4cb7310..2a6be1eb209cabce2b726637e4bfafdd9aa647cc 100644 --- a/engine/flutter/flow/raster_cache.h +++ b/engine/flutter/flow/raster_cache.h @@ -12,8 +12,8 @@ #include "flutter/flow/raster_cache_key.h" #include "flutter/fml/macros.h" #include "flutter/fml/memory/weak_ptr.h" -#include "third_party/skia/include/core/SkImage.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkImage.h" +#include "third_party/flutter/skia/include/core/SkSize.h" namespace flutter { diff --git a/engine/flutter/flow/raster_cache_unittests.cc b/engine/flutter/flow/raster_cache_unittests.cc index 64f4405ebe5a0545794aeb22e2b8ff7c259d7f6f..40be7cf5003610930ac1d10f06c15f013105f3c5 100644 --- a/engine/flutter/flow/raster_cache_unittests.cc +++ b/engine/flutter/flow/raster_cache_unittests.cc @@ -4,8 +4,8 @@ #include "flutter/flow/raster_cache.h" #include "gtest/gtest.h" -#include "third_party/skia/include/core/SkPicture.h" -#include "third_party/skia/include/core/SkPictureRecorder.h" +#include "third_party/flutter/skia/include/core/SkPicture.h" +#include "third_party/flutter/skia/include/core/SkPictureRecorder.h" sk_sp GetSamplePicture() { SkPictureRecorder recorder; diff --git a/engine/flutter/flow/scene_update_context.h b/engine/flutter/flow/scene_update_context.h index d4a46055967f3b387b0751aa621adfd398d10b36..64582f28c16329cc156e7edce56c21e1611719d3 100644 --- a/engine/flutter/flow/scene_update_context.h +++ b/engine/flutter/flow/scene_update_context.h @@ -15,8 +15,8 @@ #include "flutter/fml/logging.h" #include "flutter/fml/macros.h" #include "lib/ui/scenic/cpp/resources.h" -#include "third_party/skia/include/core/SkRect.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkRect.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { diff --git a/engine/flutter/flow/skia_gpu_object.h b/engine/flutter/flow/skia_gpu_object.h index 689283ee5d5dfb10bd30aaee54c6b72f0f8352e9..497ff41c065c98a615130ac6322294b804e842c8 100644 --- a/engine/flutter/flow/skia_gpu_object.h +++ b/engine/flutter/flow/skia_gpu_object.h @@ -11,7 +11,7 @@ #include "flutter/fml/memory/ref_counted.h" #include "flutter/fml/memory/weak_ptr.h" #include "flutter/fml/task_runner.h" -#include "third_party/skia/include/core/SkRefCnt.h" +#include "third_party/flutter/skia/include/core/SkRefCnt.h" namespace flutter { diff --git a/engine/flutter/flow/texture.h b/engine/flutter/flow/texture.h index 749e3835b236a9b0e78ee4b76f19ea6cef66080e..21ef9c45dbaa338a0443aac08ed7da62691993f5 100644 --- a/engine/flutter/flow/texture.h +++ b/engine/flutter/flow/texture.h @@ -9,7 +9,7 @@ #include "flutter/fml/macros.h" #include "flutter/fml/synchronization/waitable_event.h" -#include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" namespace flutter { diff --git a/engine/flutter/lib/ui/compositing/scene.cc b/engine/flutter/lib/ui/compositing/scene.cc index 72442ea3d754213524ff138af8e86ce947c8257c..4d8a3e1c67d82070f7e2b1ca1eb4acba225499e7 100644 --- a/engine/flutter/lib/ui/compositing/scene.cc +++ b/engine/flutter/lib/ui/compositing/scene.cc @@ -7,8 +7,8 @@ #include "flutter/fml/trace_event.h" #include "flutter/lib/ui/painting/image.h" #include "flutter/lib/ui/painting/picture.h" -#include "third_party/skia/include/core/SkImageInfo.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkImageInfo.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { diff --git a/engine/flutter/lib/ui/compositing/scene.h b/engine/flutter/lib/ui/compositing/scene.h index 2d280a534db6319c7da8e84385bb06966404aa52..55e12d2cde3bbe38b1cc55b09601f32342203aa8 100644 --- a/engine/flutter/lib/ui/compositing/scene.h +++ b/engine/flutter/lib/ui/compositing/scene.h @@ -10,7 +10,7 @@ #include "flutter/flow/layers/layer_tree.h" #include "flutter/lib/ui/dart_wrapper.h" -#include "third_party/skia/include/core/SkPicture.h" +#include "third_party/flutter/skia/include/core/SkPicture.h" namespace tonic { class DartLibraryNatives; diff --git a/engine/flutter/lib/ui/compositing/scene_builder.cc b/engine/flutter/lib/ui/compositing/scene_builder.cc index 66f67c73fca94005e9124dffdeddbaf64aacb55e..5b03c1bf098ada1f386988694061444e47227060 100644 --- a/engine/flutter/lib/ui/compositing/scene_builder.cc +++ b/engine/flutter/lib/ui/compositing/scene_builder.cc @@ -27,7 +27,7 @@ #include "flutter/lib/ui/painting/shader.h" #include "flutter/lib/ui/ui_dart_state.h" #include "flutter/lib/ui/window/window.h" -#include "third_party/skia/include/core/SkColorFilter.h" +#include "third_party/flutter/skia/include/core/SkColorFilter.h" #if defined(OS_FUCHSIA) #include "flutter/flow/layers/child_scene_layer.h" diff --git a/engine/flutter/lib/ui/compositing/scene_builder.h b/engine/flutter/lib/ui/compositing/scene_builder.h index 8c13c039e6ed5f96d9e8c83585b8f67a82f8c927..f106ad82f8b4b9c896c81b2eafb8a05e221eb8a6 100644 --- a/engine/flutter/lib/ui/compositing/scene_builder.h +++ b/engine/flutter/lib/ui/compositing/scene_builder.h @@ -26,8 +26,8 @@ #endif #include "experimental/svg/model/SkSVGDOM.h" -#include "third_party/skia/include/core/SkPaint.h" -#include "third_party/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkPath.h" namespace flutter { diff --git a/engine/flutter/lib/ui/io_manager.h b/engine/flutter/lib/ui/io_manager.h index 200d732f115ada7a66693d110970e5ea263097fb..8d4be6fefb4aa847f6888639f7782d882f4e374f 100644 --- a/engine/flutter/lib/ui/io_manager.h +++ b/engine/flutter/lib/ui/io_manager.h @@ -7,7 +7,7 @@ #include "flutter/flow/skia_gpu_object.h" #include "flutter/fml/memory/weak_ptr.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" namespace flutter { // Interface for methods that manage access to the resource GrContext and Skia diff --git a/engine/flutter/lib/ui/painting/canvas.cc b/engine/flutter/lib/ui/painting/canvas.cc index 3cfc5670f010045e7991052b6e9a82566fbe9492..9161a886b4951d2a508d029aa4c982afc7833cf9 100644 --- a/engine/flutter/lib/ui/painting/canvas.cc +++ b/engine/flutter/lib/ui/painting/canvas.cc @@ -17,9 +17,9 @@ #include "flutter/lib/ui/painting/matrix.h" #include "flutter/lib/ui/ui_dart_state.h" #include "flutter/lib/ui/window/window.h" -#include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkRSXform.h" +#include "third_party/flutter/skia/include/core/SkBitmap.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkRSXform.h" using tonic::ToDart; diff --git a/engine/flutter/lib/ui/painting/canvas.h b/engine/flutter/lib/ui/painting/canvas.h index 5eae889b816e0b4fe99dc4272a89e7a3c431a30d..e351fc7e7f4f2e932324909fb7dacf0371625304 100644 --- a/engine/flutter/lib/ui/painting/canvas.h +++ b/engine/flutter/lib/ui/painting/canvas.h @@ -12,8 +12,8 @@ #include "flutter/lib/ui/painting/picture_recorder.h" #include "flutter/lib/ui/painting/rrect.h" #include "flutter/lib/ui/painting/vertices.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/utils/SkShadowUtils.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/utils/SkShadowUtils.h" namespace tonic { class DartLibraryNatives; diff --git a/engine/flutter/lib/ui/painting/codec.cc b/engine/flutter/lib/ui/painting/codec.cc index 685acb57bed1f851c26aeb0970538f76668b17d3..f6b9e5cc51458a7ee3b8dadba078ccde549df788 100644 --- a/engine/flutter/lib/ui/painting/codec.cc +++ b/engine/flutter/lib/ui/painting/codec.cc @@ -13,8 +13,8 @@ #include "flutter/lib/ui/painting/frame_info.h" #include "flutter/lib/ui/painting/multi_frame_codec.h" #include "flutter/lib/ui/painting/single_frame_codec.h" -#include "third_party/skia/include/codec/SkCodec.h" -#include "third_party/skia/include/core/SkPixelRef.h" +#include "third_party/flutter/skia/include/codec/SkCodec.h" +#include "third_party/flutter/skia/include/core/SkPixelRef.h" #if OS_ANDROID #include diff --git a/engine/flutter/lib/ui/painting/codec.h b/engine/flutter/lib/ui/painting/codec.h index 2e0c746eac2d6599203c49bdf510d37cd4f49eae..1d3f23aea65dde33af62799d0a7ac572360d5476 100644 --- a/engine/flutter/lib/ui/painting/codec.h +++ b/engine/flutter/lib/ui/painting/codec.h @@ -7,9 +7,9 @@ #include "flutter/lib/ui/dart_wrapper.h" #include "flutter/lib/ui/painting/frame_info.h" -#include "third_party/skia/include/codec/SkCodec.h" -#include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/skia/include/core/SkImage.h" +#include "third_party/flutter/skia/include/codec/SkCodec.h" +#include "third_party/flutter/skia/include/core/SkBitmap.h" +#include "third_party/flutter/skia/include/core/SkImage.h" using tonic::DartPersistentValue; diff --git a/engine/flutter/lib/ui/painting/color_filter.h b/engine/flutter/lib/ui/painting/color_filter.h index 887b07be18695b3f8ed53d5e9d38819090f43243..fb38af27b2a0042bbac204b358b7071b291e69e0 100644 --- a/engine/flutter/lib/ui/painting/color_filter.h +++ b/engine/flutter/lib/ui/painting/color_filter.h @@ -6,7 +6,7 @@ #define FLUTTER_LIB_UI_COLOR_FILTER_H_ #include "flutter/lib/ui/dart_wrapper.h" -#include "third_party/skia/include/core/SkColorFilter.h" +#include "third_party/flutter/skia/include/core/SkColorFilter.h" using tonic::DartPersistentValue; diff --git a/engine/flutter/lib/ui/painting/gradient.h b/engine/flutter/lib/ui/painting/gradient.h index dfc8950c8763c93e64e8c4a2c9bfcbf00e6e8bf5..25c61cf5a17a03371b2a230c3c1a77f9b8c64ef4 100644 --- a/engine/flutter/lib/ui/painting/gradient.h +++ b/engine/flutter/lib/ui/painting/gradient.h @@ -8,7 +8,7 @@ #include "flutter/lib/ui/dart_wrapper.h" #include "flutter/lib/ui/painting/matrix.h" #include "flutter/lib/ui/painting/shader.h" -#include "third_party/skia/include/effects/SkGradientShader.h" +#include "third_party/flutter/skia/include/effects/SkGradientShader.h" namespace tonic { class DartLibraryNatives; diff --git a/engine/flutter/lib/ui/painting/image.h b/engine/flutter/lib/ui/painting/image.h index 516a2e5d59c4984584e15841511bbcdd07d4c8f8..3118b4aff5a4cec0bb18aed9f25c5f2a0c6aa7d2 100644 --- a/engine/flutter/lib/ui/painting/image.h +++ b/engine/flutter/lib/ui/painting/image.h @@ -8,7 +8,7 @@ #include "flutter/flow/skia_gpu_object.h" #include "flutter/lib/ui/dart_wrapper.h" #include "flutter/lib/ui/ui_dart_state.h" -#include "third_party/skia/include/core/SkImage.h" +#include "third_party/flutter/skia/include/core/SkImage.h" namespace tonic { class DartLibraryNatives; diff --git a/engine/flutter/lib/ui/painting/image_decoder.cc b/engine/flutter/lib/ui/painting/image_decoder.cc index c6a35f073b05c01f98fbbc255b29b29c21464d79..51810713d7ad2e421c888a00bae3588efaa73562 100644 --- a/engine/flutter/lib/ui/painting/image_decoder.cc +++ b/engine/flutter/lib/ui/painting/image_decoder.cc @@ -6,7 +6,7 @@ #include "flutter/fml/make_copyable.h" #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/codec/SkCodec.h" +#include "third_party/flutter/skia/include/codec/SkCodec.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/image_decoder.h b/engine/flutter/lib/ui/painting/image_decoder.h index 202dff569e1a53ff58e6ce3845765efa9f585d92..896c0d04f294c297231076626aaa4f8c5deedf0e 100644 --- a/engine/flutter/lib/ui/painting/image_decoder.h +++ b/engine/flutter/lib/ui/painting/image_decoder.h @@ -14,11 +14,11 @@ #include "flutter/fml/macros.h" #include "flutter/fml/mapping.h" #include "flutter/lib/ui/io_manager.h" -#include "third_party/skia/include/core/SkData.h" -#include "third_party/skia/include/core/SkImage.h" -#include "third_party/skia/include/core/SkImageInfo.h" -#include "third_party/skia/include/core/SkRefCnt.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkData.h" +#include "third_party/flutter/skia/include/core/SkImage.h" +#include "third_party/flutter/skia/include/core/SkImageInfo.h" +#include "third_party/flutter/skia/include/core/SkRefCnt.h" +#include "third_party/flutter/skia/include/core/SkSize.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/image_encoding.cc b/engine/flutter/lib/ui/painting/image_encoding.cc index 00c6b67f64a469e026198551d57b88bd4cd877c3..6be4f99b55493e501b8db7545680a2ba445b8f56 100644 --- a/engine/flutter/lib/ui/painting/image_encoding.cc +++ b/engine/flutter/lib/ui/painting/image_encoding.cc @@ -13,10 +13,10 @@ #include "flutter/fml/trace_event.h" #include "flutter/lib/ui/painting/image.h" #include "flutter/lib/ui/ui_dart_state.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkEncodedImageFormat.h" -#include "third_party/skia/include/core/SkImage.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkEncodedImageFormat.h" +#include "third_party/flutter/skia/include/core/SkImage.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/image_filter.cc b/engine/flutter/lib/ui/painting/image_filter.cc index fd1edbf2fd9411ed32efa1d118c588ec7534e7ad..ef9b49bf6d88de3f8dc247d715e112832853fd79 100644 --- a/engine/flutter/lib/ui/painting/image_filter.cc +++ b/engine/flutter/lib/ui/painting/image_filter.cc @@ -5,9 +5,9 @@ #include "flutter/lib/ui/painting/image_filter.h" #include "flutter/lib/ui/painting/matrix.h" -#include "third_party/skia/include/effects/SkBlurImageFilter.h" -#include "third_party/skia/include/effects/SkImageSource.h" -#include "third_party/skia/include/effects/SkPictureImageFilter.h" +#include "third_party/flutter/skia/include/effects/SkBlurImageFilter.h" +#include "third_party/flutter/skia/include/effects/SkImageSource.h" +#include "third_party/flutter/skia/include/effects/SkPictureImageFilter.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/image_filter.h b/engine/flutter/lib/ui/painting/image_filter.h index 8c3356f15c05df1d155a07af797581e2c2f46383..73909f2a4e0ae4f1847aa65588be8e49e3ba575f 100644 --- a/engine/flutter/lib/ui/painting/image_filter.h +++ b/engine/flutter/lib/ui/painting/image_filter.h @@ -8,7 +8,7 @@ #include "flutter/lib/ui/dart_wrapper.h" #include "flutter/lib/ui/painting/image.h" #include "flutter/lib/ui/painting/picture.h" -#include "third_party/skia/include/core/SkImageFilter.h" +#include "third_party/flutter/skia/include/core/SkImageFilter.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/image_shader.h b/engine/flutter/lib/ui/painting/image_shader.h index a8a65c6f87b9b1c31ebaab02d9032d678def3f2c..6f5a1d659c91cfa7b2e5131116bc02df9f23a5ee 100644 --- a/engine/flutter/lib/ui/painting/image_shader.h +++ b/engine/flutter/lib/ui/painting/image_shader.h @@ -10,8 +10,8 @@ #include "flutter/lib/ui/painting/image.h" #include "flutter/lib/ui/painting/matrix.h" #include "flutter/lib/ui/painting/shader.h" -#include "third_party/skia/include/core/SkMatrix.h" -#include "third_party/skia/include/core/SkShader.h" +#include "third_party/flutter/skia/include/core/SkMatrix.h" +#include "third_party/flutter/skia/include/core/SkShader.h" namespace tonic { class DartLibraryNatives; diff --git a/engine/flutter/lib/ui/painting/matrix.h b/engine/flutter/lib/ui/painting/matrix.h index 3aedf2d2f964b041061cf9ac97c8eeeeb72dff4c..82b32d7aa8f34c7c3c52f15be27ee94b7ba793e4 100644 --- a/engine/flutter/lib/ui/painting/matrix.h +++ b/engine/flutter/lib/ui/painting/matrix.h @@ -6,7 +6,7 @@ #define FLUTTER_LIB_UI_PAINTING_MATRIX_H_ #include "flutter/lib/ui/dart_wrapper.h" -#include "third_party/skia/include/core/SkMatrix.h" +#include "third_party/flutter/skia/include/core/SkMatrix.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/multi_frame_codec.cc b/engine/flutter/lib/ui/painting/multi_frame_codec.cc index 0c48046769b2971e129ac84a2814f98041003b0b..903cd4bfc6395cea2bc6de5969477bdc45c875c1 100644 --- a/engine/flutter/lib/ui/painting/multi_frame_codec.cc +++ b/engine/flutter/lib/ui/painting/multi_frame_codec.cc @@ -6,7 +6,7 @@ #include "flutter/fml/make_copyable.h" #include "third_party/dart/runtime/include/dart_api.h" -#include "third_party/skia/include/core/SkPixelRef.h" +#include "third_party/flutter/skia/include/core/SkPixelRef.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/paint.cc b/engine/flutter/lib/ui/painting/paint.cc index 3cb8ca999c58fcad12d413fc26b4c5ce055f7914..72cf28ffceef7a69c23a7acb1541f31cf0dc0577 100644 --- a/engine/flutter/lib/ui/painting/paint.cc +++ b/engine/flutter/lib/ui/painting/paint.cc @@ -8,11 +8,11 @@ #include "flutter/lib/ui/painting/color_filter.h" #include "flutter/lib/ui/painting/image_filter.h" #include "flutter/lib/ui/painting/shader.h" -#include "third_party/skia/include/core/SkColorFilter.h" -#include "third_party/skia/include/core/SkImageFilter.h" -#include "third_party/skia/include/core/SkMaskFilter.h" -#include "third_party/skia/include/core/SkShader.h" -#include "third_party/skia/include/core/SkString.h" +#include "third_party/flutter/skia/include/core/SkColorFilter.h" +#include "third_party/flutter/skia/include/core/SkImageFilter.h" +#include "third_party/flutter/skia/include/core/SkMaskFilter.h" +#include "third_party/flutter/skia/include/core/SkShader.h" +#include "third_party/flutter/skia/include/core/SkString.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/paint.h b/engine/flutter/lib/ui/painting/paint.h index 40466245c5d2980355f0e1bf634707d182a3870d..c830d79ff918e6daf45466cea30de84efe6298b1 100644 --- a/engine/flutter/lib/ui/painting/paint.h +++ b/engine/flutter/lib/ui/painting/paint.h @@ -6,7 +6,7 @@ #define FLUTTER_LIB_UI_PAINTING_PAINT_H_ #include "flutter/lib/ui/dart_wrapper.h" -#include "third_party/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/path.h b/engine/flutter/lib/ui/painting/path.h index db3f8d2949d292f0421520175da59271c3e239e4..4235c521f37665929a94d633f1a3be0236c937e9 100644 --- a/engine/flutter/lib/ui/painting/path.h +++ b/engine/flutter/lib/ui/painting/path.h @@ -7,8 +7,8 @@ #include "flutter/lib/ui/dart_wrapper.h" #include "flutter/lib/ui/painting/rrect.h" -#include "third_party/skia/include/core/SkPath.h" -#include "third_party/skia/include/pathops/SkPathOps.h" +#include "third_party/flutter/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/pathops/SkPathOps.h" namespace tonic { class DartLibraryNatives; diff --git a/engine/flutter/lib/ui/painting/path_measure.h b/engine/flutter/lib/ui/painting/path_measure.h index e4ef2ee017eb372378d58003152065687ef60493..24390a6ee318edd08142847043d7e331c589ab4a 100644 --- a/engine/flutter/lib/ui/painting/path_measure.h +++ b/engine/flutter/lib/ui/painting/path_measure.h @@ -9,8 +9,8 @@ #include "flutter/lib/ui/dart_wrapper.h" #include "flutter/lib/ui/painting/path.h" -#include "third_party/skia/include/core/SkContourMeasure.h" -#include "third_party/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/core/SkContourMeasure.h" +#include "third_party/flutter/skia/include/core/SkPath.h" namespace tonic { class DartLibraryNatives; diff --git a/engine/flutter/lib/ui/painting/picture.cc b/engine/flutter/lib/ui/painting/picture.cc index 8680b715ccf4cde05245a9bd2fd34256716bd89a..6ec14d9118cfdc88df733c88963b22e9f55bc0a3 100644 --- a/engine/flutter/lib/ui/painting/picture.cc +++ b/engine/flutter/lib/ui/painting/picture.cc @@ -5,7 +5,7 @@ #include "flutter/lib/ui/painting/picture.h" #include "flutter/lib/ui/painting/canvas.h" -#include "third_party/skia/include/core/SkImage.h" +#include "third_party/flutter/skia/include/core/SkImage.h" #include "flutter/lib/ui/ui_dart_state.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/picture.h b/engine/flutter/lib/ui/painting/picture.h index 3ca4bfdce0ed3c4fa6791b4b443b9d80410c1c89..f4c41b81d5ae27bb509d3d3944d57a954a5004ac 100644 --- a/engine/flutter/lib/ui/painting/picture.h +++ b/engine/flutter/lib/ui/painting/picture.h @@ -8,7 +8,7 @@ #include "flutter/fml/memory/ref_counted.h" #include "flutter/flow/skia_gpu_object.h" #include "flutter/lib/ui/painting/image.h" -#include "third_party/skia/include/core/SkPicture.h" +#include "third_party/flutter/skia/include/core/SkPicture.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/picture_recorder.h b/engine/flutter/lib/ui/painting/picture_recorder.h index 58835fb034059b4def16d56caf8cdc0c1d000d13..17e9154a2aae3a11c9622a6accf133bab9c06eb5 100644 --- a/engine/flutter/lib/ui/painting/picture_recorder.h +++ b/engine/flutter/lib/ui/painting/picture_recorder.h @@ -6,7 +6,7 @@ #define FLUTTER_LIB_UI_PAINTING_PICTURE_RECORDER_H_ #include "flutter/lib/ui/dart_wrapper.h" -#include "third_party/skia/include/core/SkPictureRecorder.h" +#include "third_party/flutter/skia/include/core/SkPictureRecorder.h" namespace tonic { class DartLibraryNatives; diff --git a/engine/flutter/lib/ui/painting/rrect.h b/engine/flutter/lib/ui/painting/rrect.h index 1e1c33ad28965c347cf3c133cc153f7b1f5bc2c5..a4647d54113788af7ee3a8866103d415235fe2ef 100644 --- a/engine/flutter/lib/ui/painting/rrect.h +++ b/engine/flutter/lib/ui/painting/rrect.h @@ -5,7 +5,7 @@ #ifndef FLUTTER_LIB_UI_PAINTING_RRECT_H_ #define FLUTTER_LIB_UI_PAINTING_RRECT_H_ -#include "third_party/skia/include/core/SkRRect.h" +#include "third_party/flutter/skia/include/core/SkRRect.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/shader.h b/engine/flutter/lib/ui/painting/shader.h index cb9043ae0b4dadfa36eb534c9290fc5594ba512e..c54b355116ffa1af55d69241bc9706c18829e9c3 100644 --- a/engine/flutter/lib/ui/painting/shader.h +++ b/engine/flutter/lib/ui/painting/shader.h @@ -8,7 +8,7 @@ #include "flutter/flow/skia_gpu_object.h" #include "flutter/lib/ui/dart_wrapper.h" #include "flutter/lib/ui/ui_dart_state.h" -#include "third_party/skia/include/core/SkShader.h" +#include "third_party/flutter/skia/include/core/SkShader.h" namespace flutter { diff --git a/engine/flutter/lib/ui/painting/vertices.h b/engine/flutter/lib/ui/painting/vertices.h index 39c236d5410bfc15f7cd5831bc7cb0b4dff2b411..d8714f876acd16c7b07ac30da2306873d92f8e29 100644 --- a/engine/flutter/lib/ui/painting/vertices.h +++ b/engine/flutter/lib/ui/painting/vertices.h @@ -6,7 +6,7 @@ #define FLUTTER_LIB_UI_PAINTING_VERTICES_H_ #include "flutter/lib/ui/dart_wrapper.h" -#include "third_party/skia/include/core/SkVertices.h" +#include "third_party/flutter/skia/include/core/SkVertices.h" namespace tonic { class DartLibraryNatives; diff --git a/engine/flutter/lib/ui/semantics/semantics_node.h b/engine/flutter/lib/ui/semantics/semantics_node.h index 81f98f1417bc62216f8f386f85dcd30de0bff9a3..23cf94c5f0b79115fc8226cdd1f24c74945508ac 100644 --- a/engine/flutter/lib/ui/semantics/semantics_node.h +++ b/engine/flutter/lib/ui/semantics/semantics_node.h @@ -11,8 +11,8 @@ #include #include -#include "third_party/skia/include/core/SkMatrix44.h" -#include "third_party/skia/include/core/SkRect.h" +#include "third_party/flutter/skia/include/core/SkMatrix44.h" +#include "third_party/flutter/skia/include/core/SkRect.h" namespace flutter { diff --git a/engine/flutter/lib/ui/semantics/semantics_update_builder.cc b/engine/flutter/lib/ui/semantics/semantics_update_builder.cc index 99cab3b0cd73f373cb5ce7f443b3dc849ac00ffc..b938bd754576e93ce8acf6344abf23e8a6b314f8 100644 --- a/engine/flutter/lib/ui/semantics/semantics_update_builder.cc +++ b/engine/flutter/lib/ui/semantics/semantics_update_builder.cc @@ -4,7 +4,7 @@ #include "flutter/lib/ui/semantics/semantics_update_builder.h" -#include "third_party/skia/include/core/SkScalar.h" +#include "third_party/flutter/skia/include/core/SkScalar.h" namespace flutter { diff --git a/engine/flutter/lib/ui/text/asset_manager_font_provider.cc b/engine/flutter/lib/ui/text/asset_manager_font_provider.cc index fd019f23cc3f2135a5193c2778444ae7ac5c9721..d206ed0d8e340e7700dc052bdf864adc9652446d 100644 --- a/engine/flutter/lib/ui/text/asset_manager_font_provider.cc +++ b/engine/flutter/lib/ui/text/asset_manager_font_provider.cc @@ -5,10 +5,10 @@ #include "flutter/lib/ui/text/asset_manager_font_provider.h" #include "flutter/fml/logging.h" -#include "third_party/skia/include/core/SkData.h" -#include "third_party/skia/include/core/SkStream.h" -#include "third_party/skia/include/core/SkString.h" -#include "third_party/skia/include/core/SkTypeface.h" +#include "third_party/flutter/skia/include/core/SkData.h" +#include "third_party/flutter/skia/include/core/SkStream.h" +#include "third_party/flutter/skia/include/core/SkString.h" +#include "third_party/flutter/skia/include/core/SkTypeface.h" namespace flutter { diff --git a/engine/flutter/lib/ui/text/asset_manager_font_provider.h b/engine/flutter/lib/ui/text/asset_manager_font_provider.h index d24e5acb078c3d728fbc7a9747aa9b8d950120e3..cafdade3f33108cf7ef354e3616f29ac4cc4e773 100644 --- a/engine/flutter/lib/ui/text/asset_manager_font_provider.h +++ b/engine/flutter/lib/ui/text/asset_manager_font_provider.h @@ -12,8 +12,8 @@ #include "flutter/assets/asset_manager.h" #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkFontMgr.h" -#include "third_party/skia/include/core/SkTypeface.h" +#include "third_party/flutter/skia/include/core/SkFontMgr.h" +#include "third_party/flutter/skia/include/core/SkTypeface.h" #include "txt/font_asset_provider.h" namespace flutter { diff --git a/engine/flutter/lib/ui/text/font_collection.cc b/engine/flutter/lib/ui/text/font_collection.cc index 2a02955026eee55cdfeaed562b54f54578bdeb78..eef27250766a25976d73b4bafa14a84d0cb43b81 100644 --- a/engine/flutter/lib/ui/text/font_collection.cc +++ b/engine/flutter/lib/ui/text/font_collection.cc @@ -10,10 +10,10 @@ #include "flutter/lib/ui/ui_dart_state.h" #include "flutter/lib/ui/window/window.h" #include "flutter/runtime/test_font_data.h" -#include "third_party/skia/include/core/SkFontMgr.h" -#include "third_party/skia/include/core/SkGraphics.h" -#include "third_party/skia/include/core/SkStream.h" -#include "third_party/skia/include/core/SkTypeface.h" +#include "third_party/flutter/skia/include/core/SkFontMgr.h" +#include "third_party/flutter/skia/include/core/SkGraphics.h" +#include "third_party/flutter/skia/include/core/SkStream.h" +#include "third_party/flutter/skia/include/core/SkTypeface.h" #include "txt/asset_font_manager.h" #include "txt/test_font_manager.h" diff --git a/engine/flutter/lib/ui/text/paragraph_builder.cc b/engine/flutter/lib/ui/text/paragraph_builder.cc index 07112f083b0c93a3ad1d93a482fc7a55d194efd8..de069027762ebe91193be964156c026f0f1218bc 100644 --- a/engine/flutter/lib/ui/text/paragraph_builder.cc +++ b/engine/flutter/lib/ui/text/paragraph_builder.cc @@ -18,7 +18,7 @@ #include "flutter/third_party/txt/src/txt/text_decoration.h" #include "flutter/third_party/txt/src/txt/text_style.h" #include "third_party/icu/source/common/unicode/ustring.h" -#include "third_party/skia/include/core/SkColor.h" +#include "third_party/flutter/skia/include/core/SkColor.h" namespace flutter { namespace { diff --git a/engine/flutter/lib/ui/text/text_box.h b/engine/flutter/lib/ui/text/text_box.h index 1327e32528a9942220ba23459abb14ec048879d4..382409b6cb96ca77bc842c10b0f958fca3d18bbb 100644 --- a/engine/flutter/lib/ui/text/text_box.h +++ b/engine/flutter/lib/ui/text/text_box.h @@ -5,7 +5,7 @@ #ifndef FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_ #define FLUTTER_LIB_UI_TEXT_TEXT_BOX_H_ -#include "third_party/skia/include/core/SkRect.h" +#include "third_party/flutter/skia/include/core/SkRect.h" #include "flutter/lib/ui/dart_wrapper.h" namespace flutter { diff --git a/engine/flutter/lib/ui/ui_dart_state.h b/engine/flutter/lib/ui/ui_dart_state.h index 7248c0c3891c6c535bd0ccf40ad26202a48398ed..4c1baaa02068cea5bad446be454b9bc3a7a20d75 100644 --- a/engine/flutter/lib/ui/ui_dart_state.h +++ b/engine/flutter/lib/ui/ui_dart_state.h @@ -5,7 +5,7 @@ #ifndef FLUTTER_LIB_UI_UI_DART_STATE_H_ #define FLUTTER_LIB_UI_UI_DART_STATE_H_ -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" #include #include diff --git a/engine/flutter/runtime/dart_vm.cc b/engine/flutter/runtime/dart_vm.cc index 60c73b5c2b871d97607e3f37b23c72c00bb64a29..82b35a615dd3090dccdd8a550cd5b828c26543df 100644 --- a/engine/flutter/runtime/dart_vm.cc +++ b/engine/flutter/runtime/dart_vm.cc @@ -27,7 +27,7 @@ #include "flutter/runtime/ptrace_ios.h" #include "flutter/runtime/start_up.h" #include "third_party/dart/runtime/include/bin/dart_io_api.h" -#include "third_party/skia/include/core/SkExecutor.h" +#include "third_party/flutter/skia/include/core/SkExecutor.h" namespace dart { namespace observatory { diff --git a/engine/flutter/runtime/skia_concurrent_executor.h b/engine/flutter/runtime/skia_concurrent_executor.h index 5744726d7d464f33196c00a628fe33313b497384..7b7e38247da9f0e82bbbb336c040ded8da3d37a5 100644 --- a/engine/flutter/runtime/skia_concurrent_executor.h +++ b/engine/flutter/runtime/skia_concurrent_executor.h @@ -7,7 +7,7 @@ #include "flutter/fml/closure.h" #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkExecutor.h" +#include "third_party/flutter/skia/include/core/SkExecutor.h" namespace flutter { diff --git a/engine/flutter/runtime/test_font_data.h b/engine/flutter/runtime/test_font_data.h index 957422e0bd47009e0a090c81510afeba4d782e88..fff08de65feef0ee733b262c2ce1fc8ab40cfeb7 100644 --- a/engine/flutter/runtime/test_font_data.h +++ b/engine/flutter/runtime/test_font_data.h @@ -8,7 +8,7 @@ #include #include -#include "third_party/skia/include/core/SkStream.h" +#include "third_party/flutter/skia/include/core/SkStream.h" namespace flutter { diff --git a/engine/flutter/shell/common/ace_engine.cc b/engine/flutter/shell/common/ace_engine.cc index 893e66890cbcb640a05a22a844b82735fe96d96c..3ebc46ddbb1a6767e5de084c931436c6aeb55b10 100644 --- a/engine/flutter/shell/common/ace_engine.cc +++ b/engine/flutter/shell/common/ace_engine.cc @@ -23,8 +23,8 @@ #include "flutter/shell/common/animator.h" #include "flutter/shell/common/platform_view.h" #include "flutter/shell/common/shell.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkPictureRecorder.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkPictureRecorder.h" namespace flutter { diff --git a/engine/flutter/shell/common/ace_platform_view.cc b/engine/flutter/shell/common/ace_platform_view.cc index 4db5148c7d3aa745bd3622df68782cde7ba78c4e..9300ac66c36f1e5edc4def95b7142e6f9018fb2e 100644 --- a/engine/flutter/shell/common/ace_platform_view.cc +++ b/engine/flutter/shell/common/ace_platform_view.cc @@ -13,8 +13,8 @@ #include "flutter/shell/common/rasterizer.h" #include "flutter/shell/common/shell.h" #include "flutter/shell/common/vsync_waiter_fallback.h" -#include "third_party/skia/include/gpu/GrContextOptions.h" -#include "third_party/skia/include/gpu/gl/GrGLInterface.h" +#include "third_party/flutter/skia/include/gpu/GrContextOptions.h" +#include "third_party/flutter/skia/include/gpu/gl/GrGLInterface.h" namespace flutter { diff --git a/engine/flutter/shell/common/ace_shell.cc b/engine/flutter/shell/common/ace_shell.cc index 61d1c2c2cb5bba35b17d34da95a07fb5201bdf01..e6ba47c3a5487cada881ea550e95ba8a4da7c47e 100644 --- a/engine/flutter/shell/common/ace_shell.cc +++ b/engine/flutter/shell/common/ace_shell.cc @@ -30,7 +30,7 @@ #include "flutter/shell/common/skia_event_tracer_impl.h" #include "flutter/shell/common/switches.h" #include "flutter/shell/common/vsync_waiter.h" -#include "third_party/skia/include/core/SkGraphics.h" +#include "third_party/flutter/skia/include/core/SkGraphics.h" namespace { diff --git a/engine/flutter/shell/common/engine.cc b/engine/flutter/shell/common/engine.cc index 7b37e14d6d06b567713b4f642e3ef96d0a9fb183..74475f9b7fb7e71095f9123f1e8456ccb2ed23a2 100644 --- a/engine/flutter/shell/common/engine.cc +++ b/engine/flutter/shell/common/engine.cc @@ -22,8 +22,8 @@ #include "flutter/shell/common/platform_view.h" #include "flutter/shell/common/shell.h" #include "rapidjson/document.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkPictureRecorder.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkPictureRecorder.h" namespace flutter { diff --git a/engine/flutter/shell/common/engine.h b/engine/flutter/shell/common/engine.h index 06264b1d2e8ce3e4a65c789412febe51c705f300..67b2d8956d7d9e506aa808c8b01bf6befc3ea321 100644 --- a/engine/flutter/shell/common/engine.h +++ b/engine/flutter/shell/common/engine.h @@ -22,7 +22,7 @@ #include "flutter/shell/common/rasterizer.h" #include "flutter/shell/common/run_configuration.h" #include "flutter/shell/common/shell_io_manager.h" -#include "third_party/skia/include/core/SkPicture.h" +#include "third_party/flutter/skia/include/core/SkPicture.h" namespace flutter { diff --git a/engine/flutter/shell/common/persistent_cache.h b/engine/flutter/shell/common/persistent_cache.h index 595593eba7227b38010d4ba34738edefc3f685e7..87182fcb6df2dc3a69166cdc3fe8a2cc50bfbf60 100644 --- a/engine/flutter/shell/common/persistent_cache.h +++ b/engine/flutter/shell/common/persistent_cache.h @@ -13,7 +13,7 @@ #include "flutter/fml/synchronization/thread_annotations.h" #include "flutter/fml/task_runner.h" #include "flutter/fml/unique_fd.h" -#include "third_party/skia/include/gpu/GrContextOptions.h" +#include "third_party/flutter/skia/include/gpu/GrContextOptions.h" namespace flutter { diff --git a/engine/flutter/shell/common/platform_view.cc b/engine/flutter/shell/common/platform_view.cc index 4a84f27f4e4569c21b1c5fcde14cf6834735e8a5..818ba7ec21de30b8427be1734d1d0b8d17816177 100644 --- a/engine/flutter/shell/common/platform_view.cc +++ b/engine/flutter/shell/common/platform_view.cc @@ -11,8 +11,8 @@ #include "flutter/shell/common/rasterizer.h" #include "flutter/shell/common/shell.h" #include "flutter/shell/common/vsync_waiter_fallback.h" -#include "third_party/skia/include/gpu/GrContextOptions.h" -#include "third_party/skia/include/gpu/gl/GrGLInterface.h" +#include "third_party/flutter/skia/include/gpu/GrContextOptions.h" +#include "third_party/flutter/skia/include/gpu/gl/GrGLInterface.h" namespace flutter { diff --git a/engine/flutter/shell/common/platform_view.h b/engine/flutter/shell/common/platform_view.h index 1492fc8a4aaeec29f78a7ee86ee1029f00924238..19a6747be93150fcc581173defe1108c2a11d7bf 100644 --- a/engine/flutter/shell/common/platform_view.h +++ b/engine/flutter/shell/common/platform_view.h @@ -16,8 +16,8 @@ #include "flutter/lib/ui/window/viewport_metrics.h" #include "flutter/shell/common/surface.h" #include "flutter/shell/common/vsync_waiter.h" -#include "third_party/skia/include/core/SkSize.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" namespace flutter { using IdleCallback = std::function; diff --git a/engine/flutter/shell/common/rasterizer.cc b/engine/flutter/shell/common/rasterizer.cc index f4733017dc1e7ab89032f913cddcfb1f94ace7ab..7b2889904a6f5dc61d8aea53b430e565e6cef80e 100644 --- a/engine/flutter/shell/common/rasterizer.cc +++ b/engine/flutter/shell/common/rasterizer.cc @@ -8,13 +8,13 @@ #include -#include "third_party/skia/include/core/SkEncodedImageFormat.h" -#include "third_party/skia/include/core/SkImageEncoder.h" -#include "third_party/skia/include/core/SkPictureRecorder.h" -#include "third_party/skia/include/core/SkSerialProcs.h" -#include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/core/SkSurfaceCharacterization.h" -#include "third_party/skia/include/utils/SkBase64.h" +#include "third_party/flutter/skia/include/core/SkEncodedImageFormat.h" +#include "third_party/flutter/skia/include/core/SkImageEncoder.h" +#include "third_party/flutter/skia/include/core/SkPictureRecorder.h" +#include "third_party/flutter/skia/include/core/SkSerialProcs.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkSurfaceCharacterization.h" +#include "third_party/flutter/skia/include/utils/SkBase64.h" namespace flutter { diff --git a/engine/flutter/shell/common/shell.cc b/engine/flutter/shell/common/shell.cc index 7ba956d90a4c4154d74fdf2a43963fd3dcb0ad36..901ff3c1b69d375a3f9a9b459270813b47c84a9a 100644 --- a/engine/flutter/shell/common/shell.cc +++ b/engine/flutter/shell/common/shell.cc @@ -26,7 +26,7 @@ #include "flutter/shell/common/skia_event_tracer_impl.h" #include "flutter/shell/common/switches.h" #include "flutter/shell/common/vsync_waiter.h" -#include "third_party/skia/include/core/SkGraphics.h" +#include "third_party/flutter/skia/include/core/SkGraphics.h" namespace flutter { diff --git a/engine/flutter/shell/common/shell_io_manager.cc b/engine/flutter/shell/common/shell_io_manager.cc index 7feb3ecd828be1b1f2ec75fe41a86a223ed026ac..1f8fb7f1d8ff582e2b6399b3e5e553270bce914e 100644 --- a/engine/flutter/shell/common/shell_io_manager.cc +++ b/engine/flutter/shell/common/shell_io_manager.cc @@ -6,7 +6,7 @@ #include "flutter/fml/message_loop.h" #include "flutter/shell/common/persistent_cache.h" -#include "third_party/skia/include/gpu/gl/GrGLInterface.h" +#include "third_party/flutter/skia/include/gpu/gl/GrGLInterface.h" namespace flutter { diff --git a/engine/flutter/shell/common/shell_io_manager.h b/engine/flutter/shell/common/shell_io_manager.h index 066937f53bdaa6e6889f226b2a331a69fce43d1f..7acfdf8540865cbcb70eebec5890f43a0a442032 100644 --- a/engine/flutter/shell/common/shell_io_manager.h +++ b/engine/flutter/shell/common/shell_io_manager.h @@ -11,7 +11,7 @@ #include "flutter/fml/macros.h" #include "flutter/fml/memory/weak_ptr.h" #include "flutter/lib/ui/io_manager.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" namespace flutter { diff --git a/engine/flutter/shell/common/skia_event_tracer_impl.cc b/engine/flutter/shell/common/skia_event_tracer_impl.cc index c750cdcdb4cf1c3e90fd84e2f74d1ed798c3810a..8bf70abb7d78b56125e9ba8bd5ce2e40eacf21bd 100644 --- a/engine/flutter/shell/common/skia_event_tracer_impl.cc +++ b/engine/flutter/shell/common/skia_event_tracer_impl.cc @@ -9,8 +9,8 @@ #include "flutter/fml/logging.h" #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/utils/SkEventTracer.h" -#include "third_party/skia/include/utils/SkTraceEventPhase.h" +#include "third_party/flutter/skia/include/utils/SkEventTracer.h" +#include "third_party/flutter/skia/include/utils/SkTraceEventPhase.h" namespace flutter { diff --git a/engine/flutter/shell/common/surface.cc b/engine/flutter/shell/common/surface.cc index b8a77ca1811d45b11a351ae76784a4ec4083ecda..5952dc9e87ef52ba648a264b4d56f449ef6baae2 100644 --- a/engine/flutter/shell/common/surface.cc +++ b/engine/flutter/shell/common/surface.cc @@ -5,7 +5,7 @@ #include "flutter/shell/common/surface.h" #include "flutter/fml/logging.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { diff --git a/engine/flutter/shell/common/surface.h b/engine/flutter/shell/common/surface.h index 7bbc16e24c6902d63e0ecce5625d1a8d96f4488f..a8484f62237625f49f16fcb77b681fcfa387f746 100644 --- a/engine/flutter/shell/common/surface.h +++ b/engine/flutter/shell/common/surface.h @@ -10,7 +10,7 @@ #include "flutter/flow/compositor_context.h" #include "flutter/flow/embedded_views.h" #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" namespace flutter { diff --git a/engine/flutter/shell/gpu/gpu_surface_gl.cc b/engine/flutter/shell/gpu/gpu_surface_gl.cc index 2c329c8db842daf59b75f7163b7bbe74c80b0d4a..e4b4d6e65561cc50d12560170692f14f0de9c9e7 100644 --- a/engine/flutter/shell/gpu/gpu_surface_gl.cc +++ b/engine/flutter/shell/gpu/gpu_surface_gl.cc @@ -8,10 +8,10 @@ #include "flutter/fml/size.h" #include "flutter/fml/trace_event.h" #include "flutter/shell/common/persistent_cache.h" -#include "third_party/skia/include/core/SkColorFilter.h" -#include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GrBackendSurface.h" -#include "third_party/skia/include/gpu/GrContextOptions.h" +#include "third_party/flutter/skia/include/core/SkColorFilter.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/gpu/GrBackendSurface.h" +#include "third_party/flutter/skia/include/gpu/GrContextOptions.h" // These are common defines present on all OpenGL headers. However, we don't // want to perform GL header reasolution on each platform we support. So just diff --git a/engine/flutter/shell/gpu/gpu_surface_gl.h b/engine/flutter/shell/gpu/gpu_surface_gl.h index 97325569bfd16b936534b17f59efb5603290753d..a95e7e6567cbc0834d384162227233f155cdc8a9 100644 --- a/engine/flutter/shell/gpu/gpu_surface_gl.h +++ b/engine/flutter/shell/gpu/gpu_surface_gl.h @@ -13,7 +13,7 @@ #include "flutter/fml/memory/weak_ptr.h" #include "flutter/shell/common/surface.h" #include "flutter/shell/gpu/gpu_surface_gl_delegate.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" namespace flutter { diff --git a/engine/flutter/shell/gpu/gpu_surface_gl_delegate.cc b/engine/flutter/shell/gpu/gpu_surface_gl_delegate.cc index 1ef969fe8acc5c3a73b5c496d92159a22d3df55a..d1fbe16539671a35bf886146ce2204911a5ec199 100644 --- a/engine/flutter/shell/gpu/gpu_surface_gl_delegate.cc +++ b/engine/flutter/shell/gpu/gpu_surface_gl_delegate.cc @@ -4,7 +4,7 @@ #include "flutter/shell/gpu/gpu_surface_gl_delegate.h" -#include "third_party/skia/include/gpu/gl/GrGLAssembleInterface.h" +#include "third_party/flutter/skia/include/gpu/gl/GrGLAssembleInterface.h" namespace flutter { diff --git a/engine/flutter/shell/gpu/gpu_surface_gl_delegate.h b/engine/flutter/shell/gpu/gpu_surface_gl_delegate.h index 9d0a66eba7497a52a84ab36f9186996dfb81b957..6a8f65db5863f82222d249e87d1c3781a90b57f3 100644 --- a/engine/flutter/shell/gpu/gpu_surface_gl_delegate.h +++ b/engine/flutter/shell/gpu/gpu_surface_gl_delegate.h @@ -7,8 +7,8 @@ #include "flutter/flow/embedded_views.h" #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkMatrix.h" -#include "third_party/skia/include/gpu/gl/GrGLInterface.h" +#include "third_party/flutter/skia/include/core/SkMatrix.h" +#include "third_party/flutter/skia/include/gpu/gl/GrGLInterface.h" namespace flutter { diff --git a/engine/flutter/shell/gpu/gpu_surface_metal.h b/engine/flutter/shell/gpu/gpu_surface_metal.h index 894aab6d8d07fa482e7f049f0f48ea1e47ad592c..1849234306898737f458ba1e2440fa8e529ec8ca 100644 --- a/engine/flutter/shell/gpu/gpu_surface_metal.h +++ b/engine/flutter/shell/gpu/gpu_surface_metal.h @@ -10,7 +10,7 @@ #include "flutter/fml/macros.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" #include "flutter/shell/common/surface.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" @class CAMetalLayer; diff --git a/engine/flutter/shell/gpu/gpu_surface_metal.mm b/engine/flutter/shell/gpu/gpu_surface_metal.mm index 88e814af12b0cd79235a84874cca2d1e778dea9f..fc636fa5acec1b02cf26d8d04abec2950337b127 100644 --- a/engine/flutter/shell/gpu/gpu_surface_metal.mm +++ b/engine/flutter/shell/gpu/gpu_surface_metal.mm @@ -6,9 +6,9 @@ #include -#include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GrBackendSurface.h" -#include "third_party/skia/include/ports/SkCFObject.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/gpu/GrBackendSurface.h" +#include "third_party/flutter/skia/include/ports/SkCFObject.h" namespace flutter { diff --git a/engine/flutter/shell/gpu/gpu_surface_software_delegate.h b/engine/flutter/shell/gpu/gpu_surface_software_delegate.h index fa62d26ce4cd3f07a1d5bba421937134ee68d38d..0b3ed4d8bbc411990126533dd6b81f1963ae0c96 100644 --- a/engine/flutter/shell/gpu/gpu_surface_software_delegate.h +++ b/engine/flutter/shell/gpu/gpu_surface_software_delegate.h @@ -7,7 +7,7 @@ #include "flutter/flow/embedded_views.h" #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { diff --git a/engine/flutter/shell/platform/android/android_context_gl.h b/engine/flutter/shell/platform/android/android_context_gl.h index 50e15aba2ed4fa8f81a213aedd50f18ff67d9f77..bd82479eb6a7af504b6e533d0f7f535b5ddfddbf 100644 --- a/engine/flutter/shell/platform/android/android_context_gl.h +++ b/engine/flutter/shell/platform/android/android_context_gl.h @@ -11,7 +11,7 @@ #include "flutter/shell/common/platform_view.h" #include "flutter/shell/platform/android/android_environment_gl.h" #include "flutter/shell/platform/android/android_native_window.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkSize.h" namespace flutter { diff --git a/engine/flutter/shell/platform/android/android_external_texture_gl.cc b/engine/flutter/shell/platform/android/android_external_texture_gl.cc index 935f60b455797b5d8444a740c9635146b80bd5e4..bd85b615055967e57d62282d338aa9553800ee43 100644 --- a/engine/flutter/shell/platform/android/android_external_texture_gl.cc +++ b/engine/flutter/shell/platform/android/android_external_texture_gl.cc @@ -7,7 +7,7 @@ #include #include "flutter/shell/platform/android/platform_view_android_jni.h" -#include "third_party/skia/include/gpu/GrBackendSurface.h" +#include "third_party/flutter/skia/include/gpu/GrBackendSurface.h" namespace flutter { diff --git a/engine/flutter/shell/platform/android/android_native_window.h b/engine/flutter/shell/platform/android/android_native_window.h index 7e9626d63d8eacfe0fafd464efb54730fbb2b223..dd29fa1bf6432e57f0d3da37ec1e48239f21d870 100644 --- a/engine/flutter/shell/platform/android/android_native_window.h +++ b/engine/flutter/shell/platform/android/android_native_window.h @@ -9,7 +9,7 @@ #include "flutter/fml/macros.h" #include "flutter/fml/memory/ref_counted.h" #include "flutter/fml/memory/ref_ptr.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkSize.h" namespace flutter { diff --git a/engine/flutter/shell/platform/android/android_surface.h b/engine/flutter/shell/platform/android/android_surface.h index 43f4cf33d0d5025aee86f1298f78bb9836166e07..942a0ed4ab88e9fe3db4673d4929d678ab8201bf 100644 --- a/engine/flutter/shell/platform/android/android_surface.h +++ b/engine/flutter/shell/platform/android/android_surface.h @@ -13,7 +13,7 @@ #include "flutter/shell/common/platform_view.h" #include "flutter/shell/common/surface.h" #include "flutter/shell/platform/android/android_native_window.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkSize.h" namespace flutter { diff --git a/engine/flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm b/engine/flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm index 091b13e7063eadd0b0f2d5ebb5ce58f0bf4f4181..7fbd19c677e7caf340782662460508c79f2e3a1f 100644 --- a/engine/flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm +++ b/engine/flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm @@ -14,7 +14,7 @@ #include "flutter/shell/common/rasterizer.h" #include "flutter/shell/platform/darwin/ios/ios_surface_gl.h" #include "flutter/shell/platform/darwin/ios/ios_surface_software.h" -#include "third_party/skia/include/utils/mac/SkCGUtils.h" +#include "third_party/flutter/skia/include/utils/mac/SkCGUtils.h" // This is mostly a duplication of FlutterView. // TODO(amirh): once GL support is in evaluate if we can merge this with FlutterView. diff --git a/engine/flutter/shell/platform/darwin/ios/framework/Source/FlutterView.mm b/engine/flutter/shell/platform/darwin/ios/framework/Source/FlutterView.mm index 0d53b44b70d31bd25b6360ff56a570b5aeea1d83..4bf115051d2d68eae6de3653131c10c5e38c3a2c 100644 --- a/engine/flutter/shell/platform/darwin/ios/framework/Source/FlutterView.mm +++ b/engine/flutter/shell/platform/darwin/ios/framework/Source/FlutterView.mm @@ -15,7 +15,7 @@ #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h" #include "flutter/shell/platform/darwin/ios/ios_surface_gl.h" #include "flutter/shell/platform/darwin/ios/ios_surface_software.h" -#include "third_party/skia/include/utils/mac/SkCGUtils.h" +#include "third_party/flutter/skia/include/utils/mac/SkCGUtils.h" #if FLUTTER_SHELL_ENABLE_METAL #include "flutter/shell/platform/darwin/ios/ios_surface_metal.h" diff --git a/engine/flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h b/engine/flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h index f563b73ce266a71ab2e69e2e37c28c51955288f8..6210130bdc30f1992ee676e8597462001bd9321e 100644 --- a/engine/flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h +++ b/engine/flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h @@ -20,8 +20,8 @@ #include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h" #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h" -#include "third_party/skia/include/core/SkMatrix44.h" -#include "third_party/skia/include/core/SkRect.h" +#include "third_party/flutter/skia/include/core/SkMatrix44.h" +#include "third_party/flutter/skia/include/core/SkRect.h" namespace flutter { class AccessibilityBridge; diff --git a/engine/flutter/shell/platform/darwin/ios/ios_external_texture_gl.mm b/engine/flutter/shell/platform/darwin/ios/ios_external_texture_gl.mm index e7e15d57191967a2e923c3af4dd2cb7ffc3a2e79..df19b954f914d4357f37409a58d76dbf295cafe0 100644 --- a/engine/flutter/shell/platform/darwin/ios/ios_external_texture_gl.mm +++ b/engine/flutter/shell/platform/darwin/ios/ios_external_texture_gl.mm @@ -9,8 +9,8 @@ #import #include "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h" -#include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GrBackendSurface.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/gpu/GrBackendSurface.h" namespace flutter { diff --git a/engine/flutter/shell/platform/darwin/ios/ios_gl_context.mm b/engine/flutter/shell/platform/darwin/ios/ios_gl_context.mm index 52fb85f8f19a9a0d284f4fd7cffb0dd705272d05..0f2b1c606be5aac5c1fa344dc6a0b0dc455aef3b 100644 --- a/engine/flutter/shell/platform/darwin/ios/ios_gl_context.mm +++ b/engine/flutter/shell/platform/darwin/ios/ios_gl_context.mm @@ -7,8 +7,8 @@ #include #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/gpu/GrContextOptions.h" -#include "third_party/skia/include/gpu/gl/GrGLInterface.h" +#include "third_party/flutter/skia/include/gpu/GrContextOptions.h" +#include "third_party/flutter/skia/include/gpu/gl/GrGLInterface.h" namespace flutter { diff --git a/engine/flutter/shell/platform/darwin/ios/ios_gl_render_target.mm b/engine/flutter/shell/platform/darwin/ios/ios_gl_render_target.mm index a57ba9c46b41499cffd5d0f2266a7c602c82403c..aa5638ba5e4ee1988f3537c6864635294f34e914 100644 --- a/engine/flutter/shell/platform/darwin/ios/ios_gl_render_target.mm +++ b/engine/flutter/shell/platform/darwin/ios/ios_gl_render_target.mm @@ -7,8 +7,8 @@ #include #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/gpu/GrContextOptions.h" -#include "third_party/skia/include/gpu/gl/GrGLInterface.h" +#include "third_party/flutter/skia/include/gpu/GrContextOptions.h" +#include "third_party/flutter/skia/include/gpu/gl/GrGLInterface.h" namespace flutter { diff --git a/engine/flutter/shell/platform/darwin/ios/ios_surface_software.mm b/engine/flutter/shell/platform/darwin/ios/ios_surface_software.mm index 4470fc25dfdd57b83ce555c0a1b744cea4f36b68..b5c4d532eaff4c9d3420b3ceac186dc3ef8df52c 100644 --- a/engine/flutter/shell/platform/darwin/ios/ios_surface_software.mm +++ b/engine/flutter/shell/platform/darwin/ios/ios_surface_software.mm @@ -11,7 +11,7 @@ #include "flutter/fml/logging.h" #include "flutter/fml/platform/darwin/cf_utils.h" #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/utils/mac/SkCGUtils.h" +#include "third_party/flutter/skia/include/utils/mac/SkCGUtils.h" namespace flutter { diff --git a/engine/flutter/shell/platform/embedder/embedder_external_texture_gl.h b/engine/flutter/shell/platform/embedder/embedder_external_texture_gl.h index e1cd383c72f5aa91707acb4e4c319d26db22f7ba..a70ac5e770ab967434131cee68dd4962daaf6b58 100644 --- a/engine/flutter/shell/platform/embedder/embedder_external_texture_gl.h +++ b/engine/flutter/shell/platform/embedder/embedder_external_texture_gl.h @@ -7,8 +7,8 @@ #include "flutter/flow/texture.h" #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkImage.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkImage.h" +#include "third_party/flutter/skia/include/core/SkSize.h" namespace flutter { diff --git a/engine/flutter/shell/platform/embedder/embedder_external_view_embedder.h b/engine/flutter/shell/platform/embedder/embedder_external_view_embedder.h index d8329ba5207763b6507f18f65111047dd9c7b76e..15285186a3d97319cf5df3f0425d6e474a604023 100644 --- a/engine/flutter/shell/platform/embedder/embedder_external_view_embedder.h +++ b/engine/flutter/shell/platform/embedder/embedder_external_view_embedder.h @@ -11,7 +11,7 @@ #include "flutter/flow/embedded_views.h" #include "flutter/fml/macros.h" #include "flutter/shell/platform/embedder/embedder_render_target.h" -#include "third_party/skia/include/core/SkPictureRecorder.h" +#include "third_party/flutter/skia/include/core/SkPictureRecorder.h" namespace flutter { diff --git a/engine/flutter/shell/platform/embedder/embedder_render_target.h b/engine/flutter/shell/platform/embedder/embedder_render_target.h index a63a068334b9e031a91c43e76476da940e3d4e79..e22923084f4c87ac22204a9f04921e41024a04d0 100644 --- a/engine/flutter/shell/platform/embedder/embedder_render_target.h +++ b/engine/flutter/shell/platform/embedder/embedder_render_target.h @@ -8,8 +8,8 @@ #include "flutter/fml/closure.h" #include "flutter/fml/macros.h" #include "flutter/shell/platform/embedder/embedder.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { diff --git a/engine/flutter/shell/platform/embedder/embedder_surface_software.cc b/engine/flutter/shell/platform/embedder/embedder_surface_software.cc index 84a83ddb3a9d0d43465a88d2164545dc2d3d461d..14ea619e972bf094d0d0481728b88cb595420413 100644 --- a/engine/flutter/shell/platform/embedder/embedder_surface_software.cc +++ b/engine/flutter/shell/platform/embedder/embedder_surface_software.cc @@ -5,7 +5,7 @@ #include "flutter/shell/platform/embedder/embedder_surface_software.h" #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" namespace flutter { diff --git a/engine/flutter/shell/platform/embedder/tests/embedder_assertions.h b/engine/flutter/shell/platform/embedder/tests/embedder_assertions.h index bdc2a597368e4f0db984fa192db956df73108bb5..27f6f2f50da1af22e31abc13e96b442120e8cb2a 100644 --- a/engine/flutter/shell/platform/embedder/tests/embedder_assertions.h +++ b/engine/flutter/shell/platform/embedder/tests/embedder_assertions.h @@ -11,8 +11,8 @@ #include "flutter/shell/platform/embedder/embedder.h" #include "flutter/testing/assertions.h" #include "gtest/gtest.h" -#include "third_party/skia/include/core/SkPoint.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkPoint.h" +#include "third_party/flutter/skia/include/core/SkSize.h" //------------------------------------------------------------------------------ // Equality diff --git a/engine/flutter/shell/platform/embedder/tests/embedder_test_compositor.cc b/engine/flutter/shell/platform/embedder/tests/embedder_test_compositor.cc index b651f4924a86372d00341e67bd7923e11c3383b9..7802a3b595fb62752173239c838b6a01cb493205 100644 --- a/engine/flutter/shell/platform/embedder/tests/embedder_test_compositor.cc +++ b/engine/flutter/shell/platform/embedder/tests/embedder_test_compositor.cc @@ -6,7 +6,7 @@ #include "flutter/fml/logging.h" #include "flutter/shell/platform/embedder/tests/embedder_assertions.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { namespace testing { diff --git a/engine/flutter/shell/platform/embedder/tests/embedder_test_compositor.h b/engine/flutter/shell/platform/embedder/tests/embedder_test_compositor.h index 8a427d1cd7e44cfec8fe5c568e4ac35316c03e6a..81b2a46414044d06bbad80303b84ef95248d9c39 100644 --- a/engine/flutter/shell/platform/embedder/tests/embedder_test_compositor.h +++ b/engine/flutter/shell/platform/embedder/tests/embedder_test_compositor.h @@ -9,7 +9,7 @@ #include "flutter/fml/macros.h" #include "flutter/shell/platform/embedder/embedder.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" namespace flutter { namespace testing { diff --git a/engine/flutter/shell/platform/embedder/tests/embedder_test_context.cc b/engine/flutter/shell/platform/embedder/tests/embedder_test_context.cc index 212dc34ffc5e920a7d57dffcf53f3f4c31bcf7ba..d4c97ee7182af9dbbec671efa95d6fe4ba15d25a 100644 --- a/engine/flutter/shell/platform/embedder/tests/embedder_test_context.cc +++ b/engine/flutter/shell/platform/embedder/tests/embedder_test_context.cc @@ -5,7 +5,7 @@ #include "flutter/shell/platform/embedder/tests/embedder_test_context.h" #include "flutter/runtime/dart_vm.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter { namespace testing { diff --git a/engine/flutter/shell/platform/embedder/tests/embedder_test_context.h b/engine/flutter/shell/platform/embedder/tests/embedder_test_context.h index 9d78a03c03c7fdd4947ea8399e28183b49ef994f..379dc65dbdc4c9a0f05a849eedf5b23d6aa0e63a 100644 --- a/engine/flutter/shell/platform/embedder/tests/embedder_test_context.h +++ b/engine/flutter/shell/platform/embedder/tests/embedder_test_context.h @@ -17,7 +17,7 @@ #include "flutter/shell/platform/embedder/tests/embedder_test_compositor.h" #include "flutter/testing/test_dart_native_resolver.h" #include "flutter/testing/test_gl_surface.h" -#include "third_party/skia/include/core/SkImage.h" +#include "third_party/flutter/skia/include/core/SkImage.h" namespace flutter { namespace testing { diff --git a/engine/flutter/shell/platform/embedder/tests/embedder_unittests.cc b/engine/flutter/shell/platform/embedder/tests/embedder_unittests.cc index 6fdf7b978ab37a14f907b9b9780491840ff19bc3..852ab4f0f926377974cc1a05f46efd4210c24818 100644 --- a/engine/flutter/shell/platform/embedder/tests/embedder_unittests.cc +++ b/engine/flutter/shell/platform/embedder/tests/embedder_unittests.cc @@ -19,7 +19,7 @@ #include "flutter/shell/platform/embedder/tests/embedder_config_builder.h" #include "flutter/shell/platform/embedder/tests/embedder_test.h" #include "flutter/testing/testing.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" #include "third_party/tonic/converter/dart_converter.h" namespace flutter { diff --git a/engine/flutter/shell/platform/fuchsia/flutter/engine.cc b/engine/flutter/shell/platform/fuchsia/flutter/engine.cc index 9f15bf4773842eed1b9d65b7e379a39a4245492d..4f228edf9658dfc3deb74cb79daedbe58c08dc16 100644 --- a/engine/flutter/shell/platform/fuchsia/flutter/engine.cc +++ b/engine/flutter/shell/platform/fuchsia/flutter/engine.cc @@ -17,7 +17,7 @@ #include "platform_view.h" #include "runtime/dart/utils/files.h" #include "task_runner_adapter.h" -#include "third_party/skia/include/ports/SkFontMgr_fuchsia.h" +#include "third_party/flutter/skia/include/ports/SkFontMgr_fuchsia.h" #include "thread.h" namespace flutter_runner { diff --git a/engine/flutter/shell/platform/fuchsia/flutter/runner.cc b/engine/flutter/shell/platform/fuchsia/flutter/runner.cc index f860b7988234de8628f5a3c1c4684e4068eda0c9..8c8c356a87a667f1cb5222391615ada7fd84eea4 100644 --- a/engine/flutter/shell/platform/fuchsia/flutter/runner.cc +++ b/engine/flutter/shell/platform/fuchsia/flutter/runner.cc @@ -19,7 +19,7 @@ #include "runtime/dart/utils/vmo.h" #include "runtime/dart/utils/vmservice_object.h" #include "third_party/icu/source/common/unicode/udata.h" -#include "third_party/skia/include/core/SkGraphics.h" +#include "third_party/flutter/skia/include/core/SkGraphics.h" namespace flutter_runner { diff --git a/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface.cc b/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface.cc index 842de3f9e0829bff977b982900b237ad4a752ab6..646f63996a5600c7cff3b14da272affcbe22ee8e 100644 --- a/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface.cc +++ b/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface.cc @@ -10,10 +10,10 @@ #include "flutter/fml/trace_event.h" #include "runtime/dart/utils/inlines.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/gpu/GrBackendSemaphore.h" -#include "third_party/skia/include/gpu/GrBackendSurface.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/gpu/GrBackendSemaphore.h" +#include "third_party/flutter/skia/include/gpu/GrBackendSurface.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" namespace flutter_runner { diff --git a/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface.h b/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface.h index 2da9f459ff0837661bb46b3a7c6f9cc2941ba6e0..a87ddfe4fd07a2c99255bca2840720975eebaf51 100644 --- a/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface.h +++ b/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface.h @@ -19,7 +19,7 @@ #include "flutter/vulkan/vulkan_proc_table.h" #include "flutter/vulkan/vulkan_provider.h" #include "lib/ui/scenic/cpp/resources.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace flutter_runner { diff --git a/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc b/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc index efba90be028880ef503911eaa0e422956a92d661..57c652745f535f1a1399b857427971b7010e3d5a 100644 --- a/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc +++ b/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc @@ -8,7 +8,7 @@ #include #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" namespace flutter_runner { diff --git a/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc b/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc index 0b678545bb4d4b20aa2d123dd964801d1140faa3..ac05d424adaa5d3d47595d6d783d62daaee1639b 100644 --- a/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc +++ b/engine/flutter/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc @@ -12,11 +12,11 @@ #include #include "flutter/fml/trace_event.h" -#include "third_party/skia/include/gpu/GrBackendSemaphore.h" -#include "third_party/skia/include/gpu/GrBackendSurface.h" -#include "third_party/skia/include/gpu/GrContext.h" -#include "third_party/skia/include/gpu/vk/GrVkBackendContext.h" -#include "third_party/skia/include/gpu/vk/GrVkTypes.h" +#include "third_party/flutter/skia/include/gpu/GrBackendSemaphore.h" +#include "third_party/flutter/skia/include/gpu/GrBackendSurface.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/vk/GrVkBackendContext.h" +#include "third_party/flutter/skia/include/gpu/vk/GrVkTypes.h" namespace flutter_runner { diff --git a/engine/flutter/testing/test_gl_surface.cc b/engine/flutter/testing/test_gl_surface.cc index e856ba452e4296731ed33eb9bf571f9d4b68ab7b..2d2af012ddd82b45bc3700fa96d94458f072a63b 100644 --- a/engine/flutter/testing/test_gl_surface.cc +++ b/engine/flutter/testing/test_gl_surface.cc @@ -11,9 +11,9 @@ #include #include "flutter/fml/logging.h" -#include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/gl/GrGLAssembleInterface.h" -#include "third_party/skia/src/gpu/gl/GrGLDefines.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/gpu/gl/GrGLAssembleInterface.h" +#include "third_party/flutter/skia/src/gpu/gl/GrGLDefines.h" namespace flutter { namespace testing { diff --git a/engine/flutter/testing/test_gl_surface.h b/engine/flutter/testing/test_gl_surface.h index 6ba27194cf2a335a6d1569f388d62a56c389231a..347b54a99dad84f9fe75afcc70d16c3a1a50ee85 100644 --- a/engine/flutter/testing/test_gl_surface.h +++ b/engine/flutter/testing/test_gl_surface.h @@ -8,7 +8,7 @@ #include #include "flutter/fml/macros.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" namespace flutter { namespace testing { diff --git a/engine/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc b/engine/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc index cf7402ba448b47f81f46f85f90a903b64a80a82e..fa6fb77f3e07c63c489ad05530ee81abeef17750 100644 --- a/engine/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc +++ b/engine/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc @@ -22,9 +22,9 @@ #include "minikin/LayoutUtils.h" #include "third_party/benchmark/include/benchmark/benchmark_api.h" #include "third_party/icu/source/common/unicode/unistr.h" -#include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkColor.h" +#include "third_party/flutter/skia/include/core/SkBitmap.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkColor.h" #include "txt/font_collection.h" #include "txt/font_skia.h" #include "txt/font_style.h" diff --git a/engine/flutter/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc b/engine/flutter/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc index 7e378f365c6e1c8b717ef4ba1f569e4a2c5b8c70..f6eee0d0b0b73296c322ab3e4200717e000881c7 100644 --- a/engine/flutter/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc +++ b/engine/flutter/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc @@ -18,7 +18,7 @@ #include "flutter/third_party/txt/tests/txt_test_utils.h" #include "third_party/benchmark/include/benchmark/benchmark_api.h" #include "third_party/icu/source/common/unicode/unistr.h" -#include "third_party/skia/include/core/SkColor.h" +#include "third_party/flutter/skia/include/core/SkColor.h" #include "txt/font_collection.h" #include "txt/font_style.h" #include "txt/font_weight.h" diff --git a/engine/flutter/third_party/txt/src/skia/paragraph_builder_skia.cc b/engine/flutter/third_party/txt/src/skia/paragraph_builder_skia.cc index 17cd9af9713e65bb0920b44ba3a8ca6ddf7873a2..23237414e0033d45a5496599b6234915a97aa495 100644 --- a/engine/flutter/third_party/txt/src/skia/paragraph_builder_skia.cc +++ b/engine/flutter/third_party/txt/src/skia/paragraph_builder_skia.cc @@ -17,8 +17,8 @@ #include "paragraph_builder_skia.h" #include "paragraph_skia.h" -#include "third_party/skia/modules/skparagraph/include/ParagraphStyle.h" -#include "third_party/skia/modules/skparagraph/include/TextStyle.h" +#include "third_party/flutter/skia/modules/skparagraph/include/ParagraphStyle.h" +#include "third_party/flutter/skia/modules/skparagraph/include/TextStyle.h" #include "txt/paragraph_style.h" namespace skt = skia::textlayout; diff --git a/engine/flutter/third_party/txt/src/skia/paragraph_builder_skia.h b/engine/flutter/third_party/txt/src/skia/paragraph_builder_skia.h index 06b00caf43c52bd64704d0f24ae393cf5a04eded..df84b8852ac7d0e6ca7bd07b8eda460aecc03b3f 100644 --- a/engine/flutter/third_party/txt/src/skia/paragraph_builder_skia.h +++ b/engine/flutter/third_party/txt/src/skia/paragraph_builder_skia.h @@ -19,7 +19,7 @@ #include "txt/paragraph_builder.h" -#include "third_party/skia/modules/skparagraph/include/ParagraphBuilder.h" +#include "third_party/flutter/skia/modules/skparagraph/include/ParagraphBuilder.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/skia/paragraph_skia.h b/engine/flutter/third_party/txt/src/skia/paragraph_skia.h index 00d713436fd1d0427227968738e02316e9c3646b..95249b03dc88e753827bef94e7b82c7b0d1f0817 100644 --- a/engine/flutter/third_party/txt/src/skia/paragraph_skia.h +++ b/engine/flutter/third_party/txt/src/skia/paragraph_skia.h @@ -19,7 +19,7 @@ #include "txt/paragraph.h" -#include "third_party/skia/modules/skparagraph/include/Paragraph.h" +#include "third_party/flutter/skia/modules/skparagraph/include/Paragraph.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/asset_font_manager.cc b/engine/flutter/third_party/txt/src/txt/asset_font_manager.cc index 36e85aefba3b9531876a1fea52366863a26fc80d..c1f7c7789322a88e1196dc85bd8d01b0314949a0 100644 --- a/engine/flutter/third_party/txt/src/txt/asset_font_manager.cc +++ b/engine/flutter/third_party/txt/src/txt/asset_font_manager.cc @@ -19,8 +19,8 @@ #include #include "flutter/fml/logging.h" -#include "third_party/skia/include/core/SkString.h" -#include "third_party/skia/include/core/SkTypeface.h" +#include "third_party/flutter/skia/include/core/SkString.h" +#include "third_party/flutter/skia/include/core/SkTypeface.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/asset_font_manager.h b/engine/flutter/third_party/txt/src/txt/asset_font_manager.h index 715d81835edea8142b2fbb60f3e4c6f0a37edab1..093b5dd62edf901dae09bed18096eb52806564c5 100644 --- a/engine/flutter/third_party/txt/src/txt/asset_font_manager.h +++ b/engine/flutter/third_party/txt/src/txt/asset_font_manager.h @@ -19,8 +19,8 @@ #include #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkFontMgr.h" -#include "third_party/skia/include/core/SkStream.h" +#include "third_party/flutter/skia/include/core/SkFontMgr.h" +#include "third_party/flutter/skia/include/core/SkStream.h" #include "txt/font_asset_provider.h" #include "txt/typeface_font_asset_provider.h" diff --git a/engine/flutter/third_party/txt/src/txt/font_asset_provider.h b/engine/flutter/third_party/txt/src/txt/font_asset_provider.h index cbecbeaf004cc88dcf6bb044f90a9c681dbcf376..0732efc6e17a01a030e683c5022c5ecf9af1ff38 100644 --- a/engine/flutter/third_party/txt/src/txt/font_asset_provider.h +++ b/engine/flutter/third_party/txt/src/txt/font_asset_provider.h @@ -17,7 +17,7 @@ #ifndef TXT_FONT_ASSET_PROVIDER_H_ #define TXT_FONT_ASSET_PROVIDER_H_ -#include "third_party/skia/include/core/SkFontMgr.h" +#include "third_party/flutter/skia/include/core/SkFontMgr.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/font_collection.h b/engine/flutter/third_party/txt/src/txt/font_collection.h index 78e7b7cd60af001a3b24553aeba107490a90540c..9e389e4ded0d980aa742d9735ffa0deb196d9891 100644 --- a/engine/flutter/third_party/txt/src/txt/font_collection.h +++ b/engine/flutter/third_party/txt/src/txt/font_collection.h @@ -25,14 +25,14 @@ #include "minikin/FontCollection.h" #include "minikin/FontFamily.h" #include "third_party/googletest/googletest/include/gtest/gtest_prod.h" // nogncheck -#include "third_party/skia/include/core/SkFontMgr.h" -#include "third_party/skia/include/core/SkRefCnt.h" +#include "third_party/flutter/skia/include/core/SkFontMgr.h" +#include "third_party/flutter/skia/include/core/SkRefCnt.h" #include "txt/asset_font_manager.h" #include "txt/platform.h" #include "txt/text_style.h" #if FLUTTER_ENABLE_SKSHAPER -#include "third_party/skia/modules/skparagraph/include/FontCollection.h" +#include "third_party/flutter/skia/modules/skparagraph/include/FontCollection.h" #endif namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/font_skia.cc b/engine/flutter/third_party/txt/src/txt/font_skia.cc index e0dc263929795872d87177780a05d67fc7afa552..5e195b19704d726472474f02c88c4e70065a7b99 100644 --- a/engine/flutter/third_party/txt/src/txt/font_skia.cc +++ b/engine/flutter/third_party/txt/src/txt/font_skia.cc @@ -15,7 +15,7 @@ */ #include "font_skia.h" -#include "third_party/skia/include/core/SkFont.h" +#include "third_party/flutter/skia/include/core/SkFont.h" #include diff --git a/engine/flutter/third_party/txt/src/txt/font_skia.h b/engine/flutter/third_party/txt/src/txt/font_skia.h index ee31ccc6ad8ad69b5a8541c8c04715d6639bf1f6..abdb107e41a826ac2bd263e06847f31571fa518d 100644 --- a/engine/flutter/third_party/txt/src/txt/font_skia.h +++ b/engine/flutter/third_party/txt/src/txt/font_skia.h @@ -16,8 +16,8 @@ #include #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkPaint.h" -#include "third_party/skia/include/core/SkTypeface.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkTypeface.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/paint_record.h b/engine/flutter/third_party/txt/src/txt/paint_record.h index 33917488ccc829dff23837c3eb90fa5ae16df528..74a34403b6bd3ab5b761603c11f57e6614556b88 100644 --- a/engine/flutter/third_party/txt/src/txt/paint_record.h +++ b/engine/flutter/third_party/txt/src/txt/paint_record.h @@ -21,8 +21,8 @@ #include "flutter/fml/macros.h" #include "placeholder_run.h" #include "text_style.h" -#include "third_party/skia/include/core/SkFontMetrics.h" -#include "third_party/skia/include/core/SkTextBlob.h" +#include "third_party/flutter/skia/include/core/SkFontMetrics.h" +#include "third_party/flutter/skia/include/core/SkTextBlob.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc b/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc index 49594991519dcf55583e92facdff9df7454abeb4..f59cd17d3afda4d1d1a90a35541bfa7e71bf3e82 100644 --- a/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc +++ b/engine/flutter/third_party/txt/src/txt/paragraph_txt.cc @@ -35,15 +35,15 @@ #include "minikin/LayoutUtils.h" #include "minikin/LineBreaker.h" #include "minikin/MinikinFont.h" -#include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/core/SkFont.h" -#include "third_party/skia/include/core/SkFontMetrics.h" -#include "third_party/skia/include/core/SkMaskFilter.h" -#include "third_party/skia/include/core/SkPaint.h" -#include "third_party/skia/include/core/SkTextBlob.h" -#include "third_party/skia/include/core/SkTypeface.h" -#include "third_party/skia/include/effects/SkDashPathEffect.h" -#include "third_party/skia/include/effects/SkDiscretePathEffect.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkFont.h" +#include "third_party/flutter/skia/include/core/SkFontMetrics.h" +#include "third_party/flutter/skia/include/core/SkMaskFilter.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkTextBlob.h" +#include "third_party/flutter/skia/include/core/SkTypeface.h" +#include "third_party/flutter/skia/include/effects/SkDashPathEffect.h" +#include "third_party/flutter/skia/include/effects/SkDiscretePathEffect.h" #include "unicode/ubidi.h" #include "unicode/utf16.h" diff --git a/engine/flutter/third_party/txt/src/txt/paragraph_txt.h b/engine/flutter/third_party/txt/src/txt/paragraph_txt.h index 37b8d44e296dacc5a5ea0e4547a015c18e24348f..cd904bd9a2e35e3bd26c7ab645ae2b960feee114 100644 --- a/engine/flutter/third_party/txt/src/txt/paragraph_txt.h +++ b/engine/flutter/third_party/txt/src/txt/paragraph_txt.h @@ -31,8 +31,8 @@ #include "placeholder_run.h" #include "styled_runs.h" #include "third_party/googletest/googletest/include/gtest/gtest_prod.h" // nogncheck -#include "third_party/skia/include/core/SkFontMetrics.h" -#include "third_party/skia/include/core/SkRect.h" +#include "third_party/flutter/skia/include/core/SkFontMetrics.h" +#include "third_party/flutter/skia/include/core/SkRect.h" #include "utils/WindowsUtils.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/platform.h b/engine/flutter/third_party/txt/src/txt/platform.h index 57eef4339af376e1462bde85e39980095b21d5f3..2397c8e76dcb08ae767fbc20e0c13e7f0cbca428 100644 --- a/engine/flutter/third_party/txt/src/txt/platform.h +++ b/engine/flutter/third_party/txt/src/txt/platform.h @@ -8,7 +8,7 @@ #include #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkFontMgr.h" +#include "third_party/flutter/skia/include/core/SkFontMgr.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/platform_linux.cc b/engine/flutter/third_party/txt/src/txt/platform_linux.cc index 36df613eecb905509114e748259d47d707853d6a..3fd149c97f89967b3798ea376e8ddfc1bf411f62 100644 --- a/engine/flutter/third_party/txt/src/txt/platform_linux.cc +++ b/engine/flutter/third_party/txt/src/txt/platform_linux.cc @@ -5,9 +5,9 @@ #include "txt/platform.h" #ifdef FLUTTER_USE_FONTCONFIG -#include "third_party/skia/include/ports/SkFontMgr_fontconfig.h" +#include "third_party/flutter/skia/include/ports/SkFontMgr_fontconfig.h" #else -#include "third_party/skia/include/ports/SkFontMgr_directory.h" +#include "third_party/flutter/skia/include/ports/SkFontMgr_directory.h" #endif namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/test_font_manager.h b/engine/flutter/third_party/txt/src/txt/test_font_manager.h index 1c2fc8966edc0cf8c1ad0e6774ab7c6506289265..35d3314fbf67f1d6bba30140ad86d82b1ffb040a 100644 --- a/engine/flutter/third_party/txt/src/txt/test_font_manager.h +++ b/engine/flutter/third_party/txt/src/txt/test_font_manager.h @@ -21,7 +21,7 @@ #include #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkFontMgr.h" +#include "third_party/flutter/skia/include/core/SkFontMgr.h" #include "txt/asset_font_manager.h" #include "txt/font_asset_provider.h" diff --git a/engine/flutter/third_party/txt/src/txt/text_shadow.cc b/engine/flutter/third_party/txt/src/txt/text_shadow.cc index f6fb9ffb04e0491e368d69d04a1af83a51751442..823f8d1198cf8d6344d12e218f29bbd4ec182d52 100644 --- a/engine/flutter/third_party/txt/src/txt/text_shadow.cc +++ b/engine/flutter/third_party/txt/src/txt/text_shadow.cc @@ -15,7 +15,7 @@ */ #include "text_shadow.h" -#include "third_party/skia/include/core/SkColor.h" +#include "third_party/flutter/skia/include/core/SkColor.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/text_shadow.h b/engine/flutter/third_party/txt/src/txt/text_shadow.h index 790481866831860f8438585b016f0da903f7960b..4107ed841c943e7451ecd78d57ecdfa1dd402162 100644 --- a/engine/flutter/third_party/txt/src/txt/text_shadow.h +++ b/engine/flutter/third_party/txt/src/txt/text_shadow.h @@ -17,8 +17,8 @@ #ifndef LIB_TXT_SRC_TEXT_SHADOW_H_ #define LIB_TXT_SRC_TEXT_SHADOW_H_ -#include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkPoint.h" +#include "third_party/flutter/skia/include/core/SkColor.h" +#include "third_party/flutter/skia/include/core/SkPoint.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/text_style.cc b/engine/flutter/third_party/txt/src/txt/text_style.cc index 8ca0c42a1e4cbd6fc80d85509f3c86ea12e6c4b6..5665d51e64405be81d27929570f4b2a8633b7000 100644 --- a/engine/flutter/third_party/txt/src/txt/text_style.cc +++ b/engine/flutter/third_party/txt/src/txt/text_style.cc @@ -18,7 +18,7 @@ #include "font_style.h" #include "font_weight.h" -#include "third_party/skia/include/core/SkColor.h" +#include "third_party/flutter/skia/include/core/SkColor.h" #include "txt/platform.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/text_style.h b/engine/flutter/third_party/txt/src/txt/text_style.h index 0d4a92a0998147b6e59073654992d9204143e418..02502b2374081ab79567540fa1552ec66f62610e 100644 --- a/engine/flutter/third_party/txt/src/txt/text_style.h +++ b/engine/flutter/third_party/txt/src/txt/text_style.h @@ -26,8 +26,8 @@ #include "text_baseline.h" #include "text_decoration.h" #include "text_shadow.h" -#include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkPaint.h" +#include "third_party/flutter/skia/include/core/SkColor.h" +#include "third_party/flutter/skia/include/core/SkPaint.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/typeface_font_asset_provider.cc b/engine/flutter/third_party/txt/src/txt/typeface_font_asset_provider.cc index fa1c30ce1464dc4028489b9420a2d10b8d62b806..2b4867f18216eb8f22b8783baa55337a234a679c 100644 --- a/engine/flutter/third_party/txt/src/txt/typeface_font_asset_provider.cc +++ b/engine/flutter/third_party/txt/src/txt/typeface_font_asset_provider.cc @@ -17,8 +17,8 @@ #include "txt/typeface_font_asset_provider.h" #include "flutter/fml/logging.h" -#include "third_party/skia/include/core/SkString.h" -#include "third_party/skia/include/core/SkTypeface.h" +#include "third_party/flutter/skia/include/core/SkString.h" +#include "third_party/flutter/skia/include/core/SkTypeface.h" namespace txt { diff --git a/engine/flutter/third_party/txt/src/txt/typeface_font_asset_provider.h b/engine/flutter/third_party/txt/src/txt/typeface_font_asset_provider.h index 2d75838f5322c06455033d77ce23f3a15f31dc9f..cb220dc0ec060bfec8793eca7a396debcba1e646 100644 --- a/engine/flutter/third_party/txt/src/txt/typeface_font_asset_provider.h +++ b/engine/flutter/third_party/txt/src/txt/typeface_font_asset_provider.h @@ -22,7 +22,7 @@ #include #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkFontMgr.h" +#include "third_party/flutter/skia/include/core/SkFontMgr.h" #include "txt/font_asset_provider.h" namespace txt { diff --git a/engine/flutter/third_party/txt/tests/paragraph_unittests.cc b/engine/flutter/third_party/txt/tests/paragraph_unittests.cc index 30e7c076a58e57f867301ba4db6df7ba8110d01f..4b1eb4c6ffeefc465aea977f9f1b559d4d25d76f 100644 --- a/engine/flutter/third_party/txt/tests/paragraph_unittests.cc +++ b/engine/flutter/third_party/txt/tests/paragraph_unittests.cc @@ -19,8 +19,8 @@ #include "flutter/fml/logging.h" #include "render_test.h" #include "third_party/icu/source/common/unicode/unistr.h" -#include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkPath.h" +#include "third_party/flutter/skia/include/core/SkColor.h" +#include "third_party/flutter/skia/include/core/SkPath.h" #include "txt/font_style.h" #include "txt/font_weight.h" #include "txt/paragraph_builder_txt.h" diff --git a/engine/flutter/third_party/txt/tests/render_test.cc b/engine/flutter/third_party/txt/tests/render_test.cc index 17e4fc43a6960f35ed453ebad000ed9301325737..1b8d55d3c6963ba2bbdf96ace89e16b2b038cd9a 100644 --- a/engine/flutter/third_party/txt/tests/render_test.cc +++ b/engine/flutter/third_party/txt/tests/render_test.cc @@ -19,8 +19,8 @@ #include #include "flutter/fml/logging.h" -#include "third_party/skia/include/core/SkImageEncoder.h" -#include "third_party/skia/include/core/SkStream.h" +#include "third_party/flutter/skia/include/core/SkImageEncoder.h" +#include "third_party/flutter/skia/include/core/SkStream.h" #include "txt/asset_font_manager.h" #include "txt/font_collection.h" #include "txt_test_utils.h" diff --git a/engine/flutter/third_party/txt/tests/render_test.h b/engine/flutter/third_party/txt/tests/render_test.h index eee8f2ad4ae8aae3858a5addc671638d1a2bffdf..95f39b2bc50505803c3fe9183239ef7eeb53d18d 100644 --- a/engine/flutter/third_party/txt/tests/render_test.h +++ b/engine/flutter/third_party/txt/tests/render_test.h @@ -18,8 +18,8 @@ #include #include "flutter/fml/macros.h" #include "gtest/gtest.h" -#include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/flutter/skia/include/core/SkBitmap.h" +#include "third_party/flutter/skia/include/core/SkCanvas.h" #include "txt/font_collection.h" namespace txt { diff --git a/engine/flutter/third_party/txt/tests/txt_run_all_unittests.cc b/engine/flutter/third_party/txt/tests/txt_run_all_unittests.cc index 992a167f0449ec0f2b10614cf0bf8bedbe895035..e2d3a7600db33677a60a87aaf40211b3f90cbf63 100644 --- a/engine/flutter/third_party/txt/tests/txt_run_all_unittests.cc +++ b/engine/flutter/third_party/txt/tests/txt_run_all_unittests.cc @@ -18,7 +18,7 @@ #include "flutter/fml/icu_util.h" #include "flutter/fml/logging.h" #include "gtest/gtest.h" -#include "third_party/skia/include/core/SkGraphics.h" +#include "third_party/flutter/skia/include/core/SkGraphics.h" #include "txt_test_utils.h" #include diff --git a/engine/flutter/third_party/txt/tests/txt_test_utils.cc b/engine/flutter/third_party/txt/tests/txt_test_utils.cc index 3dd8d4e940f071411cec61e32268c2667794fd03..e4f46712ee9e6d785a43b28dd0333a04d0988479 100644 --- a/engine/flutter/third_party/txt/tests/txt_test_utils.cc +++ b/engine/flutter/third_party/txt/tests/txt_test_utils.cc @@ -18,7 +18,7 @@ #include -#include "third_party/skia/include/core/SkTypeface.h" +#include "third_party/flutter/skia/include/core/SkTypeface.h" #include "txt/asset_font_manager.h" #include "txt/typeface_font_asset_provider.h" #include "utils/WindowsUtils.h" diff --git a/engine/flutter/vulkan/vulkan_backbuffer.cc b/engine/flutter/vulkan/vulkan_backbuffer.cc index e61045eaa8ad9739fe7e87f84551f477032a4ab1..ffda39d2f92af96dc0cb6f2e74b5be1bbb96e79e 100644 --- a/engine/flutter/vulkan/vulkan_backbuffer.cc +++ b/engine/flutter/vulkan/vulkan_backbuffer.cc @@ -7,7 +7,7 @@ #include #include "flutter/vulkan/vulkan_proc_table.h" -#include "third_party/skia/include/gpu/vk/GrVkTypes.h" +#include "third_party/flutter/skia/include/gpu/vk/GrVkTypes.h" #include "vulkan/vulkan.h" namespace vulkan { diff --git a/engine/flutter/vulkan/vulkan_backbuffer.h b/engine/flutter/vulkan/vulkan_backbuffer.h index b6cdac62b89b33449e90d28ff9cf2779870ce6c9..420dccb39f66d58ff4e084e2743758cda8ded5ba 100644 --- a/engine/flutter/vulkan/vulkan_backbuffer.h +++ b/engine/flutter/vulkan/vulkan_backbuffer.h @@ -11,8 +11,8 @@ #include "flutter/fml/macros.h" #include "flutter/vulkan/vulkan_command_buffer.h" #include "flutter/vulkan/vulkan_handle.h" -#include "third_party/skia/include/core/SkSize.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace vulkan { diff --git a/engine/flutter/vulkan/vulkan_device.cc b/engine/flutter/vulkan/vulkan_device.cc index a69e4712b0652bfc6128e964cd5d9421890f41a0..c0e6534428ca2b974daf3e98f7753d60fc68136f 100644 --- a/engine/flutter/vulkan/vulkan_device.cc +++ b/engine/flutter/vulkan/vulkan_device.cc @@ -11,7 +11,7 @@ #include "flutter/vulkan/vulkan_proc_table.h" #include "flutter/vulkan/vulkan_surface.h" #include "flutter/vulkan/vulkan_utilities.h" -#include "third_party/skia/include/gpu/vk/GrVkBackendContext.h" +#include "third_party/flutter/skia/include/gpu/vk/GrVkBackendContext.h" namespace vulkan { diff --git a/engine/flutter/vulkan/vulkan_native_surface.h b/engine/flutter/vulkan/vulkan_native_surface.h index 0cf3c33fa54314ceca032b02bd42052b00d40974..4a5b45cfd12708f8aac87807f7050449fa9ea3df 100644 --- a/engine/flutter/vulkan/vulkan_native_surface.h +++ b/engine/flutter/vulkan/vulkan_native_surface.h @@ -6,7 +6,7 @@ #define FLUTTER_VULKAN_VULKAN_NATIVE_SURFACE_H_ #include "flutter/fml/macros.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkSize.h" #include "vulkan_handle.h" #include "vulkan_proc_table.h" diff --git a/engine/flutter/vulkan/vulkan_native_surface_android.cc b/engine/flutter/vulkan/vulkan_native_surface_android.cc index ba36e9f17fcffa573f0a305ac5e2a5b08fe17a3e..8165d06109c66c5068db915ba34a4110c4abf081 100644 --- a/engine/flutter/vulkan/vulkan_native_surface_android.cc +++ b/engine/flutter/vulkan/vulkan_native_surface_android.cc @@ -6,7 +6,7 @@ #include -#include "third_party/skia/include/gpu/vk/GrVkBackendContext.h" +#include "third_party/flutter/skia/include/gpu/vk/GrVkBackendContext.h" namespace vulkan { diff --git a/engine/flutter/vulkan/vulkan_proc_table.h b/engine/flutter/vulkan/vulkan_proc_table.h index 8164fb785ca64af4fc4fa91518047f3ff0f5be78..ae93bf8bacd399501a90c14cc6b5c5e111daa765 100644 --- a/engine/flutter/vulkan/vulkan_proc_table.h +++ b/engine/flutter/vulkan/vulkan_proc_table.h @@ -10,8 +10,8 @@ #include "flutter/fml/memory/ref_ptr.h" #include "flutter/vulkan/vulkan_handle.h" #include "flutter/vulkan/vulkan_interface.h" -#include "third_party/skia/include/core/SkRefCnt.h" -#include "third_party/skia/include/gpu/vk/GrVkBackendContext.h" +#include "third_party/flutter/skia/include/core/SkRefCnt.h" +#include "third_party/flutter/skia/include/gpu/vk/GrVkBackendContext.h" namespace vulkan { diff --git a/engine/flutter/vulkan/vulkan_surface.h b/engine/flutter/vulkan/vulkan_surface.h index c1be63ed0ce7119eacaad5b5440300fb7ec68985..868a0519c5ab6443675b74112eb4212cc68cebfa 100644 --- a/engine/flutter/vulkan/vulkan_surface.h +++ b/engine/flutter/vulkan/vulkan_surface.h @@ -7,7 +7,7 @@ #include "flutter/fml/macros.h" #include "flutter/vulkan/vulkan_handle.h" -#include "third_party/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkSize.h" namespace vulkan { diff --git a/engine/flutter/vulkan/vulkan_swapchain.cc b/engine/flutter/vulkan/vulkan_swapchain.cc index c69e9d263f7d096577c2f75422edd6222a198ef9..7aa209cf56f4bba940d489c57d93aa7b25416135 100644 --- a/engine/flutter/vulkan/vulkan_swapchain.cc +++ b/engine/flutter/vulkan/vulkan_swapchain.cc @@ -9,9 +9,9 @@ #include "flutter/vulkan/vulkan_image.h" #include "flutter/vulkan/vulkan_proc_table.h" #include "flutter/vulkan/vulkan_surface.h" -#include "third_party/skia/include/gpu/GrBackendSurface.h" -#include "third_party/skia/include/gpu/GrContext.h" -#include "third_party/skia/include/gpu/vk/GrVkTypes.h" +#include "third_party/flutter/skia/include/gpu/GrBackendSurface.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/vk/GrVkTypes.h" namespace vulkan { diff --git a/engine/flutter/vulkan/vulkan_swapchain.h b/engine/flutter/vulkan/vulkan_swapchain.h index 047b27ca6b157326b7882e87e0c56eedbb414784..f2cdba5db89bafbfceb3eedb5f299ca1726f9afb 100644 --- a/engine/flutter/vulkan/vulkan_swapchain.h +++ b/engine/flutter/vulkan/vulkan_swapchain.h @@ -12,8 +12,8 @@ #include "flutter/fml/compiler_specific.h" #include "flutter/fml/macros.h" #include "flutter/vulkan/vulkan_handle.h" -#include "third_party/skia/include/core/SkSize.h" -#include "third_party/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" namespace vulkan { diff --git a/engine/flutter/vulkan/vulkan_window.cc b/engine/flutter/vulkan/vulkan_window.cc index 44ef7f4a22723dcce036d042449cfd24c5648618..2209d0aa0a835b965c2fb226cfa23e1c0ba64428 100644 --- a/engine/flutter/vulkan/vulkan_window.cc +++ b/engine/flutter/vulkan/vulkan_window.cc @@ -12,7 +12,7 @@ #include "flutter/vulkan/vulkan_native_surface.h" #include "flutter/vulkan/vulkan_surface.h" #include "flutter/vulkan/vulkan_swapchain.h" -#include "third_party/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" namespace vulkan { diff --git a/engine/flutter/vulkan/vulkan_window.h b/engine/flutter/vulkan/vulkan_window.h index ade09d57ac76509f4fe6b5f9f6986b8b0a4dfa56..57be335a53d285225d447a967691338356751d0e 100644 --- a/engine/flutter/vulkan/vulkan_window.h +++ b/engine/flutter/vulkan/vulkan_window.h @@ -13,11 +13,11 @@ #include "flutter/fml/compiler_specific.h" #include "flutter/fml/macros.h" #include "flutter/vulkan/vulkan_proc_table.h" -#include "third_party/skia/include/core/SkRefCnt.h" -#include "third_party/skia/include/core/SkSize.h" -#include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GrContext.h" -#include "third_party/skia/include/gpu/vk/GrVkBackendContext.h" +#include "third_party/flutter/skia/include/core/SkRefCnt.h" +#include "third_party/flutter/skia/include/core/SkSize.h" +#include "third_party/flutter/skia/include/core/SkSurface.h" +#include "third_party/flutter/skia/include/gpu/GrContext.h" +#include "third_party/flutter/skia/include/gpu/vk/GrVkBackendContext.h" namespace vulkan {