Roll skia r1385:1395

The non-DEPS changes were recommended by bsalomon in http://codereview.chromium.org/7052001/

BUG=none
TEST=none
TBR=vandebo

Review URL: http://codereview.chromium.org/6961031

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

DEPS

@@ -16,7 +16,7 @@ vars = {
   "libjingle_revision": "59",
   "libvpx_revision": "81610",
   "ffmpeg_revision": "83815",
-  "skia_revision": "1385",
+  "skia_revision": "1395",
   "v8_revision": "7928",
 }
 

ui/gfx/gl/gl_bindings_skia_in_process.cc

@@ -566,6 +566,7 @@ void BindSkiaToInProcessGL() {
       NULL,  // glResolveMultisampleFramebuffer
       StubGLMapBuffer,
       StubGLUnmapBuffer,
+      NULL,  // glBindFragDataLocationIndexed
       GrGLInterface::kStaticInitEndGuard,
     };
     GrGLSetGLInterface(&host_gl_interface);

webkit/glue/gl_bindings_skia_cmd_buffer.cc

@@ -125,6 +125,7 @@ void BindSkiaToCommandBufferGL() {
     NULL,  // glResolveMultisampleFramebuffer
     NULL,  // glMapBuffer
     NULL,  // glUnmapBuffer
+    NULL,  // glBindFragDataLocationIndexed
 
     GrGLInterface::kStaticInitEndGuard
   };