move GrMalloc, GrFree, Gr_bzero to their sk equivalents

src/gpu/GrAtlas.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 107 matching lines @@
     if (!fRects->addRect(width + BORDER, height + BORDER, loc)) {
         return false;
     }
 
     SkAutoSMalloc<1024> storage;
     int dstW = width + 2*BORDER;
     int dstH = height + 2*BORDER;
     if (BORDER) {
         const size_t dstRB = dstW * fBytesPerPixel;
         uint8_t* dst = (uint8_t*)storage.reset(dstH * dstRB);
-        Gr_bzero(dst, dstRB);                // zero top row
+        sk_bzero(dst, dstRB);                // zero top row
         dst += dstRB;
         for (int y = 0; y < height; y++) {
             dst = zerofill(dst, fBytesPerPixel);   // zero left edge
             memcpy(dst, image, width * fBytesPerPixel);
             dst += width * fBytesPerPixel;
             dst = zerofill(dst, fBytesPerPixel);   // zero right edge
             image = (const void*)((const char*)image + width * fBytesPerPixel);
         }
-        Gr_bzero(dst, dstRB);                // zero bottom row
+        sk_bzero(dst, dstRB);                // zero bottom row
         image = storage.get();
     }
     adjustForPlot(loc, fPlot);
     GrContext* context = fTexture->getContext();
     // We pass the flag that does not force a flush. We assume our caller is
     // smart and hasn't referenced the part of the texture we're about to update
     // since the last flush.
     context->writeTexturePixels(fTexture,
                                 loc->fX, loc->fY, dstW, dstH,
                                 fTexture->config(), image, 0,
@@ skipping 75 matching lines @@
     newAtlas->fNext = *atlas;
     *atlas = newAtlas;
 
     return newAtlas;
 }
 
 void GrAtlasMgr::freePlot(int x, int y) {
     SkASSERT(fPlotMgr->isBusy(x, y));
     fPlotMgr->freePlot(x, y);
 }