614721 - Remove some DirectDraw left overs

Status: VERIFIED FIXED

(Core :: Graphics, defect)

Description

[Matheus Kerschbaum]

User-Agent:       Mozilla/5.0 (Windows NT 6.1; rv:2.0b8pre) Gecko/20101124 Firefox/4.0b8pre
Build Identifier: 

See bug 606990 comment 9.

Reproducible: Always

Comment 1

[Serge Gautherie (:sgautherie)]

(In reply to comment #0)
> See bug 606990 comment 9.

{
Serge Gautherie (:sgautherie)      2010-11-24 15:05:59 PST

Indeed, it looks like a few more occurrences could be remove, see
http://mxr.mozilla.org/mozilla-central/search?string=DDRAW&case=1
"Found 14 matching lines in 6 files"
}

Comment 2

[Matheus Kerschbaum]

Attachment: patch

Comment 3

[Serge Gautherie (:sgautherie)]

Comment on attachment 494259 [details] [diff] [review]
patch

>diff --git a/gfx/cairo/cairo/src/cairo-ddraw.h b/gfx/cairo/cairo/src/cairo-ddraw.h

I'm not sure that cairo files should be touched.

>diff --git a/gfx/cairo/d2d.patch b/gfx/cairo/d2d.patch
> @@ -2009,7 +2010,8 @@ typedef enum _cairo_surface_type {
>-+    CAIRO_SURFACE_TYPE_DDRAW,

Morevover, you can't modify a patch number of lines without updating its header.

Comment 4

[Matheus Kerschbaum]

Attachment: patch

Serge's comments addressed.

Comment 5

[Serge Gautherie (:sgautherie)]

Comment on attachment 494316 [details] [diff] [review]
patch

(In reply to comment #3)
> >diff --git a/gfx/cairo/cairo/src/cairo-ddraw.h b/gfx/cairo/cairo/src/cairo-ddraw.h
> 
> I'm not sure that cairo files should be touched.

This file may be a Mozilla file rather than a (imported) Cairo file actually,
so it might be fine to remove it.
In that case, you would need to "update"
http://mxr.mozilla.org/mozilla-central/search?string=cairo-ddraw.h&case=1&find=%2Fgfx%2Fcairo%2Fcairo%2Fsrc%2F
{
/gfx/cairo/cairo/src/Makefile.in
    * line 170 -- EXPORTS_cairo += cairo-ddraw.h
}
too.
A reviewer will tell you...

Comment 6

[Joe Drew (not getting mail)]

Comment on attachment 494316 [details] [diff] [review]
patch

Looks good. I'm not sure if we still need _STRETCH32/_STRETCH24, though. Jeff can look at this too.

Comment 7

[Jeff Muizelaar [:jrmuizel]]

I'd rather the cairo change wait for the cairo update.

Comment 8

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 494316 [details] [diff] [review]
patch

This may need to be rebased, but the content is good.

Comment 9

[Matheus Kerschbaum]

Attachment: patch for checkin

Updated to tip and added commit message.

Comment 10

[Mounir Lamouri (:mounir)]

Comment on attachment 538170 [details] [diff] [review]
patch for checkin

Pushed to inbound.

Comment 11

[(no longer active)]

http://hg.mozilla.org/mozilla-central/rev/635d71b87150

Comment 12

[Mihaela Velimiroviciu (:mihaelav)]

Verified the files 

gfx/thebes/gfxWindowsPlatform.cpp
gfx/thebes/gfxWindowsPlatform.h
widget/src/windows/nsWindowGfx.cpp 

were updated in mozilla-central repository.
Is this enough to verify the fix?

Thank you!