Index: ui/gfx/test/fontconfig_util_linux.cc |
diff --git a/ui/gfx/test/fontconfig_util_linux.cc b/ui/gfx/test/fontconfig_util_linux.cc |
index 6f2da0be9c94017b8ad1330d9f53927b35e3ecd2..0e61627a0e58582c624ff4fd4861afeb3b5f7d2c 100644 |
--- a/ui/gfx/test/fontconfig_util_linux.cc |
+++ b/ui/gfx/test/fontconfig_util_linux.cc |
@@ -5,7 +5,6 @@ |
#include "ui/gfx/test/fontconfig_util_linux.h" |
#include <fontconfig/fontconfig.h> |
- |
msw
2016/06/27 22:14:45
nit: keep this blank line between include types?
|
#include "base/files/file_util.h" |
#include "base/logging.h" |
#include "base/macros.h" |
@@ -64,17 +63,8 @@ const char kFontconfigMatchPatternHeader[] = " <match target=\"pattern\">\n"; |
const char kFontconfigMatchFooter[] = " </match>\n"; |
void SetUpFontconfig() { |
- FcInit(); |
- |
- // A primer on undocumented FcConfig reference-counting: |
- // |
- // - FcConfigCreate() creates a config with a refcount of 1. |
- // - FcConfigReference() increments a config's refcount. |
- // - FcConfigDestroy() decrements a config's refcount, deallocating the |
- // config when the count reaches 0. |
- // - FcConfigSetCurrent() calls FcConfigDestroy() on the old config, but |
- // interestingly does not call FcConfigReference() on the new config. |
- CHECK(FcConfigSetCurrent(FcConfigCreate())); |
+ CHECK(FcInit()); |
+ CHECK(FcConfigGetCurrent()); |
} |
void TearDownFontconfig() { |