Revert 136857 - roll skia to 3912

mirror of https://chromiumcodereview.appspot.com/10310126/
Review URL: https://chromiumcodereview.appspot.com/10391105

TBR=reed@google.com
Review URL: https://chromiumcodereview.appspot.com/10356152

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

2 files changed, 49 insertions, 1 deletions

diff --git a/DEPS b/DEPS
index 2556b5d..5a378ec 100644
--- a/DEPS
+++ b/DEPS
@@ -52,7 +52,7 @@ vars = {
   "ffmpeg_hash": "5938434ce9f24585e3f1ee4016f85ac3e837ee57",
 
   "sfntly_revision": "128",
-  "skia_revision": "3919",
+  "skia_revision": "3902",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.
@@ -149,6 +149,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 988fed2..ea106f5 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -409,6 +409,8 @@
         '../third_party/skia/src/gpu/GrTDArray.h',
         '../third_party/skia/src/gpu/GrTHashCache.h',
         '../third_party/skia/src/gpu/GrTLList.h',
+        '../third_party/skia/src/gpu/GrTesselatedPathRenderer.cpp',
+        '../third_party/skia/src/gpu/GrTesselatedPathRenderer.h',
         '../third_party/skia/src/gpu/GrTextStrike.cpp',
         '../third_party/skia/src/gpu/GrTextStrike.h',
         '../third_party/skia/src/gpu/GrTextStrike_impl.h',
@@ -1003,6 +1005,7 @@
       ],
       'dependencies': [
         'skia_opts',
+        'skia_libtess',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../third_party/sfntly/sfntly.gyp:sfntly',
         '../third_party/zlib/zlib.gyp:zlib',
@@ -1219,6 +1222,48 @@
       ],
     },
     {
+      'target_name': 'skia_libtess',
+      'type': 'static_library',
+      'variables': {
+        'optimize': 'max',
+      },
+      'include_dirs': [
+        '../third_party/skia/third_party/glu',
+      ],
+      'sources': [
+        '../third_party/skia/third_party/glu/sk_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': [