686453 - Ensure as many cairo surfaces are non-null as possible

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Comment 1

[Josh Matthews [:jdm]]

Attachment: Create invalid cairo surfaces instead of null pointers when possible.

Comment 2

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 559956 [details] [diff] [review]
Create invalid cairo surfaces instead of null pointers when possible.

It's not crystal clear that this is an improvement but feels like it's in the right direction.

The added white space changes make me a little sad

>@@ -83,27 +88,29 @@
> {
>     mCGContext = cairo_quartz_surface_get_cg_context (csurf);
>     CGContextRetain (mCGContext);
> 
>     Init(csurf, PR_TRUE);
> }
> 
> gfxQuartzSurface::gfxQuartzSurface(unsigned char *data,
>-                                   const gfxSize& size,
>+                                   const gfxSize& realSize,
>                                    long stride,
>                                    gfxImageFormat format,
>                                    PRBool aForPrinting)

Why realSize?

>-    : mCGContext(nsnull), mSize(size), mForPrinting(aForPrinting)
>+    : mCGContext(nsnull), mSize(realSize), mForPrinting(aForPrinting)
> {
>-    unsigned int width = (unsigned int) floor(size.width);
>-    unsigned int height = (unsigned int) floor(size.height);
>+    gfxIntSize size((unsigned int) floor(realSize.width),
>+                    (unsigned int) floor(realSize.height));
>+    if (!CheckSurfaceSize(size))
>+        MakeInvalid();
> 
>-    if (!CheckSurfaceSize(gfxIntSize(width, height)))
>-        return;
>+    unsigned int width = (unsigned int) floor(mSize.width);
>+    unsigned int height = (unsigned int) floor(mSize.height);

We shouldn't need to floor mSize

> # Animated gifs with a very large canvas, but tiny actual content.
>-asserts(2) load delaytest.html?523528-1.gif # Bug 564231
>+load delaytest.html?523528-1.gif

Yay!

Comment 3

[Josh Matthews [:jdm]]

http://hg.mozilla.org/integration/mozilla-inbound/rev/02ae1f7047eb

Comment 4

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/02ae1f7047eb