Attachment #117384 for bug #73458

View Details Raw Unified Return to Bug 73458

| Differences between



2011-12-01  Nayan Kumar K  <nayankk@motorola.com>

        [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 NOBODY (OOPS!).

        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  Florin Malita  <fmalita@google.com>

        SVG Gaussian blur in 1-dimension is incorrect



# Compile with accelerated compositing support
# ---
if USE_ACCELERATED_COMPOSITING
if !USE_AC_CLUTTER
webcore_cppflags += \
	-I$(srcdir)/Source/WebCore/platform/graphics/texmap
endif  # END !USE_AC_CLUTTER
endif  # USE_ACCELERATED_COMPOSITING

# ---

Lines 5075-5080 endif # END ENABLE_REQUEST_ANIMATION_FRAME a/Source/WebCore/GNUmakefile.list.am_sec1
- a/Source/WebCore/GNUmakefile.list.am +4 lines
5075	# Compile with accelerated compositing support	5075	# Compile with accelerated compositing support
5076	# ---	5076	# ---
5077	if USE_ACCELERATED_COMPOSITING	5077	if USE_ACCELERATED_COMPOSITING
		5078	if !USE_AC_CLUTTER
5078	webcore_sources += \	5079	webcore_sources += \
5079	Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp \	5080	Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp \
5080	Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h \	5081	Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h \
Lines 5082-5088 webcore_sources += \ a/Source/WebCore/GNUmakefile.list.am_sec2
5082	Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp \	5083	Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp \
5083	Source/WebCore/platform/graphics/texmap/TextureMapperNode.h \	5084	Source/WebCore/platform/graphics/texmap/TextureMapperNode.h \
5084	Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h	5085	Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h
		5086	endif # END !USE_AC_CLUTTER
		5087	if USE_AC_TEXTURE_MAPPER_CAIRO
5085	webcoregtk_sources += \	5088	webcoregtk_sources += \
5086	Source/WebCore/platform/graphics/cairo/TextureMapperCairo.cpp \	5089	Source/WebCore/platform/graphics/cairo/TextureMapperCairo.cpp \
5087	Source/WebCore/platform/graphics/cairo/TextureMapperCairo.h	5090	Source/WebCore/platform/graphics/cairo/TextureMapperCairo.h
		5091	endif # END USE_AC_TEXTURE_MAPPER_CAIRO
5088	endif # USE_ACCELERATED_COMPOSITING	5092	endif # USE_ACCELERATED_COMPOSITING



class LayerChromium;
typedef LayerChromium PlatformLayer;
}
#elif PLATFORM(EFL)
namespace WebCore {
class TextureMapperPlatformLayer;
typedef TextureMapperPlatformLayer PlatformLayer;
};
#elif PLATFORM(GTK)
#if !USE(AC_CLUTTER)
namespace WebCore {
class TextureMapperPlatformLayer;
typedef TextureMapperPlatformLayer PlatformLayer;
};
#endif
#else
typedef void* PlatformLayer;
#endif



2011-12-01  Nayan Kumar K  <nayankk@motorola.com>

        [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 NOBODY (OOPS!).

        * GNUmakefile.am: Export new compilation macros.
        * configure.ac: Provide option to choose accelerated compositing and texture mapper variations.

2011-11-30  Alejandro G. Castro  <alex@igalia.com>

        [GTK] Add accelerated compositing compilation option



	-DWTF_USE_ACCELERATED_COMPOSITING=1
endif

if USE_AC_CLUTTER
global_cppflags += \
	-DWTF_USE_AC_CLUTTER=1
endif

if USE_AC_TEXTURE_MAPPER_OPENGL
global_cppflags += \
	-DWTF_USE_AC_TEXTURE_MAPPER_OPENGL=1
endif

if USE_AC_TEXTURE_MAPPER_CAIRO
global_cppflags += \
	-DWTF_USE_AC_TEXTURE_MAPPER_CAIRO=1
endif

# ----
# GTK+ 2.x/3.x support
# ----

Lines 394-400 AC_ARG_WITH(accelerated_compositing, a/configure.ac_sec1
- a/configure.ac -2 / +11 lines
394	[], [with_accelerated_compositing="no"])	394	[], [with_accelerated_compositing="no"])
395	AC_MSG_RESULT([$with_accelerated_compositing])	395	AC_MSG_RESULT([$with_accelerated_compositing])
396		396
397	if test "$enable_webgl" = "yes" \|\| test "with_accelerated_compositing" = "yes"; then	397	if test "$enable_webgl" = "yes" && test "$with_accelerated_compositing" = "clutter" ; then
		398	AC_MSG_ERROR([WebGL and Accelerated Compositing using clutter can not be enabled at the same time.]);
		399	fi
		400
		401	if test "$enable_webgl" = "yes" \|\| test "$with_accelerated_compositing" = "clutter" \|\| test "$with_accelerated_compositing" = "texmap-cairo" \|\| test "$with_accelerated_compositing" == "texmap-opengl" ; then
