From cfac654e9ce0ee6eb88ffbc030bfce5471691f0a Mon Sep 17 00:00:00 2001 From: bungeman Date: Fri, 22 Jun 2018 11:04:58 -0400 Subject: [PATCH] Change ports/SkFontMgr.h to core/SkFontMgr.h (flutter/engine#5593) Skia is moving ports/SkFontMgr.h to core/SkFontMgr.h. The existing ports/SkFontMgr.h is now just a forwarding header to keep users working through the transition. Update includes to point to the new location. --- engine/src/flutter/lib/ui/text/asset_manager_font_provider.h | 2 +- engine/src/flutter/lib/ui/text/font_collection.cc | 2 +- engine/src/flutter/third_party/txt/src/txt/asset_font_manager.h | 2 +- .../src/flutter/third_party/txt/src/txt/font_asset_provider.h | 2 +- engine/src/flutter/third_party/txt/src/txt/font_collection.h | 2 +- engine/src/flutter/third_party/txt/src/txt/test_font_manager.h | 2 +- .../third_party/txt/src/txt/typeface_font_asset_provider.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/src/flutter/lib/ui/text/asset_manager_font_provider.h b/engine/src/flutter/lib/ui/text/asset_manager_font_provider.h index c0450c83ccb..f9bc2fc6a21 100644 --- a/engine/src/flutter/lib/ui/text/asset_manager_font_provider.h +++ b/engine/src/flutter/lib/ui/text/asset_manager_font_provider.h @@ -11,7 +11,7 @@ #include "flutter/assets/asset_manager.h" #include "lib/fxl/macros.h" -#include "third_party/skia/include/ports/SkFontMgr.h" +#include "third_party/skia/include/core/SkFontMgr.h" #include "txt/font_asset_provider.h" namespace blink { diff --git a/engine/src/flutter/lib/ui/text/font_collection.cc b/engine/src/flutter/lib/ui/text/font_collection.cc index 279fb1b4800..67012519c9f 100644 --- a/engine/src/flutter/lib/ui/text/font_collection.cc +++ b/engine/src/flutter/lib/ui/text/font_collection.cc @@ -10,9 +10,9 @@ #include "flutter/runtime/test_font_data.h" #include "third_party/rapidjson/rapidjson/document.h" #include "third_party/rapidjson/rapidjson/rapidjson.h" +#include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkStream.h" #include "third_party/skia/include/core/SkTypeface.h" -#include "third_party/skia/include/ports/SkFontMgr.h" #include "txt/asset_font_manager.h" #include "txt/test_font_manager.h" #include "txt/typeface_font_asset_provider.h" diff --git a/engine/src/flutter/third_party/txt/src/txt/asset_font_manager.h b/engine/src/flutter/third_party/txt/src/txt/asset_font_manager.h index c6d0bc1b2f7..6cfc3de65da 100644 --- a/engine/src/flutter/third_party/txt/src/txt/asset_font_manager.h +++ b/engine/src/flutter/third_party/txt/src/txt/asset_font_manager.h @@ -19,8 +19,8 @@ #include #include "lib/fxl/macros.h" +#include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkStream.h" -#include "third_party/skia/include/ports/SkFontMgr.h" #include "txt/font_asset_provider.h" namespace txt { diff --git a/engine/src/flutter/third_party/txt/src/txt/font_asset_provider.h b/engine/src/flutter/third_party/txt/src/txt/font_asset_provider.h index 397ed2ec6e4..766064674db 100644 --- a/engine/src/flutter/third_party/txt/src/txt/font_asset_provider.h +++ b/engine/src/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/ports/SkFontMgr.h" +#include "third_party/skia/include/core/SkFontMgr.h" namespace txt { diff --git a/engine/src/flutter/third_party/txt/src/txt/font_collection.h b/engine/src/flutter/third_party/txt/src/txt/font_collection.h index 698eca17642..33cc7ff5b6b 100644 --- a/engine/src/flutter/third_party/txt/src/txt/font_collection.h +++ b/engine/src/flutter/third_party/txt/src/txt/font_collection.h @@ -25,8 +25,8 @@ #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/skia/include/ports/SkFontMgr.h" #include "txt/asset_font_manager.h" #include "txt/text_style.h" diff --git a/engine/src/flutter/third_party/txt/src/txt/test_font_manager.h b/engine/src/flutter/third_party/txt/src/txt/test_font_manager.h index dd4f2c32bea..0b1ba132ee7 100644 --- a/engine/src/flutter/third_party/txt/src/txt/test_font_manager.h +++ b/engine/src/flutter/third_party/txt/src/txt/test_font_manager.h @@ -21,7 +21,7 @@ #include #include "lib/fxl/macros.h" -#include "third_party/skia/include/ports/SkFontMgr.h" +#include "third_party/skia/include/core/SkFontMgr.h" #include "txt/asset_font_manager.h" #include "txt/font_asset_provider.h" diff --git a/engine/src/flutter/third_party/txt/src/txt/typeface_font_asset_provider.h b/engine/src/flutter/third_party/txt/src/txt/typeface_font_asset_provider.h index f41b5b7c347..d540e059c33 100644 --- a/engine/src/flutter/third_party/txt/src/txt/typeface_font_asset_provider.h +++ b/engine/src/flutter/third_party/txt/src/txt/typeface_font_asset_provider.h @@ -22,7 +22,7 @@ #include #include "lib/fxl/macros.h" -#include "third_party/skia/include/ports/SkFontMgr.h" +#include "third_party/skia/include/core/SkFontMgr.h" #include "txt/font_asset_provider.h" namespace txt {