diff options
| author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 14:01:49 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 14:01:49 +0000 |
| commit | c6fb9c4673b12263b8ea54cf8b8df74091e4aa11 (patch) | |
| tree | 9ef57e6e7a809b9defa3b7d947044ebe76870ddb | |
| parent | ec2ce2bbf5148677fd5ec296fb18e1aa4e7f873b (diff) | |
| download | chromium_src-c6fb9c4673b12263b8ea54cf8b8df74091e4aa11.zip chromium_src-c6fb9c4673b12263b8ea54cf8b8df74091e4aa11.tar.gz chromium_src-c6fb9c4673b12263b8ea54cf8b8df74091e4aa11.tar.bz2 | |
Compile skia's drop of the GLU tesselator into Chrome, and add the
tesselated path renderer to the chrome build. Note that this does not
actually turn on the tesselated path renderer, but makes it easier to do
so later.
BUG=none
TEST=if it builds, you're happy
Review URL: http://codereview.chromium.org/6992091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87775 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 3 | ||||
| -rw-r--r-- | skia/skia.gyp | 42 |
2 files changed, 45 insertions, 0 deletions
@@ -96,6 +96,9 @@ deps = { "src/third_party/skia/include": (Var("googlecode_url") % "skia") + "/trunk/include@" + Var("skia_revision"), + "src/third_party/skia/third_party/glu": + (Var("googlecode_url") % "skia") + "/trunk/third_party/glu@" + Var("skia_revision"), + "src/third_party/WebKit/LayoutTests": Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"), diff --git a/skia/skia.gyp b/skia/skia.gyp index 1d0531b..f59c079 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -41,6 +41,7 @@ '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp', '../third_party/skia/gpu/src/GrResource.cpp', '../third_party/skia/gpu/src/GrStencil.cpp', + '../third_party/skia/gpu/src/GrTesselatedPathRenderer.cpp', '../third_party/skia/gpu/src/GrTexture.cpp', '../third_party/skia/gpu/src/GrTextureCache.cpp', '../third_party/skia/gpu/src/GrTextContext.cpp', @@ -95,6 +96,7 @@ '../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/GrTesselatedPathRenderer.h', '../third_party/skia/gpu/include/GrTextContext.h', '../third_party/skia/gpu/include/GrTextStrike.h', '../third_party/skia/gpu/include/GrTexture.h', @@ -834,6 +836,7 @@ ], 'dependencies': [ 'skia_opts', + 'skia_libtess', '../third_party/zlib/zlib.gyp:zlib', ], 'direct_dependent_settings': { @@ -930,6 +933,45 @@ ], }, { + 'target_name': 'skia_libtess', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/skia/third_party/glu', + ], + 'sources': [ + '../third_party/skia/third_party/glu/internal_glu.h', + '../third_party/skia/third_party/glu/gluos.h', + '../third_party/skia/third_party/glu/libtess/dict-list.h', + '../third_party/skia/third_party/glu/libtess/dict.c', + '../third_party/skia/third_party/glu/libtess/dict.h', + '../third_party/skia/third_party/glu/libtess/geom.c', + '../third_party/skia/third_party/glu/libtess/geom.h', + '../third_party/skia/third_party/glu/libtess/memalloc.c', + '../third_party/skia/third_party/glu/libtess/memalloc.h', + '../third_party/skia/third_party/glu/libtess/mesh.c', + '../third_party/skia/third_party/glu/libtess/mesh.h', + '../third_party/skia/third_party/glu/libtess/normal.c', + '../third_party/skia/third_party/glu/libtess/normal.h', + '../third_party/skia/third_party/glu/libtess/priorityq-heap.h', + '../third_party/skia/third_party/glu/libtess/priorityq-sort.h', + '../third_party/skia/third_party/glu/libtess/priorityq.c', + '../third_party/skia/third_party/glu/libtess/priorityq.h', + '../third_party/skia/third_party/glu/libtess/render.c', + '../third_party/skia/third_party/glu/libtess/render.h', + '../third_party/skia/third_party/glu/libtess/sweep.c', + '../third_party/skia/third_party/glu/libtess/sweep.h', + '../third_party/skia/third_party/glu/libtess/tess.c', + '../third_party/skia/third_party/glu/libtess/tess.h', + '../third_party/skia/third_party/glu/libtess/tessmono.c', + '../third_party/skia/third_party/glu/libtess/tessmono.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/skia/third_party/glu', + ], + }, + }, + { 'target_name': 'image_operations_bench', 'type': 'executable', 'dependencies': [ |