Replace Skia ports/SkFontMgr.h with core/SkFontMgr.h

Skia is moving the include/ports/SkFontMgr.h file to
include/core/SkFontMgr.h as part of a general clean up. The old header
still exists as a forwarding header, but users need to be updated to use
the new header location so that the forwarding header can be removed.

TBR=sky@chromium.org

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:linux_vr;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I7c644f1acc3826714e0cf1a29be44fe4669f259d
Reviewed-on: https://chromium-review.googlesource.com/1108084
Commit-Queue: Ben Wagner <bungeman@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569023}

cc/paint/paint_typeface.cc

@@ -4,8 +4,8 @@
 
 #include "cc/paint/paint_typeface.h"
 #include "build/build_config.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
 
 namespace cc {
 

chrome/browser/vr/font_fallback.cc

@@ -13,9 +13,9 @@
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkTypeface.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
 #include "ui/gfx/platform_font_linux.h"
 
 namespace vr {

chrome/renderer/pepper/pepper_flash_font_file_host.cc

@@ -18,7 +18,7 @@
 #include "content/public/child/child_process_sandbox_support_linux.h"
 #include "content/public/common/common_sandbox_support_linux.h"
 #elif defined(OS_WIN)
-#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #endif
 
 PepperFlashFontFileHost::PepperFlashFontFileHost(

components/services/pdf_compositor/pdf_compositor_service.cc

@@ -25,7 +25,7 @@
 #include "content/public/child/dwrite_font_proxy_init_win.h"
 #elif defined(OS_MACOSX)
 #include "third_party/blink/public/platform/platform.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
 #include "third_party/blink/public/platform/platform.h"
 #endif

content/app/content_main_runner_impl.cc

@@ -102,8 +102,8 @@
 #include "third_party/blink/public/platform/web_font_render_style.h"
 #include "third_party/boringssl/src/include/openssl/crypto.h"
 #include "third_party/boringssl/src/include/openssl/rand.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontMgr_android.h"
 #include "third_party/webrtc_overrides/init_webrtc.h"  // nogncheck
 

content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc

@@ -17,7 +17,7 @@
 #include "content/public/common/service_names.mojom.h"
 #include "skia/ext/fontmgr_default_win.h"
 #include "third_party/blink/public/web/win/web_font_rendering.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 
 namespace mswr = Microsoft::WRL;

content/child/font_warmup_win.cc

@@ -25,8 +25,8 @@
 #include "build/build_config.h"
 #include "ppapi/buildflags/buildflags.h"
 #include "skia/ext/fontmgr_default_win.h"
+#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 "third_party/skia/include/ports/SkTypeface_win.h"
 
 #if BUILDFLAG(ENABLE_PLUGINS)

content/child/font_warmup_win_unittest.cc

@@ -16,11 +16,11 @@
 #include "base/sys_byteorder.h"
 #include "base/win/windows_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkRefCnt.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/skia/include/ports/SkFontMgr.h"
 
 namespace content {
 

content/shell/app/blink_test_platform_support_android.cc

@@ -5,7 +5,7 @@
 #include "content/shell/app/blink_test_platform_support.h"
 
 #include "skia/ext/fontmgr_default_android.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontMgr_android.h"
 
 namespace {

content/shell/app/blink_test_platform_support_fuchsia.cc

@@ -5,7 +5,7 @@
 #include "content/shell/app/blink_test_platform_support.h"
 
 #include "skia/ext/fontmgr_default_android.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontMgr_android.h"
 
 namespace content {

content/test/layouttest_support.cc

@@ -68,8 +68,8 @@
 #elif defined(OS_WIN)
 #include "content/child/font_warmup_win.h"
 #include "third_party/blink/public/web/win/web_font_rendering.h"
+#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 "third_party/skia/include/ports/SkTypeface_win.h"
 #include "ui/gfx/win/direct_write.h"
 #endif

skia/ext/fontmgr_default_android.cc

@@ -4,7 +4,7 @@
 
 #include "skia/ext/fontmgr_default_android.h"
 
-#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontMgr_android.h"
 
 namespace {

skia/ext/fontmgr_default_fuchsia.cc

@@ -4,8 +4,8 @@
 
 #include "skia/ext/fontmgr_default_fuchsia.h"
 
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontMgr_empty.h"
 
 namespace {

skia/ext/fontmgr_default_linux.cc

@@ -4,8 +4,8 @@
 
 #include "skia/ext/fontmgr_default_linux.h"
 
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h"
 
 namespace {

skia/ext/fontmgr_default_win.cc

@@ -4,7 +4,7 @@
 
 #include "skia/ext/fontmgr_default_win.h"
 
-#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 
 namespace {

third_party/blink/renderer/platform/fonts/android/font_cache_android.cc

@@ -35,8 +35,8 @@
 #include "third_party/blink/renderer/platform/fonts/font_face_creation_params.h"
 #include "third_party/blink/renderer/platform/fonts/simple_font_data.h"
 #include "third_party/blink/renderer/platform/language.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkTypeface.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
 
 namespace blink {
 

third_party/blink/renderer/platform/fonts/font_cache.h

@@ -53,10 +53,9 @@
 #include "third_party/blink/renderer/platform/wtf/text/cstring.h"
 #include "third_party/blink/renderer/platform/wtf/text/unicode.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
-#include "SkFontMgr.h"
-
 class SkString;
 class SkTypeface;
 

third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc

@@ -34,10 +34,6 @@
 #include <memory>
 #include <utility>
 
-#include "SkFontMgr.h"
-#include "SkStream.h"
-#include "SkTypeface.h"
-
 #include "build/build_config.h"
 #include "third_party/blink/public/platform/linux/web_sandbox_support.h"
 #include "third_party/blink/public/platform/platform.h"
@@ -53,6 +49,9 @@
 #include "third_party/blink/renderer/platform/wtf/assertions.h"
 #include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
 #include "third_party/blink/renderer/platform/wtf/text/cstring.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"
 
 namespace blink {
 

third_party/blink/renderer/platform/fonts/web_font_typeface_factory.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_WEB_FONT_TYPEFACE_FACTORY_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_WEB_FONT_TYPEFACE_FACTORY_H_
 
-#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 
 #include "build/build_config.h"
 #if defined(OS_WIN) || defined(OS_MACOSX)

third_party/blink/renderer/platform/fonts/win/font_cache_skia_win.cc

@@ -34,8 +34,6 @@
 #include <memory>
 #include <utility>
 
-#include "SkFontMgr.h"
-#include "SkTypeface_win.h"
 #include "base/debug/alias.h"
 #include "third_party/blink/renderer/platform/fonts/bitmap_glyphs_blacklist.h"
 #include "third_party/blink/renderer/platform/fonts/font_description.h"
@@ -44,6 +42,8 @@
 #include "third_party/blink/renderer/platform/fonts/simple_font_data.h"
 #include "third_party/blink/renderer/platform/fonts/win/font_fallback_win.h"
 #include "third_party/blink/renderer/platform/language.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
+#include "third_party/skia/include/ports/SkTypeface_win.h"
 
 namespace blink {
 

third_party/blink/renderer/platform/fonts/win/font_fallback_win.cc

@@ -33,13 +33,14 @@
 
 #include <unicode/uchar.h>
 #include <limits>
-#include "SkFontMgr.h"
-#include "SkTypeface.h"
+
 #include "third_party/blink/renderer/platform/fonts/font_cache.h"
 #include "third_party/blink/renderer/platform/text/icu_error.h"
 #include "third_party/blink/renderer/platform/wtf/hash_map.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/SkFontMgr.h"
+#include "third_party/skia/include/core/SkTypeface.h"
 
 namespace blink {
 

ui/gfx/font_list.cc

@@ -8,8 +8,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/core/SkTypeface.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
 #include "ui/gfx/font_list_impl.h"
 
 namespace {

ui/gfx/win/direct_write.cc

@@ -12,7 +12,7 @@
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "skia/ext/fontmgr_default_win.h"
-#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 #include "ui/gfx/platform_font_win.h"
 #include "ui/gfx/switches.h"