Refactor SkFontHost_linux into SkFontMgr_custom.

src/ports/SkFontMgr_custom_embedded_factory.cpp

Index: src/ports/SkFontMgr_custom_embedded_factory.cpp
diff --git a/src/ports/SkFontMgr_custom_embedded_factory.cpp b/src/ports/SkFontMgr_custom_embedded_factory.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6ea6a2d2af22cbdeaa51a6de58e8d70d00997c42
--- /dev/null
+++ b/src/ports/SkFontMgr_custom_embedded_factory.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkFontMgr.h"
+
+struct SkEmbeddedResource { const uint8_t* data; size_t size; };
+struct SkEmbeddedResourceHeader { const SkEmbeddedResource* entries; int count; };

[reed1, 2015/06/15 20:05:00]

How does this work, with struct definitions in a .cpp file?

[bungeman-skia, 2015/06/15 20:39:39]

It works the same way any function forward definition works. These types are
just a bit long to write out in full as part of the parameter list. The file
with the implementation also has these declarations in order to simplify the
declaration there as well, which is repetition I suppose. I could change the
declaration to something like

SkFontMgr* SkFontMgr_New_Custom_Embedded(const uint8_t** data, const size_t**
size, int count);

and update the user, avoiding any names or structure, but I rather like the
structure.

I could stick these and the declaration below in their own tiny header in
src/ports, but the aim here was just to split out all of the SkFontMgr::Factory
calls into their own files so that it's clear how to pick them at build time. We
may want SkFontMgr_Custom to be more flexible in the future, but there is no
immediate need.

+SkFontMgr* SkFontMgr_New_Custom_Embedded(const SkEmbeddedResourceHeader* header);
+
+extern "C" const SkEmbeddedResourceHeader SK_EMBEDDED_FONTS;
+SkFontMgr* SkFontMgr::Factory() {
+    return SkFontMgr_New_Custom_Embedded(&SK_EMBEDDED_FONTS);
+}