Move gpu/include/* to include/gpu and gpu/src/* to src/gpu

Review URL: http://codereview.appspot.com/5250070/



git-svn-id: http://skia.googlecode.com/svn/trunk@2471 2bbb7eff-a529-9590-31e7-b0007b416f81

137 files changed, 131 insertions, 132 deletions

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 0b2e4cae26..d893f283f0 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -249,7 +249,7 @@
             '../experimental/iOSSampleApp/iPad',
             '../experimental/iOSSampleApp/iPhone',
             '../include/utils/ios',
-            '../../gpu/include',
+            '../../include/gpu',
           ],
           'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',
           'mac_bundle_resources' : [
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 14b7027690..83aa525439 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -11,7 +11,6 @@
         '../include/core',
         '../src/core',
         '../include/gpu',
-        '../gpu/include',
       ],
       'sources': [
         '../include/gpu/SkGpuCanvas.h',
@@ -70,140 +69,140 @@
       'target_name': 'gr',
       'type': 'static_library',
       'include_dirs': [
-        '../gpu/include',
         '../include/core',
         '../include/config',
+        '../include/gpu',
       ],
       'dependencies': [
         'libtess.gyp:libtess',
       ],
       'sources': [
-        '../gpu/include/GrAllocator.h',
-        '../gpu/include/GrAllocPool.h',
-        '../gpu/include/GrAtlas.h',
-        '../gpu/include/GrClip.h',
-        '../gpu/include/GrClipIterator.h',
-        '../gpu/include/GrColor.h',
-        '../gpu/include/GrConfig.h',
-        '../gpu/include/GrContext.h',
-        '../gpu/include/GrFontScaler.h',
-        '../gpu/include/GrGLConfig.h',
-        '../gpu/include/GrGLConfig_chrome.h',
-        '../gpu/include/GrGLInterface.h',
-        '../gpu/include/GrGlyph.h',
-        '../gpu/include/GrGpuVertex.h',
-        '../gpu/include/GrInstanceCounter.h',
-        '../gpu/include/GrIPoint.h',
-        '../gpu/include/GrKey.h',
-        '../gpu/include/GrMatrix.h',
-        '../gpu/include/GrMesh.h',
-        '../gpu/include/GrNoncopyable.h',
-        '../gpu/include/GrPaint.h',
-        '../gpu/include/GrPath.h',
-        '../gpu/include/GrPathSink.h',
-        '../gpu/include/GrPlotMgr.h',
-        '../gpu/include/GrPoint.h',
-        '../gpu/include/GrRandom.h',
-        '../gpu/include/GrRect.h',
-        '../gpu/include/GrRectanizer.h',
-        '../gpu/include/GrRefCnt.h',
-        '../gpu/include/GrRenderTarget.h',
-        '../gpu/include/GrResource.h',
-        '../gpu/include/GrSamplerState.h',
-        '../gpu/include/GrScalar.h',
-        '../gpu/include/GrStencil.h',
-        '../gpu/include/GrStopwatch.h',
-        '../gpu/include/GrStringBuilder.h',
-        '../gpu/include/GrTBSearch.h',
-        '../gpu/include/GrTDArray.h',
-        '../gpu/include/GrTextContext.h',
-        '../gpu/include/GrTextStrike.h',
-        '../gpu/include/GrTexture.h',
-        '../gpu/include/GrTHashCache.h',
-        '../gpu/include/GrTLList.h',
-        '../gpu/include/GrTypes.h',
-        '../gpu/include/GrUserConfig.h',
+        '../include/gpu/GrAllocator.h',
+        '../include/gpu/GrAllocPool.h',
+        '../include/gpu/GrAtlas.h',
+        '../include/gpu/GrClip.h',
+        '../include/gpu/GrClipIterator.h',
+        '../include/gpu/GrColor.h',
+        '../include/gpu/GrConfig.h',
+        '../include/gpu/GrContext.h',
+        '../include/gpu/GrFontScaler.h',
+        '../include/gpu/GrGLConfig.h',
+        '../include/gpu/GrGLConfig_chrome.h',
+        '../include/gpu/GrGLInterface.h',
+        '../include/gpu/GrGlyph.h',
+        '../include/gpu/GrGpuVertex.h',
+        '../include/gpu/GrInstanceCounter.h',
+        '../include/gpu/GrIPoint.h',
+        '../include/gpu/GrKey.h',
+        '../include/gpu/GrMatrix.h',
+        '../include/gpu/GrMesh.h',
+        '../include/gpu/GrNoncopyable.h',
+        '../include/gpu/GrPaint.h',
+        '../include/gpu/GrPath.h',
+        '../include/gpu/GrPathSink.h',
+        '../include/gpu/GrPlotMgr.h',
+        '../include/gpu/GrPoint.h',
+        '../include/gpu/GrRandom.h',
+        '../include/gpu/GrRect.h',
+        '../include/gpu/GrRectanizer.h',
+        '../include/gpu/GrRefCnt.h',
+        '../include/gpu/GrRenderTarget.h',
+        '../include/gpu/GrResource.h',
+        '../include/gpu/GrSamplerState.h',
+        '../include/gpu/GrScalar.h',
+        '../include/gpu/GrStencil.h',
+        '../include/gpu/GrStopwatch.h',
+        '../include/gpu/GrStringBuilder.h',
+        '../include/gpu/GrTBSearch.h',
+        '../include/gpu/GrTDArray.h',
+        '../include/gpu/GrTextContext.h',
+        '../include/gpu/GrTextStrike.h',
+        '../include/gpu/GrTexture.h',
+        '../include/gpu/GrTHashCache.h',
+        '../include/gpu/GrTLList.h',
+        '../include/gpu/GrTypes.h',
+        '../include/gpu/GrUserConfig.h',
 
-        '../gpu/src/GrAAHairLinePathRenderer.cpp',
-        '../gpu/src/GrAAHairLinePathRenderer.h',
-        '../gpu/src/GrAddPathRenderers_aahairline.cpp',
-        '../gpu/src/GrAllocPool.cpp',
-        '../gpu/src/GrAtlas.cpp',
-        '../gpu/src/GrBinHashKey.h',
-        '../gpu/src/GrBufferAllocPool.cpp',
-        '../gpu/src/GrBufferAllocPool.h',
-        '../gpu/src/GrClip.cpp',
-        '../gpu/src/GrContext.cpp',
-        '../gpu/src/GrDefaultPathRenderer.cpp',
-        '../gpu/src/GrDefaultPathRenderer.h',
-        '../gpu/src/GrDrawTarget.cpp',
-        '../gpu/src/GrDrawTarget.h',
-        '../gpu/src/GrGeometryBuffer.h',
-        '../gpu/src/GrGLDefaultInterface_none.cpp',
-        '../gpu/src/GrGLIndexBuffer.cpp',
-        '../gpu/src/GrGLIndexBuffer.h',
-        '../gpu/src/GrGLInterface.cpp',
-        '../gpu/src/GrGLIRect.h',
-        '../gpu/src/GrGLProgram.cpp',
-        '../gpu/src/GrGLProgram.h',
-        '../gpu/src/GrGLRenderTarget.cpp',
-        '../gpu/src/GrGLRenderTarget.h',
-        '../gpu/src/GrGLShaderVar.h',
-        '../gpu/src/GrGLStencilBuffer.cpp',
-        '../gpu/src/GrGLStencilBuffer.h',
-        '../gpu/src/GrGLTexture.cpp',
-        '../gpu/src/GrGLTexture.h',
-        '../gpu/src/GrGLUtil.cpp',
-        '../gpu/src/GrGLVertexBuffer.cpp',
-        '../gpu/src/GrGLVertexBuffer.h',
-        '../gpu/src/GrGpu.cpp',
-        '../gpu/src/GrGpu.h',
-        '../gpu/src/GrGpuFactory.cpp',
-        '../gpu/src/GrGpuGL.cpp',
-        '../gpu/src/GrGpuGL.h',
-        '../gpu/src/GrGpuGLFixed.cpp',
-        '../gpu/src/GrGpuGLFixed.h',
-        '../gpu/src/GrGpuGLShaders.cpp',
-        '../gpu/src/GrGpuGLShaders.h',
-        '../gpu/src/GrIndexBuffer.h',
-        '../gpu/src/GrInOrderDrawBuffer.cpp',
-        '../gpu/src/GrInOrderDrawBuffer.h',
-        '../gpu/src/GrMatrix.cpp',
-        '../gpu/src/GrMemory.cpp',
-        '../gpu/src/GrPathRendererChain.cpp',
-        '../gpu/src/GrPathRendererChain.h',
-        '../gpu/src/GrPathRenderer.cpp',
-        '../gpu/src/GrPathRenderer.h',
-        '../gpu/src/GrPathUtils.cpp',
-        '../gpu/src/GrPathUtils.h',
-        '../gpu/src/GrRectanizer.cpp',
-        '../gpu/src/GrRedBlackTree.h',
-        '../gpu/src/GrRenderTarget.cpp',
-        '../gpu/src/GrResource.cpp',
-        '../gpu/src/GrResourceCache.cpp',
-        '../gpu/src/GrResourceCache.h',
-        '../gpu/src/GrStencil.cpp',
-        '../gpu/src/GrStencilBuffer.cpp',
-        '../gpu/src/GrStencilBuffer.h',
-        '../gpu/src/GrTesselatedPathRenderer.cpp',
-        '../gpu/src/GrTesselatedPathRenderer.h',
-        '../gpu/src/GrTextContext.cpp',
-        '../gpu/src/GrTextStrike.cpp',
-        '../gpu/src/GrTextStrike_impl.h',
-        '../gpu/src/GrTexture.cpp',
-        '../gpu/src/GrVertexBuffer.h',
-        '../gpu/src/gr_unittests.cpp',
+        '../src/gpu/GrAAHairLinePathRenderer.cpp',
+        '../src/gpu/GrAAHairLinePathRenderer.h',
+        '../src/gpu/GrAddPathRenderers_aahairline.cpp',
+        '../src/gpu/GrAllocPool.cpp',
+        '../src/gpu/GrAtlas.cpp',
+        '../src/gpu/GrBinHashKey.h',
+        '../src/gpu/GrBufferAllocPool.cpp',
+        '../src/gpu/GrBufferAllocPool.h',
+        '../src/gpu/GrClip.cpp',
+        '../src/gpu/GrContext.cpp',
+        '../src/gpu/GrDefaultPathRenderer.cpp',
+        '../src/gpu/GrDefaultPathRenderer.h',
+        '../src/gpu/GrDrawTarget.cpp',
+        '../src/gpu/GrDrawTarget.h',
+        '../src/gpu/GrGeometryBuffer.h',
+        '../src/gpu/GrGLDefaultInterface_none.cpp',
+        '../src/gpu/GrGLIndexBuffer.cpp',
+        '../src/gpu/GrGLIndexBuffer.h',
+        '../src/gpu/GrGLInterface.cpp',
+        '../src/gpu/GrGLIRect.h',
+        '../src/gpu/GrGLProgram.cpp',
+        '../src/gpu/GrGLProgram.h',
+        '../src/gpu/GrGLRenderTarget.cpp',
+        '../src/gpu/GrGLRenderTarget.h',
+        '../src/gpu/GrGLShaderVar.h',
+        '../src/gpu/GrGLStencilBuffer.cpp',
+        '../src/gpu/GrGLStencilBuffer.h',
+        '../src/gpu/GrGLTexture.cpp',
+        '../src/gpu/GrGLTexture.h',
+        '../src/gpu/GrGLUtil.cpp',
+        '../src/gpu/GrGLVertexBuffer.cpp',
+        '../src/gpu/GrGLVertexBuffer.h',
+        '../src/gpu/GrGpu.cpp',
+        '../src/gpu/GrGpu.h',
+        '../src/gpu/GrGpuFactory.cpp',
+        '../src/gpu/GrGpuGL.cpp',
+        '../src/gpu/GrGpuGL.h',
+        '../src/gpu/GrGpuGLFixed.cpp',
+        '../src/gpu/GrGpuGLFixed.h',
+        '../src/gpu/GrGpuGLShaders.cpp',
+        '../src/gpu/GrGpuGLShaders.h',
+        '../src/gpu/GrIndexBuffer.h',
+        '../src/gpu/GrInOrderDrawBuffer.cpp',
+        '../src/gpu/GrInOrderDrawBuffer.h',
+        '../src/gpu/GrMatrix.cpp',
+        '../src/gpu/GrMemory.cpp',
+        '../src/gpu/GrPathRendererChain.cpp',
+        '../src/gpu/GrPathRendererChain.h',
+        '../src/gpu/GrPathRenderer.cpp',
+        '../src/gpu/GrPathRenderer.h',
+        '../src/gpu/GrPathUtils.cpp',
+        '../src/gpu/GrPathUtils.h',
+        '../src/gpu/GrRectanizer.cpp',
+        '../src/gpu/GrRedBlackTree.h',
+        '../src/gpu/GrRenderTarget.cpp',
+        '../src/gpu/GrResource.cpp',
+        '../src/gpu/GrResourceCache.cpp',
+        '../src/gpu/GrResourceCache.h',
+        '../src/gpu/GrStencil.cpp',
+        '../src/gpu/GrStencilBuffer.cpp',
+        '../src/gpu/GrStencilBuffer.h',
+        '../src/gpu/GrTesselatedPathRenderer.cpp',
+        '../src/gpu/GrTesselatedPathRenderer.h',
+        '../src/gpu/GrTextContext.cpp',
+        '../src/gpu/GrTextStrike.cpp',
+        '../src/gpu/GrTextStrike_impl.h',
+        '../src/gpu/GrTexture.cpp',
+        '../src/gpu/GrVertexBuffer.h',
+        '../src/gpu/gr_unittests.cpp',
 
-        '../gpu/src/mac/GrGLDefaultInterface_mac.cpp',
+        '../src/gpu/mac/GrGLDefaultInterface_mac.cpp',
 
-        '../gpu/src/win/GrGLDefaultInterface_win.cpp',
+        '../src/gpu/win/GrGLDefaultInterface_win.cpp',
 
-        '../gpu/src/unix/GrGLDefaultInterface_unix.cpp',
+        '../src/gpu/unix/GrGLDefaultInterface_unix.cpp',
 
-        '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp',
+        '../src/gpu/mesa/GrGLDefaultInterface_mesa.cpp',
       ],
       'sources!': [
-        '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp',
+        '../src/gpu/mesa/GrGLDefaultInterface_mesa.cpp',
       ],
       'defines': [
         'GR_IMPLEMENTATION=1',
@@ -214,7 +213,7 @@
               'GR_LINUX_BUILD=1',
           ],
           'sources!': [
-            '../gpu/src/GrGLDefaultInterface_none.cpp',
+            '../src/gpu/GrGLDefaultInterface_none.cpp',
           ],
           'link_settings': {
             'libraries': [
@@ -233,7 +232,7 @@
             ],
           },
           'sources!': [
-            '../gpu/src/GrGLDefaultInterface_none.cpp',
+            '../src/gpu/GrGLDefaultInterface_none.cpp',
           ],
           }],
         [ 'skia_os == "win"', {
@@ -242,22 +241,22 @@
             'GR_GL_FUNCTION_TYPE=__stdcall',
           ],
           'sources!': [
-            '../gpu/src/GrGLDefaultInterface_none.cpp',
+            '../src/gpu/GrGLDefaultInterface_none.cpp',
           ],
         }],
         [ 'skia_os != "win"', {
           'sources!': [
-            '../gpu/src/win/GrGLDefaultInterface_win.cpp',
+            '../src/gpu/win/GrGLDefaultInterface_win.cpp',
           ],
         }],
         [ 'skia_os != "mac"', {
           'sources!': [
-            '../gpu/src/mac/GrGLDefaultInterface_mac.cpp',
+            '../src/gpu/mac/GrGLDefaultInterface_mac.cpp',
           ],
         }],
         [ 'skia_os != "linux"', {
           'sources!': [
-            '../gpu/src/unix/GrGLDefaultInterface_unix.cpp',
+            '../src/gpu/unix/GrGLDefaultInterface_unix.cpp',
           ],
         }],
       ],
@@ -281,7 +280,7 @@
           }],
         ],
         'include_dirs': [
-          '../gpu/include',
+          '../include/gpu',
         ],
       },
     },
diff --git a/gyp/iOSSampleApp.gyp b/gyp/iOSSampleApp.gyp
index 63d58b75c9..4fe7fe23db 100644
--- a/gyp/iOSSampleApp.gyp
+++ b/gyp/iOSSampleApp.gyp
@@ -175,7 +175,7 @@
         [ 'OS == "mac"', {
           'sources!': [
             '../samplecode/SampleDecode.cpp',
-            '../gpu/src/mac/GrGLDefaultInterface_mac.cpp',
+            '../src/gpu/mac/GrGLDefaultInterface_mac.cpp',
           ],
           'sources': [
             # Shared resources
@@ -246,7 +246,7 @@
             '../experimental/iOSSampleApp/iPad',
             '../experimental/iOSSampleApp/iPhone',
             '../include/utils/ios',
-            '../../gpu/include',
+            '../../include/gpu',
           ],
           #'xcode_settings' : {
           #  'INFOPLIST_FILE' : '../experimental/iOSSampleApp/iOSSampleApp-Info.plist',
diff --git a/gyp/tests.gyp b/gyp/tests.gyp
index 93b1149d62..c5c3ff6e13 100644
--- a/gyp/tests.gyp
+++ b/gyp/tests.gyp
@@ -10,7 +10,7 @@
       'type': 'executable',
       'include_dirs' : [
         '../src/core',
-        '../gpu/src',
+        '../src/gpu',
       ],
       'sources': [
         '../tests/BitmapCopyTest.cpp',
diff --git a/gpu/include/FlingState.h b/include/gpu/FlingState.h
index 09557b90fb..09557b90fb 100644
--- a/gpu/include/FlingState.h
+++ b/include/gpu/FlingState.h
diff --git a/gpu/include/GrAllocPool.h b/include/gpu/GrAllocPool.h
index 3ecc4aa189..3ecc4aa189 100644
--- a/gpu/include/GrAllocPool.h
+++ b/include/gpu/GrAllocPool.h
diff --git a/gpu/include/GrAllocator.h b/include/gpu/GrAllocator.h
index 21c79ec7aa..21c79ec7aa 100755
--- a/gpu/include/GrAllocator.h
+++ b/include/gpu/GrAllocator.h
diff --git a/gpu/include/GrAtlas.h b/include/gpu/GrAtlas.h
index f0114e399d..f0114e399d 100644
--- a/gpu/include/GrAtlas.h
+++ b/include/gpu/GrAtlas.h
diff --git a/gpu/include/GrClip.h b/include/gpu/GrClip.h
index d86eb978c7..d86eb978c7 100644
--- a/gpu/include/GrClip.h
+++ b/include/gpu/GrClip.h
diff --git a/gpu/include/GrClipIterator.h b/include/gpu/GrClipIterator.h
index 4a5cc7135f..4a5cc7135f 100644
--- a/gpu/include/GrClipIterator.h
+++ b/include/gpu/GrClipIterator.h
diff --git a/gpu/include/GrColor.h b/include/gpu/GrColor.h
index 5c9e408889..5c9e408889 100644
--- a/gpu/include/GrColor.h
+++ b/include/gpu/GrColor.h
diff --git a/gpu/include/GrConfig.h b/include/gpu/GrConfig.h
index 1d07af1919..1d07af1919 100644
--- a/gpu/include/GrConfig.h
+++ b/include/gpu/GrConfig.h
diff --git a/gpu/include/GrContext.h b/include/gpu/GrContext.h
index 4a1f1da8c4..4a1f1da8c4 100644
--- a/gpu/include/GrContext.h
+++ b/include/gpu/GrContext.h
diff --git a/gpu/include/GrFontScaler.h b/include/gpu/GrFontScaler.h
index 657647dea5..657647dea5 100644
--- a/gpu/include/GrFontScaler.h
+++ b/include/gpu/GrFontScaler.h
diff --git a/gpu/include/GrGLConfig.h b/include/gpu/GrGLConfig.h
index 44a3b8647c..44a3b8647c 100644
--- a/gpu/include/GrGLConfig.h
+++ b/include/gpu/GrGLConfig.h
diff --git a/gpu/include/GrGLConfig_chrome.h b/include/gpu/GrGLConfig_chrome.h
index c00f269952..c00f269952 100644
--- a/gpu/include/GrGLConfig_chrome.h
+++ b/include/gpu/GrGLConfig_chrome.h
diff --git a/gpu/include/GrGLDefines.h b/include/gpu/GrGLDefines.h
index dcacb77686..dcacb77686 100644
--- a/gpu/include/GrGLDefines.h
+++ b/include/gpu/GrGLDefines.h
diff --git a/gpu/include/GrGLInterface.h b/include/gpu/GrGLInterface.h
index 8271dcbe93..8271dcbe93 100644
--- a/gpu/include/GrGLInterface.h
+++ b/include/gpu/GrGLInterface.h
diff --git a/gpu/include/GrGlyph.h b/include/gpu/GrGlyph.h
index a0d81a1f35..a0d81a1f35 100644
--- a/gpu/include/GrGlyph.h
+++ b/include/gpu/GrGlyph.h
diff --git a/gpu/include/GrGpuVertex.h b/include/gpu/GrGpuVertex.h
index 2abc2f407e..2abc2f407e 100644
--- a/gpu/include/GrGpuVertex.h
+++ b/include/gpu/GrGpuVertex.h
diff --git a/gpu/include/GrIPoint.h b/include/gpu/GrIPoint.h
index 9471054f06..9471054f06 100644
--- a/gpu/include/GrIPoint.h
+++ b/include/gpu/GrIPoint.h
diff --git a/gpu/include/GrInstanceCounter.h b/include/gpu/GrInstanceCounter.h
index b3e21d22d4..b3e21d22d4 100644
--- a/gpu/include/GrInstanceCounter.h
+++ b/include/gpu/GrInstanceCounter.h
diff --git a/gpu/include/GrKey.h b/include/gpu/GrKey.h
index 813d82d920..813d82d920 100644
--- a/gpu/include/GrKey.h
+++ b/include/gpu/GrKey.h
diff --git a/gpu/include/GrMatrix.h b/include/gpu/GrMatrix.h
index 055680ac40..055680ac40 100644
--- a/gpu/include/GrMatrix.h
+++ b/include/gpu/GrMatrix.h
diff --git a/gpu/include/GrMesh.h b/include/gpu/GrMesh.h
index 122613264f..122613264f 100644
--- a/gpu/include/GrMesh.h
+++ b/include/gpu/GrMesh.h
diff --git a/gpu/include/GrNoncopyable.h b/include/gpu/GrNoncopyable.h
index cad722f6f4..cad722f6f4 100644
--- a/gpu/include/GrNoncopyable.h
+++ b/include/gpu/GrNoncopyable.h
diff --git a/gpu/include/GrPaint.h b/include/gpu/GrPaint.h
index 3b4b849fd7..3b4b849fd7 100644
--- a/gpu/include/GrPaint.h
+++ b/include/gpu/GrPaint.h
diff --git a/gpu/include/GrPath.h b/include/gpu/GrPath.h
index 7da0d48082..7da0d48082 100644
--- a/gpu/include/GrPath.h
+++ b/include/gpu/GrPath.h
diff --git a/gpu/include/GrPathSink.h b/include/gpu/GrPathSink.h
index ed71387e7f..ed71387e7f 100644
--- a/gpu/include/GrPathSink.h
+++ b/include/gpu/GrPathSink.h
diff --git a/gpu/include/GrPlotMgr.h b/include/gpu/GrPlotMgr.h
index 0e631a9ade..0e631a9ade 100644
--- a/gpu/include/GrPlotMgr.h
+++ b/include/gpu/GrPlotMgr.h
diff --git a/gpu/include/GrPoint.h b/include/gpu/GrPoint.h
index b32123b568..b32123b568 100644
--- a/gpu/include/GrPoint.h
+++ b/include/gpu/GrPoint.h
diff --git a/gpu/include/GrRandom.h b/include/gpu/GrRandom.h
index c98a8fbd94..c98a8fbd94 100644
--- a/gpu/include/GrRandom.h
+++ b/include/gpu/GrRandom.h
diff --git a/gpu/include/GrRect.h b/include/gpu/GrRect.h
index 60a4773820..60a4773820 100644
--- a/gpu/include/GrRect.h
+++ b/include/gpu/GrRect.h
diff --git a/gpu/include/GrRectanizer.h b/include/gpu/GrRectanizer.h
index d1f5033259..d1f5033259 100644
--- a/gpu/include/GrRectanizer.h
+++ b/include/gpu/GrRectanizer.h
diff --git a/gpu/include/GrRefCnt.h b/include/gpu/GrRefCnt.h
index 50c32c6560..50c32c6560 100644
--- a/gpu/include/GrRefCnt.h
+++ b/include/gpu/GrRefCnt.h
diff --git a/gpu/include/GrRenderTarget.h b/include/gpu/GrRenderTarget.h
index dd7a371dcb..dd7a371dcb 100644
--- a/gpu/include/GrRenderTarget.h
+++ b/include/gpu/GrRenderTarget.h
diff --git a/gpu/include/GrResource.h b/include/gpu/GrResource.h
index 0d15fe9c00..0d15fe9c00 100644
--- a/gpu/include/GrResource.h
+++ b/include/gpu/GrResource.h
diff --git a/gpu/include/GrSamplerState.h b/include/gpu/GrSamplerState.h
index 324472c972..324472c972 100644
--- a/gpu/include/GrSamplerState.h
+++ b/include/gpu/GrSamplerState.h
diff --git a/gpu/include/GrScalar.h b/include/gpu/GrScalar.h
index 4ffc4cabe0..4ffc4cabe0 100644
--- a/gpu/include/GrScalar.h
+++ b/include/gpu/GrScalar.h
diff --git a/gpu/include/GrStencil.h b/include/gpu/GrStencil.h
index b8610f2017..b8610f2017 100644
--- a/gpu/include/GrStencil.h
+++ b/include/gpu/GrStencil.h
diff --git a/gpu/include/GrStopwatch.h b/include/gpu/GrStopwatch.h
index 7ac3fd0d42..7ac3fd0d42 100644
--- a/gpu/include/GrStopwatch.h
+++ b/include/gpu/GrStopwatch.h
diff --git a/gpu/include/GrStringBuilder.h b/include/gpu/GrStringBuilder.h
index 558d0419c0..558d0419c0 100644
--- a/gpu/include/GrStringBuilder.h
+++ b/include/gpu/GrStringBuilder.h
diff --git a/gpu/include/GrTBSearch.h b/include/gpu/GrTBSearch.h
index 2697f3733b..2697f3733b 100644
--- a/gpu/include/GrTBSearch.h
+++ b/include/gpu/GrTBSearch.h
diff --git a/gpu/include/GrTDArray.h b/include/gpu/GrTDArray.h
index 731001a8c9..731001a8c9 100644
--- a/gpu/include/GrTDArray.h
+++ b/include/gpu/GrTDArray.h
diff --git a/gpu/include/GrTHashCache.h b/include/gpu/GrTHashCache.h
index 8651c35c22..8651c35c22 100644
--- a/gpu/include/GrTHashCache.h
+++ b/include/gpu/GrTHashCache.h
diff --git a/gpu/include/GrTLList.h b/include/gpu/GrTLList.h
index ea310ac20e..ea310ac20e 100644
--- a/gpu/include/GrTLList.h
+++ b/include/gpu/GrTLList.h
diff --git a/gpu/include/GrTemplates.h b/include/gpu/GrTemplates.h
index 63e43eed01..63e43eed01 100644
--- a/gpu/include/GrTemplates.h
+++ b/include/gpu/GrTemplates.h
diff --git a/gpu/include/GrTextContext.h b/include/gpu/GrTextContext.h
index 5983e358c8..5983e358c8 100644
--- a/gpu/include/GrTextContext.h
+++ b/include/gpu/GrTextContext.h
diff --git a/gpu/include/GrTextStrike.h b/include/gpu/GrTextStrike.h
index 701acea7ab..701acea7ab 100644
--- a/gpu/include/GrTextStrike.h
+++ b/include/gpu/GrTextStrike.h
diff --git a/gpu/include/GrTexture.h b/include/gpu/GrTexture.h
index 5a86b0881b..5a86b0881b 100644
--- a/gpu/include/GrTexture.h
+++ b/include/gpu/GrTexture.h
diff --git a/gpu/include/GrTypes.h b/include/gpu/GrTypes.h
index e1ab3d4e3a..e1ab3d4e3a 100644
--- a/gpu/include/GrTypes.h
+++ b/include/gpu/GrTypes.h
diff --git a/gpu/include/GrUserConfig.h b/include/gpu/GrUserConfig.h
index 9f616388cf..9f616388cf 100644
--- a/gpu/include/GrUserConfig.h
+++ b/include/gpu/GrUserConfig.h
diff --git a/gpu/include/SkUIView.h b/include/gpu/SkUIView.h
index b5a4cd8ed8..b5a4cd8ed8 100644
--- a/gpu/include/SkUIView.h
+++ b/include/gpu/SkUIView.h
diff --git a/gpu/src/FlingState.cpp b/src/gpu/FlingState.cpp
index 050a810499..050a810499 100644
--- a/gpu/src/FlingState.cpp
+++ b/src/gpu/FlingState.cpp
diff --git a/gpu/src/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index f16c8efa63..f16c8efa63 100644
--- a/gpu/src/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
diff --git a/gpu/src/GrAAHairLinePathRenderer.h b/src/gpu/GrAAHairLinePathRenderer.h
index 81cecf2c68..81cecf2c68 100644
--- a/gpu/src/GrAAHairLinePathRenderer.h
+++ b/src/gpu/GrAAHairLinePathRenderer.h
diff --git a/gpu/src/GrAddPathRenderers_aahairline.cpp b/src/gpu/GrAddPathRenderers_aahairline.cpp
index a7df66e980..a7df66e980 100644
--- a/gpu/src/GrAddPathRenderers_aahairline.cpp
+++ b/src/gpu/GrAddPathRenderers_aahairline.cpp
diff --git a/gpu/src/GrAddPathRenderers_none.cpp b/src/gpu/GrAddPathRenderers_none.cpp
index 46855db7ff..46855db7ff 100644
--- a/gpu/src/GrAddPathRenderers_none.cpp
+++ b/src/gpu/GrAddPathRenderers_none.cpp
diff --git a/gpu/src/GrAddPathRenderers_tesselated.cpp b/src/gpu/GrAddPathRenderers_tesselated.cpp
index a1cde13155..a1cde13155 100644
--- a/gpu/src/GrAddPathRenderers_tesselated.cpp
+++ b/src/gpu/GrAddPathRenderers_tesselated.cpp
diff --git a/gpu/src/GrAllocPool.cpp b/src/gpu/GrAllocPool.cpp
index ecd2acfa05..ecd2acfa05 100644
--- a/gpu/src/GrAllocPool.cpp
+++ b/src/gpu/GrAllocPool.cpp
diff --git a/gpu/src/GrAtlas.cpp b/src/gpu/GrAtlas.cpp
index 0838895a13..0838895a13 100644
--- a/gpu/src/GrAtlas.cpp
+++ b/src/gpu/GrAtlas.cpp
diff --git a/gpu/src/GrBinHashKey.h b/src/gpu/GrBinHashKey.h
index ceaef7aa6f..ceaef7aa6f 100644
--- a/gpu/src/GrBinHashKey.h
+++ b/src/gpu/GrBinHashKey.h
diff --git a/gpu/src/GrBufferAllocPool.cpp b/src/gpu/GrBufferAllocPool.cpp
index c01192db70..c01192db70 100644
--- a/gpu/src/GrBufferAllocPool.cpp
+++ b/src/gpu/GrBufferAllocPool.cpp
diff --git a/gpu/src/GrBufferAllocPool.h b/src/gpu/GrBufferAllocPool.h
index acf0289582..acf0289582 100644
--- a/gpu/src/GrBufferAllocPool.h
+++ b/src/gpu/GrBufferAllocPool.h
diff --git a/gpu/src/GrClip.cpp b/src/gpu/GrClip.cpp
index a02d9f4504..a02d9f4504 100644
--- a/gpu/src/GrClip.cpp
+++ b/src/gpu/GrClip.cpp
diff --git a/gpu/src/GrContext.cpp b/src/gpu/GrContext.cpp
index 59218386fb..59218386fb 100644
--- a/gpu/src/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
diff --git a/gpu/src/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index 14c032b937..14c032b937 100644
--- a/gpu/src/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
diff --git a/gpu/src/GrDefaultPathRenderer.h b/src/gpu/GrDefaultPathRenderer.h
index dd5964122d..dd5964122d 100644
--- a/gpu/src/GrDefaultPathRenderer.h
+++ b/src/gpu/GrDefaultPathRenderer.h
diff --git a/gpu/src/GrDrawMesh.cpp b/src/gpu/GrDrawMesh.cpp
index 75960e4f92..75960e4f92 100644
--- a/gpu/src/GrDrawMesh.cpp
+++ b/src/gpu/GrDrawMesh.cpp
diff --git a/gpu/src/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index 0ba7ead077..0ba7ead077 100644
--- a/gpu/src/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
diff --git a/gpu/src/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 10633f5ed3..10633f5ed3 100644
--- a/gpu/src/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
diff --git a/gpu/src/GrGLDefaultInterface_none.cpp b/src/gpu/GrGLDefaultInterface_none.cpp
index 2cca135c0a..2cca135c0a 100644
--- a/gpu/src/GrGLDefaultInterface_none.cpp
+++ b/src/gpu/GrGLDefaultInterface_none.cpp
diff --git a/gpu/src/GrGLIRect.h b/src/gpu/GrGLIRect.h
index e94fa21a5a..e94fa21a5a 100644
--- a/gpu/src/GrGLIRect.h
+++ b/src/gpu/GrGLIRect.h
diff --git a/gpu/src/GrGLIndexBuffer.cpp b/src/gpu/GrGLIndexBuffer.cpp
index b64668ede2..b64668ede2 100644
--- a/gpu/src/GrGLIndexBuffer.cpp
+++ b/src/gpu/GrGLIndexBuffer.cpp
diff --git a/gpu/src/GrGLIndexBuffer.h b/src/gpu/GrGLIndexBuffer.h
index c3e2287260..c3e2287260 100644
--- a/gpu/src/GrGLIndexBuffer.h
+++ b/src/gpu/GrGLIndexBuffer.h
diff --git a/gpu/src/GrGLInterface.cpp b/src/gpu/GrGLInterface.cpp
index 70dd019f83..70dd019f83 100644
--- a/gpu/src/GrGLInterface.cpp
+++ b/src/gpu/GrGLInterface.cpp
diff --git a/gpu/src/GrGLProgram.cpp b/src/gpu/GrGLProgram.cpp
index 4b4140d206..4b4140d206 100644
--- a/gpu/src/GrGLProgram.cpp
+++ b/src/gpu/GrGLProgram.cpp
diff --git a/gpu/src/GrGLProgram.h b/src/gpu/GrGLProgram.h
index dafa79dc29..dafa79dc29 100644
--- a/gpu/src/GrGLProgram.h
+++ b/src/gpu/GrGLProgram.h
diff --git a/gpu/src/GrGLRenderTarget.cpp b/src/gpu/GrGLRenderTarget.cpp
index 290ae2e47d..290ae2e47d 100644
--- a/gpu/src/GrGLRenderTarget.cpp
+++ b/src/gpu/GrGLRenderTarget.cpp
diff --git a/gpu/src/GrGLRenderTarget.h b/src/gpu/GrGLRenderTarget.h
index 5aeb36dc65..5aeb36dc65 100644
--- a/gpu/src/GrGLRenderTarget.h
+++ b/src/gpu/GrGLRenderTarget.h
diff --git a/gpu/src/GrGLShaderVar.h b/src/gpu/GrGLShaderVar.h
index 5c50079558..5c50079558 100644
--- a/gpu/src/GrGLShaderVar.h
+++ b/src/gpu/GrGLShaderVar.h
diff --git a/gpu/src/GrGLStencilBuffer.cpp b/src/gpu/GrGLStencilBuffer.cpp
index bc0bb364e8..bc0bb364e8 100644
--- a/gpu/src/GrGLStencilBuffer.cpp
+++ b/src/gpu/GrGLStencilBuffer.cpp
diff --git a/gpu/src/GrGLStencilBuffer.h b/src/gpu/GrGLStencilBuffer.h
index eaf7942118..eaf7942118 100644
--- a/gpu/src/GrGLStencilBuffer.h
+++ b/src/gpu/GrGLStencilBuffer.h
diff --git a/gpu/src/GrGLTexture.cpp b/src/gpu/GrGLTexture.cpp
index e302694043..e302694043 100644
--- a/gpu/src/GrGLTexture.cpp
+++ b/src/gpu/GrGLTexture.cpp
diff --git a/gpu/src/GrGLTexture.h b/src/gpu/GrGLTexture.h
index b0dc368adf..b0dc368adf 100644
--- a/gpu/src/GrGLTexture.h
+++ b/src/gpu/GrGLTexture.h
diff --git a/gpu/src/GrGLUtil.cpp b/src/gpu/GrGLUtil.cpp
index 8056e66216..8056e66216 100644
--- a/gpu/src/GrGLUtil.cpp
+++ b/src/gpu/GrGLUtil.cpp
diff --git a/gpu/src/GrGLVertexBuffer.cpp b/src/gpu/GrGLVertexBuffer.cpp
index 33c1e7e3e0..33c1e7e3e0 100644
--- a/gpu/src/GrGLVertexBuffer.cpp
+++ b/src/gpu/GrGLVertexBuffer.cpp
diff --git a/gpu/src/GrGLVertexBuffer.h b/src/gpu/GrGLVertexBuffer.h
index 15fc54a983..15fc54a983 100644
--- a/gpu/src/GrGLVertexBuffer.h
+++ b/src/gpu/GrGLVertexBuffer.h
diff --git a/gpu/src/GrGeometryBuffer.h b/src/gpu/GrGeometryBuffer.h
index c74b25487d..c74b25487d 100644
--- a/gpu/src/GrGeometryBuffer.h
+++ b/src/gpu/GrGeometryBuffer.h
diff --git a/gpu/src/GrGpu.cpp b/src/gpu/GrGpu.cpp
index b05f2c0b1d..b05f2c0b1d 100644
--- a/gpu/src/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
diff --git a/gpu/src/GrGpu.h b/src/gpu/GrGpu.h
index 9107554cd6..9107554cd6 100644
--- a/gpu/src/GrGpu.h
+++ b/src/gpu/GrGpu.h
diff --git a/gpu/src/GrGpuFactory.cpp b/src/gpu/GrGpuFactory.cpp
index 9498da21c3..9498da21c3 100644
--- a/gpu/src/GrGpuFactory.cpp
+++ b/src/gpu/GrGpuFactory.cpp
diff --git a/gpu/src/GrGpuGL.cpp b/src/gpu/GrGpuGL.cpp
index b27815b6d4..b27815b6d4 100644
--- a/gpu/src/GrGpuGL.cpp
+++ b/src/gpu/GrGpuGL.cpp
diff --git a/gpu/src/GrGpuGL.h b/src/gpu/GrGpuGL.h
index a2630c8b2c..a2630c8b2c 100644
--- a/gpu/src/GrGpuGL.h
+++ b/src/gpu/GrGpuGL.h
diff --git a/gpu/src/GrGpuGLFixed.cpp b/src/gpu/GrGpuGLFixed.cpp
index 336b687be8..336b687be8 100644
--- a/gpu/src/GrGpuGLFixed.cpp
+++ b/src/gpu/GrGpuGLFixed.cpp
diff --git a/gpu/src/GrGpuGLFixed.h b/src/gpu/GrGpuGLFixed.h
index 0e624b59db..0e624b59db 100644
--- a/gpu/src/GrGpuGLFixed.h
+++ b/src/gpu/GrGpuGLFixed.h
diff --git a/gpu/src/GrGpuGLShaders.cpp b/src/gpu/GrGpuGLShaders.cpp
index f1bc5ecae7..f1bc5ecae7 100644
--- a/gpu/src/GrGpuGLShaders.cpp
+++ b/src/gpu/GrGpuGLShaders.cpp
diff --git a/gpu/src/GrGpuGLShaders.h b/src/gpu/GrGpuGLShaders.h
index 0c8322b7b4..0c8322b7b4 100644
--- a/gpu/src/GrGpuGLShaders.h
+++ b/src/gpu/GrGpuGLShaders.h
diff --git a/gpu/src/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
index 5e3c769d32..5e3c769d32 100644
--- a/gpu/src/GrInOrderDrawBuffer.cpp
+++ b/src/gpu/GrInOrderDrawBuffer.cpp
diff --git a/gpu/src/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
index 327352539e..327352539e 100644
--- a/gpu/src/GrInOrderDrawBuffer.h
+++ b/src/gpu/GrInOrderDrawBuffer.h
diff --git a/gpu/src/GrIndexBuffer.h b/src/gpu/GrIndexBuffer.h
index faa5018d32..faa5018d32 100644
--- a/gpu/src/GrIndexBuffer.h
+++ b/src/gpu/GrIndexBuffer.h
diff --git a/gpu/src/GrMatrix.cpp b/src/gpu/GrMatrix.cpp
index e71636b366..e71636b366 100644
--- a/gpu/src/GrMatrix.cpp
+++ b/src/gpu/GrMatrix.cpp
diff --git a/gpu/src/GrMemory.cpp b/src/gpu/GrMemory.cpp
index fa6ee2fda3..fa6ee2fda3 100644
--- a/gpu/src/GrMemory.cpp
+++ b/src/gpu/GrMemory.cpp
diff --git a/gpu/src/GrPathRenderer.cpp b/src/gpu/GrPathRenderer.cpp
index 929941a47e..929941a47e 100644
--- a/gpu/src/GrPathRenderer.cpp
+++ b/src/gpu/GrPathRenderer.cpp
diff --git a/gpu/src/GrPathRenderer.h b/src/gpu/GrPathRenderer.h
index d95cc85afc..d95cc85afc 100644
--- a/gpu/src/GrPathRenderer.h
+++ b/src/gpu/GrPathRenderer.h
diff --git a/gpu/src/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index 7a064e8c9c..7a064e8c9c 100644
--- a/gpu/src/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
diff --git a/gpu/src/GrPathRendererChain.h b/src/gpu/GrPathRendererChain.h
index 5719484921..5719484921 100644
--- a/gpu/src/GrPathRendererChain.h
+++ b/src/gpu/GrPathRendererChain.h
diff --git a/gpu/src/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp
index 0a7759d8a1..0a7759d8a1 100644
--- a/gpu/src/GrPathUtils.cpp
+++ b/src/gpu/GrPathUtils.cpp
diff --git a/gpu/src/GrPathUtils.h b/src/gpu/GrPathUtils.h
index 5dc06aaf41..5dc06aaf41 100644
--- a/gpu/src/GrPathUtils.h
+++ b/src/gpu/GrPathUtils.h
diff --git a/gpu/src/GrPrintf_printf.cpp b/src/gpu/GrPrintf_printf.cpp
index 909a4f0a64..909a4f0a64 100644
--- a/gpu/src/GrPrintf_printf.cpp
+++ b/src/gpu/GrPrintf_printf.cpp
diff --git a/gpu/src/GrRectanizer.cpp b/src/gpu/GrRectanizer.cpp
index 628b89074c..628b89074c 100644
--- a/gpu/src/GrRectanizer.cpp
+++ b/src/gpu/GrRectanizer.cpp
diff --git a/gpu/src/GrRectanizer_fifo.cpp b/src/gpu/GrRectanizer_fifo.cpp
index 3bfc46f4a3..3bfc46f4a3 100644
--- a/gpu/src/GrRectanizer_fifo.cpp
+++ b/src/gpu/GrRectanizer_fifo.cpp
diff --git a/gpu/src/GrRedBlackTree.h b/src/gpu/GrRedBlackTree.h
index da5ae3e3b2..da5ae3e3b2 100644
--- a/gpu/src/GrRedBlackTree.h
+++ b/src/gpu/GrRedBlackTree.h
diff --git a/gpu/src/GrRenderTarget.cpp b/src/gpu/GrRenderTarget.cpp
index a5f1216571..a5f1216571 100644
--- a/gpu/src/GrRenderTarget.cpp
+++ b/src/gpu/GrRenderTarget.cpp
diff --git a/gpu/src/GrResource.cpp b/src/gpu/GrResource.cpp
index 5d7375ffb9..5d7375ffb9 100644
--- a/gpu/src/GrResource.cpp
+++ b/src/gpu/GrResource.cpp
diff --git a/gpu/src/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp
index 3094721cee..3094721cee 100644
--- a/gpu/src/GrResourceCache.cpp
+++ b/src/gpu/GrResourceCache.cpp
diff --git a/gpu/src/GrResourceCache.h b/src/gpu/GrResourceCache.h
index d3a8f03138..d3a8f03138 100644
--- a/gpu/src/GrResourceCache.h
+++ b/src/gpu/GrResourceCache.h
diff --git a/gpu/src/GrStencil.cpp b/src/gpu/GrStencil.cpp
index 376e057754..376e057754 100644
--- a/gpu/src/GrStencil.cpp
+++ b/src/gpu/GrStencil.cpp
diff --git a/gpu/src/GrStencilBuffer.cpp b/src/gpu/GrStencilBuffer.cpp
index 4b08e238ef..4b08e238ef 100644
--- a/gpu/src/GrStencilBuffer.cpp
+++ b/src/gpu/GrStencilBuffer.cpp
diff --git a/gpu/src/GrStencilBuffer.h b/src/gpu/GrStencilBuffer.h
index 5249ce8466..5249ce8466 100644
--- a/gpu/src/GrStencilBuffer.h
+++ b/src/gpu/GrStencilBuffer.h
diff --git a/gpu/src/GrTesselatedPathRenderer.cpp b/src/gpu/GrTesselatedPathRenderer.cpp
index 3c4bb0100c..3c4bb0100c 100644
--- a/gpu/src/GrTesselatedPathRenderer.cpp
+++ b/src/gpu/GrTesselatedPathRenderer.cpp
diff --git a/gpu/src/GrTesselatedPathRenderer.h b/src/gpu/GrTesselatedPathRenderer.h
index d4f22438c6..d4f22438c6 100644
--- a/gpu/src/GrTesselatedPathRenderer.h
+++ b/src/gpu/GrTesselatedPathRenderer.h
diff --git a/gpu/src/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index 06cc2a125f..06cc2a125f 100644
--- a/gpu/src/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
diff --git a/gpu/src/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp
index b8762adc11..b8762adc11 100644
--- a/gpu/src/GrTextStrike.cpp
+++ b/src/gpu/GrTextStrike.cpp
diff --git a/gpu/src/GrTextStrike_impl.h b/src/gpu/GrTextStrike_impl.h
index 1b6392c1fe..1b6392c1fe 100644
--- a/gpu/src/GrTextStrike_impl.h
+++ b/src/gpu/GrTextStrike_impl.h
diff --git a/gpu/src/GrTexture.cpp b/src/gpu/GrTexture.cpp
index 77868dfc9f..77868dfc9f 100644
--- a/gpu/src/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
diff --git a/gpu/src/GrVertexBuffer.h b/src/gpu/GrVertexBuffer.h
index bda235c7b9..bda235c7b9 100644
--- a/gpu/src/GrVertexBuffer.h
+++ b/src/gpu/GrVertexBuffer.h
diff --git a/gpu/src/android/GrGLDefaultInterface_android.cpp b/src/gpu/android/GrGLDefaultInterface_android.cpp
index 7de4bd1a65..7de4bd1a65 100644
--- a/gpu/src/android/GrGLDefaultInterface_android.cpp
+++ b/src/gpu/android/GrGLDefaultInterface_android.cpp
diff --git a/gpu/src/app-android.cpp b/src/gpu/app-android.cpp
index 39cca6ce1a..39cca6ce1a 100644
--- a/gpu/src/app-android.cpp
+++ b/src/gpu/app-android.cpp
diff --git a/gpu/src/gr_hello_world.cpp b/src/gpu/gr_hello_world.cpp
index b475fb8de9..b475fb8de9 100644
--- a/gpu/src/gr_hello_world.cpp
+++ b/src/gpu/gr_hello_world.cpp
diff --git a/gpu/src/gr_unittests.cpp b/src/gpu/gr_unittests.cpp
index 6e51e19a7c..6e51e19a7c 100644
--- a/gpu/src/gr_unittests.cpp
+++ b/src/gpu/gr_unittests.cpp
diff --git a/gpu/src/ios/GrGLDefaultInterface_iOS.cpp b/src/gpu/ios/GrGLDefaultInterface_iOS.cpp
index 7be40db89a..7be40db89a 100644
--- a/gpu/src/ios/GrGLDefaultInterface_iOS.cpp
+++ b/src/gpu/ios/GrGLDefaultInterface_iOS.cpp
diff --git a/gpu/src/ios/SkUIView.mm b/src/gpu/ios/SkUIView.mm
index 261ed9ca1f..261ed9ca1f 100644
--- a/gpu/src/ios/SkUIView.mm
+++ b/src/gpu/ios/SkUIView.mm
diff --git a/gpu/src/mac/GrGLDefaultInterface_mac.cpp b/src/gpu/mac/GrGLDefaultInterface_mac.cpp
index ba43975406..ba43975406 100644
--- a/gpu/src/mac/GrGLDefaultInterface_mac.cpp
+++ b/src/gpu/mac/GrGLDefaultInterface_mac.cpp
diff --git a/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp b/src/gpu/mesa/GrGLDefaultInterface_mesa.cpp
index 793e65c61e..793e65c61e 100644
--- a/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp
+++ b/src/gpu/mesa/GrGLDefaultInterface_mesa.cpp
diff --git a/gpu/src/unix/GrGLDefaultInterface_unix.cpp b/src/gpu/unix/GrGLDefaultInterface_unix.cpp
index 041caec1c5..041caec1c5 100644
--- a/gpu/src/unix/GrGLDefaultInterface_unix.cpp
+++ b/src/gpu/unix/GrGLDefaultInterface_unix.cpp
diff --git a/gpu/src/win/GrGLDefaultInterface_win.cpp b/src/gpu/win/GrGLDefaultInterface_win.cpp
index 609869f83d..609869f83d 100644
--- a/gpu/src/win/GrGLDefaultInterface_win.cpp
+++ b/src/gpu/win/GrGLDefaultInterface_win.cpp