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

src/gpu/gl/GrGpuGL.cpp

Index: src/gpu/gl/GrGpuGL.cpp
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index 8be1118d64839e2f2bb687cdb2709360e8470b04..be385110c9ab18999f044d750619f9f825df0d1c 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -9,9 +9,7 @@
 #include "GrGpuGL.h"
 #include "GrGLStencilBuffer.h"
 #include "GrOptDrawState.h"
-#include "GrSurfacePriv.h"
 #include "GrTemplates.h"
-#include "GrTexturePriv.h"
 #include "GrTypes.h"
 #include "SkStrokeRec.h"
 #include "SkTemplates.h"
@@ -495,7 +493,7 @@
     }
 
     if (success) {
-        texture->texturePriv().dirtyMipMaps(true);
+        texture->impl()->dirtyMipMaps(true);
         return true;
     }
 
@@ -1733,7 +1731,7 @@
 
     GrTexture *texture = target->asTexture();
     if (texture) {
-        texture->texturePriv().dirtyMipMaps(true);
+        texture->impl()->dirtyMipMaps(true);
     }
 }
 
@@ -2055,9 +2053,9 @@
     newTexParams.fMagFilter = glMagFilterModes[filterMode];
 
     if (GrTextureParams::kMipMap_FilterMode == filterMode &&
-        texture->texturePriv().mipMapsAreDirty() && !GrPixelConfigIsCompressed(texture->config())) {
+        texture->mipMapsAreDirty() && !GrPixelConfigIsCompressed(texture->config())) {
         GL_CALL(GenerateMipmap(GR_GL_TEXTURE_2D));
-        texture->texturePriv().dirtyMipMaps(false);
+        texture->dirtyMipMaps(false);
     }
 
     newTexParams.fWrapS = tile_to_gl_wrap(params.getTileModeX());
@@ -2471,7 +2469,7 @@
         SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX, dstPoint.fY,
                                             srcRect.width(), srcRect.height());
         bool selfOverlap = false;
-        if (dst->surfacePriv().isSameAs(src)) {
+        if (dst->isSameAs(src)) {
             selfOverlap = SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect);
         }
 
@@ -2549,7 +2547,7 @@
         return true;
     }
     if (can_blit_framebuffer(dst, src, this)) {
-        if (dst->surfacePriv().isSameAs(src)) {
+        if (dst->isSameAs(src)) {
             SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX, dstPoint.fY,
                                                 srcRect.width(), srcRect.height());
             if(!SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect)) {