aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/canvas/Cargo.toml2
-rw-r--r--components/canvas/canvas_data.rs3
-rw-r--r--components/canvas/webgl_thread.rs5
-rw-r--r--components/compositing/Cargo.toml6
-rw-r--r--components/compositing/compositor.rs2
-rw-r--r--components/embedder_traits/Cargo.toml2
-rw-r--r--components/layout/display_list/items.rs1
-rw-r--r--components/layout/display_list/webrender_helpers.rs1
-rw-r--r--components/layout_thread_2020/lib.rs2
-rw-r--r--components/net/image_cache.rs6
-rw-r--r--components/net_traits/Cargo.toml2
-rw-r--r--components/net_traits/image/base.rs10
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/script/dom/htmlcanvaselement.rs2
-rw-r--r--components/script/dom/htmlmediaelement.rs6
-rw-r--r--components/servo/Cargo.toml2
-rw-r--r--components/style/Cargo.toml2
-rw-r--r--components/webdriver_server/Cargo.toml2
-rw-r--r--components/webdriver_server/lib.rs2
-rw-r--r--components/webvr/Cargo.toml2
20 files changed, 33 insertions, 29 deletions
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 3ad24bea445..ab81c6672da 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -25,7 +25,7 @@ cssparser = "0.27"
embedder_traits = {path = "../embedder_traits"}
euclid = "0.20"
fnv = "1.0"
-gleam = "0.6.7"
+gleam = "0.9"
half = "1"
ipc-channel = "0.14"
log = "0.4"
diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs
index 823999b3c98..b8b756da903 100644
--- a/components/canvas/canvas_data.rs
+++ b/components/canvas/canvas_data.rs
@@ -942,8 +942,7 @@ impl<'a> CanvasData<'a> {
stride: None,
format: webrender_api::ImageFormat::BGRA8,
offset: 0,
- is_opaque: false,
- allow_mipmaps: false,
+ flags: webrender_api::ImageDescriptorFlags::empty(),
};
let data = self.drawtarget.snapshot_data_owned();
let data = webrender_api::ImageData::Raw(Arc::new(data));
diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs
index 079928c9d57..5ecf7183914 100644
--- a/components/canvas/webgl_thread.rs
+++ b/components/canvas/webgl_thread.rs
@@ -945,13 +945,14 @@ impl WebGLThread {
/// Helper function to create a `webrender_api::ImageDescriptor`.
fn image_descriptor(size: Size2D<i32>, alpha: bool) -> webrender_api::ImageDescriptor {
+ let mut flags = webrender_api::ImageDescriptorFlags::empty();
+ flags.set(webrender_api::ImageDescriptorFlags::IS_OPAQUE, !alpha);
webrender_api::ImageDescriptor {
size: webrender_api::units::DeviceIntSize::new(size.width, size.height),
stride: None,
format: webrender_api::ImageFormat::BGRA8,
offset: 0,
- is_opaque: !alpha,
- allow_mipmaps: false,
+ flags,
}
}
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 057090d3dda..70f40e3b568 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -20,8 +20,8 @@ crossbeam-channel = "0.4"
embedder_traits = {path = "../embedder_traits"}
euclid = "0.20"
gfx_traits = {path = "../gfx_traits"}
-gleam = {version = "0.6", optional = true}
-image = "0.22"
+gleam = {version = "0.9", optional = true}
+image = "0.23"
ipc-channel = "0.14"
libc = "0.2"
keyboard-types = "0.4.3"
@@ -31,7 +31,7 @@ net_traits = {path = "../net_traits"}
num-traits = "0.2"
pixels = {path = "../pixels", optional = true}
profile_traits = {path = "../profile_traits"}
-rust-webvr = {version = "0.17", features = ["mock", "openvr", "vrexternal"]}
+rust-webvr = {version = "0.18", features = ["mock", "openvr", "vrexternal"]}
script_traits = {path = "../script_traits"}
servo_geometry = {path = "../geometry"}
servo-media = {git = "https://github.com/servo/media"}
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index aa58e10b05f..c5c33afbf6b 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -1396,7 +1396,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
FramebufferUintLength::new(height),
);
let dynamic_image = DynamicImage::ImageRgb8(img);
- if let Err(e) = dynamic_image.write_to(&mut file, ImageFormat::PNG)
+ if let Err(e) = dynamic_image.write_to(&mut file, ImageFormat::Png)
{
error!("Failed to save {} ({}).", path, e);
}
diff --git a/components/embedder_traits/Cargo.toml b/components/embedder_traits/Cargo.toml
index c7febfb7c5b..8095771d28d 100644
--- a/components/embedder_traits/Cargo.toml
+++ b/components/embedder_traits/Cargo.toml
@@ -18,7 +18,7 @@ lazy_static = "1"
log = "0.4"
msg = {path = "../msg"}
num-traits = "0.2"
-num-derive = "0.2"
+num-derive = "0.3"
serde = "1.0"
servo_url = {path = "../url"}
webrender_api = {git = "https://github.com/servo/webrender"}
diff --git a/components/layout/display_list/items.rs b/components/layout/display_list/items.rs
index d7afa8423c0..ff276b674e4 100644
--- a/components/layout/display_list/items.rs
+++ b/components/layout/display_list/items.rs
@@ -454,6 +454,7 @@ pub fn empty_common_item_properties() -> CommonItemProperties {
spatial_id: SpatialId::root_scroll_node(wr::PipelineId::dummy()),
hit_info: None,
flags: PrimitiveFlags::empty(),
+ item_key: None,
}
}
diff --git a/components/layout/display_list/webrender_helpers.rs b/components/layout/display_list/webrender_helpers.rs
index 51972fed316..973ef623d5a 100644
--- a/components/layout/display_list/webrender_helpers.rs
+++ b/components/layout/display_list/webrender_helpers.rs
@@ -338,5 +338,6 @@ fn build_common_item_properties(
// TODO(gw): Make use of the WR backface visibility functionality.
flags: PrimitiveFlags::default(),
hit_info: tag,
+ item_key: None,
}
}
diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs
index 1a150401296..5a76997b2ad 100644
--- a/components/layout_thread_2020/lib.rs
+++ b/components/layout_thread_2020/lib.rs
@@ -1420,7 +1420,7 @@ impl LayoutThread {
fragment_tree.print();
}
if self.dump_display_list {
- display_list.wr.print_display_list();
+ display_list.wr.dump_serialized_display_list();
}
debug!("Layout done!");
diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs
index 57b6338dafb..b5f0c98d49d 100644
--- a/components/net/image_cache.rs
+++ b/components/net/image_cache.rs
@@ -21,6 +21,7 @@ use std::mem;
use std::sync::{Arc, Mutex};
use std::thread;
use webrender_api::units::DeviceIntSize;
+use webrender_api::ImageDescriptorFlags;
///
/// TODO(gw): Remaining work on image cache:
@@ -75,13 +76,14 @@ fn set_webrender_image_key(webrender_api: &WebrenderIpcSender, image: &mut Image
panic!("Not support by webrender yet");
},
};
+ let mut flags = ImageDescriptorFlags::ALLOW_MIPMAPS;
+ flags.set(ImageDescriptorFlags::IS_OPAQUE, is_opaque);
let descriptor = webrender_api::ImageDescriptor {
size: DeviceIntSize::new(image.width as i32, image.height as i32),
stride: None,
format: webrender_api::ImageFormat::BGRA8,
offset: 0,
- is_opaque,
- allow_mipmaps: true,
+ flags,
};
let data = webrender_api::ImageData::new(bytes);
let image_key = webrender_api.generate_image_key();
diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
index e749467a594..46def57c7ad 100644
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@@ -20,7 +20,7 @@ headers = "0.2"
http = "0.1"
hyper = "0.12"
hyper_serde = "0.11"
-piston_image = {package = "image", version = "0.22"}
+piston_image = {package = "image", version = "0.23"}
ipc-channel = "0.14"
lazy_static = "1"
log = "0.4"
diff --git a/components/net_traits/image/base.rs b/components/net_traits/image/base.rs
index 262eaf476a7..6f090f12fe1 100644
--- a/components/net_traits/image/base.rs
+++ b/components/net_traits/image/base.rs
@@ -77,15 +77,15 @@ pub fn load_from_memory(buffer: &[u8], cors_status: CorsStatus) -> Option<Image>
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
pub fn detect_image_format(buffer: &[u8]) -> Result<ImageFormat, &str> {
if is_gif(buffer) {
- Ok(ImageFormat::GIF)
+ Ok(ImageFormat::Gif)
} else if is_jpeg(buffer) {
- Ok(ImageFormat::JPEG)
+ Ok(ImageFormat::Jpeg)
} else if is_png(buffer) {
- Ok(ImageFormat::PNG)
+ Ok(ImageFormat::Png)
} else if is_bmp(buffer) {
- Ok(ImageFormat::BMP)
+ Ok(ImageFormat::Bmp)
} else if is_ico(buffer) {
- Ok(ImageFormat::ICO)
+ Ok(ImageFormat::Ico)
} else {
Err("Image Format Not Supported")
}
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 03eac6cae65..ed98282a0e5 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -61,7 +61,7 @@ html5ever = "0.25"
http = "0.1"
hyper = "0.12"
hyper_serde = "0.11"
-image = "0.22"
+image = "0.23"
indexmap = "1.0.2"
ipc-channel = "0.14"
itertools = "0.8"
diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs
index e800a89bdf1..e56ca4a8266 100644
--- a/components/script/dom/htmlcanvaselement.rs
+++ b/components/script/dom/htmlcanvaselement.rs
@@ -392,7 +392,7 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement {
// FIXME(nox): https://github.com/PistonDevelopers/image-png/issues/86
// FIXME(nox): https://github.com/PistonDevelopers/image-png/issues/87
PNGEncoder::new(&mut png)
- .encode(&file, self.Width(), self.Height(), ColorType::RGBA(8))
+ .encode(&file, self.Width(), self.Height(), ColorType::Rgba8)
.unwrap();
let mut url = "data:image/png;base64,".to_owned();
// FIXME(nox): Should this use base64::URL_SAFE?
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 6cbb25157ff..f8c686d34f2 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -96,7 +96,8 @@ use std::rc::Rc;
use std::sync::{Arc, Mutex};
use time::{self, Duration, Timespec};
use webrender_api::{ExternalImageData, ExternalImageId, ExternalImageType, TextureTarget};
-use webrender_api::{ImageData, ImageDescriptor, ImageFormat, ImageKey, Transaction};
+use webrender_api::{ImageData, ImageDescriptor, ImageDescriptorFlags, ImageFormat};
+use webrender_api::{ImageKey, Transaction};
#[derive(PartialEq)]
enum FrameStatus {
@@ -186,8 +187,7 @@ impl VideoFrameRenderer for MediaFrameRenderer {
frame.get_width(),
frame.get_height(),
ImageFormat::BGRA8,
- false,
- false,
+ ImageDescriptorFlags::empty(),
);
match self.current_frame {
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 8c975d604a6..c8d77f56683 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -55,7 +55,7 @@ embedder_traits = {path = "../embedder_traits"}
env_logger = "0.6"
euclid = "0.20"
gfx = {path = "../gfx"}
-gleam = "0.6"
+gleam = "0.9"
ipc-channel = "0.14"
keyboard-types = "0.4"
layout_thread_2013 = {path = "../layout_thread", optional = true}
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index f580d55b084..d6f685048a3 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -53,7 +53,7 @@ malloc_size_of_derive = "0.1"
num_cpus = {version = "1.1.0"}
num-integer = "0.1"
num-traits = "0.2"
-num-derive = "0.2"
+num-derive = "0.3"
owning_ref = "0.4"
parking_lot = "0.9"
precomputed-hash = "0.1.1"
diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
index 44033207ece..1ea3a1254a7 100644
--- a/components/webdriver_server/Cargo.toml
+++ b/components/webdriver_server/Cargo.toml
@@ -17,7 +17,7 @@ cookie = "0.11"
crossbeam-channel = "0.4"
euclid = "0.20"
hyper = "0.12"
-image = "0.22"
+image = "0.23"
ipc-channel = "0.14"
keyboard-types = "0.4.3"
log = "0.4"
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index 6cf3db4bc18..6b63ebf0f6a 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -1583,7 +1583,7 @@ impl Handler {
let rgb = RgbImage::from_raw(img.width, img.height, img.bytes.to_vec()).unwrap();
let mut png_data = Vec::new();
DynamicImage::ImageRgb8(rgb)
- .write_to(&mut png_data, ImageFormat::PNG)
+ .write_to(&mut png_data, ImageFormat::Png)
.unwrap();
Ok(base64::encode(&png_data))
diff --git a/components/webvr/Cargo.toml b/components/webvr/Cargo.toml
index 9f713245519..ca0e209ef60 100644
--- a/components/webvr/Cargo.toml
+++ b/components/webvr/Cargo.toml
@@ -22,7 +22,7 @@ euclid = "0.20"
ipc-channel = "0.14"
log = "0.4"
msg = {path = "../msg"}
-rust-webvr = {version = "0.17", features = ["mock", "openvr", "vrexternal"]}
+rust-webvr = {version = "0.18", features = ["mock", "openvr", "vrexternal"]}
rust-webvr-api = "0.17"
servo_config = {path = "../config"}
sparkle = "0.1"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 15:50:33 +0000