projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
skia
/
src
/
ports
/
SkFontConfigParser_android.cpp
diff --git
a/src/third_party/skia/src/ports/SkFontConfigParser_android.cpp
b/src/third_party/skia/src/ports/SkFontConfigParser_android.cpp
index
b38ec8c
..
41f5c4a
100644
(file)
--- a/
src/third_party/skia/src/ports/SkFontConfigParser_android.cpp
+++ b/
src/third_party/skia/src/ports/SkFontConfigParser_android.cpp
@@
-587,7
+587,7
@@
void SkFontConfigParser::GetTestFontFamilies(SkTDArray<FontFamily*> &fontFamilie
parseConfigFile(testMainConfigFile, fontFamilies);
SkTDArray<FontFamily*> fallbackFonts;
- if (
NULL !=
testFallbackConfigFile) {
+ if (testFallbackConfigFile) {
parseConfigFile(testFallbackConfigFile, fallbackFonts);
}