aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/canvas/canvas_paint_thread.rs16
-rw-r--r--components/canvas/webgl_paint_thread.rs20
-rw-r--r--components/canvas_traits/Cargo.toml4
-rw-r--r--components/canvas_traits/lib.rs22
-rw-r--r--components/gfx/Cargo.toml3
-rw-r--r--components/gfx/lib.rs1
-rw-r--r--components/gfx/paint_thread.rs11
-rw-r--r--components/layout/Cargo.toml3
-rw-r--r--components/layout/context.rs7
-rw-r--r--components/layout/display_list_builder.rs8
-rw-r--r--components/layout/layout_thread.rs16
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/script/dom/htmlcanvaselement.rs2
-rw-r--r--components/script/dom/webglprogram.rs2
-rw-r--r--components/script/dom/webglrenderingcontext.rs11
-rw-r--r--components/servo/Cargo.lock7
-rw-r--r--components/style/selector_matching.rs2
-rw-r--r--ports/cef/Cargo.lock7
-rw-r--r--ports/gonk/Cargo.lock7
-rw-r--r--tests/wpt/web-platform-tests/XMLHttpRequest/OWNERS2
20 files changed, 22 insertions, 131 deletions
diff --git a/components/canvas/canvas_paint_thread.rs b/components/canvas/canvas_paint_thread.rs
index 85d92ee1e8f..ceaee808569 100644
--- a/components/canvas/canvas_paint_thread.rs
+++ b/components/canvas/canvas_paint_thread.rs
@@ -15,12 +15,11 @@ use gfx_traits::color;
use ipc_channel::ipc::IpcSharedMemory;
use ipc_channel::ipc::{self, IpcSender};
use ipc_channel::router::ROUTER;
-use layers::platform::surface::NativeSurface;
use num::ToPrimitive;
use premultiplytable::PREMULTIPLY_TABLE;
use std::borrow::ToOwned;
use std::mem;
-use std::sync::mpsc::{Sender, channel};
+use std::sync::mpsc::channel;
use util::opts;
use util::thread::spawn_named;
use util::vec::byte_swap;
@@ -205,13 +204,6 @@ impl<'a> CanvasPaintThread<'a> {
}
}
}
- CanvasMsg::FromPaint(message) => {
- match message {
- FromPaintMsg::SendNativeSurface(chan) => {
- painter.send_native_surface(chan)
- }
- }
- }
CanvasMsg::WebGL(_) => panic!("Wrong message sent to Canvas2D thread"),
}
}
@@ -550,12 +542,6 @@ impl<'a> CanvasPaintThread<'a> {
})
}
- fn send_native_surface(&self, _chan: Sender<NativeSurface>) {
- // FIXME(mrobinson): We need a handle on the NativeDisplay to create compatible
- // NativeSurfaces for the compositor.
- unimplemented!()
- }
-
fn image_data(&self,
dest_rect: Rect<i32>,
canvas_size: Size2D<f64>,
diff --git a/components/canvas/webgl_paint_thread.rs b/components/canvas/webgl_paint_thread.rs
index 08d8ea2f4b6..85f03e758ba 100644
--- a/components/canvas/webgl_paint_thread.rs
+++ b/components/canvas/webgl_paint_thread.rs
@@ -2,16 +2,14 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use canvas_traits::{CanvasCommonMsg, CanvasMsg, CanvasPixelData, CanvasData, CanvasWebGLMsg};
-use canvas_traits::{FromLayoutMsg, FromPaintMsg};
+use canvas_traits::{CanvasCommonMsg, CanvasMsg, CanvasPixelData, CanvasData, CanvasWebGLMsg, FromLayoutMsg};
use euclid::size::Size2D;
use gleam::gl;
use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory};
use ipc_channel::router::ROUTER;
-use layers::platform::surface::NativeSurface;
use offscreen_gl_context::{ColorAttachmentType, GLContext, GLContextAttributes, NativeGLContext};
use std::borrow::ToOwned;
-use std::sync::mpsc::{Sender, channel};
+use std::sync::mpsc::channel;
use util::thread::spawn_named;
use util::vec::byte_swap;
use webrender_traits;
@@ -83,7 +81,7 @@ impl WebGLPaintThread {
CanvasMsg::Common(message) => {
match message {
CanvasCommonMsg::Close => break,
- // TODO(ecoal95): handle error nicely
+ // TODO(emilio): handle error nicely
CanvasCommonMsg::Recreate(size) => painter.recreate(size).unwrap(),
}
},
@@ -93,12 +91,6 @@ impl WebGLPaintThread {
painter.send_data(chan),
}
}
- CanvasMsg::FromPaint(message) => {
- match message {
- FromPaintMsg::SendNativeSurface(chan) =>
- painter.send_native_surface(chan),
- }
- }
CanvasMsg::Canvas2d(_) => panic!("Wrong message sent to WebGLThread"),
}
}
@@ -147,12 +139,6 @@ impl WebGLPaintThread {
}
}
- fn send_native_surface(&self, _: Sender<NativeSurface>) {
- // FIXME(ecoal95): We need to make a clone of the surface in order to
- // implement this
- unimplemented!()
- }
-
#[allow(unsafe_code)]
fn recreate(&mut self, size: Size2D<i32>) -> Result<(), &'static str> {
match self.data {
diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index b694f422aa5..33e128048f4 100644
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@@ -15,10 +15,6 @@ path = "../gfx_traits"
git = "https://github.com/servo/rust-azure"
features = ["plugins"]
-[dependencies.layers]
-git = "https://github.com/servo/rust-layers"
-features = ["plugins"]
-
[dependencies.offscreen_gl_context]
git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs
index 87f1f8c7e41..7abe3a7e665 100644
--- a/components/canvas_traits/lib.rs
+++ b/components/canvas_traits/lib.rs
@@ -17,7 +17,6 @@ extern crate euclid;
extern crate gfx_traits;
extern crate heapsize;
extern crate ipc_channel;
-extern crate layers;
extern crate offscreen_gl_context;
extern crate serde;
extern crate util;
@@ -35,11 +34,8 @@ use euclid::rect::Rect;
use euclid::size::Size2D;
use gfx_traits::color;
use ipc_channel::ipc::{IpcSender, IpcSharedMemory};
-use layers::platform::surface::NativeSurface;
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
use std::default::Default;
use std::str::FromStr;
-use std::sync::mpsc::Sender;
pub use webrender_traits::{WebGLFramebufferBindingRequest, WebGLError, WebGLParameter, WebGLResult, WebGLContextId};
pub use webrender_traits::WebGLCommand as CanvasWebGLMsg;
@@ -55,7 +51,6 @@ pub enum CanvasMsg {
Canvas2d(Canvas2dMsg),
Common(CanvasCommonMsg),
FromLayout(FromLayoutMsg),
- FromPaint(FromPaintMsg),
WebGL(CanvasWebGLMsg),
}
@@ -82,23 +77,6 @@ pub enum FromLayoutMsg {
SendData(IpcSender<CanvasData>),
}
-#[derive(Clone)]
-pub enum FromPaintMsg {
- SendNativeSurface(Sender<NativeSurface>),
-}
-
-impl Serialize for FromPaintMsg {
- fn serialize<S>(&self, _: &mut S) -> Result<(), S::Error> where S: Serializer {
- panic!("can't serialize a `FromPaintMsg`!")
- }
-}
-
-impl Deserialize for FromPaintMsg {
- fn deserialize<D>(_: &mut D) -> Result<FromPaintMsg, D::Error> where D: Deserializer {
- panic!("can't deserialize a `FromPaintMsg`!")
- }
-}
-
#[derive(Clone, Deserialize, Serialize)]
pub enum Canvas2dMsg {
Arc(Point2D<f32>, f32, f32, f32, bool),
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index e9463619002..823b78ed271 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -41,9 +41,6 @@ path = "../gfx_traits"
[dependencies.net_traits]
path = "../net_traits"
-[dependencies.canvas_traits]
-path = "../canvas_traits"
-
[dependencies.util]
path = "../util"
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs
index 45b164cbe88..f60575cd625 100644
--- a/components/gfx/lib.rs
+++ b/components/gfx/lib.rs
@@ -25,7 +25,6 @@ extern crate app_units;
extern crate azure;
#[macro_use]
extern crate bitflags;
-extern crate canvas_traits;
// Mac OS-specific library dependencies
#[cfg(target_os = "macos")] extern crate core_foundation;
diff --git a/components/gfx/paint_thread.rs b/components/gfx/paint_thread.rs
index a0088fe5313..3f945c3898c 100644
--- a/components/gfx/paint_thread.rs
+++ b/components/gfx/paint_thread.rs
@@ -7,7 +7,6 @@
use app_units::Au;
use azure::AzFloat;
use azure::azure_hl::{BackendType, Color, DrawTarget, SurfaceFormat};
-use canvas_traits::CanvasMsg;
use display_list::{DisplayItem, DisplayList, DisplayListEntry, DisplayListTraversal};
use display_list::{LayerInfo, StackingContext, StackingContextId, StackingContextType};
use euclid::Matrix4;
@@ -343,7 +342,6 @@ pub enum Msg {
#[derive(Deserialize, Serialize)]
pub enum LayoutToPaintMsg {
PaintInit(Epoch, Arc<DisplayList>),
- CanvasLayer(LayerId, IpcSender<CanvasMsg>),
Exit(IpcSender<()>),
}
@@ -379,9 +377,6 @@ pub struct PaintThread<C> {
/// Communication handles to each of the worker threads.
worker_threads: Vec<WorkerThreadProxy>,
-
- /// A map to track the canvas specific layers
- canvas_map: HashMap<LayerId, IpcSender<CanvasMsg>>,
}
// If we implement this as a function, we get borrowck errors from borrowing
@@ -431,7 +426,6 @@ impl<C> PaintThread<C> where C: PaintListener + Send + 'static {
paint_permission: false,
current_epoch: None,
worker_threads: worker_threads,
- canvas_map: HashMap::new()
};
let reporter_name = format!("paint-reporter-{}", id);
@@ -475,11 +469,6 @@ impl<C> PaintThread<C> where C: PaintListener + Send + 'static {
self.initialize_layers();
}
}
- // Inserts a new canvas renderer to the layer map
- Msg::FromLayout(LayoutToPaintMsg::CanvasLayer(layer_id, canvas_renderer)) => {
- debug!("Renderer received for canvas with layer {:?}", layer_id);
- self.canvas_map.insert(layer_id, canvas_renderer);
- }
Msg::FromChrome(ChromeToPaintMsg::Paint(requests, frame_tree_id)) => {
if self.paint_permission && self.root_display_list.is_some() {
let mut replies = Vec::new();
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 304e903f72f..f7371a7a34a 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -12,9 +12,6 @@ path = "lib.rs"
git = "https://github.com/servo/rust-azure"
features = ["plugins"]
-[dependencies.canvas]
-path = "../canvas"
-
[dependencies.canvas_traits]
path = "../canvas_traits"
diff --git a/components/layout/context.rs b/components/layout/context.rs
index 143e78f810e..2775e6e791c 100644
--- a/components/layout/context.rs
+++ b/components/layout/context.rs
@@ -8,7 +8,6 @@
#![allow(unsafe_code)]
use app_units::Au;
-use canvas_traits::CanvasMsg;
use euclid::Rect;
use fnv::FnvHasher;
use gfx::display_list::WebRenderImageInfo;
@@ -16,7 +15,7 @@ use gfx::font_cache_thread::FontCacheThread;
use gfx::font_context::FontContext;
use gfx_traits::LayerId;
use heapsize::HeapSizeOf;
-use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory};
+use ipc_channel::ipc::{self, IpcSharedMemory};
use net_traits::image::base::Image;
use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheThread, ImageResponse, ImageState};
use net_traits::image_cache_thread::{ImageOrMetadataAvailable, UsePlaceholder};
@@ -24,7 +23,6 @@ use std::cell::{RefCell, RefMut};
use std::collections::HashMap;
use std::hash::BuildHasherDefault;
use std::rc::Rc;
-use std::sync::mpsc::Sender;
use std::sync::{Arc, Mutex, RwLock};
use style::context::{LocalStyleContext, StyleContext};
use style::matching::{ApplicableDeclarationsCache, StyleSharingCandidateCache};
@@ -95,9 +93,6 @@ pub struct SharedLayoutContext {
/// The URL.
pub url: Url,
- /// A channel to send canvas renderers to paint thread, in order to correctly paint the layers
- pub canvas_layers_sender: Mutex<Sender<(LayerId, IpcSender<CanvasMsg>)>>,
-
/// The visible rects for each layer, as reported to us by the compositor.
pub visible_rects: Arc<HashMap<LayerId, Rect<Au>, BuildHasherDefault<FnvHasher>>>,
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs
index 407d4d19a05..4d62d221a5e 100644
--- a/components/layout/display_list_builder.rs
+++ b/components/layout/display_list_builder.rs
@@ -1197,13 +1197,7 @@ impl FragmentDisplayListBuilding for Fragment {
let (sender, receiver) = ipc::channel().unwrap();
ipc_renderer.send(CanvasMsg::FromLayout(
FromLayoutMsg::SendData(sender))).unwrap();
- let data = receiver.recv().unwrap();
-
- // Propagate the layer and the renderer to the paint task.
- state.layout_context.shared.canvas_layers_sender.lock().unwrap().send(
- (layer_id, (*ipc_renderer).clone())).unwrap();
-
- data
+ receiver.recv().unwrap()
},
None => CanvasData::Pixels(CanvasPixelData {
image_data: IpcSharedMemory::from_byte(0xFFu8, width * height * 4),
diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs
index 041eab87168..cbad465b4f8 100644
--- a/components/layout/layout_thread.rs
+++ b/components/layout/layout_thread.rs
@@ -10,7 +10,6 @@
use animation;
use app_units::Au;
use azure::azure::AzColor;
-use canvas_traits::CanvasMsg;
use construct::ConstructionResult;
use context::{LayoutContext, SharedLayoutContext, heap_size_of_local_context};
use display_list_builder::ToGfxColor;
@@ -186,11 +185,6 @@ pub struct LayoutThread {
/// Is this the first reflow in this LayoutThread?
first_reflow: bool,
- /// To receive a canvas renderer associated to a layer, this message is propagated
- /// to the paint chan
- canvas_layers_receiver: Receiver<(LayerId, IpcSender<CanvasMsg>)>,
- canvas_layers_sender: Sender<(LayerId, IpcSender<CanvasMsg>)>,
-
/// The workers that we use for parallel operation.
parallel_traversal: Option<WorkQueue<SharedLayoutContext, WorkQueueData>>,
@@ -406,7 +400,6 @@ impl LayoutThread {
// Create the channel on which new animations can be sent.
let (new_animations_sender, new_animations_receiver) = channel();
- let (canvas_layers_sender, canvas_layers_receiver) = channel();
// Proxy IPC messages from the pipeline to the layout thread.
let pipeline_receiver = ROUTER.route_ipc_receiver_to_new_mpsc_receiver(pipeline_port);
@@ -449,8 +442,6 @@ impl LayoutThread {
image_cache_sender: ImageCacheChan(ipc_image_cache_sender),
font_cache_receiver: font_cache_receiver,
font_cache_sender: ipc_font_cache_sender,
- canvas_layers_receiver: canvas_layers_receiver,
- canvas_layers_sender: canvas_layers_sender,
parallel_traversal: parallel_traversal,
generation: 0,
new_animations_sender: new_animations_sender,
@@ -521,7 +512,6 @@ impl LayoutThread {
image_cache_thread: self.image_cache_thread.clone(),
image_cache_sender: Mutex::new(self.image_cache_sender.clone()),
font_cache_thread: Mutex::new(self.font_cache_thread.clone()),
- canvas_layers_sender: Mutex::new(self.canvas_layers_sender.clone()),
url: (*url).clone(),
visible_rects: self.visible_rects.clone(),
webrender_image_cache: self.webrender_image_cache.clone(),
@@ -1148,12 +1138,6 @@ impl LayoutThread {
self.root_flow = self.try_get_layout_root(node);
}
- // Send new canvas renderers to the paint thread
- while let Ok((layer_id, renderer)) = self.canvas_layers_receiver.try_recv() {
- // Just send if there's an actual renderer
- self.paint_chan.send(LayoutToPaintMsg::CanvasLayer(layer_id, renderer)).unwrap();
- }
-
// Perform post-style recalculation layout passes.
self.perform_post_style_recalc_layout_passes(&data.reflow_info,
&mut rw_data,
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index ffde81f1a91..cb3a8d81181 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -50,7 +50,7 @@ git = "https://github.com/servo/rust-mozjs"
git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
[dependencies.angle]
-git = "https://github.com/ecoal95/angle"
+git = "https://github.com/emilio/angle"
branch = "servo"
[dependencies.ipc-channel]
diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs
index b078e87fe45..622824f88d9 100644
--- a/components/script/dom/htmlcanvaselement.rs
+++ b/components/script/dom/htmlcanvaselement.rs
@@ -206,7 +206,7 @@ impl HTMLCanvasElement {
CanvasData::Pixels(pixel_data)
=> pixel_data.image_data.to_vec(),
CanvasData::WebGL(_)
- // TODO(ecoal95): Not sure if WebGL canvas is required for 2d spec,
+ // TODO(emilio): Not sure if WebGL canvas is required for 2d spec,
// but I think it's not.
=> return None,
}
diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs
index 42eb0a23581..9df581f9afc 100644
--- a/components/script/dom/webglprogram.rs
+++ b/components/script/dom/webglprogram.rs
@@ -96,7 +96,7 @@ impl WebGLProgram {
_ => return Err(WebGLError::InvalidOperation),
};
- // TODO(ecoal95): Differentiate between same shader already assigned and other previous
+ // TODO(emilio): Differentiate between same shader already assigned and other previous
// shader.
if shader_slot.get().is_some() {
return Err(WebGLError::InvalidOperation);
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 5251585ea94..c5070cca69e 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -610,7 +610,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
}
}
- // TODO(ecoal95): Probably in the future we should keep track of the
+ // TODO(emilio): Probably in the future we should keep track of the
// generated objects, either here or in the webgl thread
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5
fn CreateBuffer(&self) -> Option<Root<WebGLBuffer>> {
@@ -1116,8 +1116,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
if texture.is_none() {
return self.webgl_error(InvalidOperation);
}
- // TODO(ecoal95): Validate more parameters
-
+ // TODO(emilio): Validate more parameters
let source = match source {
Some(s) => s,
None => return,
@@ -1144,7 +1143,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
};
let size = Size2D::new(img.width as i32, img.height as i32);
- // TODO(ecoal95): Validate that the format argument is coherent with the image.
+ // TODO(emilio): Validate that the format argument is coherent with the image.
// RGB8 should be easy to support too
let mut data = match img.format {
PixelFormat::RGBA8 => img.bytes.to_vec(),
@@ -1155,7 +1154,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
(data, size)
},
- // TODO(ecoal95): Getting canvas data is implemented in CanvasRenderingContext2D, but
+ // TODO(emilio): Getting canvas data is implemented in CanvasRenderingContext2D, but
// we need to refactor it moving it to `HTMLCanvasElement` and supporting WebGLContext
ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement::HTMLCanvasElement(canvas) => {
let canvas = canvas.r();
@@ -1170,7 +1169,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
=> unimplemented!(),
};
- // TODO(ecoal95): Invert axis, convert colorspace, premultiply alpha if requested
+ // TODO(emilio): Invert axis, convert colorspace, premultiply alpha if requested
let msg = CanvasWebGLMsg::TexImage2D(target, level, internal_format as i32,
size.width, size.height,
format, data_type, pixels);
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 28b51b5545e..94107943706 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -72,7 +72,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "angle"
version = "0.1.0"
-source = "git+https://github.com/ecoal95/angle?branch=servo#b31e70ef5cb675582de910d09b0c385ea2000a64"
+source = "git+https://github.com/emilio/angle?branch=servo#b31e70ef5cb675582de910d09b0c385ea2000a64"
dependencies = [
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -187,7 +187,6 @@ dependencies = [
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
- "layers 0.2.4 (git+https://github.com/servo/rust-layers)",
"offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"plugins 0.0.1",
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -681,7 +680,6 @@ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.4.3 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "canvas_traits 0.0.1",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1048,7 +1046,6 @@ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.4.3 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "canvas 0.0.1",
"canvas_traits 0.0.1",
"cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1689,7 +1686,7 @@ dependencies = [
name = "script"
version = "0.0.1"
dependencies = [
- "angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)",
+ "angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)",
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
diff --git a/components/style/selector_matching.rs b/components/style/selector_matching.rs
index 2321b953e4c..90748ed7be9 100644
--- a/components/style/selector_matching.rs
+++ b/components/style/selector_matching.rs
@@ -266,7 +266,7 @@ impl<Impl: SelectorImplExt> Stylist<Impl> {
let map = match pseudo_element {
Some(ref pseudo) => match self.pseudos_map.get(pseudo) {
Some(map) => map,
- // TODO(ecoal95): get non eagerly-cascaded pseudo-element rules here.
+ // TODO(emilio): get non eagerly-cascaded pseudo-element rules here.
// Actually assume there are no rules applicable.
None => return true,
},
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index b2a7f8df776..6a25b60781d 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -57,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "angle"
version = "0.1.0"
-source = "git+https://github.com/ecoal95/angle?branch=servo#b31e70ef5cb675582de910d09b0c385ea2000a64"
+source = "git+https://github.com/emilio/angle?branch=servo#b31e70ef5cb675582de910d09b0c385ea2000a64"
dependencies = [
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -172,7 +172,6 @@ dependencies = [
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
- "layers 0.2.4 (git+https://github.com/servo/rust-layers)",
"offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"plugins 0.0.1",
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -610,7 +609,6 @@ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.4.3 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "canvas_traits 0.0.1",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -968,7 +966,6 @@ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.4.3 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "canvas 0.0.1",
"canvas_traits 0.0.1",
"cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1564,7 +1561,7 @@ dependencies = [
name = "script"
version = "0.0.1"
dependencies = [
- "angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)",
+ "angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)",
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 73b2519eb32..b61388ce9c5 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -50,7 +50,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "angle"
version = "0.1.0"
-source = "git+https://github.com/ecoal95/angle?branch=servo#b31e70ef5cb675582de910d09b0c385ea2000a64"
+source = "git+https://github.com/emilio/angle?branch=servo#b31e70ef5cb675582de910d09b0c385ea2000a64"
dependencies = [
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -165,7 +165,6 @@ dependencies = [
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
- "layers 0.2.4 (git+https://github.com/servo/rust-layers)",
"offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"plugins 0.0.1",
"serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -613,7 +612,6 @@ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.4.3 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "canvas_traits 0.0.1",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -950,7 +948,6 @@ dependencies = [
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"azure 0.4.3 (git+https://github.com/servo/rust-azure)",
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "canvas 0.0.1",
"canvas_traits 0.0.1",
"cssparser 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1546,7 +1543,7 @@ dependencies = [
name = "script"
version = "0.0.1"
dependencies = [
- "angle 0.1.0 (git+https://github.com/ecoal95/angle?branch=servo)",
+ "angle 0.1.0 (git+https://github.com/emilio/angle?branch=servo)",
"app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
diff --git a/tests/wpt/web-platform-tests/XMLHttpRequest/OWNERS b/tests/wpt/web-platform-tests/XMLHttpRequest/OWNERS
index 7a809e70f6c..27421d921a0 100644
--- a/tests/wpt/web-platform-tests/XMLHttpRequest/OWNERS
+++ b/tests/wpt/web-platform-tests/XMLHttpRequest/OWNERS
@@ -1,4 +1,4 @@
-@ecoal95
+@emilio
@hallvors
@kangxu
@caitp
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 10:35:16 +0000