diff options
author | 2016-04-11 10:25:28 -0700 | |
---|---|---|
committer | 2016-04-11 10:25:28 -0700 | |
commit | 25e0a0416e5b37c1e0bef1934dc67ff62e442916 (patch) | |
tree | 3d172fdc83424f6abc7214979bb05793f5a2c6b0 /src/ports | |
parent | 29feef80de0af74eb24b703d6675aea1bc17e655 (diff) |
Revert of Pass effects directly to fontcache (patchset #8 id:140001 of https://codereview.chromium.org/1863013003/ )
Reason for revert:
Seems to have broken the DEPS roll.
Original issue's description:
> Pass effects directly to fontcache
>
> BUG=skia:5176
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1863013003
>
> Committed: https://skia.googlesource.com/skia/+/c79172857c3f69cc46837e1beeae0c1ead377bb2
TBR=djsollen@google.com,bungeman@google.com,mtklein@google.com,fmalita@chromium.org,msarett@google.com,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:5176
Review URL: https://codereview.chromium.org/1872253004
Diffstat (limited to 'src/ports')
-rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 14 | ||||
-rw-r--r-- | src/ports/SkFontHost_FreeType_common.h | 9 | ||||
-rw-r--r-- | src/ports/SkFontHost_mac.cpp | 13 | ||||
-rw-r--r-- | src/ports/SkFontHost_win.cpp | 16 | ||||
-rw-r--r-- | src/ports/SkScalerContext_win_dw.cpp | 3 | ||||
-rw-r--r-- | src/ports/SkScalerContext_win_dw.h | 2 | ||||
-rw-r--r-- | src/ports/SkTypeface_win_dw.cpp | 5 | ||||
-rw-r--r-- | src/ports/SkTypeface_win_dw.h | 3 |
8 files changed, 26 insertions, 39 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 55eb87fe6d..44eb50ce40 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -181,7 +181,7 @@ static void unref_ft_library() { class SkScalerContext_FreeType : public SkScalerContext_FreeType_Base { public: - SkScalerContext_FreeType(SkTypeface*, const SkScalerContextEffects&, const SkDescriptor* desc); + SkScalerContext_FreeType(SkTypeface*, const SkDescriptor* desc); virtual ~SkScalerContext_FreeType(); bool success() const { @@ -663,10 +663,10 @@ static bool isAxisAligned(const SkScalerContext::Rec& rec) { bothZero(rec.fPost2x2[0][0], rec.fPost2x2[1][1])); } -SkScalerContext* SkTypeface_FreeType::onCreateScalerContext(const SkScalerContextEffects& effects, - const SkDescriptor* desc) const { +SkScalerContext* SkTypeface_FreeType::onCreateScalerContext( + const SkDescriptor* desc) const { SkScalerContext_FreeType* c = - new SkScalerContext_FreeType(const_cast<SkTypeface_FreeType*>(this), effects, desc); + new SkScalerContext_FreeType(const_cast<SkTypeface_FreeType*>(this), desc); if (!c->success()) { delete c; c = nullptr; @@ -790,10 +790,8 @@ static FT_Int chooseBitmapStrike(FT_Face face, FT_F26Dot6 scaleY) { return chosenStrikeIndex; } -SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface, - const SkScalerContextEffects& effects, - const SkDescriptor* desc) - : SkScalerContext_FreeType_Base(typeface, effects, desc) +SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface, const SkDescriptor* desc) + : SkScalerContext_FreeType_Base(typeface, desc) , fFace(nullptr) , fFTSize(nullptr) , fStrikeIndex(-1) diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h index 8c13a80aa5..99b43dccca 100644 --- a/src/ports/SkFontHost_FreeType_common.h +++ b/src/ports/SkFontHost_FreeType_common.h @@ -26,9 +26,8 @@ protected: // This value was chosen by eyeballing the result in Firefox and trying to match it. static const FT_Pos kBitmapEmboldenStrength = 1 << 6; - SkScalerContext_FreeType_Base(SkTypeface* typeface, const SkScalerContextEffects& effects, - const SkDescriptor *desc) - : INHERITED(typeface, effects, desc) + SkScalerContext_FreeType_Base(SkTypeface* typeface, const SkDescriptor *desc) + : INHERITED(typeface, desc) {} void generateGlyphImage(FT_Face face, const SkGlyph& glyph); @@ -76,8 +75,8 @@ protected: , fGlyphCount(-1) {} - virtual SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, - const SkDescriptor*) const override; + virtual SkScalerContext* onCreateScalerContext( + const SkDescriptor*) const override; void onFilterRec(SkScalerContextRec*) const override; SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( PerGlyphInfo, const uint32_t*, uint32_t) const override; diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 8d4a3f8cfc..ec35707dd1 100644 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -473,8 +473,7 @@ protected: int onGetTableTags(SkFontTableTag tags[]) const override; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const override; - SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, - const SkDescriptor*) const override; + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override; void onFilterRec(SkScalerContextRec*) const override; void onGetFontDescriptor(SkFontDescriptor*, bool*) const override; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( @@ -630,7 +629,7 @@ struct GlyphRect { class SkScalerContext_Mac : public SkScalerContext { public: - SkScalerContext_Mac(SkTypeface_Mac*, const SkScalerContextEffects&, const SkDescriptor*); + SkScalerContext_Mac(SkTypeface_Mac*, const SkDescriptor*); protected: unsigned generateGlyphCount(void) override; @@ -739,9 +738,8 @@ static CTFontRef ctfont_create_exact_copy(CTFontRef baseFont, CGFloat textSize, } SkScalerContext_Mac::SkScalerContext_Mac(SkTypeface_Mac* typeface, - const SkScalerContextEffects& effects, const SkDescriptor* desc) - : INHERITED(typeface, effects, desc) + : INHERITED(typeface, desc) , fFBoundingBoxes() , fFBoundingBoxesGlyphOffset(0) , fGeneratedFBoundingBoxes(false) @@ -1939,9 +1937,8 @@ size_t SkTypeface_Mac::onGetTableData(SkFontTableTag tag, size_t offset, return length; } -SkScalerContext* SkTypeface_Mac::onCreateScalerContext(const SkScalerContextEffects& effects, - const SkDescriptor* desc) const { - return new SkScalerContext_Mac(const_cast<SkTypeface_Mac*>(this), effects, desc); +SkScalerContext* SkTypeface_Mac::onCreateScalerContext(const SkDescriptor* desc) const { + return new SkScalerContext_Mac(const_cast<SkTypeface_Mac*>(this), desc); } void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const { diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 395307cf04..f772d8c57e 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -257,8 +257,7 @@ public: protected: SkStreamAsset* onOpenStream(int* ttcIndex) const override; - SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, - const SkDescriptor*) const override; + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override; void onFilterRec(SkScalerContextRec*) const override; SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( PerGlyphInfo, const uint32_t*, uint32_t) const override; @@ -534,7 +533,7 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW, class SkScalerContext_GDI : public SkScalerContext { public: - SkScalerContext_GDI(SkTypeface*, const SkScalerContextEffects&, const SkDescriptor* desc); + SkScalerContext_GDI(SkTypeface*, const SkDescriptor* desc); virtual ~SkScalerContext_GDI(); // Returns true if the constructor was able to complete all of its @@ -605,9 +604,8 @@ static BYTE compute_quality(const SkScalerContext::Rec& rec) { } SkScalerContext_GDI::SkScalerContext_GDI(SkTypeface* rawTypeface, - const SkScalerContextEffects& effects, - const SkDescriptor* desc) - : SkScalerContext(rawTypeface, effects, desc) + const SkDescriptor* desc) + : SkScalerContext(rawTypeface, desc) , fDDC(0) , fSavefont(0) , fFont(0) @@ -2287,10 +2285,8 @@ size_t LogFontTypeface::onGetTableData(SkFontTableTag tag, size_t offset, return bufferSize == GDI_ERROR ? 0 : bufferSize; } -SkScalerContext* LogFontTypeface::onCreateScalerContext(const SkScalerContextEffects& effects, - const SkDescriptor* desc) const { - SkScalerContext_GDI* ctx = new SkScalerContext_GDI(const_cast<LogFontTypeface*>(this), - effects, desc); +SkScalerContext* LogFontTypeface::onCreateScalerContext(const SkDescriptor* desc) const { + SkScalerContext_GDI* ctx = new SkScalerContext_GDI(const_cast<LogFontTypeface*>(this), desc); if (!ctx->isValid()) { delete ctx; ctx = nullptr; diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp index 4609d04851..f276762bbf 100644 --- a/src/ports/SkScalerContext_win_dw.cpp +++ b/src/ports/SkScalerContext_win_dw.cpp @@ -204,9 +204,8 @@ static bool is_axis_aligned(const SkScalerContext::Rec& rec) { } SkScalerContext_DW::SkScalerContext_DW(DWriteFontTypeface* typeface, - const SkScalerContextEffects& effects, const SkDescriptor* desc) - : SkScalerContext(typeface, effects, desc) + : SkScalerContext(typeface, desc) , fTypeface(SkRef(typeface)) , fGlyphCount(-1) { diff --git a/src/ports/SkScalerContext_win_dw.h b/src/ports/SkScalerContext_win_dw.h index 9b24772036..abf2bc9aa0 100644 --- a/src/ports/SkScalerContext_win_dw.h +++ b/src/ports/SkScalerContext_win_dw.h @@ -20,7 +20,7 @@ class SkDescriptor; class SkScalerContext_DW : public SkScalerContext { public: - SkScalerContext_DW(DWriteFontTypeface*, const SkScalerContextEffects&, const SkDescriptor*); + SkScalerContext_DW(DWriteFontTypeface*, const SkDescriptor* desc); virtual ~SkScalerContext_DW(); protected: diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp index 18c63a5089..160c66ed0e 100644 --- a/src/ports/SkTypeface_win_dw.cpp +++ b/src/ports/SkTypeface_win_dw.cpp @@ -244,9 +244,8 @@ SkStreamAsset* DWriteFontTypeface::onOpenStream(int* ttcIndex) const { return new SkDWriteFontFileStream(fontFileStream.get()); } -SkScalerContext* DWriteFontTypeface::onCreateScalerContext(const SkScalerContextEffects& effects, - const SkDescriptor* desc) const { - return new SkScalerContext_DW(const_cast<DWriteFontTypeface*>(this), effects, desc); +SkScalerContext* DWriteFontTypeface::onCreateScalerContext(const SkDescriptor* desc) const { + return new SkScalerContext_DW(const_cast<DWriteFontTypeface*>(this), desc); } void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const { diff --git a/src/ports/SkTypeface_win_dw.h b/src/ports/SkTypeface_win_dw.h index b1237c0e98..cdbeeaa785 100644 --- a/src/ports/SkTypeface_win_dw.h +++ b/src/ports/SkTypeface_win_dw.h @@ -96,8 +96,7 @@ protected: } SkStreamAsset* onOpenStream(int* ttcIndex) const override; - SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&, - const SkDescriptor*) const override; + SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override; void onFilterRec(SkScalerContextRec*) const override; SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( PerGlyphInfo, const uint32_t*, uint32_t) const override; |