Revert "Add gpu/ files from the public skia project into the chrome build."

This reverts commit r71998. It was committed by error by the commit bot.

BUG=
TEST=

Review URL: http://codereview.chromium.org/6351011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72000 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 105 deletions

diff --git a/DEPS b/DEPS
index acdbc8f..e286554 100644
--- a/DEPS
+++ b/DEPS
@@ -11,7 +11,7 @@ vars = {
   "libjingle_revision": "50",
   "libvpx_revision": "65287",
   "ffmpeg_revision": "71842",
-  "skia_revision": "716",
+  "skia_revision": "699",
 }
 
 deps = {
@@ -66,9 +66,6 @@ deps = {
     Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" +
     Var("nacl_revision"),
 
-  "src/third_party/skia/gpu":
-    (Var("googlecode_url") % "skia") + "/trunk/gpu@" + Var("skia_revision"),
-
   "src/third_party/skia/src":
     (Var("googlecode_url") % "skia") + "/trunk/src@" + Var("skia_revision"),
 
diff --git a/skia/skia.gyp b/skia/skia.gyp
index bb7e5ff..c08f405 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -9,84 +9,6 @@
       'type': '<(library)',
       'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D',
       'sources': [
-        '../third_party/skia/gpu/src/GrAllocPool.cpp',
-        '../third_party/skia/gpu/src/GrAtlas.cpp',
-        '../third_party/skia/gpu/src/GrClip.cpp',
-        '../third_party/skia/gpu/src/GrContext.cpp',
-        '../third_party/skia/gpu/src/GrDrawTarget.cpp',
-        '../third_party/skia/gpu/src/GrGLIndexBuffer.cpp',
-        '../third_party/skia/gpu/src/GrGLTexture.cpp',
-        '../third_party/skia/gpu/src/GrGLUtil.cpp',
-        '../third_party/skia/gpu/src/GrGLVertexBuffer.cpp',
-        '../third_party/skia/gpu/src/GrGpu.cpp',
-        '../third_party/skia/gpu/src/GrGpuGLShaders.cpp',
-        '../third_party/skia/gpu/src/GrGpuGLShaders.h',
-        '../third_party/skia/gpu/src/GrGpuFactory.cpp',
-        '../third_party/skia/gpu/src/GrGpuGL.cpp',
-        '../third_party/skia/gpu/src/GrGpuGL.h',
-        '../third_party/skia/gpu/src/GrInOrderDrawBuffer.cpp',
-        '../third_party/skia/gpu/src/GrMatrix.cpp',
-        '../third_party/skia/gpu/src/GrMemory.cpp',
-        '../third_party/skia/gpu/src/GrPath.cpp',
-        '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
-        '../third_party/skia/gpu/src/GrTextureCache.cpp',
-        '../third_party/skia/gpu/src/GrTextContext.cpp',
-        '../third_party/skia/gpu/src/GrTextStrike.cpp',
-        '../third_party/skia/gpu/src/GrTextStrike_impl.h',
-        '../third_party/skia/gpu/src/GrVertexBufferAllocPool.cpp',
-
-        '../third_party/skia/gpu/include/GrAllocPool.h',
-        '../third_party/skia/gpu/include/GrAllocator.h',
-        '../third_party/skia/gpu/include/GrAtlas.h',
-        '../third_party/skia/gpu/include/GrClip.h',
-        '../third_party/skia/gpu/include/GrClipIterator.h',
-        '../third_party/skia/gpu/include/GrColor.h',
-        '../third_party/skia/gpu/include/GrConfig.h',
-        '../third_party/skia/gpu/include/GrContext.h',
-        '../third_party/skia/gpu/include/GrDrawTarget.h',
-        '../third_party/skia/gpu/include/GrFontScaler.h',
-        '../third_party/skia/gpu/include/GrGLConfig.h',
-        '../third_party/skia/gpu/include/GrGLIndexBuffer.h',
-        '../third_party/skia/gpu/include/GrGLTexture.h',
-        '../third_party/skia/gpu/include/GrGLVertexBuffer.h',
-        '../third_party/skia/gpu/include/GrGlyph.h',
-        '../third_party/skia/gpu/include/GrGpu.h',
-        '../third_party/skia/gpu/include/GrGpuVertex.h',
-        '../third_party/skia/gpu/include/GrIPoint.h',
-        '../third_party/skia/gpu/include/GrInOrderDrawBuffer.h',
-        '../third_party/skia/gpu/include/GrIndexBuffer.h',
-        '../third_party/skia/gpu/include/GrInstanceCounter.h',
-        '../third_party/skia/gpu/include/GrKey.h',
-        '../third_party/skia/gpu/include/GrMatrix.h',
-        '../third_party/skia/gpu/include/GrMemory.h',
-        '../third_party/skia/gpu/include/GrMesh.h',
-        '../third_party/skia/gpu/include/GrNoncopyable.h',
-        '../third_party/skia/gpu/include/GrPath.h',
-        '../third_party/skia/gpu/include/GrPathIter.h',
-        '../third_party/skia/gpu/include/GrPathSink.h',
-        '../third_party/skia/gpu/include/GrPoint.h',
-        '../third_party/skia/gpu/include/GrRandom.h',
-        '../third_party/skia/gpu/include/GrRect.h',
-        '../third_party/skia/gpu/include/GrRectanizer.h',
-        '../third_party/skia/gpu/include/GrRefCnt.h',
-        '../third_party/skia/gpu/include/GrSamplerState.h',
-        '../third_party/skia/gpu/include/GrScalar.h',
-        '../third_party/skia/gpu/include/GrStopwatch.h',
-        '../third_party/skia/gpu/include/GrStringBuilder.h',
-        '../third_party/skia/gpu/include/GrTArray.h',
-        '../third_party/skia/gpu/include/GrTBSearch.h',
-        '../third_party/skia/gpu/include/GrTDArray.h',
-        '../third_party/skia/gpu/include/GrTHashCache.h',
-        '../third_party/skia/gpu/include/GrTLList.h',
-        '../third_party/skia/gpu/include/GrTextContext.h',
-        '../third_party/skia/gpu/include/GrTextStrike.h',
-        '../third_party/skia/gpu/include/GrTexture.h',
-        '../third_party/skia/gpu/include/GrTextureCache.h',
-        '../third_party/skia/gpu/include/GrTypes.h',
-        '../third_party/skia/gpu/include/GrUserConfig.h',
-        '../third_party/skia/gpu/include/GrVertexBuffer.h',
-        '../third_party/skia/gpu/include/GrVertexBufferAllocPool.h',
-
         #'../third_party/skia/src/animator/SkAnimate.h',
         #'../third_party/skia/src/animator/SkAnimateActive.cpp',
         #'../third_party/skia/src/animator/SkAnimateActive.h',
@@ -405,13 +327,6 @@
         '../third_party/skia/src/effects/SkRadialGradient_Table.h',
         '../third_party/skia/src/effects/SkTransparentShader.cpp',
 
-        '../third_party/skia/src/gpu/SkGpuCanvas.cpp',
-        '../third_party/skia/src/gpu/SkGpuDevice.cpp',
-        '../third_party/skia/src/gpu/GrPrintf_skia.cpp',
-        '../third_party/skia/src/gpu/SkGrFontScaler.cpp',
-        '../third_party/skia/src/gpu/SkGr.cpp',
-        '../third_party/skia/src/gpu/SkGrTexturePixelRef.cpp',
-
         '../third_party/skia/src/images/bmpdecoderhelper.cpp',
         '../third_party/skia/src/images/bmpdecoderhelper.h',
         '../third_party/skia/src/images/fpdfemb.h',
@@ -577,12 +492,6 @@
         '../third_party/skia/include/effects/SkPixelXorXfermode.h',
         '../third_party/skia/include/effects/SkTransparentShader.h',
 
-        '../third_party/skia/include/gpu/SkGpuCanvas.h',
-        '../third_party/skia/include/gpu/SkGpuDevice.h',
-        '../third_party/skia/include/gpu/SkGpuDeviceFactory.h',
-        '../third_party/skia/include/gpu/SkGr.h',
-        '../third_party/skia/include/gpu/SkGrTexturePixelRef.h',
-
         '../third_party/skia/include/ports/SkStream_Win.h',
 
         '../third_party/skia/include/images/SkFlipPixelRef.h',
@@ -641,14 +550,9 @@
         '../third_party/skia/include/config',
         '../third_party/skia/include/core',
         '../third_party/skia/include/effects',
-        '../third_party/skia/include/gpu',
         '../third_party/skia/include/images',
         '../third_party/skia/include/utils',
-        '../third_party/skia/gpu/include',
-        '../third_party/skia/gpu/src',
         '../third_party/skia/src/core',
-
-        '../gpu',
       ],
       'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
       'mac_framework_dirs': [
@@ -656,8 +560,6 @@
       ],
       'defines': [
         'SK_BUILD_NO_IMAGE_ENCODE',
-        'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
-        'GR_SKIP_2POINTRADIAL_PROGRAMS',
       ],
       'sources!': [
         '../third_party/skia/include/core/SkTypes.h',
@@ -760,8 +662,6 @@
           '../third_party/skia/include/config',
           '../third_party/skia/include/core',
           '../third_party/skia/include/effects',
-          '../third_party/skia/include/gpu',
-          '../third_party/skia/gpu/include',
           'ext',
         ],
         'mac_framework_dirs': [
@@ -773,7 +673,7 @@
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The
     # gcc lameness is that, in order to compile SSE2 intrinsics code, it
-    # must be passed the -msse2 flag.  However, with this flag, it may
+    # must be passed the -msse2 flag.  However, with this flag, it may 
     # emit SSE2 instructions even for scalar code, such as the CPUID
     # test used to test for the presence of SSE2.  So that, and all other
     # code must be compiled *without* -msse2.  The gyp lameness is that it