[GTK] Add WebP image support
authorsergio@webkit.org <sergio@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2013 09:31:56 +0000 (09:31 +0000)
committersergio@webkit.org <sergio@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Jan 2013 09:31:56 +0000 (09:31 +0000)
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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139046 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
LayoutTests/ChangeLog
LayoutTests/platform/gtk/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/GNUmakefile.am
Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.am
configure.ac

index eb39a0a..4334344 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-03  Sergio Villar Senin  <svillar@igalia.com>
+
+        [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  <wangxianzhu@chromium.org>
 
         Add window.internals.nonFastScrollableRects for testing scrollable areas in fast/slow paths
index 68de5c5..c6c47ad 100644 (file)
@@ -1,3 +1,13 @@
+2013-01-04  Sergio Villar Senin  <svillar@igalia.com>
+
+        [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  <yosin@chromium.org>
 
         Dragging over an element with scrollbars should scroll the element when dragging near edges
index 83066c1..8ff50ae 100644 (file)
@@ -233,9 +233,8 @@ webkit.org/b/58443 fast/forms/file/input-file-entries.html [ Skip ]
 
 # 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 ]
index cfff2be..6f85a2c 100644 (file)
@@ -1,3 +1,13 @@
+2013-01-03  Sergio Villar Senin  <svillar@igalia.com>
+
+        [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  <steveblock@chromium.org>
 
         Rename 'IntSize toSize(const IntPoint&)' to 'toIntSize'
index 0dbecd9..7177ec4 100644 (file)
@@ -7,6 +7,7 @@ WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in
 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 @@ webcore_cppflags += \
        -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/webp \
        -I$(srcdir)/Source/WebCore/platform/image-decoders/png \
+       -I$(srcdir)/Source/WebCore/platform/image-decoders/webp \
        -I$(srcdir)/Source/WebCore/platform/leveldb \
        -I$(srcdir)/Source/WebCore/platform/linux \
        -I$(srcdir)/Source/WebCore/platform/mediastream \
index 016b9b6..5c5d388 100644 (file)
@@ -5702,10 +5702,10 @@ webcore_platform_sources += \
        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/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/image-decoders/webp/WEBPImageDecoder.cpp \
+       Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h \
        Source/WebCore/platform/LayoutTestSupport.cpp \
        Source/WebCore/platform/LayoutTestSupport.h \
        Source/WebCore/platform/linux/GamepadDeviceLinux.cpp \
index 157aa48..aef0603 100644 (file)
@@ -1,3 +1,12 @@
+2013-01-03  Sergio Villar Senin  <svillar@igalia.com>
+
+        [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  <mkwst@chromium.org>
 
         Make the IFRAME_SEAMLESS flag runtime-enabled.
index e0d8cea..ab06d5c 100644 (file)
@@ -115,6 +115,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBA
        $(PNG_LIBS) \
        $(SQLITE3_LIBS) \
        $(UNICODE_LIBS) \
+       $(WEBP_LIBS) \
        $(XCOMPOSITE_LIBS) \
        $(XDAMAGE_LIBS) \
        $(XRENDER_LIBS) \
index f5f5a55..7e972f5 100644 (file)
@@ -1,3 +1,12 @@
+2013-01-03  Sergio Villar Senin  <svillar@igalia.com>
+
+        [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  <ossy@webkit.org>
 
         [Qt][Win] Unreviewed buildfix, partially revert
index 3a5f7b9..3be7be2 100644 (file)
@@ -200,6 +200,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIB
        $(PNG_LIBS) \
        $(SQLITE3_LIBS) \
        $(UNICODE_LIBS) \
+       $(WEBP_LIBS) \
        $(XRENDER_LIBS) \
        $(XCOMPOSITE_LIBS) \
        $(XDAMAGE_LIBS) \
@@ -566,6 +567,7 @@ Programs_WebKitPluginProcess_LDADD += \
        $(SHM_LIBS) \
        $(SQLITE3_LIBS) \
        $(UNICODE_LIBS) \
+       $(WEBP_LIBS) \
        $(XRENDER_LIBS) \
        $(XT_LIBS) \
        $(WINMM_LIBS) \
index 0a8fa2d..7d17cbe 100644 (file)
@@ -267,6 +267,9 @@ if test "$png_ok" != yes; then
 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