diff options
| author |  bsalomon <bsalomon@google.com> | 2014-09-30 12:18:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-30 12:18:44 -0700 |
| commit | afbf2d6273cd22c683f20a7e5773843876af3085 (patch) | |
| tree | ce03339b06e13e45b5055b7cc5abdeb57cbdd86c /src/gpu/GrBitmapTextContext.cpp | |
| parent | 8de02f4bf3dfb6178132231d03caec9f9a5d0beb (diff) | |
Make "priv" classes for GrTexure and GrSurface.
R=robertphillips@google.com, egdaniel@google.com, joshualitt@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/596053002
Diffstat (limited to 'src/gpu/GrBitmapTextContext.cpp')
| -rwxr-xr-x | src/gpu/GrBitmapTextContext.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp index 0f6d1b62a9..422a7e0179 100755 --- a/src/gpu/GrBitmapTextContext.cpp +++ b/src/gpu/GrBitmapTextContext.cpp @@ -11,20 +11,21 @@ #include "GrFontScaler.h" #include "GrIndexBuffer.h" #include "GrStrokeInfo.h" +#include "GrTexturePriv.h" #include "GrTextStrike.h" #include "GrTextStrike_impl.h" -#include "SkColorPriv.h" -#include "SkPath.h" -#include "SkRTConf.h" -#include "SkStrokeRec.h" #include "effects/GrCustomCoordsTextureEffect.h" #include "SkAutoKern.h" +#include "SkColorPriv.h" #include "SkDraw.h" #include "SkDrawProcs.h" #include "SkGlyphCache.h" #include "SkGpuDevice.h" #include "SkGr.h" +#include "SkPath.h" +#include "SkRTConf.h" +#include "SkStrokeRec.h" #include "SkTextMapStateProc.h" SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false, @@ -588,10 +589,10 @@ HAS_ATLAS: // The texture coords are last in both the with and without color vertex layouts. SkPoint* textureCoords = reinterpret_cast<SkPoint*>( reinterpret_cast<intptr_t>(positions) + vertSize - sizeof(SkPoint)); - textureCoords->setRectFan(SkFixedToFloat(texture->normalizeFixedX(tx)), - SkFixedToFloat(texture->normalizeFixedY(ty)), - SkFixedToFloat(texture->normalizeFixedX(tx + width)), - SkFixedToFloat(texture->normalizeFixedY(ty + height)), + textureCoords->setRectFan(SkFixedToFloat(texture->texturePriv().normalizeFixedX(tx)), + SkFixedToFloat(texture->texturePriv().normalizeFixedY(ty)), + SkFixedToFloat(texture->texturePriv().normalizeFixedX(tx + width)), + SkFixedToFloat(texture->texturePriv().normalizeFixedY(ty + height)), vertSize); if (useColorVerts) { if (0xFF == GrColorUnpackA(fPaint.getColor())) { |