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

Update webrender.

Browse source
This commit is contained in:
Josh Matthews 2020-06-11 14:07:39 -04:00
parent a34d1573b6
commit b39955df67
11 changed files with 16 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Cargo.lock generated
View file

@ -755,7 +755,6 @@ dependencies = [
name = "compositing" name = "compositing"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units",
"canvas", "canvas",
"crossbeam-channel", "crossbeam-channel",
"embedder_traits", "embedder_traits",
@ -1890,7 +1889,6 @@ dependencies = [
name = "gfx_traits" name = "gfx_traits"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units",
"malloc_size_of", "malloc_size_of",
"malloc_size_of_derive", "malloc_size_of_derive",
"range", "range",
@ -3018,7 +3016,6 @@ dependencies = [
name = "libservo" name = "libservo"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units",
"background_hang_monitor", "background_hang_monitor",
"bluetooth", "bluetooth",
"bluetooth_traits", "bluetooth_traits",
@ -3934,7 +3931,7 @@ dependencies = [
[[package]] [[package]]
name = "peek-poke" name = "peek-poke"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627" source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
dependencies = [ dependencies = [
"euclid", "euclid",
"peek-poke-derive 0.2.1 (git+https://github.com/servo/webrender)", "peek-poke-derive 0.2.1 (git+https://github.com/servo/webrender)",
@ -3952,7 +3949,7 @@ dependencies = [
[[package]] [[package]]
name = "peek-poke-derive" name = "peek-poke-derive"
version = "0.2.1" version = "0.2.1"
source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627" source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
dependencies = [ dependencies = [
"proc-macro2 1.0.17", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
@ -6398,7 +6395,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender" name = "webrender"
version = "0.61.0" version = "0.61.0"
source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627" source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
dependencies = [ dependencies = [
"base64 0.10.1", "base64 0.10.1",
"bincode", "bincode",
@ -6440,7 +6437,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender_api" name = "webrender_api"
version = "0.61.0" version = "0.61.0"
source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627" source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
dependencies = [ dependencies = [
"app_units", "app_units",
"bitflags", "bitflags",
@ -6461,7 +6458,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender_build" name = "webrender_build"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627" source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"lazy_static", "lazy_static",
@ -6641,7 +6638,7 @@ dependencies = [
[[package]] [[package]]
name = "wr_malloc_size_of" name = "wr_malloc_size_of"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webrender#de3999583ab20aad7c57ea35a3e0394ed45be627" source = "git+https://github.com/servo/webrender#1175acad2d4f49fa712e105c84149ac7f394261d"
dependencies = [ dependencies = [
"app_units", "app_units",
"euclid", "euclid",

1
components/compositing/Cargo.toml
View file

@ -16,7 +16,6 @@ default = []
gl = ["gleam", "pixels"] gl = ["gleam", "pixels"]
[dependencies] [dependencies]
app_units = "0.7"
canvas = { path = "../canvas" } canvas = { path = "../canvas" }
crossbeam-channel = "0.4" crossbeam-channel = "0.4"
embedder_traits = { path = "../embedder_traits" } embedder_traits = { path = "../embedder_traits" }

2
components/compositing/compositor_thread.rs
View file

@ -129,7 +129,7 @@ pub enum Msg {
pub enum WebrenderFontMsg { pub enum WebrenderFontMsg {
AddFontInstance( AddFontInstance(
webrender_api::FontKey, webrender_api::FontKey,
app_units::Au, f32,
Sender<webrender_api::FontInstanceKey>, Sender<webrender_api::FontInstanceKey>,
), ),
AddFont(gfx_traits::FontData, Sender<webrender_api::FontKey>), AddFont(gfx_traits::FontData, Sender<webrender_api::FontKey>),

11
components/gfx/font_cache_thread.rs
View file

@ -182,10 +182,13 @@ impl FontCache {
Command::GetFontInstance(font_key, size, result) => { Command::GetFontInstance(font_key, size, result) => {
let webrender_api = &self.webrender_api; let webrender_api = &self.webrender_api;
let instance_key = *self let instance_key =
.font_instances *self
.entry((font_key, size)) .font_instances
.or_insert_with(|| webrender_api.add_font_instance(font_key, size)); .entry((font_key, size))
.or_insert_with(|| {
webrender_api.add_font_instance(font_key, size.to_f32_px())
});
let _ = result.send(instance_key); let _ = result.send(instance_key);
}, },

1
components/gfx_traits/Cargo.toml
View file

@ -11,7 +11,6 @@ name = "gfx_traits"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
app_units = "0.7"
malloc_size_of = { path = "../malloc_size_of" } malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = "0.1" malloc_size_of_derive = "0.1"
range = { path = "../range" } range = { path = "../range" }

2
components/gfx_traits/lib.rs
View file

@ -113,7 +113,7 @@ pub trait WebrenderApi {
fn add_font_instance( fn add_font_instance(
&self, &self,
font_key: webrender_api::FontKey, font_key: webrender_api::FontKey,
size: app_units::Au, size: f32,
) -> webrender_api::FontInstanceKey; ) -> webrender_api::FontInstanceKey;
fn add_font(&self, data: FontData) -> webrender_api::FontKey; fn add_font(&self, data: FontData) -> webrender_api::FontKey;
} }

1
components/servo/Cargo.toml
View file

@ -38,7 +38,6 @@ webrender_debugger = ["webrender/debugger"]
xr-profile = ["canvas/xr-profile", "canvas_traits/xr-profile", "script/xr-profile", "webxr/profile"] xr-profile = ["canvas/xr-profile", "canvas_traits/xr-profile", "script/xr-profile", "webxr/profile"]
[dependencies] [dependencies]
app_units = "0.7"
background_hang_monitor = { path = "../background_hang_monitor" } background_hang_monitor = { path = "../background_hang_monitor" }
bluetooth = { path = "../bluetooth" } bluetooth = { path = "../bluetooth" }
bluetooth_traits = { path = "../bluetooth_traits" } bluetooth_traits = { path = "../bluetooth_traits" }

2
components/servo/lib.rs
View file

@ -928,7 +928,7 @@ impl gfx_traits::WebrenderApi for FontCacheWR {
fn add_font_instance( fn add_font_instance(
&self, &self,
font_key: webrender_api::FontKey, font_key: webrender_api::FontKey,
size: app_units::Au, size: f32,
) -> webrender_api::FontInstanceKey { ) -> webrender_api::FontInstanceKey {
let (sender, receiver) = unbounded(); let (sender, receiver) = unbounded();
let _ = self.0.send(Msg::Webrender(WebrenderMsg::Font( let _ = self.0.send(Msg::Webrender(WebrenderMsg::Font(

3
tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini
View file

@ -1,3 +0,0 @@
[geometry-border-image-001.https.html]
bug: https://github.com/servo/servo/issues/17861
expected: FAIL

3
tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini
View file

@ -1,3 +0,0 @@
[geometry-border-image-004.https.html]
bug: https://github.com/servo/servo/issues/17860
expected: FAIL

3
tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-transform-translatez.html.ini
View file

@ -1,3 +0,0 @@
[fieldset-transform-translatez.html]
expected:
if os == "linux": FAIL