diff options
Diffstat (limited to 'chromium/third_party/skia/src/gpu/GrAllocator.h')
-rw-r--r--[-rwxr-xr-x] | chromium/third_party/skia/src/gpu/GrAllocator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/skia/src/gpu/GrAllocator.h b/chromium/third_party/skia/src/gpu/GrAllocator.h index f2afec8e467..a2ad408e072 100755..100644 --- a/chromium/third_party/skia/src/gpu/GrAllocator.h +++ b/chromium/third_party/skia/src/gpu/GrAllocator.h @@ -13,7 +13,7 @@ #include "SkTArray.h" #include "SkTypes.h" -class GrAllocator : public SkNoncopyable { +class GrAllocator : SkNoncopyable { public: ~GrAllocator() { reset(); @@ -80,7 +80,7 @@ public: * removes all added items */ void reset() { - int blockCount = GrMax((unsigned)1, + int blockCount = SkTMax((unsigned)1, GrUIDivRoundUp(fCount, fItemsPerBlock)); for (int i = 1; i < blockCount; ++i) { sk_free(fBlocks[i]); @@ -153,7 +153,7 @@ private: }; template <typename T> -class GrTAllocator : public SkNoncopyable { +class GrTAllocator : SkNoncopyable { public: virtual ~GrTAllocator() { this->reset(); }; |