962667 - Don't optimize quartz image surfaces if there is nothing to do

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Michael Wu [:mwu]]

Attachment: Avoid unnecessary creation of a new gfxQuartzImageSurface

We don't need to do anything on OSX if the image format doesn't change. The surface is always allocated by ourselves and the image code already has it wrapped in a gfxQuartzImageSurface.

Comment 1

[Jeff Muizelaar [:jrmuizel]]

(In reply to Michael Wu [:mwu] from comment #0)
> Created attachment 8363778 [details] [diff] [review]
> Avoid unnecessary creation of a new gfxQuartzImageSurface
> 
> We don't need to do anything on OSX if the image format doesn't change. The
> surface is always allocated by ourselves and the image code already has it
> wrapped in a gfxQuartzImageSurface.

OptimizeImage() is only called when mQuartzSurface is NULL which suggests that we don't still have the gfxQuartzImageSurface wrapper around. So I'm not sure how this patch helps.

Comment 2

[Michael Wu [:mwu]]

Huh, you're right. I missed that path.

Comment 3

[Michael Wu [:mwu]]

Comment on attachment 8363778 [details] [diff] [review]
Avoid unnecessary creation of a new gfxQuartzImageSurface

Clearing review while I try to understand the code a bit better.

Comment 4

[Michael Wu [:mwu]]

Attachment: Avoid using mOptSurface when no optimization is necessary

This removes the code that reuses the quartz surface. This helps in cases where the image ends up being scaled. (I am assuming that scaling code is actually used. I haven't checked.) The image gets locked (via LockImageData) again when scaling, which forces a copy to a new gfxImageSurface.

Comment 5

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 8364638 [details] [diff] [review]
Avoid using mOptSurface when no optimization is necessary

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

This seems ok. It might be worth splitting the two pieces up into separate patches.

Comment 6

[Michael Wu [:mwu]]

Split into two commits.

https://hg.mozilla.org/integration/mozilla-inbound/rev/fc3d3be15c0c
https://hg.mozilla.org/integration/mozilla-inbound/rev/977fb2494568

Comment 7

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/977fb2494568
https://hg.mozilla.org/mozilla-central/rev/fc3d3be15c0c