chromium/src
0
Fork 0
Code Activity

Compile skia's drop of the GLU tesselator into Chrome, and add the

Browse Source 
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
This commit is contained in:
senorblanco@chromium.org
2011-06-03 14:01:49 +00:00
parent ec2ce2bbf5
commit c6fb9c4673
2 changed files with 45 additions and 0 deletions

3
DEPS

@ -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"),

42
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': {
@ -929,6 +932,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',