From 2e08f42ae48c36ff6422216de4dff4bb31f9122c Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Thu, 6 Aug 2015 12:03:56 +1000 Subject: [PATCH] Update stb-image to get JPEG progressive support. --- components/servo/Cargo.lock | 2 +- ports/cef/Cargo.lock | 4 +++- ports/gonk/Cargo.lock | 4 +++- tests/ref/basic.list | 2 ++ tests/ref/jpeg_normal.html | 10 ++++++++++ tests/ref/jpeg_normal.jpg | Bin 0 -> 336 bytes tests/ref/jpeg_progressive.html | 10 ++++++++++ tests/ref/jpeg_progressive.jpg | Bin 0 -> 570 bytes tests/ref/jpeg_ref.html | 15 +++++++++++++++ .../the-img-element/img.complete.html.ini | 3 --- 10 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 tests/ref/jpeg_normal.html create mode 100644 tests/ref/jpeg_normal.jpg create mode 100644 tests/ref/jpeg_progressive.html create mode 100644 tests/ref/jpeg_progressive.jpg create mode 100644 tests/ref/jpeg_ref.html diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 7d655d91ebe..4dab7986a0b 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1333,7 +1333,7 @@ dependencies = [ [[package]] name = "stb_image" version = "0.1.0" -source = "git+https://github.com/servo/rust-stb-image#e3f7246caa694e863975ead98f4940d046108fd7" +source = "git+https://github.com/servo/rust-stb-image#ad05c642b64a9059dd31c37b1a1ac78722821008" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index d292fe6f558..bb0eff81b44 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -894,6 +894,8 @@ dependencies = [ "net_traits 0.0.1", "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", + "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1332,7 +1334,7 @@ dependencies = [ [[package]] name = "stb_image" version = "0.1.0" -source = "git+https://github.com/servo/rust-stb-image#e3f7246caa694e863975ead98f4940d046108fd7" +source = "git+https://github.com/servo/rust-stb-image#ad05c642b64a9059dd31c37b1a1ac78722821008" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 04b5e92eda8..6ed06ddf1f4 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -814,6 +814,8 @@ dependencies = [ "net_traits 0.0.1", "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", + "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1224,7 +1226,7 @@ dependencies = [ [[package]] name = "stb_image" version = "0.1.0" -source = "git+https://github.com/servo/rust-stb-image#e3f7246caa694e863975ead98f4940d046108fd7" +source = "git+https://github.com/servo/rust-stb-image#ad05c642b64a9059dd31c37b1a1ac78722821008" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/tests/ref/basic.list b/tests/ref/basic.list index b8ec45640c5..b27ac8e40d4 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -171,6 +171,8 @@ experimental == iframe/size_attributes_vertical_writing_mode.html iframe/size_at == inset.html inset_ref.html != inset_blackborder.html blackborder_ref.html == issue-1324.html issue-1324-ref.html +== jpeg_normal.html jpeg_ref.html +== jpeg_progressive.html jpeg_ref.html == jumpiness_a.html jumpiness_ref.html == last_child_pseudo_a.html last_child_pseudo_b.html == last_of_type_pseudo_a.html last_of_type_pseudo_b.html diff --git a/tests/ref/jpeg_normal.html b/tests/ref/jpeg_normal.html new file mode 100644 index 00000000000..51b5231f7a2 --- /dev/null +++ b/tests/ref/jpeg_normal.html @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/tests/ref/jpeg_normal.jpg b/tests/ref/jpeg_normal.jpg new file mode 100644 index 0000000000000000000000000000000000000000..aac501b2a022ce7d1c12169bc5a0d591cacb85ea GIT binary patch literal 336 zcmb7ef}YuZ?k?^UDxpw9TsTLf?iM z#w8?pMyf)oB2=ade=A+#H3kfVJTgzhQ@SDYshBEf9Ne6OX~%EPxGu(SKcoEj6IKxW S2#*ae=g;~yb@^2_>G1{Zj3QS6 literal 0 HcmV?d00001 diff --git a/tests/ref/jpeg_progressive.html b/tests/ref/jpeg_progressive.html new file mode 100644 index 00000000000..fe2bda0c2e2 --- /dev/null +++ b/tests/ref/jpeg_progressive.html @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/tests/ref/jpeg_progressive.jpg b/tests/ref/jpeg_progressive.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c2561d8fe5001c18bf5eed77b09fb283d72e40df GIT binary patch literal 570 zcmb79OHRWu5Pf6Ei5olVxY(gvZomyv38`v11sCWUdM6evSR(e_7P{dkW}=Ept@;tq zv+?NtCU5f(_<6pZgNU$@hrGiRv{J(e3K?UKDGF0pRcU?gy{nyT+6gypXr1GZ!(B`% z`SJaLiqXxP8d_2 literal 0 HcmV?d00001 diff --git a/tests/ref/jpeg_ref.html b/tests/ref/jpeg_ref.html new file mode 100644 index 00000000000..37417b7647b --- /dev/null +++ b/tests/ref/jpeg_ref.html @@ -0,0 +1,15 @@ + + + + + + +
+ + diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/img.complete.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/img.complete.html.ini index 97ef24b75ef..f6533bcbbbe 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/img.complete.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/img.complete.html.ini @@ -6,9 +6,6 @@ [img src empty] expected: FAIL - [async src complete test] - expected: FAIL - [IDL attribute complete returns true when image resource has been fetched but not run yet & image is not in broken state] expected: FAIL