- Revision
- 104459
- Author
- commit-qu...@webkit.org
- Date
- 2012-01-09 07:08:42 -0800 (Mon, 09 Jan 2012)
Log Message
[GTK] [AC] Simplify accelerated compositing build options
https://bugs.webkit.org/show_bug.cgi?id=75518
Patch by Martin Robinson <mrobin...@igalia.com> on 2012-01-09
Reviewed by Gustavo Noronha Silva.
.:
* configure.ac: Remove the --enable-3d-rendering option. It's enabled by
default now when accelerated compositing is enabled.
* GNUmakefile.am: Automatically enable 3D rendering when accelerated compositing
is turned on.
Source/WebCore:
* GNUmakefile.am: Automatically enable 3D rendering when AC is available.
* GNUmakefile.list.am: Clean up a comment.
Modified Paths
Diff
Modified: trunk/ChangeLog (104458 => 104459)
--- trunk/ChangeLog 2012-01-09 14:59:57 UTC (rev 104458)
+++ trunk/ChangeLog 2012-01-09 15:08:42 UTC (rev 104459)
@@ -1,3 +1,15 @@
+2012-01-09 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] [AC] Simplify accelerated compositing build options
+ https://bugs.webkit.org/show_bug.cgi?id=75518
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * configure.ac: Remove the --enable-3d-rendering option. It's enabled by
+ default now when accelerated compositing is enabled.
+ * GNUmakefile.am: Automatically enable 3D rendering when accelerated compositing
+ is turned on.
+
2012-01-04 Jon Lee <jon...@apple.com>
Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable
Modified: trunk/GNUmakefile.am (104458 => 104459)
--- trunk/GNUmakefile.am 2012-01-09 14:59:57 UTC (rev 104458)
+++ trunk/GNUmakefile.am 2012-01-09 15:08:42 UTC (rev 104459)
@@ -172,7 +172,8 @@
if USE_ACCELERATED_COMPOSITING
global_cppflags += \
- -DWTF_USE_ACCELERATED_COMPOSITING=1
+ -DWTF_USE_ACCELERATED_COMPOSITING=1 \
+ -DENABLE_3D_RENDERING=1
endif
if USE_TEXTURE_MAPPER_CAIRO
Modified: trunk/Source/WebCore/ChangeLog (104458 => 104459)
--- trunk/Source/WebCore/ChangeLog 2012-01-09 14:59:57 UTC (rev 104458)
+++ trunk/Source/WebCore/ChangeLog 2012-01-09 15:08:42 UTC (rev 104459)
@@ -1,3 +1,13 @@
+2012-01-09 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] [AC] Simplify accelerated compositing build options
+ https://bugs.webkit.org/show_bug.cgi?id=75518
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Automatically enable 3D rendering when AC is available.
+ * GNUmakefile.list.am: Clean up a comment.
+
2012-01-09 Antti Koivisto <an...@apple.com>
possible regression: r104060 maybe causing crashes
Modified: trunk/Source/WebCore/GNUmakefile.am (104458 => 104459)
--- trunk/Source/WebCore/GNUmakefile.am 2012-01-09 14:59:57 UTC (rev 104458)
+++ trunk/Source/WebCore/GNUmakefile.am 2012-01-09 15:08:42 UTC (rev 104459)
@@ -545,17 +545,14 @@
endif # END ENABLE_WEBGL
# ---
-# 3D rendering (CSS3 3D transforms) support
+# Accelerated compositing support
# ---
-if ENABLE_3D_RENDERING
-FEATURE_DEFINES += ENABLE_3D_RENDERING=1
-webcore_cppflags += -DENABLE_3D_RENDERING=1
-endif # END ENABLE_3D_RENDERING
+if USE_ACCELERATED_COMPOSITING
+FEATURE_DEFINES += \
+ ENABLE_3D_RENDERING=1 \
+ ACCELERATED_COMPOSITING=1
+endif # END USE_ACCELERATED_COMPOSITING
-# ---
-# Compile with accelerated compositing support
-# ---
-
if USE_TEXTURE_MAPPER_CAIRO
webcore_cppflags += \
-I$(srcdir)/Source/WebCore/platform/graphics/texmap
Modified: trunk/Source/WebCore/GNUmakefile.list.am (104458 => 104459)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-01-09 14:59:57 UTC (rev 104458)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-01-09 15:08:42 UTC (rev 104459)
@@ -5641,7 +5641,7 @@
endif # END ENABLE_REQUEST_ANIMATION_FRAME
# ---
-# Compile with accelerated compositing support
+# Accelerated compositing support
# ---
if USE_ACCELERATED_COMPOSITING
if USE_CLUTTER
Modified: trunk/configure.ac (104458 => 104459)
--- trunk/configure.ac 2012-01-09 14:59:57 UTC (rev 104458)
+++ trunk/configure.ac 2012-01-09 15:08:42 UTC (rev 104459)
@@ -381,14 +381,6 @@
[if test "$enable_debug" = "yes"; then enable_optimizations="no"; else enable_optimizations="yes"; fi])
AC_MSG_RESULT([$enable_optimizations])
-# check whether to enable 3D rendering support
-AC_MSG_CHECKING([whether to enable support for 3D Rendering])
-AC_ARG_ENABLE(3d_rendering,
- AC_HELP_STRING([--enable-3d-rendering],
- [enable support for 3D Rendering (experimental) [default=no]]),
- [],[enable_3d_rendering="no"])
-AC_MSG_RESULT([$enable_3d_rendering])
-
# check whether to enable WebGL support
AC_MSG_CHECKING([whether to enable WebGL support])
AC_ARG_ENABLE(webgl,
@@ -411,6 +403,16 @@
fi
AC_SUBST([OPENGL_LIBS])
+if test "$with_accelerated_compositing" = "clutter"; then
+ PKG_CHECK_MODULES(CLUTTER, clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+ PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED_VERSION])
+
+ AC_SUBST(CLUTTER_CFLAGS)
+ AC_SUBST(CLUTTER_LIBS)
+ AC_SUBST(CLUTTER_GTK_CFLAGS)
+ AC_SUBST(CLUTTER_GTK_LIBS)
+fi
+
# check whether to enable channel messaging support
AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
AC_ARG_ENABLE(channel_messaging,
@@ -1046,17 +1048,6 @@
AC_SUBST([LIBFFTW_LIBS])
fi
-if test "$with_accelerated_compositing" = "clutter"; then
- PKG_CHECK_MODULES(CLUTTER, clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
- PKG_CHECK_MODULES([CLUTTER_GTK],
- [clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED_VERSION])
-
- AC_SUBST(CLUTTER_CFLAGS)
- AC_SUBST(CLUTTER_LIBS)
- AC_SUBST(CLUTTER_GTK_CFLAGS)
- AC_SUBST(CLUTTER_GTK_LIBS)
-fi
-
# check for code coverage support
if test "$enable_coverage" = "yes"; then
COVERAGE_CFLAGS="-MD"
@@ -1138,7 +1129,6 @@
# WebKit feature conditionals
AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
-AM_CONDITIONAL([ENABLE_3D_RENDERING],[test "$enable_3d_rendering" = "yes"])
AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])
AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
AM_CONDITIONAL([ENABLE_METER_TAG],[test "$enable_meter_tag" = "yes"])
@@ -1246,7 +1236,6 @@
Accelerated Compositing : $with_accelerated_compositing
Features:
- 3D Rendering : $enable_3d_rendering
WebGL : $enable_webgl
Blob support : $enable_blob
DOM mutation observer support : $enable_mutation_observers
