Rolling Skia DEPS to r1385 (and modifying affected gyp file)

Rolling Skia DEPS to r1385 (and modifying affected gyp file)

Corresponding "control" changelist (for comparison of trybot results) is http://codereview.chromium.org/7047016 .  I await results from the trybots.

It looks like a Skia change between r1365 and r1385 requires a change to skia/skia.gyp, because a previous DEPS roll try resulted in the following error in http://build.chromium.org/p/tryserver.chromium/builders/win_layout_rel/builds/236/steps/compile/logs/stdio

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=86090

[epoger, 2011-05-19 20:09:21]

Adding Nico since this might slop over into tomorrow, when he is Skia Gardener.

[epoger, 2011-05-19 21:31:27]

So far this one seems to be going OK, but there are still a few trybot results
to come in.  And I'm heading home now... so I'm going to bequeath this deps roll
to you, Nico (since you are Skia Gardener starting tomorrow)

[vandebo (ex-Chrome), 2011-05-19 21:36:07]

It LGTM.  I'm going to try the commit button and then push it if that doesn't
work.

[epoger, 2011-05-20 14:07:50]

<sigh> on several counts.

1. Steve pushed the "commit" checkbox, but the commit never happened.  (I just
ran "svn update", and I see that my changes have not landed.)  I see a few "try
success for 'commit-bot: 7052001-1'" messages in my inbox, no indication of
failure.

2. I tried to get 'provisional committer for rolling DEPS' status as described
at
http://dev.chromium.org/getting-involved/become-a-committer#TOC-I-just-need-t....
yesterday (Brian sent an email on my behalf), but the request emails bounced.  I
will check into how to do this successfully.

3. I got all 5 trybot results for this CL, but only 4 for the corresponding
control CL http://codereview.chromium.org/7047016 (the win_layout_rel test never
ran for the control CL).  So I cannot do a full comparison.  Other than that,
though, this CL seemed to fare pretty well and I think it's safe to commit.

I will leave all of this to new Skia Gardener Nico... Nico, feel free to ping me
if you want to coordinate on any of this.

-Elliot

[bsalomon, 2011-05-20 14:18:07]

As of skia r_1390 the following pretty trivial diff is needed to roll skia:

Index: webkit/glue/gl_bindings_skia_cmd_buffer.cc
===================================================================
--- webkit/glue/gl_bindings_skia_cmd_buffer.cc  (revision 85966)
+++ webkit/glue/gl_bindings_skia_cmd_buffer.cc  (working copy)
@@ -125,6 +125,7 @@
     NULL,  // glResolveMultisampleFramebuffer
     NULL,  // glMapBuffer
     NULL,  // glUnmapBuffer
+    NULL,  // glBindFragDataLocationIndexed

     GrGLInterface::kStaticInitEndGuard
   };
Index: ui/gfx/gl/gl_bindings_skia_in_process.cc
===================================================================
--- ui/gfx/gl/gl_bindings_skia_in_process.cc    (revision 85966)
+++ ui/gfx/gl/gl_bindings_skia_in_process.cc    (working copy)
@@ -566,6 +566,7 @@
       NULL,  // glResolveMultisampleFramebuffer
       StubGLMapBuffer,
       StubGLUnmapBuffer,
+      NULL,  // glBindFragDataLocationIndexed
       GrGLInterface::kStaticInitEndGuard,
     };
     GrGLSetGLInterface(&host_gl_interface);

[vandebo (ex-Chrome), 2011-05-20 16:11:07]

Oops, I forgot to circle back to this.  I will commit this CL as is and then let
Nico do the gardening from there.

[Nico, 2011-05-20 16:21:44]

On Fri, May 20, 2011 at 9:11 AM,  <vandebo@chromium.org> wrote:
> Oops, I forgot to circle back to this.  I will commit this CL as is and then
> let Nico do the gardening from there.

Cool, thanks! I was just starting to look at landing this CL :-)

Let me know when you're done.

>
> http://codereview.chromium.org/7052001/
>

[vandebo (ex-Chrome), 2011-05-20 16:25:58]

On 2011/05/20 16:21:44, Nico wrote:
> On Fri, May 20, 2011 at 9:11 AM,  <mailto:vandebo@chromium.org> wrote:
> > Oops, I forgot to circle back to this. &nbsp;I will commit this CL as is and
then
> > let Nico do the gardening from there.
> 
> Cool, thanks! I was just starting to look at landing this CL :-)
> 
> Let me know when you're done.

It's in, just watching the tree.