933019 - Remove the gfxContext(gfxASurface*) constructor and lots of code that's then dead as a result

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Jonathan Watt [:jwatt]]

Until we completely get rid of Thebes backed gfxContexts we're going to need to maintain Thebes and Moz2D code paths in lots of places in the tree. Matt has started getting rid of these in bug 922942, but there are still 70+ locations where the gfxContext(gfxASurface*) constructor is being invoked in the tree:

https://mxr.mozilla.org/mozilla-central/search?string=gfxContext%28&filter=[sS]urface&tree=mozilla-central

Comment 1

[Andreas Gal :gal]

Interested in helping here. I will work that list backwards.

Comment 2

[Andreas Gal :gal]

Actually I lied. I will start with this:

https://mxr.mozilla.org/mozilla-central/source/content/canvas/src/CanvasRenderingContext2D.cpp#2581

Comment 3

[Jonathan Watt [:jwatt]]

Attachment: part 1 - Remove the gfxContext(gfxASurface*) constructor

Comment 4

[Jonathan Watt [:jwatt]]

Attachment: part 2 - Remove the code for handling Thebes backed gfxContext in SVGEllipseElement.cpp

Comment 5

[Jonathan Watt [:jwatt]]

Attachment: part 3 - Remove the code for handling Thebes backed gfxContext in gfxDrawable.cpp

Comment 6

[Jonathan Watt [:jwatt]]

Attachment: part 4 - Remove the code for handling Thebes backed gfxContext in gfxFont

Comment 7

[Jonathan Watt [:jwatt]]

Attachment: part 5 - Remove code for handling Thebes backed gfxContext from various files under gfx/thebes/

Comment 8

[Jonathan Watt [:jwatt]]

Attachment: part 6 - Remove code for handling Thebes backed gfxContext in imgFrame.cpp

Comment 9

[Jonathan Watt [:jwatt]]

Attachment: part 7 - Remove code for handling Thebes backed gfxContext from various files under layout/base/

Comment 10

[Jonathan Watt [:jwatt]]

Attachment: part 8 - Remove code for handling Thebes backed gfxContext in nsNativeThemeCocoa.mm

Comment 11

[Jonathan Watt [:jwatt]]

Attachment: part 9 - Remove code for handling Thebes backed gfxContext from various files under gfx/layers/

Comment 12

[Jonathan Watt [:jwatt]]

Attachment: part 10 - Remove gfxContext::IsCairo()

Comment 13

[Jonathan Watt [:jwatt]]

Attachment: part 11 - Remove gfxContext::mCairo

Comment 14

[Bas Schouten (:bas.schouten)]

Comment on attachment 8451059 [details] [diff] [review]
part 7 - Remove code for handling Thebes backed gfxContext from various files under layout/base/

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

::: layout/base/nsCSSRendering.cpp
@@ +2542,1 @@
>    }

nit: I suspect this brace needs to go...

Comment 15

[Bas Schouten (:bas.schouten)]

Comment on attachment 8451089 [details] [diff] [review]
part 11 - Remove gfxContext::mCairo

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

W00t!!!!

::: gfx/thebes/gfxContext.cpp
@@ -162,5 @@
> -
> -    if (dx && dy)
> -        cairo_surface_get_device_offset(s, dx, dy);
> -    return gfxASurface::Wrap(s);
> -  } else {

nit: This ought to need a closing brace removed somewhere... and some indentation change.

Comment 16

[Jonathan Watt [:jwatt]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/b7c3d87d9b4d
https://hg.mozilla.org/integration/mozilla-inbound/rev/1e83d71dcecc
https://hg.mozilla.org/integration/mozilla-inbound/rev/46eba5b59c8f
https://hg.mozilla.org/integration/mozilla-inbound/rev/a3f97f0f4ed4
https://hg.mozilla.org/integration/mozilla-inbound/rev/44f182e38e82
https://hg.mozilla.org/integration/mozilla-inbound/rev/ac38dea88f94
https://hg.mozilla.org/integration/mozilla-inbound/rev/e4d559c6ebb4
https://hg.mozilla.org/integration/mozilla-inbound/rev/b01d4ca9800f
https://hg.mozilla.org/integration/mozilla-inbound/rev/fb0e0980c8b3
https://hg.mozilla.org/integration/mozilla-inbound/rev/378079b096af
https://hg.mozilla.org/integration/mozilla-inbound/rev/f2973e80c482

Comment 17

[Jonathan Watt [:jwatt]]

Somehow the removal of CopySurface ended up in a later (not yet pushed) patch in my queue. Pushed separately:

https://hg.mozilla.org/integration/mozilla-inbound/rev/e13ecd9e3def

Comment 18

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/b7c3d87d9b4d
https://hg.mozilla.org/mozilla-central/rev/1e83d71dcecc
https://hg.mozilla.org/mozilla-central/rev/46eba5b59c8f
https://hg.mozilla.org/mozilla-central/rev/a3f97f0f4ed4
https://hg.mozilla.org/mozilla-central/rev/44f182e38e82
https://hg.mozilla.org/mozilla-central/rev/ac38dea88f94
https://hg.mozilla.org/mozilla-central/rev/e4d559c6ebb4
https://hg.mozilla.org/mozilla-central/rev/b01d4ca9800f
https://hg.mozilla.org/mozilla-central/rev/fb0e0980c8b3
https://hg.mozilla.org/mozilla-central/rev/378079b096af
https://hg.mozilla.org/mozilla-central/rev/f2973e80c482
https://hg.mozilla.org/mozilla-central/rev/e13ecd9e3def

Comment 19

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Outstanding!

Comment 20

[Jonathan Watt [:jwatt]]

Thanks. :)