From 6a4f31930ba1fa63e6bdf9af7f353eabb223d912 Mon Sep 17 00:00:00 2001 From: muppets Date: Thu, 13 Jan 2022 15:52:32 +0800 Subject: [PATCH] adapt path Signed-off-by: muppets Change-Id: I0867dace93bec540ada82ddc61238815f8a48d2d --- engine/flutter/flow/compositor_context.cc | 2 +- engine/flutter/flow/compositor_context.h | 4 ++-- engine/flutter/flow/debug_print.cc | 2 +- engine/flutter/flow/debug_print.h | 8 ++++---- engine/flutter/flow/embedded_views.h | 14 +++++++------- engine/flutter/flow/instrumentation.cc | 4 ++-- engine/flutter/flow/instrumentation.h | 2 +- .../flow/layers/backdrop_filter_layer.h | 2 +- .../flutter/flow/layers/color_filter_layer.h | 2 +- engine/flutter/flow/layers/filter_layer.h | 2 +- engine/flutter/flow/layers/layer.cc | 2 +- engine/flutter/flow/layers/layer.h | 18 +++++++++--------- engine/flutter/flow/layers/layer_tree.cc | 4 ++-- engine/flutter/flow/layers/layer_tree.h | 4 ++-- engine/flutter/flow/layers/mask_layer.cc | 4 ++-- engine/flutter/flow/layers/mask_layer.h | 4 ++-- .../flow/layers/performance_overlay_layer.cc | 2 +- .../performance_overlay_layer_unittests.cc | 4 ++-- .../flow/layers/physical_shape_layer.cc | 2 +- .../flutter/flow/layers/platform_view_layer.h | 4 ++-- engine/flutter/flow/layers/shader_mask_layer.h | 2 +- engine/flutter/flow/layers/texture_layer.h | 4 ++-- engine/flutter/flow/matrix_decomposition.h | 6 +++--- .../flow/ohos_layers/backdrop_filter_layer.cpp | 2 +- .../flow/ohos_layers/backdrop_filter_layer.h | 4 ++-- .../flutter/flow/ohos_layers/clip_path_layer.h | 2 +- .../flow/ohos_layers/clip_rect_layer.cpp | 4 ++-- .../flow/ohos_layers/clip_rrect_layer.cpp | 4 ++-- .../flow/ohos_layers/clip_rrect_layer.h | 2 +- engine/flutter/flow/ohos_layers/filter_layer.h | 2 +- engine/flutter/flow/ohos_layers/layer.h | 4 ++-- engine/flutter/flow/ohos_layers/layer_tree.cpp | 2 +- engine/flutter/flow/ohos_layers/layer_tree.h | 4 ++-- .../flow/ohos_layers/layer_tree_builder.cpp | 12 ++++++------ .../flow/ohos_layers/layer_tree_builder.h | 12 ++++++------ engine/flutter/flow/ohos_layers/mask_layer.cpp | 6 +++--- engine/flutter/flow/ohos_layers/mask_layer.h | 6 +++--- .../flutter/flow/ohos_layers/opacity_layer.h | 2 +- .../flutter/flow/ohos_layers/paint_context.h | 4 ++-- .../flutter/flow/ohos_layers/picture_layer.h | 2 +- .../flow/ohos_layers/shader_mask_layer.h | 4 ++-- .../flutter/flow/ohos_layers/texture_layer.h | 4 ++-- .../flutter/flow/ohos_layers/transform_layer.h | 2 +- engine/flutter/flow/paint_utils.cc | 6 +++--- engine/flutter/flow/paint_utils.h | 6 +++--- engine/flutter/flow/raster_cache.cc | 8 ++++---- engine/flutter/flow/raster_cache.h | 4 ++-- engine/flutter/flow/raster_cache_unittests.cc | 4 ++-- engine/flutter/flow/scene_update_context.h | 4 ++-- engine/flutter/flow/skia_gpu_object.h | 2 +- engine/flutter/flow/texture.h | 2 +- engine/flutter/lib/ui/compositing/scene.cc | 4 ++-- engine/flutter/lib/ui/compositing/scene.h | 2 +- .../lib/ui/compositing/scene_builder.cc | 2 +- .../flutter/lib/ui/compositing/scene_builder.h | 4 ++-- engine/flutter/lib/ui/io_manager.h | 2 +- engine/flutter/lib/ui/painting/canvas.cc | 6 +++--- engine/flutter/lib/ui/painting/canvas.h | 4 ++-- engine/flutter/lib/ui/painting/codec.cc | 4 ++-- engine/flutter/lib/ui/painting/codec.h | 6 +++--- engine/flutter/lib/ui/painting/color_filter.h | 2 +- engine/flutter/lib/ui/painting/gradient.h | 2 +- engine/flutter/lib/ui/painting/image.h | 2 +- .../flutter/lib/ui/painting/image_decoder.cc | 2 +- engine/flutter/lib/ui/painting/image_decoder.h | 10 +++++----- .../flutter/lib/ui/painting/image_encoding.cc | 8 ++++---- engine/flutter/lib/ui/painting/image_filter.cc | 6 +++--- engine/flutter/lib/ui/painting/image_filter.h | 2 +- engine/flutter/lib/ui/painting/image_shader.h | 4 ++-- engine/flutter/lib/ui/painting/matrix.h | 2 +- .../lib/ui/painting/multi_frame_codec.cc | 2 +- engine/flutter/lib/ui/painting/paint.cc | 10 +++++----- engine/flutter/lib/ui/painting/paint.h | 2 +- engine/flutter/lib/ui/painting/path.h | 4 ++-- engine/flutter/lib/ui/painting/path_measure.h | 4 ++-- engine/flutter/lib/ui/painting/picture.cc | 2 +- engine/flutter/lib/ui/painting/picture.h | 2 +- .../flutter/lib/ui/painting/picture_recorder.h | 2 +- engine/flutter/lib/ui/painting/rrect.h | 2 +- engine/flutter/lib/ui/painting/shader.h | 2 +- engine/flutter/lib/ui/painting/vertices.h | 2 +- .../flutter/lib/ui/semantics/semantics_node.h | 4 ++-- .../ui/semantics/semantics_update_builder.cc | 2 +- .../lib/ui/text/asset_manager_font_provider.cc | 8 ++++---- .../lib/ui/text/asset_manager_font_provider.h | 4 ++-- engine/flutter/lib/ui/text/font_collection.cc | 8 ++++---- .../flutter/lib/ui/text/paragraph_builder.cc | 2 +- engine/flutter/lib/ui/text/text_box.h | 2 +- engine/flutter/lib/ui/ui_dart_state.h | 2 +- engine/flutter/runtime/dart_vm.cc | 2 +- .../flutter/runtime/skia_concurrent_executor.h | 2 +- engine/flutter/runtime/test_font_data.h | 2 +- engine/flutter/shell/common/ace_engine.cc | 4 ++-- .../flutter/shell/common/ace_platform_view.cc | 4 ++-- engine/flutter/shell/common/ace_shell.cc | 2 +- engine/flutter/shell/common/engine.cc | 4 ++-- engine/flutter/shell/common/engine.h | 2 +- engine/flutter/shell/common/persistent_cache.h | 2 +- engine/flutter/shell/common/platform_view.cc | 4 ++-- engine/flutter/shell/common/platform_view.h | 4 ++-- engine/flutter/shell/common/rasterizer.cc | 14 +++++++------- engine/flutter/shell/common/shell.cc | 2 +- .../flutter/shell/common/shell_io_manager.cc | 2 +- engine/flutter/shell/common/shell_io_manager.h | 2 +- .../shell/common/skia_event_tracer_impl.cc | 4 ++-- engine/flutter/shell/common/surface.cc | 2 +- engine/flutter/shell/common/surface.h | 2 +- engine/flutter/shell/gpu/gpu_surface_gl.cc | 8 ++++---- engine/flutter/shell/gpu/gpu_surface_gl.h | 2 +- .../shell/gpu/gpu_surface_gl_delegate.cc | 2 +- .../shell/gpu/gpu_surface_gl_delegate.h | 4 ++-- engine/flutter/shell/gpu/gpu_surface_metal.h | 2 +- engine/flutter/shell/gpu/gpu_surface_metal.mm | 6 +++--- .../shell/gpu/gpu_surface_software_delegate.h | 2 +- .../platform/android/android_context_gl.h | 2 +- .../android/android_external_texture_gl.cc | 2 +- .../platform/android/android_native_window.h | 2 +- .../shell/platform/android/android_surface.h | 2 +- .../ios/framework/Source/FlutterOverlayView.mm | 2 +- .../darwin/ios/framework/Source/FlutterView.mm | 2 +- .../framework/Source/accessibility_bridge.h | 4 ++-- .../darwin/ios/ios_external_texture_gl.mm | 4 ++-- .../platform/darwin/ios/ios_gl_context.mm | 4 ++-- .../darwin/ios/ios_gl_render_target.mm | 4 ++-- .../darwin/ios/ios_surface_software.mm | 2 +- .../embedder/embedder_external_texture_gl.h | 4 ++-- .../embedder/embedder_external_view_embedder.h | 2 +- .../platform/embedder/embedder_render_target.h | 4 ++-- .../embedder/embedder_surface_software.cc | 2 +- .../embedder/tests/embedder_assertions.h | 4 ++-- .../embedder/tests/embedder_test_compositor.cc | 2 +- .../embedder/tests/embedder_test_compositor.h | 2 +- .../embedder/tests/embedder_test_context.cc | 2 +- .../embedder/tests/embedder_test_context.h | 2 +- .../embedder/tests/embedder_unittests.cc | 2 +- .../shell/platform/fuchsia/flutter/engine.cc | 2 +- .../shell/platform/fuchsia/flutter/runner.cc | 2 +- .../platform/fuchsia/flutter/vulkan_surface.cc | 8 ++++---- .../platform/fuchsia/flutter/vulkan_surface.h | 2 +- .../fuchsia/flutter/vulkan_surface_pool.cc | 2 +- .../fuchsia/flutter/vulkan_surface_producer.cc | 10 +++++----- engine/flutter/testing/test_gl_surface.cc | 6 +++--- engine/flutter/testing/test_gl_surface.h | 2 +- .../txt/benchmarks/paragraph_benchmarks.cc | 6 +++--- .../benchmarks/paragraph_builder_benchmarks.cc | 2 +- .../txt/src/skia/paragraph_builder_skia.cc | 4 ++-- .../txt/src/skia/paragraph_builder_skia.h | 2 +- .../third_party/txt/src/skia/paragraph_skia.h | 2 +- .../txt/src/txt/asset_font_manager.cc | 4 ++-- .../txt/src/txt/asset_font_manager.h | 4 ++-- .../txt/src/txt/font_asset_provider.h | 2 +- .../third_party/txt/src/txt/font_collection.h | 6 +++--- .../third_party/txt/src/txt/font_skia.cc | 2 +- .../third_party/txt/src/txt/font_skia.h | 4 ++-- .../third_party/txt/src/txt/paint_record.h | 4 ++-- .../third_party/txt/src/txt/paragraph_txt.cc | 18 +++++++++--------- .../third_party/txt/src/txt/paragraph_txt.h | 4 ++-- .../flutter/third_party/txt/src/txt/platform.h | 2 +- .../third_party/txt/src/txt/platform_linux.cc | 4 ++-- .../txt/src/txt/test_font_manager.h | 2 +- .../third_party/txt/src/txt/text_shadow.cc | 2 +- .../third_party/txt/src/txt/text_shadow.h | 4 ++-- .../third_party/txt/src/txt/text_style.cc | 2 +- .../third_party/txt/src/txt/text_style.h | 4 ++-- .../src/txt/typeface_font_asset_provider.cc | 4 ++-- .../txt/src/txt/typeface_font_asset_provider.h | 2 +- .../txt/tests/paragraph_unittests.cc | 4 ++-- .../third_party/txt/tests/render_test.cc | 4 ++-- .../third_party/txt/tests/render_test.h | 4 ++-- .../txt/tests/txt_run_all_unittests.cc | 2 +- .../third_party/txt/tests/txt_test_utils.cc | 2 +- engine/flutter/vulkan/vulkan_backbuffer.cc | 2 +- engine/flutter/vulkan/vulkan_backbuffer.h | 4 ++-- engine/flutter/vulkan/vulkan_device.cc | 2 +- engine/flutter/vulkan/vulkan_native_surface.h | 2 +- .../vulkan/vulkan_native_surface_android.cc | 2 +- engine/flutter/vulkan/vulkan_proc_table.h | 4 ++-- engine/flutter/vulkan/vulkan_surface.h | 2 +- engine/flutter/vulkan/vulkan_swapchain.cc | 6 +++--- engine/flutter/vulkan/vulkan_swapchain.h | 4 ++-- engine/flutter/vulkan/vulkan_window.cc | 2 +- engine/flutter/vulkan/vulkan_window.h | 10 +++++----- 182 files changed, 342 insertions(+), 342 deletions(-) diff --git a/engine/flutter/flow/compositor_context.cc b/engine/flutter/flow/compositor_context.cc index 8c0d7f63..6fa3933b 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 bba4a76a..9aa6d5b2 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 965c3c2c..fc6341f4 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 f8e0d239..456f4de2 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 afaf9037..f295de34 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 19270dc6..749caf9f 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 aae76cc8..0aeacb11 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 ede9ceee..669c61e0 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 cf1de4cb..12f2186f 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 ec3f8637..aa45c394 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 b729f582..9c93dad1 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 da2dcd8b..7b5204c3 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 b031ebf8..ab4624dd 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 920fd166..a6145cc1 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 a35b4072..68deba86 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 feefede9..2073a048 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 ebb279c9..8ac9c8c4 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 c34d5b96..16f56453 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 21c9265c..0e7e1ca9 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 7ce7ccb5..775674f7 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 01836f4f..432c585f 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 9f4fd1bc..71bc0b46 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 81794c2f..e9f83f7d 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 8f26cfe9..361fff7f 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 8600eee7..d8149a35 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 c3ff27dc..13427723 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 158d3ee7..ac73e616 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 63be9953..7c16df06 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 2384109e..99f61827 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 34670d67..eb0ba8a4 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 4d448505..ea10bb81 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 0238cb27..3363e0be 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 fcd059b2..fe8f0c45 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 14b45bab..82ff1174 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 04b74511..e3ee1aa0 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 83a91176..d063b0b8 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 b83da5c7..1ea69797 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 f9e4432f..4299faab 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 1496bb81..a02f7ece 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 7156ea15..5c5f0ed4 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 44a12f08..77426288 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 0f2bea46..fce17924 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 21d6753c..a542e61c 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 ba8309ee..2a16f7fc 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 c6bfcced..f5184f2a 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 e0ed193d..fa2fc93b 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 f008f245..2a6be1eb 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 64f4405e..40be7cf5 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 d4a46055..64582f28 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 689283ee..497ff41c 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 749e3835..21ef9c45 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 72442ea3..4d8a3e1c 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 2d280a53..55e12d2c 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 66f67c73..5b03c1bf 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 8c13c039..f106ad82 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 200d732f..8d4be6fe 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 3cfc5670..9161a886 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 5eae889b..e351fc7e 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 685acb57..f6b9e5cc 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 2e0c746e..1d3f23ae 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 887b07be..fb38af27 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 dfc8950c..25c61cf5 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 516a2e5d..3118b4af 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 c6a35f07..51810713 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 202dff56..896c0d04 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 00c6b67f..6be4f99b 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 fd1edbf2..ef9b49bf 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 8c3356f1..73909f2a 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 a8a65c6f..6f5a1d65 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 3aedf2d2..82b32d7a 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 0c480467..903cd4bf 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 3cb8ca99..72cf28ff 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 40466245..c830d79f 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 db3f8d29..4235c521 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 e4ef2ee0..24390a6e 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 8680b715..6ec14d91 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 3ca4bfdc..f4c41b81 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 58835fb0..17e9154a 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 1e1c33ad..a4647d54 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 cb9043ae..c54b3551 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 39c236d5..d8714f87 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 81f98f14..23cf94c5 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 99cab3b0..b938bd75 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 fd019f23..d206ed0d 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 d24e5acb..cafdade3 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 2a029550..eef27250 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 07112f08..de069027 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 1327e325..382409b6 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 7248c0c3..4c1baaa0 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 60c73b5c..82b35a61 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 5744726d..7b7e3824 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 957422e0..fff08de6 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 893e6689..3ebc46dd 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 4db5148c..9300ac66 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 61d1c2c2..e6ba47c3 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 7b37e14d..74475f9b 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 06264b1d..67b2d895 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 595593eb..87182fcb 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 4a84f27f..818ba7ec 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 1492fc8a..19a6747b 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 f4733017..7b288990 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 7ba956d9..901ff3c1 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 7feb3ecd..1f8fb7f1 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 066937f5..7acfdf85 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 c750cdcd..8bf70abb 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 b8a77ca1..5952dc9e 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 7bbc16e2..a8484f62 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 2c329c8d..e4b4d6e6 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 97325569..a95e7e65 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 1ef969fe..d1fbe165 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 9d0a66eb..6a8f65db 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 894aab6d..18492343 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 88e814af..fc636fa5 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 fa62d26c..0b3ed4d8 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 50e15aba..bd82479e 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 935f60b4..bd85b615 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 7e9626d6..dd29fa1b 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 43f4cf33..942a0ed4 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 091b13e7..7fbd19c6 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 0d53b44b..4bf11505 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 f563b73c..6210130b 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 e7e15d57..df19b954 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 52fb85f8..0f2b1c60 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 a57ba9c4..aa5638ba 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 4470fc25..b5c4d532 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 e1cd383c..a70ac5e7 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 d8329ba5..15285186 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 a63a0683..e2292308 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 84a83ddb..14ea619e 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 bdc2a597..27f6f2f5 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 b651f492..7802a3b5 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 8a427d1c..81b2a464 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 212dc34f..d4c97ee7 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 9d78a03c..379dc65d 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 6fdf7b97..852ab4f0 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 9f15bf47..4f228edf 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 f860b798..8c8c356a 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 842de3f9..646f6399 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 2da9f459..a87ddfe4 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 efba90be..57c65274 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 0b678545..ac05d424 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 e856ba45..2d2af012 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 6ba27194..347b54a9 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 cf7402ba..fa6fb77f 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 7e378f36..f6eee0d0 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 17cd9af9..23237414 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 06b00caf..df84b885 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 00d71343..95249b03 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 36e85aef..c1f7c778 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 715d8183..093b5dd6 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 cbecbeaf..0732efc6 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 78e7b7cd..9e389e4d 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 e0dc2639..5e195b19 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 ee31ccc6..abdb107e 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 33917488..74a34403 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 49594991..f59cd17d 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 37b8d44e..cd904bd9 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 57eef433..2397c8e7 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 36df613e..3fd149c9 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 1c2fc896..35d3314f 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 f6fb9ffb..823f8d11 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 79048186..4107ed84 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 8ca0c42a..5665d51e 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 0d4a92a0..02502b23 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 fa1c30ce..2b4867f1 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 2d75838f..cb220dc0 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 30e7c076..4b1eb4c6 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 17e4fc43..1b8d55d3 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 eee8f2ad..95f39b2b 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 992a167f..e2d3a760 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 3dd8d4e9..e4f46712 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 e61045ea..ffda39d2 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 b6cdac62..420dccb3 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 a69e4712..c0e65344 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 0cf3c33f..4a5b45cf 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 ba36e9f1..8165d061 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 8164fb78..ae93bf8b 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 c1be63ed..868a0519 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 c69e9d26..7aa209cf 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 047b27ca..f2cdba5d 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 44ef7f4a..2209d0aa 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 ade09d57..57be335a 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 { -- Gitee