Roll Skia to r4780.

Review URL: https://chromiumcodereview.appspot.com/10826019

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

DEPS

@@ -57,7 +57,7 @@ vars = {
   "ffmpeg_hash": "23f177366e3bce3a628a7d3feedceed4e18dcc04",
 
   "sfntly_revision": "134",
-  "skia_revision": "4720",
+  "skia_revision": "4780",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.

skia/skia.gyp

@@ -387,6 +387,8 @@
         '../third_party/skia/src/gpu/GrIndexBuffer.h',
         '../third_party/skia/src/gpu/GrMatrix.cpp',
         '../third_party/skia/src/gpu/GrMemory.cpp',
+        '../third_party/skia/src/gpu/GrMemoryPool.cpp',
+        '../third_party/skia/src/gpu/GrMemoryPool.h',
         '../third_party/skia/src/gpu/GrPathRenderer.cpp',
         '../third_party/skia/src/gpu/GrPathRenderer.h',
         '../third_party/skia/src/gpu/GrPathRendererChain.cpp',
@@ -468,6 +470,9 @@
         '../third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp',
         '../third_party/skia/src/gpu/gl/GrGLTexture.cpp',
         '../third_party/skia/src/gpu/gl/GrGLTexture.h',
+        '../third_party/skia/src/gpu/gl/GrGLUniformManager.cpp',
+        '../third_party/skia/src/gpu/gl/GrGLUniformManager.h',
+        '../third_party/skia/src/gpu/gl/GrGLUniformHandle.h',
         '../third_party/skia/src/gpu/gl/GrGLUtil.cpp',
         '../third_party/skia/src/gpu/gl/GrGLUtil.h',
         '../third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp',

skia/skia_test_expectations.txt

@@ -394,5 +394,7 @@ BUGCR131189 WIN : tables/mozilla_expected_failures/bugs/bug92647-1.html = IMAGE
 BUGCR131189 LINUX WIN : tables/mozilla_expected_failures/marvin/backgr_fixed-bg.html = IMAGE
 BUGCR131189 WIN : tables/mozilla_expected_failures/marvin/backgr_layers-show.html = IMAGE
 BUGCR131189 WIN : transforms/2d/zoom-menulist.html = IMAGE
+// Rebaseline this after Skia rev. 4780 has landed
+BUGCR139162 LINUX : svg/W3C-SVG-1.1/filters-example-01-b.svg = IMAGE
 
 // END OVERRIDES HERE (this line ensures that the file is newline-terminated)