aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/document.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/document.rs')
-rw-r--r--components/script/dom/document.rs62
1 files changed, 31 insertions, 31 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 05bc4bffc21..6928d6f4977 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -510,7 +510,7 @@ impl Document {
self.ready_state.set(state);
let event = Event::new(GlobalRef::Window(&self.window),
- DOMString("readystatechange".to_owned()),
+ DOMString::from("readystatechange"),
EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable);
let target = self.upcast::<EventTarget>();
@@ -568,7 +568,7 @@ impl Document {
/// Handles any updates when the document's title has changed.
pub fn title_changed(&self) {
// https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsertitlechange
- self.trigger_mozbrowser_event(MozBrowserEvent::TitleChange(self.Title().0));
+ self.trigger_mozbrowser_event(MozBrowserEvent::TitleChange(String::from(self.Title())));
self.send_title_to_compositor();
}
@@ -577,7 +577,7 @@ impl Document {
pub fn send_title_to_compositor(&self) {
let window = self.window();
let compositor = window.compositor();
- compositor.send(ScriptToCompositorMsg::SetTitle(window.pipeline(), Some(self.Title().0))).unwrap();
+ compositor.send(ScriptToCompositorMsg::SetTitle(window.pipeline(), Some(String::from(self.Title())))).unwrap();
}
pub fn dirty_all_nodes(&self) {
@@ -598,7 +598,7 @@ impl Document {
debug!("{}: at {:?}", mouse_event_type_string, point);
let node = match self.hit_test(&point) {
Some(node_address) => {
- debug!("node address is {:?}", node_address.0);
+ debug!("node address is {:?}", node_address);
node::from_untrusted_node_address(js_runtime, node_address)
},
None => return,
@@ -631,7 +631,7 @@ impl Document {
let y = point.y as i32;
let clickCount = 1;
let event = MouseEvent::new(&self.window,
- DOMString(mouse_event_type_string),
+ DOMString::from(mouse_event_type_string),
EventBubbles::Bubbles,
EventCancelable::Cancelable,
Some(&self.window),
@@ -669,7 +669,7 @@ impl Document {
let y = point.y.to_i32().unwrap_or(0);
let mouse_event = MouseEvent::new(&self.window,
- DOMString(event_name),
+ DOMString::from(event_name),
EventBubbles::Bubbles,
EventCancelable::Cancelable,
Some(&self.window),
@@ -827,7 +827,7 @@ impl Document {
|t| t.Target() == target).cloned());
let event = TouchEvent::new(window,
- DOMString(event_name.to_owned()),
+ DOMString::from(event_name),
EventBubbles::Bubbles,
EventCancelable::Cancelable,
Some(window),
@@ -868,7 +868,7 @@ impl Document {
let is_composing = false;
let is_repeating = state == KeyState::Repeated;
- let ev_type = DOMString(match state {
+ let ev_type = DOMString::from(match state {
KeyState::Pressed | KeyState::Repeated => "keydown",
KeyState::Released => "keyup",
}.to_owned());
@@ -877,8 +877,8 @@ impl Document {
let keyevent = KeyboardEvent::new(&self.window, ev_type, true, true,
Some(&self.window), 0, Some(key),
- DOMString(props.key_string.to_owned()),
- DOMString(props.code.to_owned()),
+ DOMString::from(props.key_string),
+ DOMString::from(props.code),
props.location, is_repeating, is_composing,
ctrl, alt, shift, meta,
None, props.key_code);
@@ -889,10 +889,10 @@ impl Document {
// https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#keys-cancelable-keys
if state != KeyState::Released && props.is_printable() && !prevented {
// https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#keypress-event-order
- let event = KeyboardEvent::new(&self.window, DOMString("keypress".to_owned()),
+ let event = KeyboardEvent::new(&self.window, DOMString::from("keypress"),
true, true, Some(&self.window), 0, Some(key),
- DOMString(props.key_string.to_owned()),
- DOMString(props.code.to_owned()),
+ DOMString::from(props.key_string),
+ DOMString::from(props.code),
props.location, is_repeating, is_composing,
ctrl, alt, shift, meta,
props.char_code, 0);
@@ -1227,7 +1227,7 @@ impl Document {
}
self.domcontentloaded_dispatched.set(true);
let event = Event::new(GlobalRef::Window(self.window()),
- DOMString("DOMContentLoaded".to_owned()),
+ DOMString::from("DOMContentLoaded"),
EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable);
let doctarget = self.upcast::<EventTarget>();
@@ -1320,11 +1320,11 @@ impl Document {
location: Default::default(),
content_type: match content_type {
Some(string) => string,
- None => DOMString(match is_html_document {
+ None => DOMString::from(match is_html_document {
// https://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument
- IsHTMLDocument::HTMLDocument => "text/html".to_owned(),
+ IsHTMLDocument::HTMLDocument => "text/html",
// https://dom.spec.whatwg.org/#concept-document-content-type
- IsHTMLDocument::NonHTMLDocument => "application/xml".to_owned()
+ IsHTMLDocument::NonHTMLDocument => "application/xml"
})
},
last_modified: last_modified,
@@ -1332,7 +1332,7 @@ impl Document {
// https://dom.spec.whatwg.org/#concept-document-quirks
quirks_mode: Cell::new(NoQuirks),
// https://dom.spec.whatwg.org/#concept-document-encoding
- encoding_name: DOMRefCell::new(DOMString("UTF-8".to_owned())),
+ encoding_name: DOMRefCell::new(DOMString::from("UTF-8")),
is_html_document: is_html_document == IsHTMLDocument::HTMLDocument,
id_map: DOMRefCell::new(HashMap::new()),
tag_map: DOMRefCell::new(HashMap::new()),
@@ -1502,7 +1502,7 @@ impl DocumentMethods for Document {
// https://dom.spec.whatwg.org/#dom-document-url
fn URL(&self) -> DOMString {
- DOMString(self.url().serialize())
+ DOMString::from(self.url().serialize())
}
// https://html.spec.whatwg.org/multipage/#dom-document-activeelement
@@ -1544,9 +1544,9 @@ impl DocumentMethods for Document {
// https://dom.spec.whatwg.org/#dom-document-compatmode
fn CompatMode(&self) -> DOMString {
- DOMString(match self.quirks_mode.get() {
- LimitedQuirks | NoQuirks => "CSS1Compat".to_owned(),
- Quirks => "BackCompat".to_owned()
+ DOMString::from(match self.quirks_mode.get() {
+ LimitedQuirks | NoQuirks => "CSS1Compat",
+ Quirks => "BackCompat"
})
}
@@ -1767,10 +1767,10 @@ impl DocumentMethods for Document {
// https://html.spec.whatwg.org/multipage/#dom-document-lastmodified
fn LastModified(&self) -> DOMString {
- DOMString(match self.last_modified {
- Some(ref t) => t.clone(),
- None => time::now().strftime("%m/%d/%Y %H:%M:%S").unwrap().to_string(),
- })
+ match self.last_modified {
+ Some(ref t) => DOMString::from(t.clone()),
+ None => DOMString::from(time::now().strftime("%m/%d/%Y %H:%M:%S").unwrap().to_string()),
+ }
}
// https://dom.spec.whatwg.org/#dom-document-createrange
@@ -1827,7 +1827,7 @@ impl DocumentMethods for Document {
Some(ref title) => {
// Steps 3-4.
let value = Node::collect_text_contents(title.children());
- DOMString(str_join(split_html_space_chars(&value), " "))
+ DOMString::from(str_join(split_html_space_chars(&value), " "))
},
}
}
@@ -2096,7 +2096,7 @@ impl DocumentMethods for Document {
let (tx, rx) = ipc::channel().unwrap();
let _ = self.window.resource_task().send(GetCookiesForUrl((*url).clone(), tx, NonHTTP));
let cookies = rx.recv().unwrap();
- Ok(DOMString(cookies.unwrap_or("".to_owned())))
+ Ok(cookies.map(DOMString::from).unwrap_or(DOMString::from("")))
}
// https://html.spec.whatwg.org/multipage/#dom-document-cookie
@@ -2106,7 +2106,7 @@ impl DocumentMethods for Document {
if !is_scheme_host_port_tuple(url) {
return Err(Error::Security);
}
- let _ = self.window.resource_task().send(SetCookiesForUrl((*url).clone(), cookie.0, NonHTTP));
+ let _ = self.window.resource_task().send(SetCookiesForUrl((*url).clone(), String::from(cookie), NonHTTP));
Ok(())
}
@@ -2256,7 +2256,7 @@ impl DocumentProgressHandler {
fn dispatch_load(&self) {
let document = self.addr.root();
let window = document.window();
- let event = Event::new(GlobalRef::Window(window), DOMString("load".to_owned()),
+ let event = Event::new(GlobalRef::Window(window), DOMString::from("load"),
EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable);
let wintarget = window.upcast::<EventTarget>();
@@ -2268,7 +2268,7 @@ impl DocumentProgressHandler {
if let Some(frame_element) = browsing_context.frame_element() {
let frame_window = window_from_node(frame_element);
- let event = Event::new(GlobalRef::Window(frame_window.r()), DOMString("load".to_owned()),
+ let event = Event::new(GlobalRef::Window(frame_window.r()), DOMString::from("load"),
EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable);
event.fire(frame_element.upcast());
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 10:33:36 +0000