Title: [137839] trunk
- Revision
- 137839
- Author
- [email protected]
- Date
- 2012-12-16 09:59:46 -0800 (Sun, 16 Dec 2012)
Log Message
[GTK][AC] Build failure with an option --with-acceleration-backend=clutter
https://bugs.webkit.org/show_bug.cgi?id=105027
Patch by ChangSeok Oh <[email protected]> on 2012-12-16
Reviewed by Gustavo Noronha Silva.
.:
I turned off opengl related variables, enable_glx, enable_egl and enable_gles2
when selecting clutter as the acceleration-backend. Because they seem useless for the AC by clutter.
* configure.ac:
Source/WebCore:
GLContext.* and RedirectedXCompositeWindow.* are meaningful only if opengl is
a backend for the AC. So I wrap them in USE_OPENGL.
No new tests. This patch fixes a build fauilure, not adding new features.
* GNUmakefile.list.am:
Modified Paths
Diff
Modified: trunk/ChangeLog (137838 => 137839)
--- trunk/ChangeLog 2012-12-16 15:41:47 UTC (rev 137838)
+++ trunk/ChangeLog 2012-12-16 17:59:46 UTC (rev 137839)
@@ -1,3 +1,15 @@
+2012-12-16 ChangSeok Oh <[email protected]>
+
+ [GTK][AC] Build failure with an option --with-acceleration-backend=clutter
+ https://bugs.webkit.org/show_bug.cgi?id=105027
+
+ Reviewed by Gustavo Noronha Silva.
+
+ I turned off opengl related variables, enable_glx, enable_egl and enable_gles2
+ when selecting clutter as the acceleration-backend. Because they seem useless for the AC by clutter.
+
+ * configure.ac:
+
2012-12-15 Simon Fraser <[email protected]>
Fix repaint issues when resizing a window with centered content, for platforms with a tile cache
Modified: trunk/Source/WebCore/ChangeLog (137838 => 137839)
--- trunk/Source/WebCore/ChangeLog 2012-12-16 15:41:47 UTC (rev 137838)
+++ trunk/Source/WebCore/ChangeLog 2012-12-16 17:59:46 UTC (rev 137839)
@@ -1,3 +1,17 @@
+2012-12-16 ChangSeok Oh <[email protected]>
+
+ [GTK][AC] Build failure with an option --with-acceleration-backend=clutter
+ https://bugs.webkit.org/show_bug.cgi?id=105027
+
+ Reviewed by Gustavo Noronha Silva.
+
+ GLContext.* and RedirectedXCompositeWindow.* are meaningful only if opengl is
+ a backend for the AC. So I wrap them in USE_OPENGL.
+
+ No new tests. This patch fixes a build fauilure, not adding new features.
+
+ * GNUmakefile.list.am:
+
2012-12-16 Víctor Manuel Jáquez Leal <[email protected]>
[GStreamer] create playbin in ::load(), not in player constructor
Modified: trunk/Source/WebCore/GNUmakefile.list.am (137838 => 137839)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-12-16 15:41:47 UTC (rev 137838)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-12-16 17:59:46 UTC (rev 137839)
@@ -6103,16 +6103,19 @@
if TARGET_X11
webcoregtk_sources += \
- Source/WebCore/platform/graphics/cairo/GLContext.cpp \
- Source/WebCore/platform/graphics/cairo/GLContext.h \
Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp \
- Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
- Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h \
Source/WebCore/plugins/gtk/gtk2xtbin.c \
Source/WebCore/plugins/gtk/gtk2xtbin.h \
Source/WebCore/plugins/gtk/PluginPackageGtk.cpp \
Source/WebCore/plugins/gtk/PluginViewGtk.cpp \
Source/WebCore/plugins/gtk/xembed.h
+if USE_OPENGL
+webcoregtk_sources += \
+ Source/WebCore/platform/graphics/cairo/GLContext.cpp \
+ Source/WebCore/platform/graphics/cairo/GLContext.h \
+ Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
+ Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
+endif # END USE_OPENGL
if USE_EGL
webcoregtk_sources += \
Source/WebCore/platform/graphics/egl/GLContextEGL.cpp \
Modified: trunk/configure.ac (137838 => 137839)
--- trunk/configure.ac 2012-12-16 15:41:47 UTC (rev 137838)
+++ trunk/configure.ac 2012-12-16 17:59:46 UTC (rev 137839)
@@ -1012,6 +1012,10 @@
AC_SUBST(CLUTTER_LIBS)
AC_SUBST(CLUTTER_GTK_CFLAGS)
AC_SUBST(CLUTTER_GTK_LIBS)
+
+ enable_gles2=no
+ enable_glx=no
+ enable_egl=no
fi
if test "$with_acceleration_backend" = "opengl"; then
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
