aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/layout/layout_task.rs2
-rw-r--r--components/net/storage_task.rs35
-rw-r--r--components/profile/mem.rs49
-rw-r--r--components/script/dom/storage.rs98
-rw-r--r--components/script/script_task.rs2
-rw-r--r--python/servo/post_build_commands.py2
-rw-r--r--support/rust-task_info/src/task_basic_info.rs32
-rw-r--r--support/rust-task_info/src/task_info.c4
-rw-r--r--tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html.ini2
-rw-r--r--tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html.ini2
-rw-r--r--tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html.ini2
-rw-r--r--tests/wpt/metadata/webstorage/event_local_key.html.ini6
-rw-r--r--tests/wpt/metadata/webstorage/event_local_newvalue.html.ini6
-rw-r--r--tests/wpt/metadata/webstorage/event_local_oldvalue.html.ini6
-rw-r--r--tests/wpt/metadata/webstorage/event_local_storagearea.html.ini6
-rw-r--r--tests/wpt/metadata/webstorage/event_local_url.html.ini6
-rw-r--r--tests/wpt/metadata/webstorage/event_session_key.html.ini6
-rw-r--r--tests/wpt/metadata/webstorage/event_session_newvalue.html.ini6
-rw-r--r--tests/wpt/metadata/webstorage/event_session_oldvalue.html.ini6
-rw-r--r--tests/wpt/metadata/webstorage/event_session_storagearea.html.ini6
-rw-r--r--tests/wpt/metadata/webstorage/event_session_url.html.ini6
21 files changed, 158 insertions, 132 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 4016c3173f8..c61f84cf066 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -508,7 +508,7 @@ impl LayoutTask {
let stacking_context = rw_data.stacking_context.as_ref();
reports.push(Report {
path: path!["pages", format!("url({})", self.url), "display-list"],
- size: stacking_context.map_or(0, |sc| sc.heap_size_of_children() as u64),
+ size: stacking_context.map_or(0, |sc| sc.heap_size_of_children()),
});
reports_chan.send(reports);
diff --git a/components/net/storage_task.rs b/components/net/storage_task.rs
index 658340b8bf3..4533a364f6a 100644
--- a/components/net/storage_task.rs
+++ b/components/net/storage_task.rs
@@ -30,10 +30,10 @@ pub enum StorageTaskMsg {
/// sets the value of the given key in the associated storage data
/// TODO throw QuotaExceededError in case of error
- SetItem(Sender<bool>, Url, StorageType, DOMString, DOMString),
+ SetItem(Sender<(bool, Option<DOMString>)>, Url, StorageType, DOMString, DOMString),
/// removes the key/value pair for the given key in the associated storage data
- RemoveItem(Sender<bool>, Url, StorageType, DOMString),
+ RemoveItem(Sender<Option<DOMString>>, Url, StorageType, DOMString),
/// clears the associated storage data by removing all the key/value pairs
Clear(Sender<bool>, Url, StorageType),
@@ -133,23 +133,25 @@ impl StorageManager {
.map(|key| key.clone())).unwrap();
}
- fn set_item(&mut self, sender: Sender<bool>, url: Url, storage_type: StorageType, name: DOMString, value: DOMString) {
+ /// Sends Some(old_value) in case there was a previous value with the same key name but with different
+ /// value name, otherwise sends None
+ fn set_item(&mut self, sender: Sender<(bool, Option<DOMString>)>, url: Url, storage_type: StorageType, name: DOMString, value: DOMString) {
let origin = self.get_origin_as_string(url);
let data = self.select_data_mut(storage_type);
if !data.contains_key(&origin) {
data.insert(origin.clone(), BTreeMap::new());
}
- let updated = data.get_mut(&origin).map(|entry| {
- if entry.get(&origin).map_or(true, |item| *item != value) {
- entry.insert(name.clone(), value.clone());
- true
- } else {
- false
- }
+ let (changed, old_value) = data.get_mut(&origin).map(|entry| {
+ entry.insert(name, value.clone()).map_or(
+ (true, None),
+ |old| if old == value {
+ (false, None)
+ } else {
+ (true, Some(old))
+ })
}).unwrap();
-
- sender.send(updated).unwrap();
+ sender.send((changed, old_value)).unwrap();
}
fn get_item(&self, sender: Sender<Option<DOMString>>, url: Url, storage_type: StorageType, name: DOMString) {
@@ -160,11 +162,14 @@ impl StorageManager {
.map(|value| value.to_string())).unwrap();
}
- fn remove_item(&mut self, sender: Sender<bool>, url: Url, storage_type: StorageType, name: DOMString) {
+ /// Sends Some(old_value) in case there was a previous value with the key name, otherwise sends None
+ fn remove_item(&mut self, sender: Sender<Option<DOMString>>, url: Url, storage_type: StorageType, name: DOMString) {
let origin = self.get_origin_as_string(url);
let data = self.select_data_mut(storage_type);
- sender.send(data.get_mut(&origin)
- .map_or(false, |entry| entry.remove(&name).is_some())).unwrap();
+ let old_value = data.get_mut(&origin).map(|entry| {
+ entry.remove(&name)
+ }).unwrap();
+ sender.send(old_value).unwrap();
}
fn clear(&mut self, sender: Sender<bool>, url: Url, storage_type: StorageType) {
diff --git a/components/profile/mem.rs b/components/profile/mem.rs
index 8e2ef614ed6..38e4eb7088d 100644
--- a/components/profile/mem.rs
+++ b/components/profile/mem.rs
@@ -32,12 +32,13 @@ macro_rules! path {
}}
}
+/// A single memory-related measurement.
pub struct Report {
/// The identifying path for this report.
pub path: Vec<String>,
/// The size, in bytes.
- pub size: u64,
+ pub size: usize,
}
/// A channel through which memory reports can be sent.
@@ -208,7 +209,7 @@ impl Profiler {
struct ReportsTree {
/// For leaf nodes, this is the sum of the sizes of all reports that mapped to this location.
/// For interior nodes, this is the sum of the sizes of all its child nodes.
- size: u64,
+ size: usize,
/// For leaf nodes, this is the count of all reports that mapped to this location.
/// For interor nodes, this is always zero.
@@ -243,7 +244,7 @@ impl ReportsTree {
}
// Insert the path and size into the tree, adding any nodes as necessary.
- fn insert(&mut self, path: &[String], size: u64) {
+ fn insert(&mut self, path: &[String], size: usize) {
let mut t: &mut ReportsTree = self;
for path_seg in path.iter() {
let i = match t.find_child(&path_seg) {
@@ -264,7 +265,7 @@ impl ReportsTree {
// Fill in sizes for interior nodes. Should only be done once all the reports have been
// inserted.
- fn compute_interior_node_sizes(&mut self) -> u64 {
+ fn compute_interior_node_sizes(&mut self) -> usize {
if !self.children.is_empty() {
// Interior node. Derive its size from its children.
if self.size != 0 {
@@ -313,7 +314,7 @@ impl ReportsForest {
}
// Insert the path and size into the forest, adding any trees and nodes as necessary.
- fn insert(&mut self, path: &[String], size: u64) {
+ fn insert(&mut self, path: &[String], size: usize) {
// Get the right tree, creating it if necessary.
if !self.trees.contains_key(&path[0]) {
self.trees.insert(path[0].clone(), ReportsTree::new(path[0].clone()));
@@ -440,7 +441,7 @@ mod system_reporter {
}
#[cfg(target_os="linux")]
- fn get_system_heap_allocated() -> Option<u64> {
+ fn get_system_heap_allocated() -> Option<usize> {
let mut info: struct_mallinfo;
unsafe {
info = mallinfo();
@@ -449,11 +450,11 @@ mod system_reporter {
// would suffice, but that only gets the small allocations that are put in
// the brk heap. We need |hblkhd| as well to get the larger allocations
// that are mmapped.
- Some((info.hblkhd + info.uordblks) as u64)
+ Some((info.hblkhd + info.uordblks) as usize)
}
#[cfg(not(target_os="linux"))]
- fn get_system_heap_allocated() -> Option<u64> {
+ fn get_system_heap_allocated() -> Option<usize> {
None
}
@@ -462,7 +463,7 @@ mod system_reporter {
newp: *mut c_void, newlen: size_t) -> c_int;
}
- fn get_jemalloc_stat(value_name: &str) -> Option<u64> {
+ fn get_jemalloc_stat(value_name: &str) -> Option<usize> {
// Before we request the measurement of interest, we first send an "epoch"
// request. Without that jemalloc gives cached statistics(!) which can be
// highly inaccurate.
@@ -494,7 +495,7 @@ mod system_reporter {
return None;
}
- Some(value as u64)
+ Some(value as usize)
}
// Like std::macros::try!, but for Option<>.
@@ -503,7 +504,7 @@ mod system_reporter {
);
#[cfg(target_os="linux")]
- fn get_proc_self_statm_field(field: usize) -> Option<u64> {
+ fn get_proc_self_statm_field(field: usize) -> Option<usize> {
use std::fs::File;
use std::io::Read;
@@ -511,42 +512,42 @@ mod system_reporter {
let mut contents = String::new();
option_try!(f.read_to_string(&mut contents).ok());
let s = option_try!(contents.words().nth(field));
- let npages = option_try!(s.parse::<u64>().ok());
- Some(npages * (::std::env::page_size() as u64))
+ let npages = option_try!(s.parse::<usize>().ok());
+ Some(npages * ::std::env::page_size())
}
#[cfg(target_os="linux")]
- fn get_vsize() -> Option<u64> {
+ fn get_vsize() -> Option<usize> {
get_proc_self_statm_field(0)
}
#[cfg(target_os="linux")]
- fn get_resident() -> Option<u64> {
+ fn get_resident() -> Option<usize> {
get_proc_self_statm_field(1)
}
#[cfg(target_os="macos")]
- fn get_vsize() -> Option<u64> {
+ fn get_vsize() -> Option<usize> {
virtual_size()
}
#[cfg(target_os="macos")]
- fn get_resident() -> Option<u64> {
+ fn get_resident() -> Option<usize> {
resident_size()
}
#[cfg(not(any(target_os="linux", target_os = "macos")))]
- fn get_vsize() -> Option<u64> {
+ fn get_vsize() -> Option<usize> {
None
}
#[cfg(not(any(target_os="linux", target_os = "macos")))]
- fn get_resident() -> Option<u64> {
+ fn get_resident() -> Option<usize> {
None
}
#[cfg(target_os="linux")]
- fn get_resident_segments() -> Vec<(String, u64)> {
+ fn get_resident_segments() -> Vec<(String, usize)> {
use regex::Regex;
use std::collections::HashMap;
use std::collections::hash_map::Entry;
@@ -575,7 +576,7 @@ mod system_reporter {
let rss_re = Regex::new(r"^Rss: +(\d+) kB").unwrap();
// We record each segment's resident size.
- let mut seg_map: HashMap<String, u64> = HashMap::new();
+ let mut seg_map: HashMap<String, usize> = HashMap::new();
#[derive(PartialEq)]
enum LookingFor { Segment, Rss }
@@ -620,7 +621,7 @@ mod system_reporter {
Some(cap) => cap,
None => continue,
};
- let rss = cap.at(1).unwrap().parse::<u64>().unwrap() * 1024;
+ let rss = cap.at(1).unwrap().parse::<usize>().unwrap() * 1024;
if rss > 0 {
// Aggregate small segments into "other".
@@ -639,7 +640,7 @@ mod system_reporter {
}
}
- let mut segs: Vec<(String, u64)> = seg_map.into_iter().collect();
+ let mut segs: Vec<(String, usize)> = seg_map.into_iter().collect();
// Note that the sum of all these segments' RSS values differs from the "resident" measurement
// obtained via /proc/<pid>/statm in get_resident(). It's unclear why this difference occurs;
@@ -650,7 +651,7 @@ mod system_reporter {
}
#[cfg(not(target_os="linux"))]
- fn get_resident_segments() -> Vec<(String, u64)> {
+ fn get_resident_segments() -> Vec<(String, usize)> {
vec![]
}
}
diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs
index d15bb12b14a..191482c39c1 100644
--- a/components/script/dom/storage.rs
+++ b/components/script/dom/storage.rs
@@ -5,15 +5,27 @@
use dom::bindings::codegen::Bindings::StorageBinding;
use dom::bindings::codegen::Bindings::StorageBinding::StorageMethods;
use dom::bindings::global::{GlobalRef, GlobalField};
-use dom::bindings::js::{JSRef, Temporary};
+use dom::bindings::js::{JSRef, Temporary, RootedReference};
+use dom::bindings::refcounted::Trusted;
use dom::bindings::utils::{Reflector, reflect_dom_object};
+use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast};
+use dom::event::{Event, EventHelpers, EventBubbles, EventCancelable};
+use dom::eventtarget::{EventTarget};
+use dom::storageevent::StorageEvent;
+use dom::urlhelper::UrlHelper;
+use dom::window::WindowHelpers;
use util::str::DOMString;
use net::storage_task::StorageTask;
use net::storage_task::StorageType;
use net::storage_task::StorageTaskMsg;
+use page::IterablePage;
use std::sync::mpsc::channel;
use url::Url;
+use script_task::{ScriptTask, ScriptMsg, MainThreadRunnable};
+
+use collections::borrow::ToOwned;
+
#[dom_struct]
pub struct Storage {
reflector_: Reflector,
@@ -79,9 +91,10 @@ impl<'a> StorageMethods for JSRef<'a, Storage> {
fn SetItem(self, name: DOMString, value: DOMString) {
let (sender, receiver) = channel();
- self.get_storage_task().send(StorageTaskMsg::SetItem(sender, self.get_url(), self.storage_type, name, value)).unwrap();
- if receiver.recv().unwrap() {
- //TODO send notification
+ self.get_storage_task().send(StorageTaskMsg::SetItem(sender, self.get_url(), self.storage_type, name.clone(), value.clone())).unwrap();
+ let (changed, old_value) = receiver.recv().unwrap();
+ if changed {
+ self.broadcast_change_notification(Some(name), old_value, Some(value));
}
}
@@ -96,9 +109,9 @@ impl<'a> StorageMethods for JSRef<'a, Storage> {
fn RemoveItem(self, name: DOMString) {
let (sender, receiver) = channel();
- self.get_storage_task().send(StorageTaskMsg::RemoveItem(sender, self.get_url(), self.storage_type, name)).unwrap();
- if receiver.recv().unwrap() {
- //TODO send notification
+ self.get_storage_task().send(StorageTaskMsg::RemoveItem(sender, self.get_url(), self.storage_type, name.clone())).unwrap();
+ if let Some(old_value) = receiver.recv().unwrap() {
+ self.broadcast_change_notification(Some(name), Some(old_value), None);
}
}
@@ -111,7 +124,76 @@ impl<'a> StorageMethods for JSRef<'a, Storage> {
self.get_storage_task().send(StorageTaskMsg::Clear(sender, self.get_url(), self.storage_type)).unwrap();
if receiver.recv().unwrap() {
- //TODO send notification
+ self.broadcast_change_notification(None, None, None);
+ }
+ }
+}
+
+trait PrivateStorageHelpers {
+ fn broadcast_change_notification(self, key: Option<DOMString>, old_value: Option<DOMString>,
+ new_value: Option<DOMString>);
+}
+
+impl<'a> PrivateStorageHelpers for JSRef<'a, Storage> {
+ /// https://html.spec.whatwg.org/multipage/webstorage.html#send-a-storage-notification
+ fn broadcast_change_notification(self, key: Option<DOMString>, old_value: Option<DOMString>,
+ new_value: Option<DOMString>){
+ let global_root = self.global.root();
+ let global_ref = global_root.r();
+ let script_chan = global_ref.script_chan();
+ let trusted_storage = Trusted::new(global_ref.get_cx(), self,
+ script_chan.clone());
+ script_chan.send(ScriptMsg::MainThreadRunnableMsg(
+ box StorageEventRunnable::new(trusted_storage, key,
+ old_value, new_value))).unwrap();
+ }
+}
+
+pub struct StorageEventRunnable {
+ element: Trusted<Storage>,
+ key: Option<DOMString>,
+ old_value: Option<DOMString>,
+ new_value: Option<DOMString>
+}
+
+impl StorageEventRunnable {
+ fn new(storage: Trusted<Storage>, key: Option<DOMString>, old_value: Option<DOMString>,
+ new_value: Option<DOMString>) -> StorageEventRunnable {
+ StorageEventRunnable { element: storage, key: key, old_value: old_value, new_value: new_value }
+ }
+}
+
+impl MainThreadRunnable for StorageEventRunnable {
+ fn handler(self: Box<StorageEventRunnable>, script_task: &ScriptTask) {
+ let this = *self;
+ let storage_root = this.element.to_temporary().root();
+ let storage = storage_root.r();
+ let global_root = storage.global.root();
+ let global_ref = global_root.r();
+ let ev_window = global_ref.as_window();
+ let ev_url = storage.get_url();
+
+ let storage_event = StorageEvent::new(
+ global_ref,
+ "storage".to_owned(),
+ EventBubbles::DoesNotBubble, EventCancelable::NotCancelable,
+ this.key, this.old_value, this.new_value,
+ ev_url.to_string(),
+ Some(storage)
+ ).root();
+ let event: JSRef<Event> = EventCast::from_ref(storage_event.r());
+
+ let root_page = script_task.root_page();
+ for it_page in root_page.iter() {
+ let it_window_root = it_page.window().root();
+ let it_window = it_window_root.r();
+ assert!(UrlHelper::SameOrigin(&ev_url, &it_window.get_url()));
+ // TODO: Such a Document object is not necessarily fully active, but events fired on such
+ // objects are ignored by the event loop until the Document becomes fully active again.
+ if ev_window.pipeline() != it_window.pipeline() {
+ let target: JSRef<EventTarget> = EventTargetCast::from_ref(it_window);
+ event.fire(target);
+ }
}
}
}
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 2db2ef24a80..a891455c0de 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -498,7 +498,7 @@ impl ScriptTask {
}
// Return the root page in the frame tree. Panics if it doesn't exist.
- fn root_page(&self) -> Rc<Page> {
+ pub fn root_page(&self) -> Rc<Page> {
self.page.borrow().as_ref().unwrap().clone()
}
diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py
index 7faf3a598cf..667e4c6ace5 100644
--- a/python/servo/post_build_commands.py
+++ b/python/servo/post_build_commands.py
@@ -67,7 +67,7 @@ class MachCommands(CommandBase):
print("The %s profile is not built. Please run './mach build%s' "
"and try again." % ("release" if release else "dev",
- "--release" if release else ""))
+ " --release" if release else ""))
sys.exit()
@Command('run',
diff --git a/support/rust-task_info/src/task_basic_info.rs b/support/rust-task_info/src/task_basic_info.rs
index 85fd84954ed..78efca0fd4f 100644
--- a/support/rust-task_info/src/task_basic_info.rs
+++ b/support/rust-task_info/src/task_basic_info.rs
@@ -10,32 +10,30 @@
//! Interface to the measurements in the task_basic_info struct, gathered by
//! invoking `task_info()` with the `TASK_BASIC_INFO` flavor.
-use libc::{c_int,uint64_t};
+use libc::{c_int, size_t};
/// Obtains task_basic_info::virtual_size.
-pub fn virtual_size() -> Option<u64> {
- let mut virtual_size: u64 = 0;
- let mut rv;
- unsafe {
- rv = TaskBasicInfoVirtualSize(&mut virtual_size);
- }
- if rv == 0 { Some(virtual_size) } else { None }
+pub fn virtual_size() -> Option<usize> {
+ let mut virtual_size: size_t = 0;
+ let rv = unsafe {
+ TaskBasicInfoVirtualSize(&mut virtual_size)
+ };
+ if rv == 0 { Some(virtual_size as usize) } else { None }
}
/// Obtains task_basic_info::resident_size.
-pub fn resident_size() -> Option<u64> {
- let mut resident_size: u64 = 0;
- let mut rv;
- unsafe {
- rv = TaskBasicInfoResidentSize(&mut resident_size);
- }
- if rv == 0 { Some(resident_size) } else { None }
+pub fn resident_size() -> Option<usize> {
+ let mut resident_size: size_t = 0;
+ let rv = unsafe {
+ TaskBasicInfoResidentSize(&mut resident_size)
+ };
+ if rv == 0 { Some(resident_size as usize) } else { None }
}
#[link(name = "task_info", kind = "static")]
extern {
- fn TaskBasicInfoVirtualSize(virtual_size: *mut uint64_t) -> c_int;
- fn TaskBasicInfoResidentSize(resident_size: *mut uint64_t) -> c_int;
+ fn TaskBasicInfoVirtualSize(virtual_size: *mut size_t) -> c_int;
+ fn TaskBasicInfoResidentSize(resident_size: *mut size_t) -> c_int;
}
#[cfg(test)]
diff --git a/support/rust-task_info/src/task_info.c b/support/rust-task_info/src/task_info.c
index e8f59082609..476551c063b 100644
--- a/support/rust-task_info/src/task_info.c
+++ b/support/rust-task_info/src/task_info.c
@@ -20,7 +20,7 @@ TaskBasicInfo(struct task_basic_info* info)
}
int
-TaskBasicInfoVirtualSize(int64_t *virtualSize)
+TaskBasicInfoVirtualSize(size_t* virtualSize)
{
struct task_basic_info ti;
int rv = TaskBasicInfo(&ti);
@@ -29,7 +29,7 @@ TaskBasicInfoVirtualSize(int64_t *virtualSize)
}
int
-TaskBasicInfoResidentSize(int64_t *residentSize)
+TaskBasicInfoResidentSize(size_t* residentSize)
{
struct task_basic_info ti;
int rv = TaskBasicInfo(&ti);
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html.ini
index 293c51f06ae..c555d152783 100644
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html.ini
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html.ini
@@ -1,3 +1,3 @@
[2d.fillStyle.parse.rgb-clamp-3.html]
type: testharness
- expected: CRASH
+ disabled: 5285 and https://github.com/servo/rust-cssparser/issues/72
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html.ini
index def25383235..61a342cc709 100644
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html.ini
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html.ini
@@ -1,3 +1,3 @@
[2d.fillStyle.parse.rgb-clamp-4.html]
type: testharness
- expected: CRASH
+ disabled: 5285 and https://github.com/servo/rust-cssparser/issues/72
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html.ini
index 29e71891ded..ed320feddc3 100644
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html.ini
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html.ini
@@ -1,3 +1,3 @@
[2d.fillStyle.parse.rgb-clamp-5.html]
type: testharness
- expected: CRASH
+ disabled: 5285 and https://github.com/servo/rust-cssparser/issues/72
diff --git a/tests/wpt/metadata/webstorage/event_local_key.html.ini b/tests/wpt/metadata/webstorage/event_local_key.html.ini
deleted file mode 100644
index c5f2de2294c..00000000000
--- a/tests/wpt/metadata/webstorage/event_local_key.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[event_local_key.html]
- type: testharness
- expected: TIMEOUT
- [key property test of local event]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/webstorage/event_local_newvalue.html.ini b/tests/wpt/metadata/webstorage/event_local_newvalue.html.ini
deleted file mode 100644
index 794820e2cdc..00000000000
--- a/tests/wpt/metadata/webstorage/event_local_newvalue.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[event_local_newvalue.html]
- type: testharness
- expected: TIMEOUT
- [newValue property test of local event]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/webstorage/event_local_oldvalue.html.ini b/tests/wpt/metadata/webstorage/event_local_oldvalue.html.ini
deleted file mode 100644
index 2da1ccf1006..00000000000
--- a/tests/wpt/metadata/webstorage/event_local_oldvalue.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[event_local_oldvalue.html]
- type: testharness
- expected: TIMEOUT
- [oldValue property test of local event]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/webstorage/event_local_storagearea.html.ini b/tests/wpt/metadata/webstorage/event_local_storagearea.html.ini
deleted file mode 100644
index b06b363d151..00000000000
--- a/tests/wpt/metadata/webstorage/event_local_storagearea.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[event_local_storagearea.html]
- type: testharness
- expected: TIMEOUT
- [storageArea property test of local event]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/webstorage/event_local_url.html.ini b/tests/wpt/metadata/webstorage/event_local_url.html.ini
deleted file mode 100644
index 14e10bb843c..00000000000
--- a/tests/wpt/metadata/webstorage/event_local_url.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[event_local_url.html]
- type: testharness
- expected: TIMEOUT
- [url property test of local event]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/webstorage/event_session_key.html.ini b/tests/wpt/metadata/webstorage/event_session_key.html.ini
deleted file mode 100644
index 3b6f2521ce3..00000000000
--- a/tests/wpt/metadata/webstorage/event_session_key.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[event_session_key.html]
- type: testharness
- expected: TIMEOUT
- [key property test of session event]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/webstorage/event_session_newvalue.html.ini b/tests/wpt/metadata/webstorage/event_session_newvalue.html.ini
deleted file mode 100644
index a2bb72dd0be..00000000000
--- a/tests/wpt/metadata/webstorage/event_session_newvalue.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[event_session_newvalue.html]
- type: testharness
- expected: TIMEOUT
- [newvalue property test of session event]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/webstorage/event_session_oldvalue.html.ini b/tests/wpt/metadata/webstorage/event_session_oldvalue.html.ini
deleted file mode 100644
index c48ad25a449..00000000000
--- a/tests/wpt/metadata/webstorage/event_session_oldvalue.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[event_session_oldvalue.html]
- type: testharness
- expected: TIMEOUT
- [oldvalue property test of session event]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/webstorage/event_session_storagearea.html.ini b/tests/wpt/metadata/webstorage/event_session_storagearea.html.ini
deleted file mode 100644
index cba8ba656e6..00000000000
--- a/tests/wpt/metadata/webstorage/event_session_storagearea.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[event_session_storagearea.html]
- type: testharness
- expected: TIMEOUT
- [storageArea property test of session event]
- expected: NOTRUN
-
diff --git a/tests/wpt/metadata/webstorage/event_session_url.html.ini b/tests/wpt/metadata/webstorage/event_session_url.html.ini
deleted file mode 100644
index f227f91c0dd..00000000000
--- a/tests/wpt/metadata/webstorage/event_session_url.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[event_session_url.html]
- type: testharness
- expected: TIMEOUT
- [url property test of session event]
- expected: NOTRUN
-