From 1bc35d4dd974badcf13dbc8c455caf2cf77a721f Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Fri, 26 Apr 2019 07:45:11 +0000 Subject: [PATCH] clean up Skia include_dirs Skia's recently cleaned itself up so that it can build with many fewer include_dirs / -Ifoo directives. This should let us tidy up skia/BUILD.gn in turn. Since we had all those include_dirs available, a bunch of odd Skia includes have slipped through the cracks. I think this CL cleans them all up so that they're all relative from chromium/src. Also, git clang-format... some formatting changes from that beyond just resorting. Change-Id: I61fcba9e28a34eb394ec69795887d46728ebc788 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1583060 Commit-Queue: Kinuko Yasuda Auto-Submit: Mike Klein Reviewed-by: Dominic Mazzoni Reviewed-by: Kinuko Yasuda Reviewed-by: Florin Malita Reviewed-by: vmpstr Reviewed-by: Philip Rogers Cr-Commit-Position: refs/heads/master@{#654369} --- .../viz/service/display/resource_metadata.h | 2 +- skia/BUILD.gn | 65 +------------------ skia/config/SkUserConfig.h | 4 +- skia/ext/event_tracer_impl.h | 2 +- .../public/platform/web_font_render_style.h | 6 +- .../public/platform/web_image_generator.h | 2 +- .../core/imagebitmap/image_bitmap_test.cc | 3 +- .../accessibility/ax_image_map_link.cc | 2 +- .../accessibility/ax_menu_list_option.cc | 2 +- .../modules/accessibility/ax_object.cc | 2 +- .../accessibility/ax_validation_message.cc | 2 +- .../modules/exported/web_ax_object.cc | 2 +- .../fonts/bitmap_glyphs_block_list.cc | 4 +- .../platform/fonts/font_description.h | 6 +- .../renderer/platform/fonts/font_metrics.cc | 7 +- .../platform/fonts/font_platform_data.cc | 4 +- .../platform/fonts/font_unique_name_lookup.h | 4 +- .../fonts/opentype/font_format_check.cc | 2 +- .../fonts/opentype/open_type_vertical_data.cc | 2 +- .../fonts/opentype/open_type_vertical_data.h | 5 +- .../platform/fonts/shaping/harfbuzz_face.cc | 19 +++--- .../platform/fonts/simple_font_data.cc | 9 ++- .../platform/fonts/simple_font_data.h | 3 +- .../platform/fonts/skia/skia_text_metrics.cc | 5 +- .../platform/fonts/web_font_render_style.cc | 3 +- .../fonts/win/font_platform_data_win.cc | 8 +-- .../renderer/platform/geometry/float_point.cc | 3 +- .../compositing/chunk_to_layer_mapper.h | 2 +- .../platform/graphics/filters/fe_blend.cc | 2 +- .../graphics/filters/fe_color_matrix.cc | 4 +- .../graphics/filters/fe_component_transfer.cc | 3 +- .../platform/graphics/filters/fe_composite.cc | 5 +- .../platform/graphics/filters/fe_composite.h | 2 +- .../graphics/filters/fe_convolve_matrix.cc | 3 +- .../graphics/filters/fe_displacement_map.cc | 2 +- .../platform/graphics/filters/fe_flood.cc | 4 +- .../graphics/filters/fe_gaussian_blur.cc | 3 +- .../platform/graphics/filters/fe_lighting.cc | 4 +- .../platform/graphics/filters/fe_merge.cc | 3 +- .../graphics/filters/fe_morphology.cc | 2 +- .../platform/graphics/filters/fe_offset.cc | 2 +- .../platform/graphics/filters/fe_tile.cc | 2 +- .../graphics/filters/fe_turbulence.cc | 4 +- .../graphics/filters/paint_filter_builder.cc | 8 +-- .../platform/graphics/image_decoding_store.h | 4 +- .../graphics/image_frame_generator.cc | 2 +- .../paint/raster_invalidation_tracking.cc | 2 +- .../platform/graphics/skia/sk_size_hash.h | 5 +- .../blink/renderer/platform/text/text_run.h | 6 +- .../transforms/transformation_matrix.h | 4 +- 50 files changed, 93 insertions(+), 163 deletions(-) diff --git a/components/viz/service/display/resource_metadata.h b/components/viz/service/display/resource_metadata.h index 3b90d308e28db7..ec482a8c03fa22 100644 --- a/components/viz/service/display/resource_metadata.h +++ b/components/viz/service/display/resource_metadata.h @@ -5,12 +5,12 @@ #ifndef COMPONENTS_VIZ_SERVICE_DISPLAY_RESOURCE_METADATA_H_ #define COMPONENTS_VIZ_SERVICE_DISPLAY_RESOURCE_METADATA_H_ -#include "GrTypes.h" #include "components/viz/common/resources/resource_format.h" #include "components/viz/common/resources/resource_id.h" #include "components/viz/service/viz_service_export.h" #include "gpu/command_buffer/common/mailbox_holder.h" #include "gpu/command_buffer/common/sync_token.h" +#include "third_party/skia/include/gpu/GrTypes.h" #include "ui/gfx/color_space.h" #include "ui/gfx/geometry/size.h" diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 62f8116a53f59c..46b2401ff769b3 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -30,19 +30,7 @@ declare_args() { # External-facing config for dependent code. config("skia_config") { include_dirs = [ - "config", - "ext", - "//third_party/skia/", - "//third_party/skia/include/c", - "//third_party/skia/include/codec", - "//third_party/skia/include/core", - "//third_party/skia/include/docs", - "//third_party/skia/include/effects", - "//third_party/skia/include/encode", - "//third_party/skia/include/gpu", - "//third_party/skia/include/pathops", - "//third_party/skia/include/ports", - "//third_party/skia/include/utils", + "//third_party/skia", "//third_party/skia/third_party/skcms", ] if (enable_vulkan) { @@ -82,10 +70,6 @@ config("skia_config") { } if (skia_support_gpu) { - include_dirs += [ - "//third_party/skia/src/gpu", - "//third_party/skia/src/sksl", - ] workaround_header = "gpu/config/gpu_driver_bug_workaround_autogen.h" defines += [ "SK_SUPPORT_GPU=1", @@ -116,47 +100,12 @@ config("skia_config") { if (skia_whitelist_serialized_typefaces) { defines += [ "SK_WHITELIST_SERIALIZED_TYPEFACES" ] } - - if (skia_support_skottie) { - include_dirs += [ "//third_party/skia/modules/skottie/include" ] - } } # Internal-facing config for Skia library code. config("skia_library_config") { defines = [ "SK_IGNORE_LINEAR_METRICS_FIX" ] - # These include directories are only included for Skia code and are not - # exported to dependents. - include_dirs = [ - "//third_party/skia/include/codec", - "//third_party/skia/include/private", - "//third_party/skia/include/client/android", - "//third_party/skia/src/codec", - "//third_party/skia/src/core", - "//third_party/skia/src/image", - "//third_party/skia/src/images", - "//third_party/skia/src/opts", - "//third_party/skia/src/pdf", - "//third_party/skia/src/ports", - "//third_party/skia/src/shaders", - "//third_party/skia/src/shaders/gradients", - "//third_party/skia/src/sfnt", - "//third_party/skia/src/utils", - "//third_party/skia/src/lazy", - "//third_party/skia/third_party/gif", - ] - - if (is_mac || is_ios) { - include_dirs += [ "//third_party/skia/include/utils/mac" ] - } - if (is_mac) { - include_dirs += [ "//third_party/skia/include/utils/ios" ] - } - - # TODO: remove after Skia shader relocation (https://skia-review.googlesource.com/c/17927) - include_dirs += [ "//third_party/skia/src/effects/gradients" ] - if (!is_ios && !use_system_freetype) { defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) * 0x01000000) | ((FREETYPE_MINOR) * 0x00010000) | ((FREETYPE_PATCH) * 0x00000100))" ] } @@ -207,11 +156,6 @@ config("skia_library_config") { } if (is_win) { - include_dirs += [ - "//third_party/skia/include/utils/win", - "//third_party/skia/src/utils/win", - ] - defines += [ # On windows, GDI handles are a scarse system-wide resource so we have to # keep the glyph cache, which holds up to 4 GDI handles per entry, to a @@ -232,13 +176,6 @@ config("skia_library_config") { "/wd4800", # forcing value to bool 'true/false'(assigning int to bool). ] } - - if (skia_support_skottie) { - include_dirs += [ - "//third_party/skia/modules/sksg/include", - "//third_party/skia/modules/skshaper/include", - ] - } } source_set("skcms") { diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index a077187092e6d6..9dd3f4d1fd3f1d 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -73,9 +73,9 @@ // ===== Begin Chrome-specific definitions ===== #ifdef SK_DEBUG -#define SK_REF_CNT_MIXIN_INCLUDE "sk_ref_cnt_ext_debug.h" +#define SK_REF_CNT_MIXIN_INCLUDE "skia/config/sk_ref_cnt_ext_debug.h" #else -#define SK_REF_CNT_MIXIN_INCLUDE "sk_ref_cnt_ext_release.h" +#define SK_REF_CNT_MIXIN_INCLUDE "skia/config/sk_ref_cnt_ext_release.h" #endif #define SK_MSCALAR_IS_FLOAT diff --git a/skia/ext/event_tracer_impl.h b/skia/ext/event_tracer_impl.h index 31acd9b63133d3..0db6209c1c4440 100644 --- a/skia/ext/event_tracer_impl.h +++ b/skia/ext/event_tracer_impl.h @@ -5,7 +5,7 @@ #ifndef SKIA_EXT_TRACE_EVENT_H_ #define SKIA_EXT_TRACE_EVENT_H_ -#include "SkPreConfig.h" +#include "include/core/SkTypes.h" SK_API void InitSkiaEventTracer(); diff --git a/third_party/blink/public/platform/web_font_render_style.h b/third_party/blink/public/platform/web_font_render_style.h index 75853e26e157c5..ac37531343aaa7 100644 --- a/third_party/blink/public/platform/web_font_render_style.h +++ b/third_party/blink/public/platform/web_font_render_style.h @@ -30,10 +30,10 @@ #ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_FONT_RENDER_STYLE_H_ #define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_FONT_RENDER_STYLE_H_ -#include "SkFontStyle.h" -#include "SkFontTypes.h" -#include "SkPaint.h" #include "third_party/blink/public/platform/web_string.h" +#include "third_party/skia/include/core/SkFontStyle.h" +#include "third_party/skia/include/core/SkFontTypes.h" +#include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkRefCnt.h" class SkFont; diff --git a/third_party/blink/public/platform/web_image_generator.h b/third_party/blink/public/platform/web_image_generator.h index 095454cff1336d..1407429aad5954 100644 --- a/third_party/blink/public/platform/web_image_generator.h +++ b/third_party/blink/public/platform/web_image_generator.h @@ -31,8 +31,8 @@ #ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_IMAGE_GENERATOR_H_ #define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_IMAGE_GENERATOR_H_ -#include "SkRefCnt.h" #include "third_party/blink/public/platform/web_common.h" +#include "third_party/skia/include/core/SkRefCnt.h" class SkData; class SkImageGenerator; diff --git a/third_party/blink/renderer/core/imagebitmap/image_bitmap_test.cc b/third_party/blink/renderer/core/imagebitmap/image_bitmap_test.cc index 7bcfa63f38ffe8..79b022d3275794 100644 --- a/third_party/blink/renderer/core/imagebitmap/image_bitmap_test.cc +++ b/third_party/blink/renderer/core/imagebitmap/image_bitmap_test.cc @@ -30,8 +30,6 @@ #include "third_party/blink/renderer/core/imagebitmap/image_bitmap.h" -#include "SkPixelRef.h" // FIXME: qualify this skia header file. - #include "build/build_config.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -58,6 +56,7 @@ #include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkImage.h" +#include "third_party/skia/include/core/SkPixelRef.h" #include "third_party/skia/include/core/SkSurface.h" namespace blink { diff --git a/third_party/blink/renderer/modules/accessibility/ax_image_map_link.cc b/third_party/blink/renderer/modules/accessibility/ax_image_map_link.cc index dbbf10c72680c6..84025c47dc6b69 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_image_map_link.cc +++ b/third_party/blink/renderer/modules/accessibility/ax_image_map_link.cc @@ -28,12 +28,12 @@ #include "third_party/blink/renderer/modules/accessibility/ax_image_map_link.h" -#include "SkMatrix44.h" #include "third_party/blink/renderer/core/aom/accessible_node.h" #include "third_party/blink/renderer/core/dom/element_traversal.h" #include "third_party/blink/renderer/modules/accessibility/ax_layout_object.h" #include "third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h" #include "third_party/blink/renderer/platform/graphics/path.h" +#include "third_party/skia/include/core/SkMatrix44.h" namespace blink { diff --git a/third_party/blink/renderer/modules/accessibility/ax_menu_list_option.cc b/third_party/blink/renderer/modules/accessibility/ax_menu_list_option.cc index cdd53f2cd8bdbf..3113e675cb302c 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_menu_list_option.cc +++ b/third_party/blink/renderer/modules/accessibility/ax_menu_list_option.cc @@ -25,12 +25,12 @@ #include "third_party/blink/renderer/modules/accessibility/ax_menu_list_option.h" -#include "SkMatrix44.h" #include "third_party/blink/renderer/core/aom/accessible_node.h" #include "third_party/blink/renderer/core/html/forms/html_select_element.h" #include "third_party/blink/renderer/modules/accessibility/ax_menu_list.h" #include "third_party/blink/renderer/modules/accessibility/ax_menu_list_popup.h" #include "third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h" +#include "third_party/skia/include/core/SkMatrix44.h" namespace blink { diff --git a/third_party/blink/renderer/modules/accessibility/ax_object.cc b/third_party/blink/renderer/modules/accessibility/ax_object.cc index 5603092dc09b7b..f784a93cd820ff 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_object.cc +++ b/third_party/blink/renderer/modules/accessibility/ax_object.cc @@ -28,7 +28,6 @@ #include "third_party/blink/renderer/modules/accessibility/ax_object.h" -#include "SkMatrix44.h" #include "third_party/blink/public/platform/web_scroll_into_view_params.h" #include "third_party/blink/renderer/core/aom/accessible_node.h" #include "third_party/blink/renderer/core/aom/accessible_node_list.h" @@ -64,6 +63,7 @@ #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/blink/renderer/platform/wtf/wtf_size_t.h" +#include "third_party/skia/include/core/SkMatrix44.h" using blink::WebLocalizedString; diff --git a/third_party/blink/renderer/modules/accessibility/ax_validation_message.cc b/third_party/blink/renderer/modules/accessibility/ax_validation_message.cc index eed688c477dda1..51fc1472fdb802 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_validation_message.cc +++ b/third_party/blink/renderer/modules/accessibility/ax_validation_message.cc @@ -4,12 +4,12 @@ #include "third_party/blink/renderer/modules/accessibility/ax_validation_message.h" -#include "SkMatrix44.h" #include "third_party/blink/renderer/core/html/forms/listed_element.h" #include "third_party/blink/renderer/core/html/html_element.h" #include "third_party/blink/renderer/core/layout/layout_object.h" #include "third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h" #include "third_party/blink/renderer/platform/wtf/text/string_builder.h" +#include "third_party/skia/include/core/SkMatrix44.h" namespace blink { diff --git a/third_party/blink/renderer/modules/exported/web_ax_object.cc b/third_party/blink/renderer/modules/exported/web_ax_object.cc index 11afd19eaf03f1..84ec4bb238c3fa 100644 --- a/third_party/blink/renderer/modules/exported/web_ax_object.cc +++ b/third_party/blink/renderer/modules/exported/web_ax_object.cc @@ -30,7 +30,6 @@ #include "third_party/blink/public/web/web_ax_object.h" -#include "SkMatrix44.h" #include "third_party/blink/public/platform/web_float_rect.h" #include "third_party/blink/public/platform/web_point.h" #include "third_party/blink/public/platform/web_rect.h" @@ -61,6 +60,7 @@ #include "third_party/blink/renderer/modules/accessibility/ax_range.h" #include "third_party/blink/renderer/modules/accessibility/ax_selection.h" #include "third_party/blink/renderer/platform/wtf/text/string_builder.h" +#include "third_party/skia/include/core/SkMatrix44.h" namespace blink { diff --git a/third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.cc b/third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.cc index 02cf4903fc58f0..076078f5180941 100644 --- a/third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.cc +++ b/third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "third_party/blink/renderer/platform/fonts/bitmap_glyphs_block_list.h" -#include "third_party/blink/renderer/platform/wtf/assertions.h" -#include "SkTypeface.h" +#include "third_party/blink/renderer/platform/wtf/assertions.h" +#include "third_party/skia/include/core/SkTypeface.h" namespace blink { diff --git a/third_party/blink/renderer/platform/fonts/font_description.h b/third_party/blink/renderer/platform/fonts/font_description.h index c1b3b1547182a6..9db2e58faf0f76 100644 --- a/third_party/blink/renderer/platform/fonts/font_description.h +++ b/third_party/blink/renderer/platform/fonts/font_description.h @@ -26,7 +26,8 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_FONT_DESCRIPTION_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_FONT_DESCRIPTION_H_ -#include "SkFontStyle.h" +#include + #include "base/memory/scoped_refptr.h" #include "third_party/blink/renderer/platform/font_family_names.h" #include "third_party/blink/renderer/platform/fonts/font_cache_key.h" @@ -43,8 +44,7 @@ #include "third_party/blink/renderer/platform/text/layout_locale.h" #include "third_party/blink/renderer/platform/wtf/allocator.h" #include "third_party/blink/renderer/platform/wtf/math_extras.h" - -#include +#include "third_party/skia/include/core/SkFontStyle.h" namespace blink { diff --git a/third_party/blink/renderer/platform/fonts/font_metrics.cc b/third_party/blink/renderer/platform/fonts/font_metrics.cc index b4ed950174e6bd..390f70e143fa9f 100644 --- a/third_party/blink/renderer/platform/fonts/font_metrics.cc +++ b/third_party/blink/renderer/platform/fonts/font_metrics.cc @@ -32,10 +32,9 @@ #include "build/build_config.h" #include "third_party/blink/renderer/platform/fonts/font_platform_data.h" #include "third_party/blink/renderer/platform/fonts/vdmx_parser.h" - -#include -#include -#include +#include "third_party/skia/include/core/SkFont.h" +#include "third_party/skia/include/core/SkFontMetrics.h" +#include "third_party/skia/include/core/SkTypeface.h" namespace blink { diff --git a/third_party/blink/renderer/platform/fonts/font_platform_data.cc b/third_party/blink/renderer/platform/fonts/font_platform_data.cc index b31daf89291d34..b3b02d3dbccb9b 100644 --- a/third_party/blink/renderer/platform/fonts/font_platform_data.cc +++ b/third_party/blink/renderer/platform/fonts/font_platform_data.cc @@ -20,8 +20,6 @@ #include "third_party/blink/renderer/platform/fonts/font_platform_data.h" -#include "SkFont.h" -#include "SkTypeface.h" #include "build/build_config.h" #include "hb-ot.h" #include "hb.h" @@ -35,6 +33,8 @@ #include "third_party/blink/renderer/platform/wtf/text/character_names.h" #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" +#include "third_party/skia/include/core/SkFont.h" +#include "third_party/skia/include/core/SkTypeface.h" #if defined(OS_MACOSX) #include "third_party/skia/include/ports/SkTypeface_mac.h" diff --git a/third_party/blink/renderer/platform/fonts/font_unique_name_lookup.h b/third_party/blink/renderer/platform/fonts/font_unique_name_lookup.h index 3f7390ff0b3711..39b5a8c288a14d 100644 --- a/third_party/blink/renderer/platform/fonts/font_unique_name_lookup.h +++ b/third_party/blink/renderer/platform/fonts/font_unique_name_lookup.h @@ -10,13 +10,13 @@ #include "build/build_config.h" #include "third_party/blink/renderer/platform/wtf/allocator.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" +#include "third_party/skia/include/core/SkRefCnt.h" +#include "third_party/skia/include/core/SkTypeface.h" #if defined(OS_ANDROID) || defined(OS_WIN) #include "third_party/blink/public/common/font_unique_name_lookup/font_table_matcher.h" #endif -#include -#include #include namespace blink { diff --git a/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc b/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc index a72946aaa9e35e..964943fa0b25e0 100644 --- a/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc +++ b/third_party/blink/renderer/platform/fonts/opentype/font_format_check.cc @@ -4,8 +4,8 @@ #include "third_party/blink/renderer/platform/fonts/opentype/font_format_check.h" -#include "SkTypeface.h" #include "third_party/blink/renderer/platform/wtf/vector.h" +#include "third_party/skia/include/core/SkTypeface.h" // Include HarfBuzz to have a cross-platform way to retrieve table tags without // having to rely on the platform being able to instantiate this font format. diff --git a/third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.cc b/third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.cc index 39676595708b4c..611775a5d528c1 100644 --- a/third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.cc +++ b/third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.cc @@ -24,13 +24,13 @@ #include "third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.h" -#include "SkTypeface.h" #include "base/memory/scoped_refptr.h" #include "third_party/blink/renderer/platform/fonts/opentype/open_type_types.h" #include "third_party/blink/renderer/platform/fonts/simple_font_data.h" #include "third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h" #include "third_party/blink/renderer/platform/geometry/float_rect.h" #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h" +#include "third_party/skia/include/core/SkTypeface.h" namespace blink { namespace open_type { diff --git a/third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.h b/third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.h index 4ed64a1230afae..0a1db95d4ff06c 100644 --- a/third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.h +++ b/third_party/blink/renderer/platform/fonts/opentype/open_type_vertical_data.h @@ -32,9 +32,8 @@ #include "third_party/blink/renderer/platform/wtf/hash_map.h" #include "third_party/blink/renderer/platform/wtf/ref_counted.h" #include "third_party/blink/renderer/platform/wtf/vector.h" - -#include -#include +#include "third_party/skia/include/core/SkRefCnt.h" +#include "third_party/skia/include/core/SkTypeface.h" class SkFont; diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc index 046fd9ec4e3ac9..6fc0e1f04d0c52 100644 --- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc +++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc @@ -30,6 +30,9 @@ #include "third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.h" +#include +#include + #include #include "build/build_config.h" @@ -47,16 +50,12 @@ #include "third_party/blink/renderer/platform/wtf/hash_map.h" #include "third_party/blink/renderer/platform/wtf/math_extras.h" #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h" - -#include -#include - -#include -#include -#include -#include -#include -#include +#include "third_party/skia/include/core/SkPaint.h" +#include "third_party/skia/include/core/SkPath.h" +#include "third_party/skia/include/core/SkPoint.h" +#include "third_party/skia/include/core/SkRect.h" +#include "third_party/skia/include/core/SkStream.h" +#include "third_party/skia/include/core/SkTypeface.h" namespace blink { diff --git a/third_party/blink/renderer/platform/fonts/simple_font_data.cc b/third_party/blink/renderer/platform/fonts/simple_font_data.cc index 8568abb8683ea5..54e01dd9c5c5ea 100644 --- a/third_party/blink/renderer/platform/fonts/simple_font_data.cc +++ b/third_party/blink/renderer/platform/fonts/simple_font_data.cc @@ -35,11 +35,6 @@ #include #include -#include "SkFontMetrics.h" -#include "SkPath.h" -#include "SkTypeface.h" -#include "SkTypes.h" - #include "base/memory/ptr_util.h" #include "base/sys_byteorder.h" #include "build/build_config.h" @@ -51,6 +46,10 @@ #include "third_party/blink/renderer/platform/wtf/math_extras.h" #include "third_party/blink/renderer/platform/wtf/text/character_names.h" #include "third_party/blink/renderer/platform/wtf/text/unicode.h" +#include "third_party/skia/include/core/SkFontMetrics.h" +#include "third_party/skia/include/core/SkPath.h" +#include "third_party/skia/include/core/SkTypeface.h" +#include "third_party/skia/include/core/SkTypes.h" namespace blink { diff --git a/third_party/blink/renderer/platform/fonts/simple_font_data.h b/third_party/blink/renderer/platform/fonts/simple_font_data.h index 4440450de0daee..7c5e9561c83808 100644 --- a/third_party/blink/renderer/platform/fonts/simple_font_data.h +++ b/third_party/blink/renderer/platform/fonts/simple_font_data.h @@ -24,8 +24,6 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_SIMPLE_FONT_DATA_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_SIMPLE_FONT_DATA_H_ -#include - #include #include @@ -42,6 +40,7 @@ #include "third_party/blink/renderer/platform/geometry/float_rect.h" #include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" +#include "third_party/skia/include/core/SkFont.h" #if defined(OS_MACOSX) #include "third_party/blink/renderer/platform/fonts/glyph_metrics_map.h" diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc index 841f967040364c..fd2858c64ad007 100644 --- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc +++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc @@ -6,9 +6,8 @@ #include "build/build_config.h" #include "third_party/blink/renderer/platform/wtf/math_extras.h" - -#include -#include +#include "third_party/skia/include/core/SkFont.h" +#include "third_party/skia/include/core/SkPath.h" namespace blink { diff --git a/third_party/blink/renderer/platform/fonts/web_font_render_style.cc b/third_party/blink/renderer/platform/fonts/web_font_render_style.cc index e78ea8c04c4610..be4c64d36856b5 100644 --- a/third_party/blink/renderer/platform/fonts/web_font_render_style.cc +++ b/third_party/blink/renderer/platform/fonts/web_font_render_style.cc @@ -8,8 +8,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #include "third_party/blink/renderer/platform/fonts/font_description.h" #include "third_party/blink/renderer/platform/web_test_support.h" - -#include +#include "third_party/skia/include/core/SkFont.h" namespace blink { diff --git a/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc b/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc index e5cc329396146b..8447baf67bf4e2 100644 --- a/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc +++ b/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc @@ -29,13 +29,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "third_party/blink/renderer/platform/fonts/font_platform_data.h" - #include -#include "SkFont.h" -#include "SkTypeface.h" + #include "third_party/blink/renderer/platform/fonts/font_cache.h" +#include "third_party/blink/renderer/platform/fonts/font_platform_data.h" #include "third_party/blink/renderer/platform/web_test_support.h" +#include "third_party/skia/include/core/SkFont.h" +#include "third_party/skia/include/core/SkTypeface.h" namespace blink { diff --git a/third_party/blink/renderer/platform/geometry/float_point.cc b/third_party/blink/renderer/platform/geometry/float_point.cc index f30c3d71f4b4a8..f91fbfec93474d 100644 --- a/third_party/blink/renderer/platform/geometry/float_point.cc +++ b/third_party/blink/renderer/platform/geometry/float_point.cc @@ -27,15 +27,16 @@ #include "third_party/blink/renderer/platform/geometry/float_point.h" #include + #include #include -#include "SkPoint.h" #include "third_party/blink/renderer/platform/geometry/layout_point.h" #include "third_party/blink/renderer/platform/geometry/layout_size.h" #include "third_party/blink/renderer/platform/wtf/math_extras.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" +#include "third_party/skia/include/core/SkPoint.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/compositing/chunk_to_layer_mapper.h b/third_party/blink/renderer/platform/graphics/compositing/chunk_to_layer_mapper.h index b08f8b90a74309..1709155e9df804 100644 --- a/third_party/blink/renderer/platform/graphics/compositing/chunk_to_layer_mapper.h +++ b/third_party/blink/renderer/platform/graphics/compositing/chunk_to_layer_mapper.h @@ -5,10 +5,10 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_COMPOSITING_CHUNK_TO_LAYER_MAPPER_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_COMPOSITING_CHUNK_TO_LAYER_MAPPER_H_ -#include "SkMatrix.h" #include "third_party/blink/renderer/platform/graphics/paint/float_clip_rect.h" #include "third_party/blink/renderer/platform/graphics/paint/geometry_mapper.h" #include "third_party/blink/renderer/platform/graphics/paint/property_tree_state.h" +#include "third_party/skia/include/core/SkMatrix.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_blend.cc b/third_party/blink/renderer/platform/graphics/filters/fe_blend.cc index 062977d28af05b..7b69feefc5d23b 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_blend.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_blend.cc @@ -24,10 +24,10 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_blend.h" -#include "SkXfermodeImageFilter.h" #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkXfermodeImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_color_matrix.cc b/third_party/blink/renderer/platform/graphics/filters/fe_color_matrix.cc index 2a0309d67f0e4c..e87d8af0928c86 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_color_matrix.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_color_matrix.cc @@ -23,10 +23,10 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_color_matrix.h" -#include "SkColorFilterImageFilter.h" -#include "SkColorMatrixFilter.h" #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkColorFilterImageFilter.h" +#include "third_party/skia/include/effects/SkColorMatrixFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_component_transfer.cc b/third_party/blink/renderer/platform/graphics/filters/fe_component_transfer.cc index 431d16df46b977..a54b3ff2ed4d50 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_component_transfer.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_component_transfer.cc @@ -26,12 +26,11 @@ #include -#include "SkTableColorFilter.h" - #include "base/stl_util.h" #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/wtf/math_extras.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkTableColorFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_composite.cc b/third_party/blink/renderer/platform/graphics/filters/fe_composite.cc index f77cba23ce310a..6954edfc4fec4f 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_composite.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_composite.cc @@ -24,12 +24,11 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_composite.h" -#include "SkArithmeticImageFilter.h" -#include "SkXfermodeImageFilter.h" - #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkArithmeticImageFilter.h" +#include "third_party/skia/include/effects/SkXfermodeImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_composite.h b/third_party/blink/renderer/platform/graphics/filters/fe_composite.h index 90b23204973eda..6227640d94686a 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_composite.h +++ b/third_party/blink/renderer/platform/graphics/filters/fe_composite.h @@ -23,8 +23,8 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_FILTERS_FE_COMPOSITE_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_FILTERS_FE_COMPOSITE_H_ -#include "SkBlendMode.h" #include "third_party/blink/renderer/platform/graphics/filters/filter_effect.h" +#include "third_party/skia/include/core/SkBlendMode.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_convolve_matrix.cc b/third_party/blink/renderer/platform/graphics/filters/fe_convolve_matrix.cc index 261dcf62b53292..940a79825b3072 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_convolve_matrix.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_convolve_matrix.cc @@ -25,10 +25,11 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_convolve_matrix.h" #include -#include "SkMatrixConvolutionImageFilter.h" + #include "base/numerics/checked_math.h" #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_displacement_map.cc b/third_party/blink/renderer/platform/graphics/filters/fe_displacement_map.cc index a82b34674cc95a..da5866788162bb 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_displacement_map.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_displacement_map.cc @@ -24,10 +24,10 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_displacement_map.h" -#include "SkDisplacementMapEffect.h" #include "third_party/blink/renderer/platform/graphics/filters/filter.h" #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkDisplacementMapEffect.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_flood.cc b/third_party/blink/renderer/platform/graphics/filters/fe_flood.cc index b01a45c8034e36..3b38104d1f2bbe 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_flood.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_flood.cc @@ -23,9 +23,9 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_flood.h" -#include "SkColorFilter.h" -#include "SkColorFilterImageFilter.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/core/SkColorFilter.h" +#include "third_party/skia/include/effects/SkColorFilterImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_gaussian_blur.cc b/third_party/blink/renderer/platform/graphics/filters/fe_gaussian_blur.cc index 373144a3c3d1b1..64d77f92ccde4a 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_gaussian_blur.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_gaussian_blur.cc @@ -28,8 +28,7 @@ #include "third_party/blink/renderer/platform/graphics/filters/filter.h" #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" - -#include "SkBlurImageFilter.h" +#include "third_party/skia/include/effects/SkBlurImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_lighting.cc b/third_party/blink/renderer/platform/graphics/filters/fe_lighting.cc index 232a37cb30b826..2a0c7ddf992494 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_lighting.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_lighting.cc @@ -27,12 +27,12 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_lighting.h" -#include "SkLightingImageFilter.h" -#include "SkPoint3.h" #include "third_party/blink/renderer/platform/graphics/filters/distant_light_source.h" #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/graphics/filters/point_light_source.h" #include "third_party/blink/renderer/platform/graphics/filters/spot_light_source.h" +#include "third_party/skia/include/core/SkPoint3.h" +#include "third_party/skia/include/effects/SkLightingImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_merge.cc b/third_party/blink/renderer/platform/graphics/filters/fe_merge.cc index 6a1291c1a626e4..6cd3d006913f74 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_merge.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_merge.cc @@ -23,9 +23,10 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_merge.h" #include -#include "SkMergeImageFilter.h" + #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkMergeImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_morphology.cc b/third_party/blink/renderer/platform/graphics/filters/fe_morphology.cc index 52ec2fe81e239e..a28affea5bdb1f 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_morphology.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_morphology.cc @@ -24,10 +24,10 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_morphology.h" -#include "SkMorphologyImageFilter.h" #include "third_party/blink/renderer/platform/graphics/filters/filter.h" #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkMorphologyImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_offset.cc b/third_party/blink/renderer/platform/graphics/filters/fe_offset.cc index bbe9f3cdb40f04..364a6595d23b7c 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_offset.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_offset.cc @@ -24,10 +24,10 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_offset.h" -#include "SkOffsetImageFilter.h" #include "third_party/blink/renderer/platform/graphics/filters/filter.h" #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkOffsetImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_tile.cc b/third_party/blink/renderer/platform/graphics/filters/fe_tile.cc index f29c9f4a0716c6..8ea49549dc54b1 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_tile.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_tile.cc @@ -21,10 +21,10 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_tile.h" -#include "SkTileImageFilter.h" #include "third_party/blink/renderer/platform/graphics/filters/filter.h" #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkTileImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/fe_turbulence.cc b/third_party/blink/renderer/platform/graphics/filters/fe_turbulence.cc index 1186e8baa9dd83..df7735c1182cb1 100644 --- a/third_party/blink/renderer/platform/graphics/filters/fe_turbulence.cc +++ b/third_party/blink/renderer/platform/graphics/filters/fe_turbulence.cc @@ -25,10 +25,10 @@ #include "third_party/blink/renderer/platform/graphics/filters/fe_turbulence.h" -#include "SkPaintImageFilter.h" -#include "SkPerlinNoiseShader.h" #include "third_party/blink/renderer/platform/graphics/filters/filter.h" #include "third_party/blink/renderer/platform/wtf/text/text_stream.h" +#include "third_party/skia/include/effects/SkPaintImageFilter.h" +#include "third_party/skia/include/effects/SkPerlinNoiseShader.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.cc b/third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.cc index 77db2ffb4d4ce3..650d1859fcb622 100644 --- a/third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.cc +++ b/third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.cc @@ -25,18 +25,18 @@ #include "third_party/blink/renderer/platform/graphics/filters/paint_filter_builder.h" -#include "SkBlurImageFilter.h" -#include "SkColorFilterImageFilter.h" -#include "SkColorMatrixFilter.h" -#include "SkTableColorFilter.h" #include "third_party/blink/renderer/platform/graphics/box_reflection.h" #include "third_party/blink/renderer/platform/graphics/filters/filter_effect.h" #include "third_party/blink/renderer/platform/graphics/paint/paint_canvas.h" #include "third_party/blink/renderer/platform/graphics/paint/paint_record.h" #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h" +#include "third_party/skia/include/effects/SkBlurImageFilter.h" +#include "third_party/skia/include/effects/SkColorFilterImageFilter.h" +#include "third_party/skia/include/effects/SkColorMatrixFilter.h" #include "third_party/skia/include/effects/SkImageSource.h" #include "third_party/skia/include/effects/SkOffsetImageFilter.h" #include "third_party/skia/include/effects/SkPictureImageFilter.h" +#include "third_party/skia/include/effects/SkTableColorFilter.h" #include "third_party/skia/include/effects/SkXfermodeImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/image_decoding_store.h b/third_party/blink/renderer/platform/graphics/image_decoding_store.h index 7f239ddbb5d732..8ef570c510ee42 100644 --- a/third_party/blink/renderer/platform/graphics/image_decoding_store.h +++ b/third_party/blink/renderer/platform/graphics/image_decoding_store.h @@ -29,8 +29,6 @@ #include #include -#include "SkSize.h" -#include "SkTypes.h" #include "base/macros.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/ptr_util.h" @@ -43,6 +41,8 @@ #include "third_party/blink/renderer/platform/wtf/hash_set.h" #include "third_party/blink/renderer/platform/wtf/threading_primitives.h" #include "third_party/blink/renderer/platform/wtf/vector.h" +#include "third_party/skia/include/core/SkSize.h" +#include "third_party/skia/include/core/SkTypes.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/image_frame_generator.cc b/third_party/blink/renderer/platform/graphics/image_frame_generator.cc index 6e2437175a7d0a..124efef8ae9e4a 100644 --- a/third_party/blink/renderer/platform/graphics/image_frame_generator.cc +++ b/third_party/blink/renderer/platform/graphics/image_frame_generator.cc @@ -28,12 +28,12 @@ #include #include -#include "SkData.h" #include "base/macros.h" #include "third_party/blink/renderer/platform/graphics/image_decoder_wrapper.h" #include "third_party/blink/renderer/platform/graphics/image_decoding_store.h" #include "third_party/blink/renderer/platform/image-decoders/image_decoder.h" #include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h" +#include "third_party/skia/include/core/SkData.h" #include "third_party/skia/include/core/SkYUVASizeInfo.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.cc b/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.cc index 928442872799fe..90e158e722ded9 100644 --- a/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.cc +++ b/third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.cc @@ -4,7 +4,6 @@ #include "third_party/blink/renderer/platform/graphics/paint/raster_invalidation_tracking.h" -#include "SkImageFilter.h" #include "base/trace_event/traced_value.h" #include "third_party/blink/renderer/platform/geometry/geometry_as_json.h" #include "third_party/blink/renderer/platform/geometry/layout_rect.h" @@ -14,6 +13,7 @@ #include "third_party/blink/renderer/platform/instrumentation/tracing/trace_event.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/wtf/text/string_utf8_adaptor.h" +#include "third_party/skia/include/core/SkImageFilter.h" namespace blink { diff --git a/third_party/blink/renderer/platform/graphics/skia/sk_size_hash.h b/third_party/blink/renderer/platform/graphics/skia/sk_size_hash.h index f8afda108ea190..039b06e3b85760 100644 --- a/third_party/blink/renderer/platform/graphics/skia/sk_size_hash.h +++ b/third_party/blink/renderer/platform/graphics/skia/sk_size_hash.h @@ -26,10 +26,9 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_SKIA_SK_SIZE_HASH_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_SKIA_SK_SIZE_HASH_H_ -#include "SkScalar.h" -#include "SkSize.h" - #include "third_party/blink/renderer/platform/wtf/hash_map.h" +#include "third_party/skia/include/core/SkScalar.h" +#include "third_party/skia/include/core/SkSize.h" namespace WTF { diff --git a/third_party/blink/renderer/platform/text/text_run.h b/third_party/blink/renderer/platform/text/text_run.h index 72f9081c41f30a..c39f194cbabd35 100644 --- a/third_party/blink/renderer/platform/text/text_run.h +++ b/third_party/blink/renderer/platform/text/text_run.h @@ -24,6 +24,8 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_TEXT_TEXT_RUN_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_TEXT_TEXT_RUN_H_ +#include + #include "base/optional.h" #include "third_party/blink/renderer/platform/heap/heap.h" #include "third_party/blink/renderer/platform/platform_export.h" @@ -33,9 +35,7 @@ #include "third_party/blink/renderer/platform/wtf/allocator.h" #include "third_party/blink/renderer/platform/wtf/text/string_view.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" - -#include -#include +#include "third_party/skia/include/core/SkRefCnt.h" namespace blink { diff --git a/third_party/blink/renderer/platform/transforms/transformation_matrix.h b/third_party/blink/renderer/platform/transforms/transformation_matrix.h index bc6fb4c98ee234..88f391d4df3431 100644 --- a/third_party/blink/renderer/platform/transforms/transformation_matrix.h +++ b/third_party/blink/renderer/platform/transforms/transformation_matrix.h @@ -27,14 +27,16 @@ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_TRANSFORMS_TRANSFORMATION_MATRIX_H_ #include // for memcpy + #include #include #include -#include "SkMatrix44.h" + #include "build/build_config.h" #include "third_party/blink/renderer/platform/geometry/float_point.h" #include "third_party/blink/renderer/platform/geometry/float_point_3d.h" #include "third_party/blink/renderer/platform/wtf/allocator.h" +#include "third_party/skia/include/core/SkMatrix44.h" namespace gfx { class Transform;