398	AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))	402	AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))
399	AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))	403	AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))
400	OPENGL_LIBS="-lGL -ldl"	404	OPENGL_LIBS="-lGL -ldl"
Lines 1148-1154 AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"]) a/configure.ac_sec2
1148	AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"])	1152	AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"])
1149		1153
1150	# Accelerated compositing conditional	1154	# Accelerated compositing conditional
1151	AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "yes"])	1155	AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "clutter"])
		1156	AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "texmap-cairo"])
		1157	AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$with_accelerated_compositing" = "texmap-opengl"])
		1158	AM_CONDITIONAL([USE_AC_CLUTTER], [test "$with_accelerated_compositing" = "clutter"])
		1159	AM_CONDITIONAL([USE_AC_TEXTURE_MAPPER_OPENGL], [test "$with_accelerated_compositing" = "texmap-opengl"])
		1160	AM_CONDITIONAL([USE_AC_TEXTURE_MAPPER_CAIRO], [test "$with_accelerated_compositing" = "texmap-cairo"])
1152		1161
1153	# WebKit feature conditionals	1162	# WebKit feature conditionals
1154	AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])	1163	AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])

Return to Bug 73458

Lines 565-572 endif # END ENABLE_3D_RENDERING a/Source/WebCore/GNUmakefile.am_sec1
- a/Source/WebCore/GNUmakefile.am +2 lines
565	# Compile with accelerated compositing support	565	# Compile with accelerated compositing support
566	# ---	566	# ---
567	if USE_ACCELERATED_COMPOSITING	567	if USE_ACCELERATED_COMPOSITING
		568	if !USE_AC_CLUTTER
568	webcore_cppflags += \	569	webcore_cppflags += \
569	-I$(srcdir)/Source/WebCore/platform/graphics/texmap	570	-I$(srcdir)/Source/WebCore/platform/graphics/texmap
		571	endif # END !USE_AC_CLUTTER
570	endif # USE_ACCELERATED_COMPOSITING	572	endif # USE_ACCELERATED_COMPOSITING
571		573
572	# ---	574	# ---

Lines 170-175 global_cppflags += \ a/GNUmakefile.am_sec1
- a/GNUmakefile.am +15 lines
170	-DWTF_USE_ACCELERATED_COMPOSITING=1	170	-DWTF_USE_ACCELERATED_COMPOSITING=1
171	endif	171	endif
172		172
		173	if USE_AC_CLUTTER
		174	global_cppflags += \
		175	-DWTF_USE_AC_CLUTTER=1
		176	endif
		177
		178	if USE_AC_TEXTURE_MAPPER_OPENGL
		179	global_cppflags += \
		180	-DWTF_USE_AC_TEXTURE_MAPPER_OPENGL=1
		181	endif
		182
		183	if USE_AC_TEXTURE_MAPPER_CAIRO
		184	global_cppflags += \
		185	-DWTF_USE_AC_TEXTURE_MAPPER_CAIRO=1
		186	endif
		187
173	# ----	188	# ----
174	# GTK+ 2.x/3.x support	189	# GTK+ 2.x/3.x support
175	# ----	190	# ----

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +13 lines
		1	2011-12-01 Nayan Kumar K <nayankk@motorola.com>
		2
		3	[GTK] Add compilation options to enable/disable Accelerated Compositing and to choose texture mapper implementation.
		4	https://bugs.webkit.org/show_bug.cgi?id=73458
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	No new tests added as this patch doesn't affect any functionality.
		9
		10	* GNUmakefile.am: Guard the include files.
		11	* GNUmakefile.list.am: Guard the compilation of few files.
		12	* platform/graphics/GraphicsLayer.h: Guard the typedef of GraphicsLayer.
		13
1	2011-12-01 Florin Malita <fmalita@google.com>	14	2011-12-01 Florin Malita <fmalita@google.com>
2		15
3	SVG Gaussian blur in 1-dimension is incorrect	16	SVG Gaussian blur in 1-dimension is incorrect

Lines 68-78 namespace WebCore { a/Source/WebCore/platform/graphics/GraphicsLayer.h_sec1
- a/Source/WebCore/platform/graphics/GraphicsLayer.h -1 / +8 lines
68	class LayerChromium;	68	class LayerChromium;
69	typedef LayerChromium PlatformLayer;	69	typedef LayerChromium PlatformLayer;
70	}	70	}
71	#elif PLATFORM(EFL) \|\| PLATFORM(GTK)	71	#elif PLATFORM(EFL)
72	namespace WebCore {	72	namespace WebCore {
73	class TextureMapperPlatformLayer;	73	class TextureMapperPlatformLayer;
74	typedef TextureMapperPlatformLayer PlatformLayer;	74	typedef TextureMapperPlatformLayer PlatformLayer;
75	};	75	};
		76	#elif PLATFORM(GTK)
		77	#if !USE(AC_CLUTTER)
		78	namespace WebCore {
		79	class TextureMapperPlatformLayer;
		80	typedef TextureMapperPlatformLayer PlatformLayer;
		81	};
		82	#endif
76	#else	83	#else
77	typedef void* PlatformLayer;	84	typedef void* PlatformLayer;
78	#endif	85	#endif

Lines 1-3 a/ChangeLog_sec1
- a/ChangeLog +10 lines
		1	2011-12-01 Nayan Kumar K <nayankk@motorola.com>
		2
		3	[GTK] Add compilation options to enable/disable Accelerated Compositing and to choose texture mapper implementation.
		4	https://bugs.webkit.org/show_bug.cgi?id=73458
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* GNUmakefile.am: Export new compilation macros.
		9	* configure.ac: Provide option to choose accelerated compositing and texture mapper variations.
		10
1	2011-11-30 Alejandro G. Castro <alex@igalia.com>	11	2011-11-30 Alejandro G. Castro <alex@igalia.com>
2		12
3	[GTK] Add accelerated compositing compilation option	13	[GTK] Add accelerated compositing compilation option