583033 - D2D fill currently always falls back with clear

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Bas Schouten (:bas.schouten)]

Attachment: Do not abort for operator clear

We return unsupported for all operators but ADD and OVER. Because the clear operator has been implemented after the operator check since the clipping patch. We should continue for operator clear and let it try.

Comment 1

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 461289 [details] [diff] [review]
Do not abort for operator clear

>diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
>--- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
>+++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
>@@ -2374,17 +2374,18 @@ _cairo_d2d_fill(void			*surface,
> 		cairo_clip_t		*clip)
> {
>     cairo_int_status_t status;
> 
>     cairo_d2d_surface_t *d2dsurf = static_cast<cairo_d2d_surface_t*>(surface);
> 
>     op = _cairo_d2d_simplify_operator(op, source);
> 
>-    if (op != CAIRO_OPERATOR_OVER && op != CAIRO_OPERATOR_ADD) {
>+    if (op != CAIRO_OPERATOR_OVER && op != CAIRO_OPERATOR_ADD &&
>+	op != CAIRO_OPERATOR_CLEAR) {

We should eventually try to get rid of this condition by handling the cases we support and bailing otherwise.

Comment 2

[Bas Schouten (:bas.schouten)]

Pushed http://hg.mozilla.org/mozilla-central/rev/8b83111e2a7f.

Comment 3

[lukaswrites.bugzilla]

why I can't see it on http://hg.mozilla.org/mozilla-central/shortlog ?

Comment 4

[Bas Schouten (:bas.schouten)]

(In reply to comment #3)
> why I can't see it on http://hg.mozilla.org/mozilla-central/shortlog ?

Bug 582998 perhaps?

Comment 5

[lukaswrites.bugzilla]

(In reply to comment #4)
> (In reply to comment #3)
> > why I can't see it on http://hg.mozilla.org/mozilla-central/shortlog ?
> 
> Bug 582998 perhaps?

you mean there's bug in http://hg.mozilla.org/mozilla-central/ ???

Comment 6

[Bas Schouten (:bas.schouten)]

It burped. Not the repository though, the pushlog.