| Index: src/gpu/GrStencilAndCoverTextContext.cpp
|
| diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/GrStencilAndCoverTextContext.cpp
|
| index 0867f2eb91f50c434226cd60b9cac4e9bdf3225a..0a09a2fbc249cf43b15a7635d583739621f1db33 100644
|
| --- a/src/gpu/GrStencilAndCoverTextContext.cpp
|
| +++ b/src/gpu/GrStencilAndCoverTextContext.cpp
|
| @@ -18,7 +18,7 @@
|
| #include "SkPath.h"
|
| #include "SkTextMapStateProc.h"
|
|
|
| -class GrStencilAndCoverTextContext::GlyphPathRange : public GrGpuObject {
|
| +class GrStencilAndCoverTextContext::GlyphPathRange : public GrGpuResource {
|
| static const int kMaxGlyphCount = 1 << 16; // Glyph IDs are uint16_t's
|
| static const int kGlyphGroupSize = 16; // Glyphs get tracked in groups of 16
|
|
|
| @@ -75,7 +75,7 @@ public:
|
| this->didChangeGpuMemorySize();
|
| }
|
|
|
| - // GrGpuObject overrides
|
| + // GrGpuResource overrides
|
| virtual size_t gpuMemorySize() const SK_OVERRIDE { return fPathRange->gpuMemorySize(); }
|
|
|
| private:
|
| @@ -111,7 +111,7 @@ private:
|
| uint8_t fLoadedGlyphs[(kMaxGroupCount + 7) >> 3]; // One bit per glyph group
|
| SkAutoTUnref<GrPathRange> fPathRange;
|
|
|
| - typedef GrGpuObject INHERITED;
|
| + typedef GrGpuResource INHERITED;
|
| };
|
|
|
|
|
|
|