Revert of Make "priv" classes for GrTexure and GrSurface.

src/gpu/GrTextStrike.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 "GrGpu.h"
 #include "GrRectanizer.h"
-#include "GrSurfacePriv.h"
 #include "GrTextStrike.h"
 #include "GrTextStrike_impl.h"
 #include "SkString.h"
 
 #include "SkDistanceFieldGen.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #define GR_ATLAS_TEXTURE_WIDTH 1024
 #define GR_ATLAS_TEXTURE_HEIGHT 2048
@@ skipping 179 matching lines @@
     for (int i = 0; i < kAtlasCount; ++i) {
         if (fAtlases[i]) {
             GrTexture* texture = fAtlases[i]->getTexture();
             if (texture) {
                 SkString filename;
 #ifdef SK_BUILD_FOR_ANDROID
                 filename.printf("/sdcard/fontcache_%d%d.png", gDumpCount, i);
 #else
                 filename.printf("fontcache_%d%d.png", gDumpCount, i);
 #endif
-                texture->surfacePriv().savePixels(filename.c_str());
+                texture->savePixels(filename.c_str());
             }
         }
     }
     ++gDumpCount;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
     static int gCounter;
@@ skipping 120 matching lines @@
                                        glyph->height(), storage.get(),
                                        &glyph->fAtlasLocation);
 
     if (NULL == plot) {
         return false;
     }
 
     glyph->fPlot = plot;
     return true;
 }