diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-10 16:32:06 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-10 16:32:06 +0000 |
| commit | 47fb2b9c67c2c4c464e8eb05e9b7877cfb1636aa (patch) | |
| tree | d6c5d0df49c6621e109ee5dbaf3bbefcb005667f /src/ports/SkFontHost_win_dw.cpp | |
| parent | e167b11fb5e74a34398172c6cb7874df9c6e0fe7 (diff) | |
[PDF] Fix font embedding restrictions.
Stop using restricted font outlines and honor don't subset restriction.
R=reed@google.com, bungeman@google.com
Author: vandebo@chromium.org
Review URL: https://codereview.chromium.org/107863002
git-svn-id: http://skia.googlecode.com/svn/trunk@12600 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports/SkFontHost_win_dw.cpp')
| -rw-r--r-- | src/ports/SkFontHost_win_dw.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp index 00623623b0..3df743055a 100644 --- a/src/ports/SkFontHost_win_dw.cpp +++ b/src/ports/SkFontHost_win_dw.cpp @@ -1490,10 +1490,9 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics( info = new SkAdvancedTypefaceMetrics; info->fEmSize = dwfm.designUnitsPerEm; - info->fMultiMaster = false; info->fLastGlyphID = SkToU16(glyphCount - 1); info->fStyle = 0; - + info->fFlags = SkAdvancedTypefaceMetrics::kEmpty_FontFlag; SkTScopedComPtr<IDWriteLocalizedStrings> familyNames; SkTScopedComPtr<IDWriteLocalizedStrings> faceNames; @@ -1601,12 +1600,7 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics( } */ - // If Restricted, the font may not be embedded in a document. - // If not Restricted, the font can be embedded. - // If PreviewPrint, the embedding is read-only. - if (os2Table->version.v0.fsType.field.Restricted) { - info->fType = SkAdvancedTypefaceMetrics::kNotEmbeddable_Font; - } else if (perGlyphInfo & SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo) { + if (perGlyphInfo & SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo) { if (fixedWidth) { appendRange(&info->fGlyphWidths, 0); int16_t advance; |