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

SkPDF: Stop #include PREPROCESSOR_DEFINE pattern

Browse Source 
No more:
   #include SK_SFNTLY_SUBSETTER
   #include ZLIB_INCLUDE

Also, rename SK_SFNTLY_SUBSETTER to SK_PDF_USE_SFNTLY
to follow my pattern of prefixing SkPDF-specific defines
with 'SK_PDF_'.

The ZLIB_INCLUDE define is no longer is used by anyone.

TODO: rename Sfntly to something pronounceable.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2273343002

Review-Url: https://codereview.chromium.org/2273343002
This commit is contained in:
halcanary 2016-08-25 09:07:02 -07:00 committed by Commit bot
parent 464a7d6f95
commit 650e20d705
8 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BUILD.gn
View File

@ -285,10 +285,7 @@ optional("pdf") {
if (skia_use_sfntly) {
deps += [ "//third_party/sfntly" ]
public_defines += [
# TODO(halcanary): make this the default; this is the value Android uses.
"SK_SFNTLY_SUBSETTER=\"sample/chromium/font_subsetter.h\"",
]
public_defines += [ "SK_PDF_USE_SFNTLY" ]
}
}

1
gyp/common_conditions.gypi
View File

@ -381,7 +381,6 @@
# using freetype's embolden allows us to adjust fake bold settings at
# draw-time, at which point we know which SkTypeface is being drawn
'SK_USE_FREETYPE_EMBOLDEN',
'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
# When built as part of the system image we can enable certian non-NDK
# compliant optimizations.
'SK_BUILD_FOR_ANDROID_FRAMEWORK',

10
gyp/pdf.gyp
View File

@ -38,13 +38,15 @@
'conditions': [
[ 'skia_pdf_use_sfntly and not skia_android_framework and \
skia_os in ["win", "android", "linux", "mac"]',
{ 'dependencies': [ 'sfntly.gyp:sfntly' ] }
{
'dependencies': [ 'sfntly.gyp:sfntly' ],
'defines': [ 'SK_PDF_USE_SFNTLY' ],
}
],
[ 'skia_android_framework', {
# Add SFTNLY support for PDF (which in turns depends on ICU)
'include_dirs': [
'external/sfntly/cpp/src',
],
'include_dirs': [ 'external/sfntly/cpp/src' ],
'defines': [ 'SK_PDF_USE_SFNTLY' ],
'libraries': [
'libsfntly.a',
'-licuuc',

3
gyp/sfntly.gyp
View File

@ -15,9 +15,6 @@
},
'direct_dependent_settings': {
'include_dirs': [ '<(sfntly_src_path)', ],
'defines': [
'SK_SFNTLY_SUBSETTER="sample/chromium/font_subsetter.h"',
],
},
'sources': [
'<(sfntly_src_path)/sample/chromium/font_subsetter.cc',

2
public.bzl
View File

@ -567,7 +567,7 @@ DEFINES_UNIX = [
"PNG_SKIP_SETJMP_CHECK",
"SK_BUILD_FOR_UNIX",
"SK_SAMPLES_FOR_X",
"SK_SFNTLY_SUBSETTER",
"SK_PDF_USE_SFNTLY",
"SK_CODEC_DECODES_RAW",
"SK_HAS_GIF_LIBRARY",
"SK_HAS_JPEG_LIBRARY",

6
src/pdf/SkDeflate.cpp
View File

@ -9,11 +9,7 @@
#include "SkData.h"
#include "SkDeflate.h"
#ifdef ZLIB_INCLUDE
#include ZLIB_INCLUDE
#else
#include "zlib.h"
#endif
#include "zlib.h"
namespace {

24
src/pdf/SkPDFFont.cpp
View File

@ -22,13 +22,13 @@
#include "SkTypes.h"
#include "SkUtils.h"
#if defined (SK_SFNTLY_SUBSETTER)
#if defined (GOOGLE3)
// #including #defines doesn't work with this build system.
#include "sample/chromium/font_subsetter.h"
#else
#include SK_SFNTLY_SUBSETTER
#endif
// TODO(halcanary): Switch Chrome from SK_SFNTLY_SUBSETTER to SK_PDF_USE_SFNTLY.
#if defined(SK_SFNTLY_SUBSETTER) && !defined(SK_PDF_USE_SFNTLY)
#define SK_PDF_USE_SFNTLY
#endif
#ifdef SK_PDF_USE_SFNTLY
#include "sample/chromium/font_subsetter.h"
#endif
namespace {
@ -142,7 +142,7 @@ static bool can_embed(const SkAdvancedTypefaceMetrics& metrics) {
return !SkToBool(metrics.fFlags & SkAdvancedTypefaceMetrics::kNotEmbeddable_FontFlag);
}
#ifdef SK_SFNTLY_SUBSETTER
#ifdef SK_PDF_USE_SFNTLY
static bool can_subset(const SkAdvancedTypefaceMetrics& metrics) {
return !SkToBool(metrics.fFlags & SkAdvancedTypefaceMetrics::kNotSubsettable_FontFlag);
}
@ -336,7 +336,7 @@ void SkPDFType0Font::emitObject(SkWStream* stream,
}
#endif
#ifdef SK_SFNTLY_SUBSETTER
#ifdef SK_PDF_USE_SFNTLY
// if possible, make no copy.
static sk_sp<SkData> stream_to_data(std::unique_ptr<SkStreamAsset> stream) {
SkASSERT(stream);
@ -387,7 +387,7 @@ static sk_sp<SkPDFObject> get_subset_font_stream(
subsetStream->dict()->insertInt("Length1", subsetFontSize);
return subsetStream;
}
#endif // SK_SFNTLY_SUBSETTER
#endif // SK_PDF_USE_SFNTLY
void SkPDFType0Font::getFontSubset(SkPDFCanon* canon) {
const SkAdvancedTypefaceMetrics* metricsPtr =
@ -417,7 +417,7 @@ void SkPDFType0Font::getFontSubset(SkPDFCanon* canon) {
return;
}
#ifdef SK_SFNTLY_SUBSETTER
#ifdef SK_PDF_USE_SFNTLY
if (can_subset(metrics)) {
// Generate glyph id array. in format needed by sfntly
SkTDArray<uint32_t> glyphIDs;
@ -434,7 +434,7 @@ void SkPDFType0Font::getFontSubset(SkPDFCanon* canon) {
// If subsetting fails, fall back to original font data.
fontAsset.reset(face->openStream(&ttcIndex));
}
#endif // SK_SFNTLY_SUBSETTER
#endif // SK_PDF_USE_SFNTLY
auto fontStream = sk_make_sp<SkPDFSharedStream>(std::move(fontAsset));
fontStream->dict()->insertInt("Length1", fontSize);
descriptor->insertObjRef("FontFile2", std::move(fontStream));

6
tests/PDFDeflateWStreamTest.cpp
View File

@ -11,11 +11,7 @@
namespace {
#ifdef ZLIB_INCLUDE
#include ZLIB_INCLUDE
#else
#include "zlib.h"
#endif
#include "zlib.h"
// Different zlib implementations use different T.
// We've seen size_t and unsigned.