- Revision
- 101764
- Author
- [email protected]
- Date
- 2011-12-02 01:16:58 -0800 (Fri, 02 Dec 2011)
Log Message
[GTK] Add compilation options to enable/disable Accelerated Compositing and to choose texture mapper implementation.
https://bugs.webkit.org/show_bug.cgi?id=73458
Patch by Nayan Kumar K <[email protected]> on 2011-12-01
Reviewed by Martin Robinson.
.:
* GNUmakefile.am: Export new compilation macros.
* configure.ac: Provide option to choose accelerated compositing and texture mapper variations.
Source/WebCore:
No new tests added as this patch doesn't affect any functionality.
* GNUmakefile.am: Guard the include files.
* GNUmakefile.list.am: Guard the compilation of few files.
* platform/graphics/GraphicsLayer.h: Guard the typedef of GraphicsLayer.
Modified Paths
Diff
Modified: trunk/ChangeLog (101763 => 101764)
--- trunk/ChangeLog 2011-12-02 09:15:18 UTC (rev 101763)
+++ trunk/ChangeLog 2011-12-02 09:16:58 UTC (rev 101764)
@@ -1,3 +1,13 @@
+2011-12-01 Nayan Kumar K <[email protected]>
+
+ [GTK] Add compilation options to enable/disable Accelerated Compositing and to choose texture mapper implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=73458
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: Export new compilation macros.
+ * configure.ac: Provide option to choose accelerated compositing and texture mapper variations.
+
2011-12-01 Patrick Gansterer <[email protected]>
[CMake] Make the feature defines for DOM names explicit
Modified: trunk/GNUmakefile.am (101763 => 101764)
--- trunk/GNUmakefile.am 2011-12-02 09:15:18 UTC (rev 101763)
+++ trunk/GNUmakefile.am 2011-12-02 09:16:58 UTC (rev 101764)
@@ -170,6 +170,16 @@
-DWTF_USE_ACCELERATED_COMPOSITING=1
endif
+if USE_TEXTURE_MAPPER_CAIRO
+global_cppflags += \
+ -DWTF_TEXTURE_MAPPER_CAIRO=1
+endif
+
+if USE_TEXTURE_MAPPER_GL
+global_cppflags += \
+ -DWTF_TEXTURE_MAPPER_OPENGL=1
+endif
+
# ----
# GTK+ 2.x/3.x support
# ----
Modified: trunk/Source/WebCore/ChangeLog (101763 => 101764)
--- trunk/Source/WebCore/ChangeLog 2011-12-02 09:15:18 UTC (rev 101763)
+++ trunk/Source/WebCore/ChangeLog 2011-12-02 09:16:58 UTC (rev 101764)
@@ -1,3 +1,16 @@
+2011-12-01 Nayan Kumar K <[email protected]>
+
+ [GTK] Add compilation options to enable/disable Accelerated Compositing and to choose texture mapper implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=73458
+
+ Reviewed by Martin Robinson.
+
+ No new tests added as this patch doesn't affect any functionality.
+
+ * GNUmakefile.am: Guard the include files.
+ * GNUmakefile.list.am: Guard the compilation of few files.
+ * platform/graphics/GraphicsLayer.h: Guard the typedef of GraphicsLayer.
+
2011-12-01 Andrey Kosyakov <[email protected]>
Web Inspector: use object properties, not element attributes to pass preferred panel/line/request id in linkified anchors
Modified: trunk/Source/WebCore/GNUmakefile.am (101763 => 101764)
--- trunk/Source/WebCore/GNUmakefile.am 2011-12-02 09:15:18 UTC (rev 101763)
+++ trunk/Source/WebCore/GNUmakefile.am 2011-12-02 09:16:58 UTC (rev 101764)
@@ -564,11 +564,17 @@
# ---
# Compile with accelerated compositing support
# ---
-if USE_ACCELERATED_COMPOSITING
+
+if USE_TEXTURE_MAPPER_CAIRO
webcore_cppflags += \
-I$(srcdir)/Source/WebCore/platform/graphics/texmap
-endif # USE_ACCELERATED_COMPOSITING
+endif # END USE_TEXTURE_MAPPER_CAIRO
+if USE_TEXTURE_MAPPER_GL
+webcore_cppflags += \
+ -I$(srcdir)/Source/WebCore/platform/graphics/texmap
+endif # END USETEXTURE_MAPPER_GL
+
# ---
# MHTML support
# ---
Modified: trunk/Source/WebCore/GNUmakefile.list.am (101763 => 101764)
--- trunk/Source/WebCore/GNUmakefile.list.am 2011-12-02 09:15:18 UTC (rev 101763)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2011-12-02 09:16:58 UTC (rev 101764)
@@ -5076,7 +5076,9 @@
Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp \
Source/WebCore/platform/graphics/texmap/TextureMapperNode.h \
Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h
+if USE_TEXTURE_MAPPER_CAIRO
webcoregtk_sources += \
Source/WebCore/platform/graphics/cairo/TextureMapperCairo.cpp \
Source/WebCore/platform/graphics/cairo/TextureMapperCairo.h
+endif # END USE_TEXTURE_MAPPER_CAIRO
endif # USE_ACCELERATED_COMPOSITING
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (101763 => 101764)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2011-12-02 09:15:18 UTC (rev 101763)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2011-12-02 09:16:58 UTC (rev 101764)
@@ -68,11 +68,18 @@
class LayerChromium;
typedef LayerChromium PlatformLayer;
}
-#elif PLATFORM(EFL) || PLATFORM(GTK)
+#elif PLATFORM(EFL)
namespace WebCore {
class TextureMapperPlatformLayer;
typedef TextureMapperPlatformLayer PlatformLayer;
};
+#elif PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER_CAIRO) || USE(TEXTURE_MAPPER_GL)
+namespace WebCore {
+class TextureMapperPlatformLayer;
+typedef TextureMapperPlatformLayer PlatformLayer;
+};
+#endif
#else
typedef void* PlatformLayer;
#endif
Modified: trunk/configure.ac (101763 => 101764)
--- trunk/configure.ac 2011-12-02 09:15:18 UTC (rev 101763)
+++ trunk/configure.ac 2011-12-02 09:16:58 UTC (rev 101764)
@@ -389,12 +389,12 @@
# check whether to enable accelerated compositing support
AC_MSG_CHECKING([whether to enable accelerated compositing support])
AC_ARG_WITH(accelerated_compositing,
- AC_HELP_STRING([--with-accelerated-compositing],
+ AC_HELP_STRING([--with-accelerated-compositing=@<:@no/opengl/cairo@:>@],
[use accelerated compositing (experimental) [default=no]]),
[], [with_accelerated_compositing="no"])
AC_MSG_RESULT([$with_accelerated_compositing])
-if test "$enable_webgl" = "yes" || test "with_accelerated_compositing" = "yes"; then
+if test "$enable_webgl" = "yes" || test "$with_accelerated_compositing" = "opengl" ; then
AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))
AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))
OPENGL_LIBS="-lGL -ldl"
@@ -1148,7 +1148,10 @@
AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"])
# Accelerated compositing conditional
-AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "yes"])
+AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "cairo"])
+AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "opengl"])
+AM_CONDITIONAL([USE_TEXTURE_MAPPER_CAIRO], [test "$with_accelerated_compositing" = "cairo"])
+AM_CONDITIONAL([USE_TEXTURE_MAPPER_GL], [test "$with_accelerated_compositing" = "opengl"])
# WebKit feature conditionals
AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
