aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_task.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-11-13 07:17:30 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-11-13 07:17:30 +0530
commit62acdd303b78951885c2c90747b31f318907d6c9 (patch)
treeb0023f9bef56e99485f78004e727f19cbe520d16 /components/script/script_task.rs
parente63b1e83d4acd272cdf293292f2a496455405098 (diff)
parent0da1623788022d82d045e215e48ba0c07798a787 (diff)
downloadservo-62acdd303b78951885c2c90747b31f318907d6c9.tar.gz
servo-62acdd303b78951885c2c90747b31f318907d6c9.zip
Auto merge of #8477 - asajeffrey:opaque-domstring, r=asajeffrey
Opaque DOMString This patch makes DOMString an opaque wrapper round String (currently it's a transparent wrapper). The changes are: * Replacing DOMString(foo) by DOMString::from(foo). * Replacing foo.0 by String::from(foo). * Adding functions clear, push_str and extend for in-place mutation of DOMStrings. * Replacing DOMString by String in other threads (devtools, storage and filereader). * Making DOMString implement !Send. * Removing the pub attribute from the contents of DOMString. This enables experimenting with other string representations in the DOM. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8477) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r--components/script/script_task.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index c366329af1e..71c55ef8b77 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -1622,7 +1622,7 @@ impl ScriptTask {
let content_type = match metadata.content_type {
Some(ContentType(Mime(TopLevel::Text, SubLevel::Plain, _))) => {
- Some(DOMString("text/plain".to_owned()))
+ Some(DOMString::from("text/plain"))
}
_ => None
};
@@ -1695,7 +1695,7 @@ impl ScriptTask {
fn notify_devtools(&self, title: DOMString, url: Url, ids: (PipelineId, Option<WorkerId>)) {
if let Some(ref chan) = self.devtools_chan {
let page_info = DevtoolsPageInfo {
- title: title,
+ title: String::from(title),
url: url,
};
chan.send(ScriptToDevtoolsControlMsg::NewGlobal(
@@ -1914,7 +1914,7 @@ impl ScriptTask {
// http://dev.w3.org/csswg/cssom-view/#resizing-viewports
// https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#event-type-resize
let uievent = UIEvent::new(window.r(),
- DOMString("resize".to_owned()), EventBubbles::DoesNotBubble,
+ DOMString::from("resize"), EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable, Some(window.r()),
0i32);
uievent.upcast::<Event>().fire(window.upcast());