[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:42:33 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5c2d99a5c257eba7b231fc019613c5c5bce1eda9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 18 06:51:34 2010 +0000
2010-10-17 Pascal Massimino <pascal.massimino at gmail.com>
Reviewed by Adam Barth.
Add support for WebP image decoding in ImageDecoder
using library libwebp-decode library available from
http://www.webmproject.org/code/
https://bugs.webkit.org/show_bug.cgi?id=47512
Tests: fast/images/webp-image-decoding.html
* CMakeLists.txt:
add platform/image-decoders/webp files and directory
* GNUmakefile.am:
add platform/image-decoders/webp directory
* WebCore.gyp/WebCore.gyp:
add platform/image-decoders/webp directory
* WebCore.gypi:
add platform/image-decoders/webp directory
* features.gypi:
add WTF_USE_WEBP=1
* platform/image-decoders/ImageDecoder.cpp:
(WebCore::ImageDecoder::create):
instantiate webp decoder for file starting with 'RIFF????WEBP'
* platform/image-decoders/webp: Added.
* platform/image-decoders/webp/WEBPImageDecoder.cpp: Added.
(WebCore::WEBPImageDecoder::WEBPImageDecoder):
(WebCore::WEBPImageDecoder::~WEBPImageDecoder):
(WebCore::WEBPImageDecoder::isSizeAvailable):
(WebCore::WEBPImageDecoder::frameBufferAtIndex):
(WebCore::WEBPImageDecoder::decode):
sub-class handling decoding of webp images
* platform/image-decoders/webp/WEBPImageDecoder.h: Added.
(WebCore::WEBPImageDecoder::filenameExtension):
(WebCore::WEBPImageDecoder::supportsAlpha):
header for webp-decoder sub-class
2010-10-17 Pascal Massimino <pascal.massimino at gmail.com>
Reviewed by Adam Barth.
Add support for decoding WebP image
https://bugs.webkit.org/show_bug.cgi?id=47512
* DEPS:
- Add dependency to libwebp.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69942 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1d95113..be64e2a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-17 Pascal Massimino <pascal.massimino at gmail.com>
+
+ Reviewed by Adam Barth.
+
+ Add support for decoding WebP image
+ https://bugs.webkit.org/show_bug.cgi?id=47512
+
+ * DEPS:
+ - Add dependency to libwebp.
+
2010-10-17 Oliver Hunt <oliver at apple.com>
Reviewed by Sam Weinig.
diff --git a/LayoutTests/fast/images/resources/test.webp b/LayoutTests/fast/images/resources/test.webp
new file mode 100644
index 0000000..c4a7b16
Binary files /dev/null and b/LayoutTests/fast/images/resources/test.webp differ
diff --git a/LayoutTests/fast/images/webp-image-decoding-expected.txt b/LayoutTests/fast/images/webp-image-decoding-expected.txt
new file mode 100644
index 0000000..2088be1
--- /dev/null
+++ b/LayoutTests/fast/images/webp-image-decoding-expected.txt
@@ -0,0 +1 @@
+128x128
diff --git a/LayoutTests/fast/images/webp-image-decoding.html b/LayoutTests/fast/images/webp-image-decoding.html
new file mode 100644
index 0000000..8f37eef
--- /dev/null
+++ b/LayoutTests/fast/images/webp-image-decoding.html
@@ -0,0 +1,16 @@
+<html>
+<body>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+window.onload = function() {
+ document.getElementById('results').innerHTML =
+ document.getElementsByTagName('img')[0].width + 'x' +
+ document.getElementsByTagName('img')[0].height;
+}
+</script>
+<img src="resources/test.webp">
+<div id="results"></div>
+</body>
+</html>
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 7ab6d57..cb05dd7 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -316,3 +316,6 @@ fast/events/spatial-navigation/snav-iframe-with-offscreen-focusable-element.html
# https://bugs.webkit.org/show_bug.cgi?id=47449
fast/events/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html
+
+# Requres WebP support.
+fast/images/webp-image-decoding.html
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 4086606..b85c17e 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -1039,3 +1039,6 @@ plugins/iframe-shims.html
# https://bugs.webkit.org/show_bug.cgi?id=22261
fast/events/click-focus-control.html
+
+# Requres WebP support.
+fast/images/webp-image-decoding.html
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 2e1bac7..76033cf 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -38,6 +38,7 @@ SET(WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/image-decoders/ico"
"${WEBCORE_DIR}/platform/image-decoders/jpeg"
"${WEBCORE_DIR}/platform/image-decoders/png"
+ "${WEBCORE_DIR}/platform/image-decoders/webp"
"${WEBCORE_DIR}/platform/mock"
"${WEBCORE_DIR}/platform/network"
"${WEBCORE_DIR}/platform/sql"
@@ -1335,6 +1336,7 @@ SET(WebCore_SOURCES
platform/image-decoders/ico/ICOImageDecoder.cpp
platform/image-decoders/jpeg/JPEGImageDecoder.cpp
platform/image-decoders/png/PNGImageDecoder.cpp
+ platform/image-decoders/webp/WEBPImageDecoder.cpp
platform/mock/DeviceOrientationClientMock.cpp
platform/mock/GeolocationServiceMock.cpp
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 7b8c161..735f61b 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -43,6 +43,7 @@ webcore_cppflags += \
-I$(srcdir)/WebCore/platform/image-decoders/gif \
-I$(srcdir)/WebCore/platform/image-decoders/ico \
-I$(srcdir)/WebCore/platform/image-decoders/jpeg \
+ -I$(srcdir)/WebCore/platform/image-decoders/webp \
-I$(srcdir)/WebCore/platform/image-decoders/png \
-I$(srcdir)/WebCore/platform/mock \
-I$(srcdir)/WebCore/platform/network \
@@ -3573,6 +3574,8 @@ webcoregtk_sources += \
WebCore/platform/image-decoders/ImageDecoder.h \
WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp \
WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h \
+ WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp \
+ WebCore/platform/image-decoders/webp/WEBPImageDecoder.h \
WebCore/platform/image-decoders/png/PNGImageDecoder.cpp \
WebCore/platform/image-decoders/png/PNGImageDecoder.h \
WebCore/platform/network/soup/AuthenticationChallenge.h \
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index ab0d338..08341e5 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -158,6 +158,7 @@
'../platform/image-decoders/png',
'../platform/image-decoders/skia',
'../platform/image-decoders/xbm',
+ '../platform/image-decoders/webp',
'../platform/image-encoders/skia',
'../platform/mock',
'../platform/network',
@@ -722,6 +723,7 @@
'<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
'<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
'<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
+ '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
'<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
'<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
],
@@ -829,6 +831,7 @@
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
'<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
+ '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
'<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
'<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
'<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
@@ -844,6 +847,7 @@
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
'<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
+ '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
'<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
'<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
'<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
@@ -1173,6 +1177,7 @@
['exclude', 'platform/image-decoders/gif/GIFImageReader\\.(cpp|h)$'],
['exclude', 'platform/image-decoders/ico/ICOImageDecoder\\.(cpp|h)$'],
['exclude', 'platform/image-decoders/jpeg/JPEGImageDecoder\\.(cpp|h)$'],
+ ['exclude', 'platform/image-decoders/webp/WEBPImageDecoder\\.(cpp|h)$'],
['exclude', 'platform/image-decoders/png/PNGImageDecoder\\.(cpp|h)$'],
['exclude', 'platform/image-decoders/skia/ImageDecoderSkia\\.cpp$'],
['exclude', 'platform/image-decoders/xbm/XBMImageDecoder\\.(cpp|h)$'],
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 8d70283..5c6c3d2 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2854,6 +2854,8 @@
'platform/image-decoders/jpeg/JPEGImageDecoder.h',
'platform/image-decoders/png/PNGImageDecoder.cpp',
'platform/image-decoders/png/PNGImageDecoder.h',
+ 'platform/image-decoders/webp/WEBPImageDecoder.cpp',
+ 'platform/image-decoders/webp/WEBPImageDecoder.h',
'platform/image-decoders/skia/ImageDecoderSkia.cpp',
'platform/image-decoders/wx/ImageDecoderWx.cpp',
'platform/image-decoders/zlib/crc32.h',
diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp
index 5d4e7b1..58c71f8 100644
--- a/WebCore/platform/image-decoders/ImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/ImageDecoder.cpp
@@ -31,6 +31,7 @@
#include "ICOImageDecoder.h"
#include "JPEGImageDecoder.h"
#include "PNGImageDecoder.h"
+#include "WEBPImageDecoder.h"
#include "SharedBuffer.h"
using namespace std;
@@ -74,6 +75,19 @@ ImageDecoder* ImageDecoder::create(const SharedBuffer& data, bool premultiplyAlp
if (!memcmp(contents, "\xFF\xD8\xFF", 3))
return new JPEGImageDecoder(premultiplyAlpha);
+#if USE(WEBP)
+ if (!memcmp(contents, "RIFF", 4)) {
+ static const unsigned webpExtraMarker = 6;
+ static const unsigned webpExtraMarkeroffset = 8;
+ char header[webpExtraMarker];
+ unsigned length = copyFromSharedBuffer(header, webpExtraMarker, data, webpExtraMarkeroffset);
+ if (length >= webpExtraMarker) {
+ if (!memcmp(header, "WEBPVP", webpExtraMarker))
+ return new WEBPImageDecoder(premultiplyAlpha);
+ }
+ }
+#endif
+
// BMP
if (strncmp(contents, "BM", 2) == 0)
return new BMPImageDecoder(premultiplyAlpha);
diff --git a/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp b/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp
new file mode 100644
index 0000000..5794fd6
--- /dev/null
+++ b/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WEBPImageDecoder.h"
+
+#if USE(WEBP)
+
+#include "webp/decode.h"
+
+namespace WebCore {
+
+WEBPImageDecoder::WEBPImageDecoder(bool premultiplyAlpha)
+ : ImageDecoder(premultiplyAlpha)
+{
+}
+
+WEBPImageDecoder::~WEBPImageDecoder()
+{
+}
+
+bool WEBPImageDecoder::isSizeAvailable()
+{
+ if (!ImageDecoder::isSizeAvailable())
+ decode(true);
+
+ return ImageDecoder::isSizeAvailable();
+}
+
+RGBA32Buffer* WEBPImageDecoder::frameBufferAtIndex(size_t index)
+{
+ if (index)
+ return 0;
+
+ if (m_frameBufferCache.isEmpty()) {
+ m_frameBufferCache.resize(1);
+ m_frameBufferCache[0].setPremultiplyAlpha(m_premultiplyAlpha);
+ }
+
+ RGBA32Buffer& frame = m_frameBufferCache[0];
+ if (frame.status() != RGBA32Buffer::FrameComplete)
+ decode(false);
+ return &frame;
+}
+
+
+bool WEBPImageDecoder::decode(bool onlySize)
+{
+ // Minimum number of bytes needed to ensure one can parse size information.
+ static const size_t sizeOfHeader = 30;
+ // Number of bytes per pixel.
+ static const int bytesPerPixel = 3;
+
+ if (failed())
+ return false;
+ const size_t dataSize = m_data->buffer().size();
+ const uint8_t* dataBytes =
+ reinterpret_cast<const uint8_t*>(m_data->buffer().data());
+ int width, height;
+ if (dataSize < sizeOfHeader)
+ return true;
+ if (!WebPGetInfo(dataBytes, dataSize, &width, &height))
+ return setFailed();
+ if (onlySize)
+ return setSize(width, height) || setFailed();
+
+ // FIXME: Add support for progressive decoding.
+ if (!isAllDataReceived())
+ return true;
+ if (m_frameBufferCache.isEmpty())
+ return true;
+ RGBA32Buffer& buffer = m_frameBufferCache[0];
+ if (buffer.status() == RGBA32Buffer::FrameEmpty) {
+ ASSERT(width == size().width());
+ ASSERT(height == size().height());
+ if (!buffer.setSize(width, height))
+ return setFailed();
+ }
+ const int stride = width * bytesPerPixel;
+ Vector<uint8_t> rgb;
+ rgb.reserveCapacity(height * stride);
+ if (!WebPDecodeBGRInto(dataBytes, dataSize, &rgb[0], height * stride, stride))
+ return setFailed();
+ // FIXME: remove this data copy.
+ for (int y = 0; y < height; ++y) {
+ const uint8_t* const src = &rgb[y * stride];
+ for (int x = 0; x < width; ++x)
+ buffer.setRGBA(x, y, src[bytesPerPixel * x + 2], src[bytesPerPixel * x + 1], src[bytesPerPixel * x + 0], 0xff);
+ }
+ buffer.setStatus(RGBA32Buffer::FrameComplete);
+ buffer.setHasAlpha(false);
+ buffer.setRect(IntRect(IntPoint(), size()));
+ return true;
+}
+
+}
+
+#endif
diff --git a/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h b/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h
new file mode 100644
index 0000000..266c0ff
--- /dev/null
+++ b/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WEBPImageDecoder_h
+#define WEBPImageDecoder_h
+
+#include "ImageDecoder.h"
+
+#if USE(WEBP)
+
+namespace WebCore {
+
+class WEBPImageDecoder : public ImageDecoder {
+public:
+ WEBPImageDecoder(bool premultiplyAlpha);
+ virtual ~WEBPImageDecoder();
+ virtual String filenameExtension() const { return "vp8"; }
+ virtual bool isSizeAvailable();
+ virtual RGBA32Buffer* frameBufferAtIndex(size_t index);
+ virtual bool supportsAlpha() const { return false; }
+
+private:
+ // Returns false in case of decoding failure.
+ bool decode(bool onlySize);
+};
+
+} // namespace WebCore
+
+#endif
+
+#endif
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6fee6a3..028bfec 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,41 @@
+2010-10-17 Pascal Massimino <pascal.massimino at gmail.com>
+
+ Reviewed by Adam Barth.
+
+ Add support for WebP image decoding in ImageDecoder
+ using library libwebp-decode library available from
+ http://www.webmproject.org/code/
+
+ https://bugs.webkit.org/show_bug.cgi?id=47512
+
+ Tests: fast/images/webp-image-decoding.html
+
+ * CMakeLists.txt:
+ add platform/image-decoders/webp files and directory
+ * GNUmakefile.am:
+ add platform/image-decoders/webp directory
+ * WebCore.gyp/WebCore.gyp:
+ add platform/image-decoders/webp directory
+ * WebCore.gypi:
+ add platform/image-decoders/webp directory
+ * features.gypi:
+ add WTF_USE_WEBP=1
+ * platform/image-decoders/ImageDecoder.cpp:
+ (WebCore::ImageDecoder::create):
+ instantiate webp decoder for file starting with 'RIFF????WEBP'
+ * platform/image-decoders/webp: Added.
+ * platform/image-decoders/webp/WEBPImageDecoder.cpp: Added.
+ (WebCore::WEBPImageDecoder::WEBPImageDecoder):
+ (WebCore::WEBPImageDecoder::~WEBPImageDecoder):
+ (WebCore::WEBPImageDecoder::isSizeAvailable):
+ (WebCore::WEBPImageDecoder::frameBufferAtIndex):
+ (WebCore::WEBPImageDecoder::decode):
+ sub-class handling decoding of webp images
+ * platform/image-decoders/webp/WEBPImageDecoder.h: Added.
+ (WebCore::WEBPImageDecoder::filenameExtension):
+ (WebCore::WEBPImageDecoder::supportsAlpha):
+ header for webp-decoder sub-class
+
2010-10-15 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index 1b91487..4d0ccdc 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -99,6 +99,8 @@ deps = {
From('chromium_deps', 'src/third_party/libvpx/include'),
'third_party/libvpx/lib':
From('chromium_deps', 'src/third_party/libvpx/lib'),
+ 'third_party/libwebp':
+ Var('chromium_svn')+'/third_party/libwebp@'+Var('chromium_rev'),
'tools/grit':
Var('chromium_svn')+'/tools/grit@'+Var('chromium_rev'),
'tools/generate_stubs':
diff --git a/WebKit/chromium/features.gypi b/WebKit/chromium/features.gypi
index 515358e..1e78b04 100644
--- a/WebKit/chromium/features.gypi
+++ b/WebKit/chromium/features.gypi
@@ -87,6 +87,7 @@
'ENABLE_XPATH=1',
'ENABLE_XSLT=1',
'WTF_USE_ACCELERATED_COMPOSITING=1',
+ 'WTF_USE_WEBP=1',
],
'use_accelerated_compositing%': 1,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list