Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / GrAllocator.h

diff --git a/src/third_party/skia/src/gpu/GrAllocator.h b/src/third_party/skia/src/gpu/GrAllocator.h
old mode 100755 (executable)
new mode 100644 (file)
index f2afec8..a2ad408
--- a/src/third_party/skia/src/gpu/GrAllocator.h
+++ b/src/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(); };