985217 - [Skia] Update Skia, 2014-03-18 (Firefox 31)

Status: RESOLVED FIXED

(Core :: Graphics, enhancement)

Description

[George Wright (:gw280) (needinfo me!)]

This is the first planned landing of the new Skia update schedule - once per train. This is targeting Firefox 31.

Comment 1

[George Wright (:gw280) (needinfo me!)]

https://tbpl.mozilla.org/?tree=Graphics&rev=2aef06c96029

Comment 2

[George Wright (:gw280) (needinfo me!)]

Attachment: 0002-Bug-985217-Enable-three-legacy-APIs-in-the-new-Skia-.patch

Enable legacy APIs for now, file bugs immediately after landing to track making the appropriate changes to gfx/2d to no longer require these.

Comment 3

[George Wright (:gw280) (needinfo me!)]

Attachment: 0003-Bug-985217-Minor-changes-to-gfx-2d-for-API-changes-i.patch

Comment 4

[George Wright (:gw280) (needinfo me!)]

Attachment: 0004-Bug-985217-Remove-client-side-array-functions-as-Ski.patch

Comment 5

[George Wright (:gw280) (needinfo me!)]

Attachment: 0005-Bug-985217-Stub-out-CreateTypeface-for-Mac-r-snorp.patch

I missed upstreaming this the last time round. Will upstream asap.

Comment 6

[George Wright (:gw280) (needinfo me!)]

Attachment: 0006-Bug-985217-Ensure-that-our-GLContext-is-current-and-.patch

Comment 7

[James Willcox (:snorp) ([e-mail]) (he/him)]

Comment on attachment 8394313 [details] [diff] [review]
0006-Bug-985217-Ensure-that-our-GLContext-is-current-and-.patch

Review of attachment 8394313 [details] [diff] [review]:
-----------------------------------------------------------------

::: gfx/gl/SkiaGLGlue.cpp
@@ +39,5 @@
> +}
> +
> +void EnsureGLContext(const GrGLInterface* i)
> +{
> +    const SkiaGLGlue* contextSkia = reinterpret_cast<const SkiaGLGlue*>(i->fCallbackData);

Maybe add a null guard here, since maybe Skia will someday start calling this at creation time too.

Comment 8

[George Wright (:gw280) (needinfo me!)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/dfba3a2480bc
https://hg.mozilla.org/integration/mozilla-inbound/rev/e1176480f8de
https://hg.mozilla.org/integration/mozilla-inbound/rev/7223dac2c37c
https://hg.mozilla.org/integration/mozilla-inbound/rev/3c74cf8975d5
https://hg.mozilla.org/integration/mozilla-inbound/rev/46e992a65343
https://hg.mozilla.org/integration/mozilla-inbound/rev/e6a116d382ae

Comment 9

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/dfba3a2480bc
https://hg.mozilla.org/mozilla-central/rev/e1176480f8de
https://hg.mozilla.org/mozilla-central/rev/7223dac2c37c
https://hg.mozilla.org/mozilla-central/rev/3c74cf8975d5
https://hg.mozilla.org/mozilla-central/rev/46e992a65343
https://hg.mozilla.org/mozilla-central/rev/e6a116d382ae