Revert "Move headers used by headers in include/ to include/private."

include/gpu/gl/SkGLContext.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkGLContext_DEFINED
 #define SkGLContext_DEFINED
 
 #include "GrGLInterface.h"
-#include "../../private/SkGpuFenceSync.h"
+#include "../../src/gpu/SkGpuFenceSync.h"
 
 /**
  * Create an offscreen opengl context with an RGBA8 / 8bit stencil FBO.
  * Provides a GrGLInterface struct of function pointers for the context.
  */
 
 class SK_API SkGLContext : public SkRefCnt {
 public:
-
+    
 
     ~SkGLContext() override;
 
     bool isValid() const { return NULL != gl(); }
 
     const GrGLInterface* gl() const { return fGL.get(); }
 
     bool fenceSyncSupport() const { return SkToBool(fFenceSync); }
 
     bool getMaxGpuFrameLag(int* maxFrameLag) const {
@@ skipping 77 matching lines @@
  * SK_GL(glCtx, GenTextures(1, &texID));
  */
 #define SK_GL(ctx, X) (ctx).gl()->fFunctions.f ## X;    \
                       SkASSERT(0 == (ctx).gl()->fFunctions.fGetError())
 #define SK_GL_RET(ctx, RET, X) (RET) = (ctx).gl()->fFunctions.f ## X;    \
                   SkASSERT(0 == (ctx).gl()->fFunctions.fGetError())
 #define SK_GL_NOERRCHECK(ctx, X) (ctx).gl()->fFunctions.f ## X
 #define SK_GL_RET_NOERRCHECK(ctx, RET, X) (RET) = (ctx).gl()->fFunctions.f ## X
 
 #endif