AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SkPDF: vertical writing: draw nothing

Browse Source 
BUG=skia:5665
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2274153002

Review-Url: https://codereview.chromium.org/2274153002
This commit is contained in:
halcanary 2016-08-24 09:20:57 -07:00 committed by Commit bot
parent bea9748449
commit ea17dfe40b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pdf/SkPDFDevice.cpp
View File

@ -1079,6 +1079,14 @@ void SkPDFDevice::internalDrawText(
// making text unreadable (e.g. same text twice when using CSS shadows). // making text unreadable (e.g. same text twice when using CSS shadows).
return; return;
} }
NOT_IMPLEMENTED(srcPaint.isVerticalText(), false);
if (srcPaint.isVerticalText()) {
// Don't pretend we support drawing vertical text. It is not
// clear to me how to switch to "vertical writing" mode in PDF.
// Currently neither Chromium or Android set this flag.
// https://bug.skia.org/5665
return;
}
SkPaint paint = calculate_text_paint(srcPaint); SkPaint paint = calculate_text_paint(srcPaint);
replace_srcmode_on_opaque_paint(&paint); replace_srcmode_on_opaque_paint(&paint);
if (!paint.getTypeface()) { if (!paint.getTypeface()) {
@ -1126,7 +1134,6 @@ void SkPDFDevice::internalDrawText(
SkAutoGlyphCache glyphCache(paint, nullptr, nullptr); SkAutoGlyphCache glyphCache(paint, nullptr, nullptr);
SkPaint::Align alignment = paint.getTextAlign(); SkPaint::Align alignment = paint.getTextAlign();
bool verticalText = paint.isVerticalText();
if (defaultPositioning && alignment != SkPaint::kLeft_Align) { if (defaultPositioning && alignment != SkPaint::kLeft_Align) {
SkScalar advance{0}; SkScalar advance{0};
for (int i = 0; i < glyphCount; ++i) { for (int i = 0; i < glyphCount; ++i) {
@ -1134,7 +1141,7 @@ void SkPDFDevice::internalDrawText(
} }
SkScalar m = alignment == SkPaint::kCenter_Align SkScalar m = alignment == SkPaint::kCenter_Align
? 0.5f * advance : advance; ? 0.5f * advance : advance;
offset -= verticalText ? SkPoint{0, m} : SkPoint{m, 0}; offset -= SkPoint{m, 0};
} }
ScopedContentEntry content(this, d, paint, true); ScopedContentEntry content(this, d, paint, true);
if (!content.entry()) { if (!content.entry()) {
@ -1200,7 +1207,7 @@ void SkPDFDevice::internalDrawText(
if (alignment != SkPaint::kLeft_Align) { if (alignment != SkPaint::kLeft_Align) {
SkScalar m = alignment == SkPaint::kCenter_Align SkScalar m = alignment == SkPaint::kCenter_Align
? 0.5f * advance : advance; ? 0.5f * advance : advance;
xy -= verticalText ? SkPoint{0, m} : SkPoint{m, 0}; xy -= SkPoint{m, 0};
} }
(void)font->glyphsToPDFFontEncoding(glyphs, 1); (void)font->glyphsToPDFFontEncoding(glyphs, 1);
glyphPositioner.writeGlyph(xy.x(), xy.y(), advance, *glyphs); glyphPositioner.writeGlyph(xy.x(), xy.y(), advance, *glyphs);