diff options
| author |  tomhudson <tomhudson@chromium.org> | 2014-08-11 11:28:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-11 11:28:01 -0700 |
| commit | d3ddea284ec6611a93a6b75e64de39d0bc7e083c (patch) | |
| tree | 7adaff91ec14d7289689ad554680785c77e5f034 /tests | |
| parent | 9c0822a4150e23cec9f9b72bd1abc2c5f9ea5a3b (diff) | |
Parses sample code provided by Android project. Attempts to keep FontFamily data structures produced consistent with expectations of previous versions of Skia.
R=bungeman@google.com, djsollen@google.com, palmer@chromium.org, reed@google.com, hcm@google.com, tomhudson@google.com
BUG=400801
Committed: https://skia.googlesource.com/skia/+/07544757c9fcf0f359f1686a3779eb2e75dd5b36
Author: tomhudson@chromium.org
Review URL: https://codereview.chromium.org/446473003
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/FontConfigParser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/FontConfigParser.cpp b/tests/FontConfigParser.cpp index 1c32704938..8ca7556df1 100644 --- a/tests/FontConfigParser.cpp +++ b/tests/FontConfigParser.cpp @@ -14,7 +14,7 @@ void ValidateLoadedFonts(SkTDArray<FontFamily*> fontFamilies, REPORTER_ASSERT(reporter, fontFamilies[0]->fNames.count() == 5); REPORTER_ASSERT(reporter, !strcmp(fontFamilies[0]->fNames[0].c_str(), "sans-serif")); REPORTER_ASSERT(reporter, - !strcmp(fontFamilies[0]->fFontFiles[0].fFileName.c_str(), + !strcmp(fontFamilies[0]->fFonts[0].fFileName.c_str(), "Roboto-Regular.ttf")); REPORTER_ASSERT(reporter, !fontFamilies[0]->fIsFallbackFont); @@ -35,8 +35,8 @@ void DumpLoadedFonts(SkTDArray<FontFamily*> fontFamilies) { for (int j = 0; j < fontFamilies[i]->fNames.count(); ++j) { SkDebugf(" name %s\n", fontFamilies[i]->fNames[j].c_str()); } - for (int j = 0; j < fontFamilies[i]->fFontFiles.count(); ++j) { - const FontFileInfo& ffi = fontFamilies[i]->fFontFiles[j]; + for (int j = 0; j < fontFamilies[i]->fFonts.count(); ++j) { + const FontFileInfo& ffi = fontFamilies[i]->fFonts[j]; SkDebugf(" file (%d %s %d) %s\n", ffi.fWeight, ffi.fPaintOptions.getLanguage().getTag().isEmpty() ? "" : |