Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #27717 - servo:jdm-patch-46, r=jdm

Browse source 
Pin bluetooth devices.

The lack of a pinned revision in this manifest makes it harder for people to experiment with using libsimpleservo from other projects.
This commit is contained in:
bors-servo 2020-11-15 10:58:13 -05:00 • committed by GitHub
commit 838d833cf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Cargo.lock generated
View file

@ -401,7 +401,7 @@ checksum = "19b23557dd27704797128f9db2816416bef20dad62d4a9768714eeb65f07d296"
[[package]] [[package]]
name = "blurmac" name = "blurmac"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/devices#cb28c4725ffbfece99dab842d17d3e8c50774778" source = "git+https://github.com/servo/devices?rev=cb28c4725ffbfece99dab842d17d3e8c50774778#cb28c4725ffbfece99dab842d17d3e8c50774778"
dependencies = [ dependencies = [
"log", "log",
"objc", "objc",
@ -1284,7 +1284,7 @@ dependencies = [
[[package]] [[package]]
name = "device" name = "device"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/devices#cb28c4725ffbfece99dab842d17d3e8c50774778" source = "git+https://github.com/servo/devices?rev=cb28c4725ffbfece99dab842d17d3e8c50774778#cb28c4725ffbfece99dab842d17d3e8c50774778"
dependencies = [ dependencies = [
"blurdroid", "blurdroid",
"blurmac", "blurmac",
@ -2085,12 +2085,12 @@ dependencies = [
[[package]] [[package]]
name = "gif" name = "gif"
version = "0.10.3" version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af" checksum = "02efba560f227847cb41463a7395c514d127d4f74fff12ef0137fff1b84b96c4"
dependencies = [ dependencies = [
"color_quant", "color_quant",
"lzw", "weezl",
] ]
[[package]] [[package]]
@ -2517,9 +2517,9 @@ dependencies = [
[[package]] [[package]]
name = "half" name = "half"
version = "1.0.0" version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63d68db75012a85555434ee079e7e6337931f87a087ab2988becbadf64673a7f" checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
[[package]] [[package]]
name = "harfbuzz-sys" name = "harfbuzz-sys"
@ -2763,9 +2763,9 @@ dependencies = [
[[package]] [[package]]
name = "image" name = "image"
version = "0.23.6" version = "0.23.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b0553fec6407d63fe2975b794dfb099f3f790bdc958823851af37b26404ab4" checksum = "985fc06b1304d19c28d5c562ed78ef5316183f2b0053b46763a0b94862373c34"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"byteorder", "byteorder",
@ -7048,10 +7048,16 @@ dependencies = [
"time", "time",
] ]
[[package]]
name = "weezl"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e2bb9fc8309084dd7cd651336673844c1d47f8ef6d2091ec160b27f5c4aa277"
[[package]] [[package]]
name = "wgpu-core" name = "wgpu-core"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/gfx-rs/wgpu#e72724a6e393503c73f37e86aa9317a5c62e32b8" source = "git+https://github.com/gfx-rs/wgpu?rev=e72724a6e393503c73f37e86aa9317a5c62e32b8#e72724a6e393503c73f37e86aa9317a5c62e32b8"
dependencies = [ dependencies = [
"arrayvec 0.5.1", "arrayvec 0.5.1",
"bitflags", "bitflags",
@ -7079,7 +7085,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-types" name = "wgpu-types"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/gfx-rs/wgpu#e72724a6e393503c73f37e86aa9317a5c62e32b8" source = "git+https://github.com/gfx-rs/wgpu?rev=e72724a6e393503c73f37e86aa9317a5c62e32b8#e72724a6e393503c73f37e86aa9317a5c62e32b8"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"serde", "serde",

2
components/bluetooth/Cargo.toml
View file

@ -13,7 +13,7 @@ path = "lib.rs"
[dependencies] [dependencies]
bitflags = "1.0" bitflags = "1.0"
bluetooth_traits = { path = "../bluetooth_traits" } bluetooth_traits = { path = "../bluetooth_traits" }
device = { git = "https://github.com/servo/devices", features = ["bluetooth-test"] } device = { git = "https://github.com/servo/devices", features = ["bluetooth-test"], rev = "cb28c4725ffbfece99dab842d17d3e8c50774778" }
embedder_traits = { path = "../embedder_traits" } embedder_traits = { path = "../embedder_traits" }
ipc-channel = "0.14" ipc-channel = "0.14"
log = "0.4" log = "0.4"

22
components/canvas/webgl_thread.rs
View file

@ -2873,16 +2873,16 @@ fn image_to_tex_image_data(
let mut rgbaf16 = Vec::<u8>::with_capacity(pixel_count * 8); let mut rgbaf16 = Vec::<u8>::with_capacity(pixel_count * 8);
for rgba8 in pixels.chunks(4) { for rgba8 in pixels.chunks(4) {
rgbaf16 rgbaf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[0] as f32).as_bits()) .write_u16::<NativeEndian>(f16::from_f32(rgba8[0] as f32).to_bits())
.unwrap(); .unwrap();
rgbaf16 rgbaf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[1] as f32).as_bits()) .write_u16::<NativeEndian>(f16::from_f32(rgba8[1] as f32).to_bits())
.unwrap(); .unwrap();
rgbaf16 rgbaf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[2] as f32).as_bits()) .write_u16::<NativeEndian>(f16::from_f32(rgba8[2] as f32).to_bits())
.unwrap(); .unwrap();
rgbaf16 rgbaf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[3] as f32).as_bits()) .write_u16::<NativeEndian>(f16::from_f32(rgba8[3] as f32).to_bits())
.unwrap(); .unwrap();
} }
rgbaf16 rgbaf16
@ -2892,13 +2892,13 @@ fn image_to_tex_image_data(
let mut rgbf16 = Vec::<u8>::with_capacity(pixel_count * 6); let mut rgbf16 = Vec::<u8>::with_capacity(pixel_count * 6);
for rgba8 in pixels.chunks(4) { for rgba8 in pixels.chunks(4) {
rgbf16 rgbf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[0] as f32).as_bits()) .write_u16::<NativeEndian>(f16::from_f32(rgba8[0] as f32).to_bits())
.unwrap(); .unwrap();
rgbf16 rgbf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[1] as f32).as_bits()) .write_u16::<NativeEndian>(f16::from_f32(rgba8[1] as f32).to_bits())
.unwrap(); .unwrap();
rgbf16 rgbf16
.write_u16::<NativeEndian>(f16::from_f32(rgba8[2] as f32).as_bits()) .write_u16::<NativeEndian>(f16::from_f32(rgba8[2] as f32).to_bits())
.unwrap(); .unwrap();
} }
rgbf16 rgbf16
@ -2906,7 +2906,7 @@ fn image_to_tex_image_data(
(TexFormat::Alpha, TexDataType::HalfFloat) | (TexFormat::Alpha, TexDataType::HalfFloat) |
(TexFormat::Alpha16f, TexDataType::HalfFloat) => { (TexFormat::Alpha16f, TexDataType::HalfFloat) => {
for i in 0..pixel_count { for i in 0..pixel_count {
let p = f16::from_f32(pixels[i * 4 + 3] as f32).as_bits(); let p = f16::from_f32(pixels[i * 4 + 3] as f32).to_bits();
NativeEndian::write_u16(&mut pixels[i * 2..i * 2 + 2], p); NativeEndian::write_u16(&mut pixels[i * 2..i * 2 + 2], p);
} }
pixels.truncate(pixel_count * 2); pixels.truncate(pixel_count * 2);
@ -2915,7 +2915,7 @@ fn image_to_tex_image_data(
(TexFormat::Luminance, TexDataType::HalfFloat) | (TexFormat::Luminance, TexDataType::HalfFloat) |
(TexFormat::Luminance16f, TexDataType::HalfFloat) => { (TexFormat::Luminance16f, TexDataType::HalfFloat) => {
for i in 0..pixel_count { for i in 0..pixel_count {
let p = f16::from_f32(pixels[i * 4] as f32).as_bits(); let p = f16::from_f32(pixels[i * 4] as f32).to_bits();
NativeEndian::write_u16(&mut pixels[i * 2..i * 2 + 2], p); NativeEndian::write_u16(&mut pixels[i * 2..i * 2 + 2], p);
} }
pixels.truncate(pixel_count * 2); pixels.truncate(pixel_count * 2);
@ -2924,8 +2924,8 @@ fn image_to_tex_image_data(
(TexFormat::LuminanceAlpha, TexDataType::HalfFloat) | (TexFormat::LuminanceAlpha, TexDataType::HalfFloat) |
(TexFormat::LuminanceAlpha16f, TexDataType::HalfFloat) => { (TexFormat::LuminanceAlpha16f, TexDataType::HalfFloat) => {
for rgba8 in pixels.chunks_mut(4) { for rgba8 in pixels.chunks_mut(4) {
let lum = f16::from_f32(rgba8[0] as f32).as_bits(); let lum = f16::from_f32(rgba8[0] as f32).to_bits();
let a = f16::from_f32(rgba8[3] as f32).as_bits(); let a = f16::from_f32(rgba8[3] as f32).to_bits();
NativeEndian::write_u16(&mut rgba8[0..2], lum); NativeEndian::write_u16(&mut rgba8[0..2], lum);
NativeEndian::write_u16(&mut rgba8[2..4], a); NativeEndian::write_u16(&mut rgba8[2..4], a);
} }

4
components/script/dom/htmlcanvaselement.rs
View file

@ -37,7 +37,7 @@ use canvas_traits::webgl::{GLContextAttributes, WebGLVersion};
use dom_struct::dom_struct; use dom_struct::dom_struct;
use euclid::default::{Rect, Size2D}; use euclid::default::{Rect, Size2D};
use html5ever::{LocalName, Prefix}; use html5ever::{LocalName, Prefix};
use image::png::PNGEncoder; use image::png::PngEncoder;
use image::ColorType; use image::ColorType;
use ipc_channel::ipc::{self as ipcchan, IpcSharedMemory}; use ipc_channel::ipc::{self as ipcchan, IpcSharedMemory};
use js::error::throw_type_error; use js::error::throw_type_error;
@ -426,7 +426,7 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement {
let mut png = Vec::new(); let mut png = Vec::new();
// FIXME(nox): https://github.com/image-rs/image-png/issues/86 // FIXME(nox): https://github.com/image-rs/image-png/issues/86
// FIXME(nox): https://github.com/image-rs/image-png/issues/87 // FIXME(nox): https://github.com/image-rs/image-png/issues/87
PNGEncoder::new(&mut png) PngEncoder::new(&mut png)
.encode(&file, self.Width(), self.Height(), ColorType::Rgba8) .encode(&file, self.Width(), self.Height(), ColorType::Rgba8)
.unwrap(); .unwrap();
let mut url = "data:image/png;base64,".to_owned(); let mut url = "data:image/png;base64,".to_owned();

4
components/webgpu/Cargo.toml
View file

@ -22,5 +22,5 @@ servo_config = { path = "../config" }
smallvec = { version = "0.6", features = ["serde"] } smallvec = { version = "0.6", features = ["serde"] }
webrender_api = { git = "https://github.com/servo/webrender" } webrender_api = { git = "https://github.com/servo/webrender" }
webrender_traits = { path = "../webrender_traits" } webrender_traits = { path = "../webrender_traits" }
wgpu-core = { version = "0.6.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace", "serial-pass"] } wgpu-core = { version = "0.6.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace", "serial-pass"], rev = "e72724a6e393503c73f37e86aa9317a5c62e32b8" }
wgpu-types = { version = "0.6.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace"] } wgpu-types = { version = "0.6.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace"], rev = "e72724a6e393503c73f37e86aa9317a5c62e32b8" }