diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-22 22:01:41 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-22 22:01:41 +0000 |
| commit | f1d63aa80dc951417ad34dd00914c8150112e42a (patch) | |
| tree | 1efaf1c45fb04f46604c9a816e2bb9f6d15a3658 /src/gpu/GrDistanceFieldTextContext.cpp | |
| parent | ce96b651d383305561ff0459a527acda8e93cc49 (diff) | |
Revert of Add factory class for generating various flavors of GrTextContext. (https://codereview.chromium.org/144283002/)
Reason for revert:
Breaks Chrome. Need to fix template issue.
Original issue's description:
> Add factory class for generating various flavors of GrTextContext.
>
> This is the first pass of making Gr*TextContext more generic and easily
> subclassed. The next stage will be making GrBitmapTextContext and
> GrDistanceFieldTextContext more similar by moving the SkDraw loop into
> each subclass.
>
> BUG=skia:2018
>
> Committed: http://code.google.com/p/skia/source/detail?r=13142
R=bsalomon@google.com, reed@google.com
TBR=bsalomon@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2018
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/145023006
git-svn-id: http://skia.googlecode.com/svn/trunk@13143 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrDistanceFieldTextContext.cpp')
| -rwxr-xr-x | src/gpu/GrDistanceFieldTextContext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp index 4c9631e146..95e773ec65 100755 --- a/src/gpu/GrDistanceFieldTextContext.cpp +++ b/src/gpu/GrDistanceFieldTextContext.cpp @@ -28,7 +28,8 @@ SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false, GrDistanceFieldTextContext::GrDistanceFieldTextContext(GrContext* context, const GrPaint& grPaint, const SkPaint& skPaint) - : GrTextContext(context, grPaint, skPaint) { + : GrTextContext(context, grPaint), + fSkPaint(skPaint) { fStrike = NULL; fCurrTexture = NULL; |