1057488 - Update OTS to 97d043dd8977751835ca8d33d773ae8416e456d5 or later

Status: RESOLVED FIXED

(Core :: Graphics: Text, defect)

Comment 1

[Frédéric Wang (:fredw)]

https://tbpl.mozilla.org/?tree=Try&rev=2d17c9666995

Comment 2

[Behdad Esfahbod]

Just curious, which fix do you want this for specifically?

We need to fix cmap soon: https://github.com/khaledhosny/ots/issues/34

Comment 3

[Frédéric Wang (:fredw)]

I saw that b2c8c01258eb706ab426fa72f53b8cacb61c22c8 changed again the way we pass info to OTSContext, so I wanted to update the Gecko code for that and also take the opportunity to add a small bash script to help keeping the code up-to-date. If there are important commits to take, I can just wait before asking a review.

Comment 4

[Behdad Esfahbod]

Ok, I think you can do the update on the Gecko side.  If we end up needing another commit I think taking that is easy enough later.  Thanks.

Comment 5

[Frédéric Wang (:fredw)]

Attachment: Part 1 - Add a small bash script to help keeping OTS up-to-date

Comment 6

[Frédéric Wang (:fredw)]

Attachment: Part 2 - Update OTS to 2a1859a6629bdb6f2915b1d3041621dbd396a4f7

Comment 7

[Frédéric Wang (:fredw)]

Attachment: Part 3 - Update OTS to 97d043dd8977751835ca8d33d773ae8416e456d5

Comment 8

[Jonathan Kew [:jfkthame]]

Comment on attachment 8477833 [details] [diff] [review]
Part 3 - Update OTS to 97d043dd8977751835ca8d33d773ae8416e456d5

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

::: gfx/thebes/gfxUserFontSet.cpp
@@ -194,5 @@
>      gfxProxyFontEntry  *mProxy;
>  };
>  
> -/* static */ bool
> -gfxProxyFontEntry::OTSMessage(void *aUserData, const char *format, ...)

Also remove the declaration from gfxUserFontSet.h.

Comment 9

[Frédéric Wang (:fredw)]

(In reply to Behdad Esfahbod from comment #2)
> Just curious, which fix do you want this for specifically?
> 
> We need to fix cmap soon: https://github.com/khaledhosny/ots/issues/34

(In reply to Behdad Esfahbod from comment #4)
> Ok, I think you can do the update on the Gecko side.  If we end up needing
> another commit I think taking that is easy enough later.  Thanks.

OK, I'll submit a fourth patch that includes https://github.com/khaledhosny/ots/issues/34. I'll just wait that my comment on https://github.com/khaledhosny/ots/commit/080d3a89d568e029cdc0b74f19081b61af1f25d1 is addressed.

Comment 10

[Frédéric Wang (:fredw)]

Attachment: Part 3 - Update OTS to 97d043dd8977751835ca8d33d773ae8416e456d5

Comment 11

[Frédéric Wang (:fredw)]

Attachment: Part 4 - Update OTS to 5c25bdac8f02080f49fa416ea997ed77e3be0d30

OK, here is part 4. We can take it if Jonathan is fine with the temporary "uncommenting" in gfx/ots/src/cff_type2_charstring.cc.

Comment 12

[Jonathan Kew [:jfkthame]]

Comment on attachment 8477877 [details] [diff] [review]
Part 4 - Update OTS to 5c25bdac8f02080f49fa416ea997ed77e3be0d30

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

::: gfx/ots/src/cff_type2_charstring.cc
@@ +707,5 @@
>        argument_stack->pop();
>      return true;
>    }
>  
> +  //OTS_WARNING("Undefined operator: %d (0x%x)", op, op);

There are plenty of other cases where this function returns failure without generating a specific message; so omitting this one for now doesn't seem too bad.

Comment 13

[Khaled Hosny]

(In reply to Jonathan Kew (:jfkthame) from comment #12)
> Comment on attachment 8477877 [details] [diff] [review]
> Part 4 - Update OTS to 5c25bdac8f02080f49fa416ea997ed77e3be0d30
> 
> Review of attachment 8477877 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: gfx/ots/src/cff_type2_charstring.cc
> @@ +707,5 @@
> >        argument_stack->pop();
> >      return true;
> >    }
> >  
> > +  //OTS_WARNING("Undefined operator: %d (0x%x)", op, op);
> 
> There are plenty of other cases where this function returns failure without
> generating a specific message; so omitting this one for now doesn't seem too
> bad.

Nothing is lost as far as Gecko is concerned actually, since previously OTS_WARNING wrote to the stderr and only when OTS_DEBUG was defined.

Comment 14

[Frédéric Wang (:fredw)]

Attachment: Part 4 - Update OTS to 5c25bdac8f02080f49fa416ea997ed77e3be0d30

Just adding the commit message...

https://tbpl.mozilla.org/?tree=Try&rev=45a0c006a19f

Comment 15

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/a7e585d5299f
https://hg.mozilla.org/integration/mozilla-inbound/rev/a2a702cbbf55
https://hg.mozilla.org/integration/mozilla-inbound/rev/96312bdb2fb4
https://hg.mozilla.org/integration/mozilla-inbound/rev/2bf8a805206e

Comment 16

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/a7e585d5299f
https://hg.mozilla.org/mozilla-central/rev/a2a702cbbf55
https://hg.mozilla.org/mozilla-central/rev/96312bdb2fb4
https://hg.mozilla.org/mozilla-central/rev/2bf8a805206e