Title: [139046] trunk
Revision
139046
Author
[email protected]
Date
2013-01-08 01:31:56 -0800 (Tue, 08 Jan 2013)

Log Message

[GTK] Add WebP image support
https://bugs.webkit.org/show_bug.cgi?id=105915

Reviewed by Martin Robinson.

.:

WebP is from now on a dependency for WebKitGtk+.

* configure.ac: added WebP library detection.

Source/WebCore:

* GNUmakefile.am: add WTF_USE_WEBP definition.
* GNUmakefile.list.am: properly sort image decoders in the sources list.

Source/WebKit/gtk:

* GNUmakefile.am: link against WebP library.

Source/WebKit2:

* GNUmakefile.am: link against WebP library.

LayoutTests:

* platform/gtk/TestExpectations: unskipped two tests passing now
that we have WebP support.

Modified Paths

Diff

Modified: trunk/ChangeLog (139045 => 139046)


--- trunk/ChangeLog	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/ChangeLog	2013-01-08 09:31:56 UTC (rev 139046)
@@ -1,3 +1,14 @@
+2013-01-03  Sergio Villar Senin  <[email protected]>
+
+        [GTK] Add WebP image support
+        https://bugs.webkit.org/show_bug.cgi?id=105915
+
+        Reviewed by Martin Robinson.
+
+        WebP is from now on a dependency for WebKitGtk+.
+
+        * configure.ac: added WebP library detection.
+
 2013-01-07  Xianzhu Wang  <[email protected]>
 
         Add window.internals.nonFastScrollableRects for testing scrollable areas in fast/slow paths

Modified: trunk/LayoutTests/ChangeLog (139045 => 139046)


--- trunk/LayoutTests/ChangeLog	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/LayoutTests/ChangeLog	2013-01-08 09:31:56 UTC (rev 139046)
@@ -1,3 +1,13 @@
+2013-01-04  Sergio Villar Senin  <[email protected]>
+
+        [GTK] Add WebP image support
+        https://bugs.webkit.org/show_bug.cgi?id=105915
+
+        Reviewed by Martin Robinson.
+
+        * platform/gtk/TestExpectations: unskipped two tests passing now
+        that we have WebP support.
+
 2013-01-08  Yoshifumi Inoue  <[email protected]>
 
         Dragging over an element with scrollbars should scroll the element when dragging near edges

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (139045 => 139046)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2013-01-08 09:31:56 UTC (rev 139046)
@@ -233,9 +233,8 @@
 
 # Requires WebP support.
 webkit.org/b/98939 fast/canvas/canvas-toDataURL-webp.html [ Skip ]
+# Requires WebP 0.2 support.
 webkit.org/b/98939 fast/images/webp-image-decoding.html [ Skip ]
-webkit.org/b/98939 http/tests/images/webp-partial-load.html [ Skip ]
-webkit.org/b/98939 http/tests/images/webp-progressive-load.html [ Skip ]
 
 # DataTransferItems is not yet implemented.
 webkit.org/b/98940 editing/pasteboard/data-transfer-items.html [ Skip ]

Modified: trunk/Source/WebCore/ChangeLog (139045 => 139046)


--- trunk/Source/WebCore/ChangeLog	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/Source/WebCore/ChangeLog	2013-01-08 09:31:56 UTC (rev 139046)
@@ -1,3 +1,13 @@
+2013-01-03  Sergio Villar Senin  <[email protected]>
+
+        [GTK] Add WebP image support
+        https://bugs.webkit.org/show_bug.cgi?id=105915
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: add WTF_USE_WEBP definition.
+        * GNUmakefile.list.am: properly sort image decoders in the sources list.
+
 2013-01-08  Steve Block  <[email protected]>
 
         Rename 'IntSize toSize(const IntPoint&)' to 'toIntSize'

Modified: trunk/Source/WebCore/GNUmakefile.am (139045 => 139046)


--- trunk/Source/WebCore/GNUmakefile.am	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/Source/WebCore/GNUmakefile.am	2013-01-08 09:31:56 UTC (rev 139046)
@@ -7,6 +7,7 @@
 webcore_cppflags += \
 	-DWTF_USE_FREETYPE=1 \
 	-DWTF_USE_HARFBUZZ_NG=1 \
+	-DWTF_USE_WEBP=1 \
 	-I$(srcdir)/Source/ThirdParty/ANGLE/src \
 	-I$(srcdir)/Source/ThirdParty/ANGLE/include \
 	-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
@@ -72,8 +73,8 @@
 	-I$(srcdir)/Source/WebCore/platform/image-decoders/gif \
 	-I$(srcdir)/Source/WebCore/platform/image-decoders/ico \
 	-I$(srcdir)/Source/WebCore/platform/image-decoders/jpeg \
