24 version = "0.1.0" |
24 version = "0.1.0" |
25 dependencies = [ |
25 dependencies = [ |
26 diff --git a/Cargo.toml b/Cargo.toml |
26 diff --git a/Cargo.toml b/Cargo.toml |
27 --- a/Cargo.toml |
27 --- a/Cargo.toml |
28 +++ b/Cargo.toml |
28 +++ b/Cargo.toml |
29 @@ -143,16 +143,17 @@ async-task = { git = "https://github.com |
29 @@ -150,16 +150,17 @@ async-task = { git = "https://github.com |
30 chardetng = { git = "https://github.com/hsivonen/chardetng", rev="3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" } |
30 chardetng = { git = "https://github.com/hsivonen/chardetng", rev="3484d3e3ebdc8931493aa5df4d7ee9360a90e76b" } |
31 chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" } |
31 chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" } |
32 coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev="fc68464b5445caf111e41f643a2e69ccce0b4f83" } |
32 coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev="fc68464b5445caf111e41f643a2e69ccce0b4f83" } |
33 fog = { path = "toolkit/components/glean/api" } |
33 fog = { path = "toolkit/components/glean/api" } |
34 libudev-sys = { path = "dom/webauthn/libudev-sys" } |
34 libudev-sys = { path = "dom/webauthn/libudev-sys" } |
36 midir = { git = "https://github.com/mozilla/midir.git", rev = "e1b4dcb767f9e69afe95a860374aaa9635d81e3d" } |
36 midir = { git = "https://github.com/mozilla/midir.git", rev = "e1b4dcb767f9e69afe95a860374aaa9635d81e3d" } |
37 minidump_writer_linux = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "75ada456c92a429704691a85e1cb42fef8cafc0d" } |
37 minidump_writer_linux = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "75ada456c92a429704691a85e1cb42fef8cafc0d" } |
38 +glslopt = { path = "third_party/rust/glslopt/" } |
38 +glslopt = { path = "third_party/rust/glslopt/" } |
39 |
39 |
40 # application-services overrides to make updating them all simpler. |
40 # application-services overrides to make updating them all simpler. |
41 interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "fb1c78b13c27b5db1fd5458b8c2d8f433855dd61" } |
41 interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "d8503475f43dbf1d78eef4e23b0578d0fada3f39" } |
42 sql-support = { git = "https://github.com/mozilla/application-services", rev = "fb1c78b13c27b5db1fd5458b8c2d8f433855dd61" } |
42 sql-support = { git = "https://github.com/mozilla/application-services", rev = "d8503475f43dbf1d78eef4e23b0578d0fada3f39" } |
43 sync15-traits = { git = "https://github.com/mozilla/application-services", rev = "fb1c78b13c27b5db1fd5458b8c2d8f433855dd61" } |
43 sync15 = { git = "https://github.com/mozilla/application-services", rev = "d8503475f43dbf1d78eef4e23b0578d0fada3f39" } |
44 viaduct = { git = "https://github.com/mozilla/application-services", rev = "fb1c78b13c27b5db1fd5458b8c2d8f433855dd61" } |
44 viaduct = { git = "https://github.com/mozilla/application-services", rev = "d8503475f43dbf1d78eef4e23b0578d0fada3f39" } |
45 webext-storage = { git = "https://github.com/mozilla/application-services", rev = "fb1c78b13c27b5db1fd5458b8c2d8f433855dd61" } |
45 webext-storage = { git = "https://github.com/mozilla/application-services", rev = "d8503475f43dbf1d78eef4e23b0578d0fada3f39" } |
46 |
46 |
47 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
47 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
48 --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
48 --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
49 +++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
49 +++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
50 @@ -36,12 +36,13 @@ static inline SkMatrix SkEncodedOriginTo |
50 @@ -36,12 +36,13 @@ static inline SkMatrix SkEncodedOriginTo |