diff options
| author |  borenet <borenet@google.com> | 2016-04-11 10:25:28 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-11 10:25:28 -0700 |
| commit | 25e0a0416e5b37c1e0bef1934dc67ff62e442916 (patch) | |
| tree | 3d172fdc83424f6abc7214979bb05793f5a2c6b0 /src/ports/SkFontHost_FreeType.cpp | |
| 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/SkFontHost_FreeType.cpp')
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 14 |
1 files changed, 6 insertions, 8 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) |