+	-I$(srcdir)/Source/WebCore/platform/image-decoders/png \
 	-I$(srcdir)/Source/WebCore/platform/image-decoders/webp \
-	-I$(srcdir)/Source/WebCore/platform/image-decoders/png \
 	-I$(srcdir)/Source/WebCore/platform/leveldb \
 	-I$(srcdir)/Source/WebCore/platform/linux \
 	-I$(srcdir)/Source/WebCore/platform/mediastream \

Modified: trunk/Source/WebCore/GNUmakefile.list.am (139045 => 139046)


--- trunk/Source/WebCore/GNUmakefile.list.am	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/Source/WebCore/GNUmakefile.list.am	2013-01-08 09:31:56 UTC (rev 139046)
@@ -5702,10 +5702,10 @@
 	Source/WebCore/platform/image-decoders/ImageDecoder.h \
 	Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp \
 	Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h \
+	Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp \
+	Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h \
 	Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp \
 	Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h \
-	Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp \
-	Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h \
 	Source/WebCore/platform/LayoutTestSupport.cpp \
 	Source/WebCore/platform/LayoutTestSupport.h \
 	Source/WebCore/platform/linux/GamepadDeviceLinux.cpp \

Modified: trunk/Source/WebKit/gtk/ChangeLog (139045 => 139046)


--- trunk/Source/WebKit/gtk/ChangeLog	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/Source/WebKit/gtk/ChangeLog	2013-01-08 09:31:56 UTC (rev 139046)
@@ -1,3 +1,12 @@
+2013-01-03  Sergio Villar Senin  <[email protected]>
+
+        [GTK] Add WebP image support
+        https://bugs.webkit.org/show_bug.cgi?id=105915
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: link against WebP library.
+
 2013-01-07  Mike West  <[email protected]>
 
         Make the IFRAME_SEAMLESS flag runtime-enabled.

Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (139045 => 139046)


--- trunk/Source/WebKit/gtk/GNUmakefile.am	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am	2013-01-08 09:31:56 UTC (rev 139046)
@@ -115,6 +115,7 @@
 	$(PNG_LIBS) \
 	$(SQLITE3_LIBS) \
 	$(UNICODE_LIBS) \
+	$(WEBP_LIBS) \
 	$(XCOMPOSITE_LIBS) \
 	$(XDAMAGE_LIBS) \
 	$(XRENDER_LIBS) \

Modified: trunk/Source/WebKit2/ChangeLog (139045 => 139046)


--- trunk/Source/WebKit2/ChangeLog	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-08 09:31:56 UTC (rev 139046)
@@ -1,3 +1,12 @@
+2013-01-03  Sergio Villar Senin  <[email protected]>
+
+        [GTK] Add WebP image support
+        https://bugs.webkit.org/show_bug.cgi?id=105915
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: link against WebP library.
+
 2013-01-08  Csaba Osztrogonác  <[email protected]>
 
         [Qt][Win] Unreviewed buildfix, partially revert

Modified: trunk/Source/WebKit2/GNUmakefile.am (139045 => 139046)


--- trunk/Source/WebKit2/GNUmakefile.am	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/Source/WebKit2/GNUmakefile.am	2013-01-08 09:31:56 UTC (rev 139046)
@@ -200,6 +200,7 @@
 	$(PNG_LIBS) \
 	$(SQLITE3_LIBS) \
 	$(UNICODE_LIBS) \
+	$(WEBP_LIBS) \
 	$(XRENDER_LIBS) \
 	$(XCOMPOSITE_LIBS) \
 	$(XDAMAGE_LIBS) \
@@ -566,6 +567,7 @@
 	$(SHM_LIBS) \
 	$(SQLITE3_LIBS) \
 	$(UNICODE_LIBS) \
+	$(WEBP_LIBS) \
 	$(XRENDER_LIBS) \
 	$(XT_LIBS) \
 	$(WINMM_LIBS) \

Modified: trunk/configure.ac (139045 => 139046)


--- trunk/configure.ac	2013-01-08 09:27:08 UTC (rev 139045)
+++ trunk/configure.ac	2013-01-08 09:31:56 UTC (rev 139046)
@@ -267,6 +267,9 @@
 fi
 AC_SUBST([PNG_LIBS])
 
+# Check for WEBP Image support
+AC_CHECK_HEADERS([webp/decode.h], [WEBP_LIBS='-lwebp'], [AC_MSG_ERROR([WebP library (libwebp) not found])])
+AC_SUBST([WEBP_LIBS])
 
 if test "$os_win32" = "yes"; then
   WINMM_LIBS=-lwinmm
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to