6 files changed, 5 insertions, 9 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 8034a7b3b4..77cbf2e256 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -139,7 +139,7 @@
         }],
         [ 'skia_distancefield_fonts', {
           'sources': [
-            '<(skia_include_path)/gpu/GrDistanceFieldTextContext.h',
+            '<(skia_src_path)/gpu/GrDistanceFieldTextContext.h',
             '<(skia_src_path)/gpu/GrDistanceFieldTextContext.cpp',
             '<(skia_src_path)/gpu/effects/GrDistanceFieldTextureEffect.cpp',
             '<(skia_src_path)/gpu/effects/GrDistanceFieldTextureEffect.h',
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index cbf721c4d3..e0f4b0e108 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -9,7 +9,6 @@
   'variables': {
     'skgpu_sources': [
       '<(skia_include_path)/gpu/GrBackendEffectFactory.h',
-      '<(skia_include_path)/gpu/GrBitmapTextContext.h',
       '<(skia_include_path)/gpu/GrClipData.h',
       '<(skia_include_path)/gpu/GrColor.h',
       '<(skia_include_path)/gpu/GrConfig.h',
@@ -30,7 +29,6 @@
       '<(skia_include_path)/gpu/GrResource.h',
       '<(skia_include_path)/gpu/GrSurface.h',
       '<(skia_include_path)/gpu/GrTBackendEffectFactory.h',
-      '<(skia_include_path)/gpu/GrTextContext.h',
       '<(skia_include_path)/gpu/GrTexture.h',
       '<(skia_include_path)/gpu/GrTextureAccess.h',
       '<(skia_include_path)/gpu/GrTypes.h',
@@ -55,6 +53,7 @@
       '<(skia_src_path)/gpu/GrAtlas.h',
       '<(skia_src_path)/gpu/GrBinHashKey.h',
       '<(skia_src_path)/gpu/GrBitmapTextContext.cpp',
+      '<(skia_src_path)/gpu/GrBitmapTextContext.h',
       '<(skia_src_path)/gpu/GrBlend.cpp',
       '<(skia_src_path)/gpu/GrBlend.h',
       '<(skia_src_path)/gpu/GrBufferAllocPool.cpp',
@@ -118,6 +117,7 @@
       '<(skia_src_path)/gpu/GrSurface.cpp',
       '<(skia_src_path)/gpu/GrTemplates.h',
       '<(skia_src_path)/gpu/GrTextContext.cpp',
+      '<(skia_src_path)/gpu/GrTextContext.h',
       '<(skia_src_path)/gpu/GrTextStrike.cpp',
       '<(skia_src_path)/gpu/GrTextStrike.h',
       '<(skia_src_path)/gpu/GrTextStrike_impl.h',
diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h
index addf678654..bfcdba3fdd 100644
--- a/include/gpu/SkGpuDevice.h
+++ b/include/gpu/SkGpuDevice.h
@@ -16,11 +16,12 @@
 #include "SkBitmapDevice.h"
 #include "SkRegion.h"
 #include "GrContext.h"
-#include "GrTextContext.h"
 
 struct SkDrawProcs;
 struct GrSkDrawProcs;
 
+class GrTextContextManager;
+
 /**
  *  Subclass of SkBitmapDevice, which directs all drawing to the GrGpu owned by the
  *  canvas.
@@ -208,11 +209,6 @@ private:
                          int tileSize,
                          bool bicubic);
 
-    /**
-     * Returns non-initialized instance.
-     */
-    GrTextContext* getTextContext();
-
     typedef SkBitmapDevice INHERITED;
 };
 
diff --git a/include/gpu/GrBitmapTextContext.h b/src/gpu/GrBitmapTextContext.h
index 6550e3c079..6550e3c079 100755
--- a/include/gpu/GrBitmapTextContext.h
+++ b/src/gpu/GrBitmapTextContext.h
diff --git a/include/gpu/GrDistanceFieldTextContext.h b/src/gpu/GrDistanceFieldTextContext.h
index 8b94038b67..8b94038b67 100755
--- a/include/gpu/GrDistanceFieldTextContext.h
+++ b/src/gpu/GrDistanceFieldTextContext.h
diff --git a/include/gpu/GrTextContext.h b/src/gpu/GrTextContext.h
index c572d0d016..c572d0d016 100644
--- a/include/gpu/GrTextContext.h
+++ b/src/gpu/GrTextContext.h