Filter font list, use Fontconfig and build on Ozone

content/common/BUILD.gn

Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 3e9cdd60b8ddfcf66ae4af90e44155b1a62804b7..7b5db9e46e170d838320144a8cbb1fa8abb247c6 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -143,10 +143,7 @@ source_set("common") {
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   } else {
-    sources -= [
-      "cursors/webcursor_ozone.cc",
-      "font_list_ozone.cc",
-    ]
+    sources -= [ "cursors/webcursor_ozone.cc" ]
   }
 
   if (!use_aura || is_android) {
@@ -157,15 +154,12 @@ source_set("common") {
     sources -= [ "cursors/webcursor_aurax11.cc" ]
   }
 
-  if (use_pango) {
-    configs += [ "//build/config/linux/pangocairo" ]
-    if (use_ozone) {
-      # If we're using pango, never use this ozone file (it was removed in all
-      # non-ozone cases above).
-      sources -= [ "font_list_ozone.cc" ]
-    }
-  } else {
-    sources -= [ "font_list_pango.cc" ]
+  if (is_linux) {

[rjkroege, 2016/08/25 19:17:16]

I think you've conflated use_ozone and is_linux. They are currently equivalent
but that might change someday.

If use_pango is no longer supported, should it be removed elsewhere?

+    deps += [ "//build/linux:fontconfig" ]
+  }
+
+  if (is_mac || is_win || is_android) {
+    sources -= [ "font_list_fontconfig.cc" ]
   }
 
   if (enable_plugins) {