Move GrIPoint16 to SkIPoint16 (and remove GrPoint.h)

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.
  */
 
 #include "GrAtlas.h"
 #include "GrContext.h"
@@ skipping 30 matching lines @@
     fRects = GrRectanizer::Factory(width, height);
     fAtlasMgr = mgr;
     fOffset.set(offX * width, offY * height);
     fBytesPerPixel = bpp;
     fPlotData = NULL;
     fDirtyRect.setEmpty();
     fDirty = false;
     fBatchUploads = batchUploads;
 }
 
-static inline void adjust_for_offset(GrIPoint16* loc, const GrIPoint16& offset) {
+static inline void adjust_for_offset(SkIPoint16* loc, const SkIPoint16& offset) {
     loc->fX += offset.fX;
     loc->fY += offset.fY;
 }
 
 bool GrPlot::addSubImage(int width, int height, const void* image,
-                          GrIPoint16* loc) {
+                         SkIPoint16* loc) {
     float percentFull = fRects->percentFull();
     if (!fRects->addRect(width, height, loc)) {
         return false;
     }
 
     // if batching uploads, create backing memory on first use
     // once the plot is nearly full we will revert to uploading each subimage individually
     int plotWidth = fRects->width();
     int plotHeight = fRects->height();
     if (fBatchUploads && NULL == fPlotData && 0.0f == percentFull) {
@@ skipping 125 matching lines @@
     if (fPlotList.head() == plot) {
         return;
     }
 
     fPlotList.remove(plot);
     fPlotList.addToHead(plot);
 };
 
 GrPlot* GrAtlasMgr::addToAtlas(GrAtlas* atlas,
                                int width, int height, const void* image,
-                               GrIPoint16* loc) {
+                               SkIPoint16* loc) {
     // iterate through entire plot list for this atlas, see if we can find a hole
     // last one was most recently added and probably most empty
     for (int i = atlas->fPlots.count()-1; i >= 0; --i) {
         GrPlot* plot = atlas->fPlots[i];
         if (plot->addSubImage(width, height, image, loc)) {
             this->moveToHead(plot);
             return plot;
         }
     }
 
@@ skipping 64 matching lines @@
     if (fBatchUploads) {
         GrPlotList::Iter plotIter;
         plotIter.init(fPlotList, GrPlotList::Iter::kHead_IterStart);
         GrPlot* plot;
         while (NULL != (plot = plotIter.get())) {
             plot->uploadToTexture();
             plotIter.next();
         }
     }
 }