diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-05-09 15:35:54 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-09 15:36:06 +0000 |
| commit | 97c1108607584b6050a6880d6ce22846e4913a92 (patch) | |
| tree | e6cb5bfa22fdd2fba53c9cd49d3beed28fff686b /tests/PDFGlyphsToUnicodeTest.cpp | |
| parent | 2ed5f69da6f101e60a3cf49c0767212b563552f3 (diff) | |
Revert "SkAdvancedTypefaceMetrics: factor out GlyphToUnicode"
This reverts commit 1c2bcd8b14e029a70e88b1e81acd29553cab0d1c.
Reason for revert: breaking chrome roll
Original change's description:
> SkAdvancedTypefaceMetrics: factor out GlyphToUnicode
>
> Change-Id: Iedce8c1ea2c405d5ab64ccac353970d5cd2b9d63
> Reviewed-on: https://skia-review.googlesource.com/126507
> Commit-Queue: Hal Canary <halcanary@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>
TBR=halcanary@google.com,bungeman@google.com,reed@google.com
Change-Id: Ib1ff8484ffd09cdb88d461ac00745aa32c191124
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/127000
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tests/PDFGlyphsToUnicodeTest.cpp')
| -rw-r--r-- | tests/PDFGlyphsToUnicodeTest.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/tests/PDFGlyphsToUnicodeTest.cpp b/tests/PDFGlyphsToUnicodeTest.cpp index 2aeedf0330..332520bfb0 100644 --- a/tests/PDFGlyphsToUnicodeTest.cpp +++ b/tests/PDFGlyphsToUnicodeTest.cpp @@ -74,12 +74,9 @@ DEF_TEST(SkPDF_ToUnicode, reporter) { glyphsInSubset.push(0x101); glyphToUnicode.push(0x1013); - SkGlyphID lastGlyphID = SkToU16(glyphToUnicode.count() - 1); - SkDynamicMemoryWStream buffer; subset.setAll(glyphsInSubset.begin(), glyphsInSubset.count()); - SkPDFAppendCmapSections(&glyphToUnicode[0], &subset, &buffer, true, 0, - SkTMin<SkGlyphID>(0xFFFF, lastGlyphID)); + SkPDFAppendCmapSections(glyphToUnicode, &subset, &buffer, true, 0, 0xFFFF); char expectedResult[] = "4 beginbfchar\n\ @@ -101,8 +98,7 @@ endbfrange\n"; // Remove characters and ranges. buffer.reset(); - SkPDFAppendCmapSections(&glyphToUnicode[0], &subset, &buffer, true, 8, - SkTMin<SkGlyphID>(0x00FF, lastGlyphID)); + SkPDFAppendCmapSections(glyphToUnicode, &subset, &buffer, true, 8, 0x00FF); char expectedResultChop1[] = "2 beginbfchar\n\ @@ -120,8 +116,7 @@ endbfrange\n"; // Remove characters from range to downdrade it to one char. buffer.reset(); - SkPDFAppendCmapSections(&glyphToUnicode[0], &subset, &buffer, true, 0x00D, - SkTMin<SkGlyphID>(0x00FE, lastGlyphID)); + SkPDFAppendCmapSections(glyphToUnicode, &subset, &buffer, true, 0x00D, 0x00FE); char expectedResultChop2[] = "2 beginbfchar\n\ @@ -134,8 +129,7 @@ endbfchar\n"; buffer.reset(); - SkPDFAppendCmapSections(&glyphToUnicode[0], nullptr, &buffer, false, 0xFC, - SkTMin<SkGlyphID>(0x110, lastGlyphID)); + SkPDFAppendCmapSections(glyphToUnicode, nullptr, &buffer, false, 0xFC, 0x110); char expectedResultSingleBytes[] = "2 beginbfchar\n\ @@ -161,7 +155,6 @@ endbfrange\n"; for (SkUnichar i = 0; i < 100; ++i) { glyphToUnicode.push(i + 29); } - lastGlyphID = SkToU16(glyphToUnicode.count() - 1); glyphsInSubset.push(0x2C); glyphsInSubset.push(0x44); @@ -172,8 +165,7 @@ endbfrange\n"; SkDynamicMemoryWStream buffer2; subset2.setAll(glyphsInSubset.begin(), glyphsInSubset.count()); - SkPDFAppendCmapSections(&glyphToUnicode[0], &subset2, &buffer2, true, 0, - SkTMin<SkGlyphID>(0xFFFF, lastGlyphID)); + SkPDFAppendCmapSections(glyphToUnicode, &subset2, &buffer2, true, 0, 0xffff); char expectedResult2[] = "4 beginbfchar\n\ |