Add skia extension to allow setting default fontmgr on linux. Use it to allow the linux blimp clien…

blimp/client/app/linux/blimp_main.cc

Index: blimp/client/app/linux/blimp_main.cc
diff --git a/blimp/client/app/linux/blimp_main.cc b/blimp/client/app/linux/blimp_main.cc
index 2223836e230bfd58bed090735f9c85d75512225c..4d994d0d93d6b9aa19ecffe9bc86555b9e09cf7a 100644
--- a/blimp/client/app/linux/blimp_main.cc
+++ b/blimp/client/app/linux/blimp_main.cc
@@ -14,6 +14,7 @@
 #include "blimp/client/app/linux/blimp_display_manager.h"
 #include "blimp/client/app/linux/blimp_display_manager_delegate_main.h"
 #include "blimp/client/core/settings/settings_prefs.h"
+#include "blimp/client/core/switches/blimp_client_switches.h"
 #include "blimp/client/public/blimp_client_context.h"
 #include "blimp/client/public/contents/blimp_navigation_controller.h"
 #include "blimp/client/support/compositor/compositor_dependencies_impl.h"
@@ -22,6 +23,10 @@
 #include "components/prefs/in_memory_pref_store.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/pref_service_factory.h"
+#include "skia/ext/fontmgr_default_linux.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 "ui/gfx/x/x11_connection.h"
 
 namespace {
@@ -39,11 +44,58 @@ class BlimpShellCommandLinePrefStore : public CommandLinePrefStore {
  protected:
   ~BlimpShellCommandLinePrefStore() override = default;
 };
+
+bool HasAndroidFontSwitch() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      blimp::switches::kAndroidFontsPath);
+}
+
+std::string GetAndroidFontsDirectory() {
+  std::string android_fonts_dir =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          blimp::switches::kAndroidFontsPath);
+  if (android_fonts_dir.size() > 0 && android_fonts_dir.back() != '/') {
+    android_fonts_dir += '/';
+  }
+  return android_fonts_dir;
+}
+
+std::unique_ptr<SkFontMgr> CreateAndroidFontMgr(std::string android_fonts_dir) {

[bungeman-chromium, 2016/11/14 16:03:48]

I think you want to use sk_sp<SkFontMgr> here. SkFontMgr is reference counted
and unique_ptr will just delete it.

[steimel, 2016/11/14 18:04:42]

Done.

+  SkFontMgr_Android_CustomFonts custom;
+  custom.fSystemFontUse =
+      SkFontMgr_Android_CustomFonts::SystemFontUse::kOnlyCustom;
+  custom.fBasePath = android_fonts_dir.c_str();
+
+  std::string font_config;
+  std::string fallback_font_config;
+  if (android_fonts_dir.find("kitkat") != std::string::npos) {
+    font_config = android_fonts_dir + "system_fonts.xml";
+    fallback_font_config = android_fonts_dir + "fallback_fonts.xml";
+    custom.fFallbackFontsXml = fallback_font_config.c_str();
+  } else {
+    font_config = android_fonts_dir + "fonts.xml";
+    custom.fFallbackFontsXml = nullptr;
+  }
+  custom.fFontsXml = font_config.c_str();
+  custom.fIsolated = true;
+
+  return base::WrapUnique<SkFontMgr>(SkFontMgr_New_Android(&custom));
+}
+
+std::unique_ptr<SkFontMgr> SetupAndroidFontManager() {
+  std::unique_ptr<SkFontMgr> android_font_manager;
+  if (HasAndroidFontSwitch()) {
+    android_font_manager = CreateAndroidFontMgr(GetAndroidFontsDirectory());
+    SetDefaultSkiaFactory(android_font_manager.get());
+  }
+  return android_font_manager;
+}
 }  // namespace
 
 int main(int argc, const char**argv) {
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
+  std::unique_ptr<SkFontMgr> android_font_manager = SetupAndroidFontManager();

[bungeman-chromium, 2016/11/14 16:03:48]

I think the only reason you have this otherwise unused variable here is to keep
the unique_ptr alive so you don't inadvertently delete the global. If you change
to sk_sp<SkFontMgr> above, then I don't think you need this variable at all.
(Nor does SetupAndroidFontManager need to return anything).

[steimel, 2016/11/14 18:04:42]

Yep. Done.

 
   CHECK(gfx::InitializeThreadedX11());