Add gpu/ files from the public skia project into the chrome build. This is in

preparation for experimenting with them to gpu-accelerate various aspects of
chrome's drawing. In this initial patch, the files will be built, but not
called.

Now with dependency on gpu lib for sharedlib build on linux

TEST=be sure that page rendering, and <canvas> rendering, look the same as before

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=71998

Review URL: http://codereview.chromium.org/6357006
Patch from Mike Reed <reed@google.com>.

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

1 files changed, 102 insertions, 1 deletions

diff --git a/skia/skia.gyp b/skia/skia.gyp
index c08f405..35df70c 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -9,6 +9,84 @@
       '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',
@@ -327,6 +405,13 @@
         '../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',
@@ -492,6 +577,12 @@
         '../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',
@@ -550,9 +641,14 @@
         '../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': [
@@ -560,6 +656,8 @@
       ],
       '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',
@@ -613,6 +711,7 @@
             '../build/linux/system.gyp:freetype2',
             '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
             '../third_party/icu/icu.gyp:icuuc',
+            '../gpu/gpu.gyp:gles2_c_lib',
           ],
           'cflags': [
             '-Wno-unused',
@@ -662,6 +761,8 @@
           '../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': [
@@ -673,7 +774,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