diff options
| author |  robertphillips <robertphillips@google.com> | 2014-09-30 06:58:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-30 06:58:20 -0700 |
| commit | b06e5a2f558133b865cb0c3cc0b36e9bd2e594e2 (patch) | |
| tree | 52a68d8103a78776d05f5c933b4f715dd7828633 /src/gpu/GrDistanceFieldTextContext.cpp | |
| parent | dbe6074a06efc5fb6883bb5e4f251ed67c8c0ab4 (diff) | |
Revert of Make "priv" classes for GrTexure and GrSurface. (patchset #9 id:260001 of https://codereview.chromium.org/596053002/)
Reason for revert:
Breaking the Chrome builds with:
lib/libcc.so: error: undefined reference to 'GrAutoScratchTexture::detach()'
(http://108.170.220.120:10117/builders/Canary-Chrome-Ubuntu13.10-Ninja-x86_64-DRT/builds/2990/steps/Retry_BuildContentShell_1/logs/stdio)
Original issue's description:
> Make "priv" classes for GrTexure and GrSurface.
R=egdaniel@google.com, joshualitt@google.com, bsalomon@google.com
TBR=bsalomon@google.com, egdaniel@google.com, joshualitt@google.com
NOTREECHECKS=true
NOTRY=true
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/618733002
Diffstat (limited to 'src/gpu/GrDistanceFieldTextContext.cpp')
| -rwxr-xr-x | src/gpu/GrDistanceFieldTextContext.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp index 07e9a2e21d..e2bd6e9f9c 100755 --- a/src/gpu/GrDistanceFieldTextContext.cpp +++ b/src/gpu/GrDistanceFieldTextContext.cpp @@ -7,20 +7,18 @@ #include "GrDistanceFieldTextContext.h" #include "GrAtlas.h" +#include "SkColorFilter.h" #include "GrDrawTarget.h" #include "GrDrawTargetCaps.h" #include "GrFontScaler.h" +#include "SkGlyphCache.h" #include "GrGpu.h" #include "GrIndexBuffer.h" #include "GrStrokeInfo.h" -#include "GrTexturePriv.h" #include "GrTextStrike.h" #include "GrTextStrike_impl.h" - -#include "SkColorFilter.h" #include "SkDistanceFieldGen.h" #include "SkDraw.h" -#include "SkGlyphCache.h" #include "SkGpuDevice.h" #include "SkPath.h" #include "SkRTConf.h" @@ -425,10 +423,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->texturePriv().normalizeFixedX(tx)), - SkFixedToFloat(texture->texturePriv().normalizeFixedY(ty)), - SkFixedToFloat(texture->texturePriv().normalizeFixedX(tx + tw)), - SkFixedToFloat(texture->texturePriv().normalizeFixedY(ty + th)), + textureCoords->setRectFan(SkFixedToFloat(texture->normalizeFixedX(tx)), + SkFixedToFloat(texture->normalizeFixedY(ty)), + SkFixedToFloat(texture->normalizeFixedX(tx + tw)), + SkFixedToFloat(texture->normalizeFixedY(ty + th)), vertSize); if (useColorVerts) { if (0xFF == GrColorUnpackA(fPaint.getColor())) { |