diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-16 18:59:19 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-17 00:35:39 +0000 |
| commit | 2ee084e73056b0ad76b721017f576168b7306da3 (patch) | |
| tree | a07e78e5b454be986463704ab480dfa97750671b /src/gpu/text/GrAtlasTextBlob.h | |
| parent | 903da79a19c35723ff198d56923250d5f3fe0f15 (diff) | |
Rename GrBatchAtlas -> GrDrawOpAtlas.
Change-Id: I776f37e42dcab8b16535c48df9c405b1f211f6c9
Reviewed-on: https://skia-review.googlesource.com/6165
Commit-Queue: Brian Salomon <brian@thesalomons.net>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/text/GrAtlasTextBlob.h')
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gpu/text/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h index e0b4a0573e..0028cc1f98 100644 --- a/src/gpu/text/GrAtlasTextBlob.h +++ b/src/gpu/text/GrAtlasTextBlob.h @@ -9,8 +9,8 @@ #define GrAtlasTextBlob_DEFINED #include "GrAtlasGlyphCache.h" -#include "GrDrawOpAtlas.h" #include "GrColor.h" +#include "GrDrawOpAtlas.h" #include "GrMemoryPool.h" #include "SkDescriptor.h" #include "SkMaskFilter.h" @@ -364,15 +364,15 @@ private: } struct SubRunInfo { SubRunInfo() - : fAtlasGeneration(GrBatchAtlas::kInvalidAtlasGeneration) - , fVertexStartIndex(0) - , fVertexEndIndex(0) - , fGlyphStartIndex(0) - , fGlyphEndIndex(0) - , fColor(GrColor_ILLEGAL) - , fMaskFormat(kA8_GrMaskFormat) - , fDrawAsDistanceFields(false) - , fUseLCDText(false) { + : fAtlasGeneration(GrDrawOpAtlas::kInvalidAtlasGeneration) + , fVertexStartIndex(0) + , fVertexEndIndex(0) + , fGlyphStartIndex(0) + , fGlyphEndIndex(0) + , fColor(GrColor_ILLEGAL) + , fMaskFormat(kA8_GrMaskFormat) + , fDrawAsDistanceFields(false) + , fUseLCDText(false) { fVertexBounds.setLargestInverted(); } SubRunInfo(const SubRunInfo& that) @@ -395,7 +395,7 @@ private: // TODO when this object is more internal, drop the privacy void resetBulkUseToken() { fBulkUseToken.reset(); } - GrBatchAtlas::BulkUseTokenUpdater* bulkUseToken() { return &fBulkUseToken; } + GrDrawOpAtlas::BulkUseTokenUpdater* bulkUseToken() { return &fBulkUseToken; } void setStrike(GrAtlasTextStrike* strike) { fStrike.reset(SkRef(strike)); } GrAtlasTextStrike* strike() const { return fStrike.get(); } @@ -451,7 +451,7 @@ private: bool drawAsDistanceFields() const { return fDrawAsDistanceFields; } private: - GrBatchAtlas::BulkUseTokenUpdater fBulkUseToken; + GrDrawOpAtlas::BulkUseTokenUpdater fBulkUseToken; sk_sp<GrAtlasTextStrike> fStrike; SkMatrix fCurrentViewMatrix; SkRect fVertexBounds; |