diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-28 15:13:50 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-28 15:13:50 +0000 |
| commit | 42a895730fa09ee9222ec7b08d7b3c21e94855c4 (patch) | |
| tree | e17869308e1771929018e349dea673a969976ded /include/gpu/GrBitmapTextContext.h | |
| parent | da3d69ce71bc278c2670793c660ddd96b49ba745 (diff) | |
Fix for issue 1728: raster vs. gpu text draws with the wrong color
The blend mode for LCD text was not set up correctly when using colors with alpha. This takes the color's alpha value
into account when setting up the blending function.
BUG=Skia:1728
R=bsalomon@google.com
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/45363002
git-svn-id: http://skia.googlecode.com/svn/trunk@11980 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu/GrBitmapTextContext.h')
| -rwxr-xr-x | include/gpu/GrBitmapTextContext.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/gpu/GrBitmapTextContext.h b/include/gpu/GrBitmapTextContext.h index 89672a84d5..e0900ecd7d 100755 --- a/include/gpu/GrBitmapTextContext.h +++ b/include/gpu/GrBitmapTextContext.h @@ -17,7 +17,7 @@ class GrTextStrike; */ class GrBitmapTextContext : public GrTextContext { public: - GrBitmapTextContext(GrContext*, const GrPaint&); + GrBitmapTextContext(GrContext*, const GrPaint&, SkColor); virtual ~GrBitmapTextContext(); virtual void drawPackedGlyph(GrGlyph::PackedID, GrFixed left, GrFixed top, @@ -36,6 +36,7 @@ private: kDefaultRequestedVerts = kDefaultRequestedGlyphs * 4, }; + SkColor fSkPaintColor; SkPoint* fVertices; int32_t fMaxVertices; GrTexture* fCurrTexture; |