Title: [128294] trunk/Source/WebCore
- Revision
- 128294
- Author
- commit-qu...@webkit.org
- Date
- 2012-09-12 05:10:20 -0700 (Wed, 12 Sep 2012)
Log Message
[Qt] Build on X11 with GraphicsSurface but without NPAPI is broken
https://bugs.webkit.org/show_bug.cgi?id=96495
Patch by Simon Hausmann <simon.hausm...@nokia.com> on 2012-09-12
Reviewed by Kenneth Rohde Christiansen.
When enabling NPAPI we link against XRender on X11. The other component that needs Xrender
is GraphicsSurface. So when building without NPAPI we need to make sure that we link in Xrender.
This patch cleans up the GraphicsSurface related linkage required on Mac OS X and X11 by wrapping
it in use?(graphics_surface) instead of 3D_GRAPHICS. It is not neccesary to perform the have?(XCOMPOSITE)
check anymore because it's already done in features.prf before enabling use_graphics_surface in the
first place.
* WebCore.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128293 => 128294)
--- trunk/Source/WebCore/ChangeLog 2012-09-12 12:07:24 UTC (rev 128293)
+++ trunk/Source/WebCore/ChangeLog 2012-09-12 12:10:20 UTC (rev 128294)
@@ -1,3 +1,20 @@
+2012-09-12 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt] Build on X11 with GraphicsSurface but without NPAPI is broken
+ https://bugs.webkit.org/show_bug.cgi?id=96495
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ When enabling NPAPI we link against XRender on X11. The other component that needs Xrender
+ is GraphicsSurface. So when building without NPAPI we need to make sure that we link in Xrender.
+
+ This patch cleans up the GraphicsSurface related linkage required on Mac OS X and X11 by wrapping
+ it in use?(graphics_surface) instead of 3D_GRAPHICS. It is not neccesary to perform the have?(XCOMPOSITE)
+ check anymore because it's already done in features.prf before enabling use_graphics_surface in the
+ first place.
+
+ * WebCore.pri:
+
2012-09-12 Andrei Poenaru <poen...@adobe.com>
Web Inspector: Protocol Extension: Add "regionLayoutUpdate" event
Modified: trunk/Source/WebCore/WebCore.pri (128293 => 128294)
--- trunk/Source/WebCore/WebCore.pri 2012-09-12 12:07:24 UTC (rev 128293)
+++ trunk/Source/WebCore/WebCore.pri 2012-09-12 12:10:20 UTC (rev 128294)
@@ -197,8 +197,11 @@
use?(3D_GRAPHICS) {
contains(QT_CONFIG, opengles2):!win32: LIBS += -lEGL
+}
+
+use?(graphics_surface) {
mac: LIBS += -framework IOSurface -framework CoreFoundation
- linux-*:have?(XCOMPOSITE): LIBS += -lXcomposite
+ linux-*: LIBS += -lXcomposite -lXrender
}
!system-sqlite:exists( $${SQLITE3SRCDIR}/sqlite3.c ) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
