1017113 - [Skia] Update to 2014-07

Status: RESOLVED FIXED

(Core :: Graphics, enhancement)

Description

[Walter Litwinczyk [:walter]]

Attachment: skia_update_patch

Updated skia to newer version. Hopefully it's not too messed up.

Comment 1

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

As we discussed on IRC:

Please split up this patch into separate patches:

- One that simply updates the Skia code to the latest SVN revision, and the associated moz.build changes (this doesn't really need a review, r=upstream should be fine)
- One that changes any moz2d code to cater for Skia API changes etc
- Separate patches that deal with any further changes necessitated by the Skia update. They should be split into as many patches as makes sense.

Take a look at bug 985217 for an example of what I mean.

Of course, this update will be slightly more involved because we're also planning to split out local files into gfx/skia/local and gfx/skia/trunk will be a full checkout of upstream.

Comment 2

[Mike Hommey [:glandium]]

Please address bug 1023732 before further updating skia.

Comment 3

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

https://tbpl.mozilla.org/?tree=Try&rev=12fcebc1a5ca

Comment 4

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

updated run with moz.build fix: https://tbpl.mozilla.org/?tree=Try&rev=bce36282ecd7

Comment 5

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

third time lucky? https://tbpl.mozilla.org/?tree=Try&rev=0610cfcf2c19

Comment 6

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

Woo, after about a dozen attempts I finally managed to push a new try build:

https://tbpl.mozilla.org/?tree=Try&rev=06269b546389

Comment 7

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

Attachment: 0002-Bug-1017113-Calling-save-on-an-SkCanvas-no-longer-ta.patch

Comment 8

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

Attachment: 0003-Bug-1017113-Update-DrawTargetSkia-to-use-the-new-SkD.patch

Comment 9

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

Attachment: 0004-Bug-1017113-Remove-GL-functions-no-longer-required-b.patch

Comment 10

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

Attachment: 0005-Bug-1017113-Remove-unnecessary-SkEmptyShader.h-inclu.patch

Comment 11

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

Attachment: 0006-Bug-1017113-Update-SkFontHost_android_old.cpp-and-Sk.patch

Comment 12

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

Attachment: 0007-Bug-1017113-Add-some-legacy-defines-to-SkUserConfig..patch

Comment 13

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

Attachment: 0009-Bug-1017113-Update-buildsystem-for-new-Skia-r-snorp.patch

Comment 14

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

Attachment: 0010-Bug-1017113-Include-SkPreConfig.h-to-ensure-that-SK_.patch

Comment 15

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

Attachment: 0014-Bug-1017113-Add-RefPtrSkia-to-replace-SkRefPtr-funct.patch

Comment 16

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

Attachment: 0015-Bug-1017113-Use-RefPtrSkia-instead-of-SkRefPtr-as-it.patch

Comment 17

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

This is Skia from 2014-07-28 for what it's worth. They don't use SVN anymore so we don't have meaningful revision numbers.

Comment 18

[Matt Woodrow (:mattwoodrow)]

Comment on attachment 8469022 [details] [diff] [review]
0007-Bug-1017113-Add-some-legacy-defines-to-SkUserConfig..patch

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

::: gfx/skia/trunk/include/config/SkUserConfig.h
@@ +206,5 @@
>  #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0
> +
> +#define SK_SUPPORT_LEGACY_GETDEVICE
> +#define SK_SUPPORT_LEGACY_GETTOPDEVICE
> +#define SK_SUPPORT_LEGACY_BITMAP_CONFIG

Can we get rid of this with bug 1043745?

Comment 19

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

(In reply to Matt Woodrow (:mattwoodrow) from comment #18)
> Comment on attachment 8469022 [details] [diff] [review]
> 0007-Bug-1017113-Add-some-legacy-defines-to-SkUserConfig..patch
> 
> Review of attachment 8469022 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: gfx/skia/trunk/include/config/SkUserConfig.h
> @@ +206,5 @@
> >  #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0
> > +
> > +#define SK_SUPPORT_LEGACY_GETDEVICE
> > +#define SK_SUPPORT_LEGACY_GETTOPDEVICE
> > +#define SK_SUPPORT_LEGACY_BITMAP_CONFIG
> 
> Can we get rid of this with bug 1043745?

I think it's necessary but not sufficient.

Comment 20

[Matt Woodrow (:mattwoodrow)]

Comment on attachment 8469025 [details] [diff] [review]
0014-Bug-1017113-Add-RefPtrSkia-to-replace-SkRefPtr-funct.patch

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

Fine code wise, but get someone to confirm this is ok license-wise.

Comment 21

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

https://hg.mozilla.org/integration/mozilla-inbound/rev/8634d6832618
https://hg.mozilla.org/integration/mozilla-inbound/rev/13821c5b8d7f
https://hg.mozilla.org/integration/mozilla-inbound/rev/5168f0d8638e
https://hg.mozilla.org/integration/mozilla-inbound/rev/0c879222f713
https://hg.mozilla.org/integration/mozilla-inbound/rev/8131fb76e999
https://hg.mozilla.org/integration/mozilla-inbound/rev/66843861f0e7
https://hg.mozilla.org/integration/mozilla-inbound/rev/883cd6be06d2
https://hg.mozilla.org/integration/mozilla-inbound/rev/6ffb58cad19a
https://hg.mozilla.org/integration/mozilla-inbound/rev/156984ed5267
https://hg.mozilla.org/integration/mozilla-inbound/rev/ec999d65c6af
https://hg.mozilla.org/integration/mozilla-inbound/rev/3a3820a17f0b
https://hg.mozilla.org/integration/mozilla-inbound/rev/91b4b7c8cdfe
https://hg.mozilla.org/integration/mozilla-inbound/rev/f724798f08b6
https://hg.mozilla.org/integration/mozilla-inbound/rev/10146132cfa4

Comment 22

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/8634d6832618
https://hg.mozilla.org/mozilla-central/rev/13821c5b8d7f
https://hg.mozilla.org/mozilla-central/rev/5168f0d8638e
https://hg.mozilla.org/mozilla-central/rev/0c879222f713
https://hg.mozilla.org/mozilla-central/rev/8131fb76e999
https://hg.mozilla.org/mozilla-central/rev/66843861f0e7
https://hg.mozilla.org/mozilla-central/rev/883cd6be06d2
https://hg.mozilla.org/mozilla-central/rev/6ffb58cad19a
https://hg.mozilla.org/mozilla-central/rev/156984ed5267
https://hg.mozilla.org/mozilla-central/rev/ec999d65c6af
https://hg.mozilla.org/mozilla-central/rev/3a3820a17f0b
https://hg.mozilla.org/mozilla-central/rev/91b4b7c8cdfe
https://hg.mozilla.org/mozilla-central/rev/f724798f08b6
https://hg.mozilla.org/mozilla-central/rev/10146132cfa4

Comment 23

[Mike Hommey [:glandium]]

I'm sure every changeset before 883cd6be06d2 broke the build even more than bug 1043745 did.

883cd6be06d2 itself also breaks the build because moz.build doesn't match the new sources. That's fixed in the subsequent 6ffb58cad19a, but still...

In fact, none of the changesets from that push except the last one build.

883cd6be06d2 also touches CLOBBER, but there's no reason it needed to.

Bonus fact, the changeset summaries contain useless [PATCH] headers, probably coming from git-format-patch. Please use -k.

Comment 24

[Mike Hommey [:glandium]]

And two .orig files, as well as a .rej file were added:
  gfx/skia/trunk/src/pathops/SkLineParameters.h.orig
  gfx/skia/trunk/src/opts/SkBlitRow_opts_arm.cpp.orig
  gfx/skia/trunk/src/pathops/SkLineParameters.h.rej

Comment 25

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

https://hg.mozilla.org/integration/mozilla-inbound/rev/2c8a22b9c18f

Comment 26

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/2c8a22b9c18f