288042 - cairo/svg does not build on qt, xlib

Status: RESOLVED FIXED

(Core :: SVG, defect, P1)

Description

[Christian :Biesinger (don't email me, ping me on IRC)]

nsSVGCairoCanvas.cpp currently only compiles on macosx and gtk, not qt or xlib.

Comment 1

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: gfx/src/{xlib,xprint} part

this patch allows to get a Display* from an xlib drawing surface.

Comment 2

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: gfx/src/qt part

makes GetPaintDevice (and GetPainter, for consistency) virtual, so that it can
be called from other modules

I could have used NS_EXPORT_ instead, but it looks like I'd still have to link
to libgfx_qt.so. I think I prefer making the functions virtual, but if
reviewers prefer I can change this.

Comment 3

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: layout/svg/renderer part

Comment 4

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 178841 [details] [diff] [review]
gfx/src/{xlib,xprint} part

this patch isn't actually needed...

Comment 5

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: layout/svg/renderer part, merged to trunk

also eliminates the need for gfx/src/xlib changes.

Comment 6

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 192196 [details] [diff] [review]
layout/svg/renderer part, merged to trunk

Qt/Xlib specific patch to allow building with SVG. does not affect the default
build.

Comment 7

[Dirk Mueller]

this eliminates the necessity for the Qt change too, no? At least I don't see 
why those methods should be virtual.. if at all they should be NS_EXPORT_ but 
you're using internal API anyway.. 

Comment 8

[Christian :Biesinger (don't email me, ping me on IRC)]

well, the qt change is still needed... if it's NS_EXPORT_ don't I need to link
against libgfx_qt? (I guess not with the linux linker... hm...)

Comment 9

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 178863 [details] [diff] [review]
gfx/src/qt part 

OK, our component libraries are loaded without RTLD_GLOBAL. and I can't link to
libgfx_qt either, because the dynamic linker doesn't find it (presumably
components/ isn't in the linker path). so the NS_EXPORT solution doesn't work.

given that, is this patch acceptable?

Comment 10

[Dirk Mueller]

its fine with me, but adding a comment on why a simple inline accessor is 
virtual wouldn't hurt.  

Comment 11

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: gfx/src/qt part, with comment

ok, although these are not inline...

Comment 12

[Zack Rusin]

Comment on attachment 192988 [details] [diff] [review]
gfx/src/qt part, with comment

looks good.

Comment 13

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 192988 [details] [diff] [review]
gfx/src/qt part, with comment

affects only the qt port and is a requirement for using cairo as the svg
renderer.

Comment 14

[Christian :Biesinger (don't email me, ping me on IRC)]

Checking in gfx/src/qt/nsDrawingSurfaceQt.h;
/cvsroot/mozilla/gfx/src/qt/nsDrawingSurfaceQt.h,v  <--  nsDrawingSurfaceQt.h
new revision: 1.4; previous revision: 1.3
done


Checking in layout/build/Makefile.in;
/cvsroot/mozilla/layout/build/Makefile.in,v  <--  Makefile.in
new revision: 1.128; previous revision: 1.127
done
Checking in layout/svg/renderer/src/cairo/Makefile.in;
/cvsroot/mozilla/layout/svg/renderer/src/cairo/Makefile.in,v  <--  Makefile.in
new revision: 1.19; previous revision: 1.18
done
Checking in layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp;
/cvsroot/mozilla/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp,v  <-- 
nsSVGCairoCanvas.cpp
new revision: 1.22; previous revision: 1.21
done

Comment 15

[Christian :Biesinger (don't email me, ping me on IRC)]

MOZILLA_1_8_BRANCH:
Checking in gfx/src/qt/nsDrawingSurfaceQt.h;
/cvsroot/mozilla/gfx/src/qt/nsDrawingSurfaceQt.h,v  <--  nsDrawingSurfaceQt.h
new revision: 1.3.18.1; previous revision: 1.3
done

Checking in layout/build/Makefile.in;
/cvsroot/mozilla/layout/build/Makefile.in,v  <--  Makefile.in
new revision: 1.127.8.1; previous revision: 1.127
done
Checking in layout/svg/renderer/src/cairo/Makefile.in;
/cvsroot/mozilla/layout/svg/renderer/src/cairo/Makefile.in,v  <--  Makefile.in
new revision: 1.18.6.1; previous revision: 1.18
done
Checking in layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp;
/cvsroot/mozilla/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp,v  <-- 
nsSVGCairoCanvas.cpp
new revision: 1.21.4.1; previous revision: 1.21
done