diff options
| -rw-r--r-- | bench/FontCacheBench.cpp | 1 | ||||
| -rw-r--r-- | bench/ShaderMaskBench.cpp | 1 | ||||
| -rw-r--r-- | bench/TextBench.cpp | 1 | ||||
| -rw-r--r-- | src/core/SkPaint.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkScalerContext.cpp | 3 | ||||
| -rw-r--r-- | src/device/xps/SkXPSDevice.cpp | 1 | ||||
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 1 | ||||
| -rw-r--r-- | src/pdf/SkPDFFont.cpp | 1 | ||||
| -rw-r--r-- | tests/FontHostStreamTest.cpp | 1 |
9 files changed, 0 insertions, 12 deletions
diff --git a/bench/FontCacheBench.cpp b/bench/FontCacheBench.cpp index 697bde64f4..dbf6b1677b 100644 --- a/bench/FontCacheBench.cpp +++ b/bench/FontCacheBench.cpp @@ -8,7 +8,6 @@ #include "Benchmark.h" #include "SkCanvas.h" #include "SkChecksum.h" -#include "SkFontHost.h" #include "SkPaint.h" #include "SkString.h" #include "SkTemplates.h" diff --git a/bench/ShaderMaskBench.cpp b/bench/ShaderMaskBench.cpp index aa3dadff2f..32805352fc 100644 --- a/bench/ShaderMaskBench.cpp +++ b/bench/ShaderMaskBench.cpp @@ -8,7 +8,6 @@ #include "Benchmark.h" #include "SkCanvas.h" #include "SkColorShader.h" -#include "SkFontHost.h" #include "SkPaint.h" #include "SkRandom.h" #include "SkString.h" diff --git a/bench/TextBench.cpp b/bench/TextBench.cpp index f150be2188..6c3bab13d9 100644 --- a/bench/TextBench.cpp +++ b/bench/TextBench.cpp @@ -7,7 +7,6 @@ */ #include "Benchmark.h" #include "SkCanvas.h" -#include "SkFontHost.h" #include "SkPaint.h" #include "SkRandom.h" #include "SkString.h" diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index ff08a0a65f..2aadce1d0a 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -14,7 +14,6 @@ #include "SkDeviceProperties.h" #include "SkDraw.h" #include "SkFontDescriptor.h" -#include "SkFontHost.h" #include "SkGlyphCache.h" #include "SkImageFilter.h" #include "SkMaskFilter.h" @@ -1257,7 +1256,6 @@ static void add_flattenable(SkDescriptor* desc, uint32_t tag, buffer->writeToMemory(desc->addEntry(tag, buffer->bytesWritten(), NULL)); } -// SkFontHost can override this choice in FilterRec() static SkMask::Format computeMaskFormat(const SkPaint& paint) { uint32_t flags = paint.getFlags(); diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp index cf3c30cfff..771db50425 100644 --- a/src/core/SkScalerContext.cpp +++ b/src/core/SkScalerContext.cpp @@ -11,7 +11,6 @@ #include "SkColorPriv.h" #include "SkDescriptor.h" #include "SkDraw.h" -#include "SkFontHost.h" #include "SkGlyph.h" #include "SkMaskFilter.h" #include "SkMaskGamma.h" @@ -851,8 +850,6 @@ SkAxisAlignment SkComputeAxisAlignmentForHText(const SkMatrix& matrix) { /////////////////////////////////////////////////////////////////////////////// -#include "SkFontHost.h" - class SkScalerContext_Empty : public SkScalerContext { public: SkScalerContext_Empty(SkTypeface* face, const SkDescriptor* desc) diff --git a/src/device/xps/SkXPSDevice.cpp b/src/device/xps/SkXPSDevice.cpp index 45036b2aa8..df2cdd9b61 100644 --- a/src/device/xps/SkXPSDevice.cpp +++ b/src/device/xps/SkXPSDevice.cpp @@ -23,7 +23,6 @@ #include "SkDraw.h" #include "SkDrawProcs.h" #include "SkEndian.h" -#include "SkFontHost.h" #include "SkGlyphCache.h" #include "SkHRESULT.h" #include "SkImageEncoder.h" diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 6592ba0c68..e9a38a0e9b 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -13,7 +13,6 @@ #include "SkClipStack.h" #include "SkData.h" #include "SkDraw.h" -#include "SkFontHost.h" #include "SkGlyphCache.h" #include "SkPaint.h" #include "SkPath.h" diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp index 5d092e5db7..3c5739cb71 100644 --- a/src/pdf/SkPDFFont.cpp +++ b/src/pdf/SkPDFFont.cpp @@ -8,7 +8,6 @@ #include <ctype.h> #include "SkData.h" -#include "SkFontHost.h" #include "SkGlyphCache.h" #include "SkPaint.h" #include "SkPDFCatalog.h" diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp index a2254fd541..18c74605bf 100644 --- a/tests/FontHostStreamTest.cpp +++ b/tests/FontHostStreamTest.cpp @@ -9,7 +9,6 @@ #include "SkCanvas.h" #include "SkColor.h" #include "SkFontDescriptor.h" -#include "SkFontHost.h" #include "SkGraphics.h" #include "SkPaint.h" #include "SkPoint.h" |