From 58f100c02cb9dd14ab63af1152843d3ddfa01e87 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Tue, 20 Dec 2016 09:49:25 -0500 Subject: [PATCH] Update libwebp to v0.5.2-rc2 This matches the version used by Chromium (crbug.com/675306) and Android (https://android-review.googlesource.com/#/c/316352/). Update our test. In the new version, we successfully decode a subset from incomplete input that we previously did not. Change-Id: I3442bf59ffdf223a723d8aa75f5b9b816b9e9c3c Reviewed-on: https://skia-review.googlesource.com/6320 Reviewed-by: Matt Sarett Commit-Queue: Leon Scroggins --- DEPS | 2 +- tests/CodecTest.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 7256fd0..60c7ce9 100644 --- a/DEPS +++ b/DEPS @@ -15,7 +15,7 @@ deps = { "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@87ac4d0e63fc7dd8152a350327fea8dcf031bf56", "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@1.3.0", "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0", - "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.5.0", + "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.5.2-rc2", "third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@4576304a4b9835aa8646c9735b079e1d96858633", "third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae", diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 19494b2..01e9cc4 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -387,7 +387,13 @@ static void check(skiatest::Reporter* r, &opts, nullptr, nullptr); if (supportsSubsetDecoding) { - REPORTER_ASSERT(r, result == expectedResult); + if (expectedResult == SkCodec::kSuccess) { + REPORTER_ASSERT(r, result == expectedResult); + } else { + SkASSERT(expectedResult == SkCodec::kIncompleteInput); + REPORTER_ASSERT(r, result == SkCodec::kIncompleteInput + || result == SkCodec::kSuccess); + } // Webp is the only codec that supports subsets, and it will have modified the subset // to have even left/top. REPORTER_ASSERT(r, SkIsAlign2(subset.fLeft) && SkIsAlign2(subset.fTop)); -- 2.7.4