diff options
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/webidls/NamedNodeMap.webidl | 6 | ||||
| -rw-r--r-- | components/script/dom/webidls/ParentNode.webidl | 3 | ||||
| -rw-r--r-- | components/script/dom/window.rs | 5 | ||||
| -rw-r--r-- | components/script/dom/workerglobalscope.rs | 6 |
4 files changed, 14 insertions, 6 deletions
diff --git a/components/script/dom/webidls/NamedNodeMap.webidl b/components/script/dom/webidls/NamedNodeMap.webidl index c28d2566a0e..66156943b08 100644 --- a/components/script/dom/webidls/NamedNodeMap.webidl +++ b/components/script/dom/webidls/NamedNodeMap.webidl @@ -11,7 +11,7 @@ interface NamedNodeMap { [Pure] getter Attr? item(unsigned long index); [Pure] - getter Attr? getNamedItem(DOMString name); + getter Attr? getNamedItem(DOMString qualifiedName); [Pure] Attr? getNamedItemNS(DOMString? namespace, DOMString localName); [Throws] @@ -19,7 +19,7 @@ interface NamedNodeMap { [Throws] Attr? setNamedItemNS(Attr attr); [Throws] - Attr removeNamedItem(DOMString name); + Attr removeNamedItem(DOMString qualifiedName); [Throws] - Attr removeNamedItemNS(DOMString? namespace, DOMString name); + Attr removeNamedItemNS(DOMString? namespace, DOMString localName); }; diff --git a/components/script/dom/webidls/ParentNode.webidl b/components/script/dom/webidls/ParentNode.webidl index 678b3aeafa5..667dcc4671d 100644 --- a/components/script/dom/webidls/ParentNode.webidl +++ b/components/script/dom/webidls/ParentNode.webidl @@ -22,9 +22,6 @@ interface ParentNode { [Throws] void append((Node or DOMString)... nodes); - //Element? query(DOMString relativeSelectors); - //[NewObject] - //Elements queryAll(DOMString relativeSelectors); [Pure, Throws] Element? querySelector(DOMString selectors); [NewObject, Throws] diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index b52c57e4674..90c1ee1bdba 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use app_units::Au; +use blob_url_store::BlobURLStore; use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType, WorkerId}; use dom::bindings::callback::ExceptionHandling; use dom::bindings::cell::DOMRefCell; @@ -165,6 +166,9 @@ pub struct Window { scheduler_chan: IpcSender<TimerEventRequest>, timers: OneshotTimers, + /// Blob URL store + blob_url_store: DOMRefCell<BlobURLStore>, + next_worker_id: Cell<WorkerId>, /// For sending messages to the memory profiler. @@ -1581,6 +1585,7 @@ impl Window { console: Default::default(), crypto: Default::default(), navigator: Default::default(), + blob_url_store: DOMRefCell::new(BlobURLStore::new()), image_cache_thread: image_cache_thread, mem_profiler_chan: mem_profiler_chan, time_profiler_chan: time_profiler_chan, diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 06b3894ded3..89b4ed59bf9 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -2,7 +2,9 @@ * 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 blob_url_store::BlobURLStore; use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId, DevtoolsPageInfo}; +use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::FunctionBinding::Function; use dom::bindings::codegen::Bindings::WorkerGlobalScopeBinding::WorkerGlobalScopeMethods; use dom::bindings::error::{Error, ErrorResult, Fallible, report_pending_exception}; @@ -113,6 +115,9 @@ pub struct WorkerGlobalScope { console: MutNullableHeap<JS<Console>>, crypto: MutNullableHeap<JS<Crypto>>, timers: OneshotTimers, + /// Blob URL store + blob_url_store: DOMRefCell<BlobURLStore>, + #[ignore_heap_size_of = "Defined in std"] mem_profiler_chan: mem::ProfilerChan, #[ignore_heap_size_of = "Defined in std"] @@ -172,6 +177,7 @@ impl WorkerGlobalScope { console: Default::default(), crypto: Default::default(), timers: OneshotTimers::new(timer_event_chan, init.scheduler_chan.clone()), + blob_url_store: DOMRefCell::new(BlobURLStore::new()), mem_profiler_chan: init.mem_profiler_chan, time_profiler_chan: init.time_profiler_chan, to_devtools_sender: init.to_devtools_sender, |