replacing Gr* with Sk* in SkTArray.h

REVIEW=http://codereview.appspot.com/5447053/



git-svn-id: http://skia.googlecode.com/svn/trunk@2770 2bbb7eff-a529-9590-31e7-b0007b416f81

include/core/SkTArray.h

@@ -299,8 +299,8 @@ protected:
 
     void init(const T* array, int count,
                void* preAllocStorage, int preAllocOrReserveCount) {
-        GrAssert(count >= 0);
-        GrAssert(preAllocOrReserveCount >= 0);
+        SkASSERT(count >= 0);
+        SkASSERT(preAllocOrReserveCount >= 0);
         fCount              = count;
         fReserveCount       = (preAllocOrReserveCount > 0) ?
                                     preAllocOrReserveCount :
@@ -311,8 +311,8 @@ protected:
             fAllocCount = fReserveCount;
             fMemArray = preAllocStorage;
         } else {
-            fAllocCount = GrMax(fCount, fReserveCount);
-            fMemArray = GrMalloc(fAllocCount * sizeof(T));
+            fAllocCount = SkMax32(fCount, fReserveCount);
+            fMemArray = sk_malloc_throw(fAllocCount * sizeof(T));
         }
 
         SkTArrayExt::copy(this, array);