Skip to content
Permalink
Browse files

Updated content_type of Document and XMLDocument from DOCString to Mime

  • Loading branch information...
nupurbaghel committed Feb 7, 2018
1 parent 1662fd7 commit d02422408e43ee279da81c091dd295e199d6b842
@@ -98,6 +98,7 @@ use ipc_channel::ipc::{self, IpcSender};
use js::jsapi::{JSContext, JSObject, JSRuntime};
use js::jsapi::JS_GetRuntime;
use metrics::{InteractiveFlag, InteractiveMetrics, InteractiveWindow, ProfilerMetadataFactory, ProgressiveWebMetric};
use mime::{Mime, TopLevel, SubLevel};
use msg::constellation_msg::{BrowsingContextId, Key, KeyModifiers, KeyState, TopLevelBrowsingContextId};
use net_traits::{FetchResponseMsg, IpcSend, ReferrerPolicy};
use net_traits::CookieSource::NonHTTP;
@@ -236,7 +237,8 @@ pub struct Document {
node: Node,
window: Dom<Window>,
implementation: MutNullableDom<DOMImplementation>,
content_type: DOMString,
#[ignore_malloc_size_of = "type from external crate"]
content_type: Mime,
last_modified: Option<String>,
encoding: Cell<&'static Encoding>,
has_browsing_context: bool,
@@ -2197,7 +2199,7 @@ impl Document {
url: Option<ServoUrl>,
origin: MutableOrigin,
is_html_document: IsHTMLDocument,
content_type: Option<DOMString>,
content_type: Option<Mime>,
last_modified: Option<String>,
activity: DocumentActivity,
source: DocumentSource,
@@ -2222,12 +2224,12 @@ impl Document {
has_browsing_context: has_browsing_context == HasBrowsingContext::Yes,
implementation: Default::default(),
content_type: match content_type {
Some(string) => string,
None => DOMString::from(match is_html_document {
Some(mime_data) => mime_data,
None => Mime::from(match is_html_document {
// https://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument
IsHTMLDocument::HTMLDocument => "text/html",
IsHTMLDocument::HTMLDocument => Mime(TopLevel::Text, SubLevel::Html, vec![]),
// https://dom.spec.whatwg.org/#concept-document-content-type
IsHTMLDocument::NonHTMLDocument => "application/xml",
IsHTMLDocument::NonHTMLDocument => Mime(TopLevel::Application, SubLevel::Xml, vec![]),
}),
},
last_modified: last_modified,
@@ -2339,7 +2341,7 @@ impl Document {
url: Option<ServoUrl>,
origin: MutableOrigin,
doctype: IsHTMLDocument,
content_type: Option<DOMString>,
content_type: Option<Mime>,
last_modified: Option<String>,
activity: DocumentActivity,
source: DocumentSource,
@@ -2889,7 +2891,7 @@ impl DocumentMethods for Document {

// https://dom.spec.whatwg.org/#dom-document-content_type
fn ContentType(&self) -> DOMString {
self.content_type.clone()
DOMString::from(self.content_type.to_string())
}

// https://dom.spec.whatwg.org/#dom-document-doctype
@@ -2969,7 +2971,8 @@ impl DocumentMethods for Document {
local_name.make_ascii_lowercase();
}

let ns = if self.is_html_document || self.content_type == "application/xhtml+xml" {
let is_xhtml = self.content_type.0 == TopLevel::Application && self.content_type.1.as_str() == "xhtml+xml";
let ns = if self.is_html_document || is_xhtml {
ns!(html)
} else {
ns!()
@@ -24,6 +24,7 @@ use dom::node::Node;
use dom::text::Text;
use dom::xmldocument::XMLDocument;
use dom_struct::dom_struct;
use mime::{Mime, TopLevel, SubLevel};
use script_traits::DocumentActivity;

// https://dom.spec.whatwg.org/#domimplementation
@@ -72,9 +73,9 @@ impl DOMImplementationMethods for DOMImplementation {
let namespace = namespace_from_domstring(maybe_namespace.to_owned());

let content_type = match namespace {
ns!(html) => "application/xhtml+xml",
ns!(svg) => "image/svg+xml",
_ => "application/xml"
ns!(html) => Mime(TopLevel::Application, SubLevel::Ext("xhtml+xml".to_string()), vec![]),
ns!(svg) => Mime(TopLevel::Image, SubLevel::Ext("svg+xml".to_string()), vec![]),
_ => Mime(TopLevel::Application, SubLevel::Xml, vec![])
};

// Step 1.
@@ -83,7 +84,7 @@ impl DOMImplementationMethods for DOMImplementation {
None,
self.document.origin().clone(),
IsHTMLDocument::NonHTMLDocument,
Some(DOMString::from(content_type)),
Some(content_type),
None,
DocumentActivity::Inactive,
DocumentSource::NotFromParser,
@@ -54,7 +54,7 @@ impl DOMParserMethods for DOMParser {
ty: DOMParserBinding::SupportedType)
-> Fallible<DomRoot<Document>> {
let url = self.window.get_url();
let content_type = DOMString::from(ty.as_str());
let content_type = ty.as_str().parse().expect("Supported type is not a MIME type");
let doc = self.window.Document();
let loader = DocumentLoader::new(&*doc.loader());
match ty {
@@ -16,6 +16,7 @@ use dom::window::Window;
use dom_struct::dom_struct;
use js::jsapi::JSContext;
use js::jsapi::JSObject;
use mime::Mime;
use script_traits::DocumentActivity;
use servo_url::{MutableOrigin, ServoUrl};
use std::ptr::NonNull;
@@ -32,7 +33,7 @@ impl XMLDocument {
url: Option<ServoUrl>,
origin: MutableOrigin,
is_html_document: IsHTMLDocument,
content_type: Option<DOMString>,
content_type: Option<Mime>,
last_modified: Option<String>,
activity: DocumentActivity,
source: DocumentSource,
@@ -59,7 +60,7 @@ impl XMLDocument {
url: Option<ServoUrl>,
origin: MutableOrigin,
doctype: IsHTMLDocument,
content_type: Option<DOMString>,
content_type: Option<Mime>,
last_modified: Option<String>,
activity: DocumentActivity,
source: DocumentSource,
@@ -1271,10 +1271,7 @@ impl XMLHttpRequest {
Ok(parsed) => Some(parsed),
Err(_) => None // Step 7
};
let mime_type = self.final_mime_type();
let content_type = mime_type.map(|mime|{
DOMString::from(format!("{}", mime))
});
let content_type = self.final_mime_type();
Document::new(win,
HasBrowsingContext::No,
parsed_url,
@@ -2183,7 +2183,7 @@ impl ScriptThread {

let content_type = metadata.content_type
.as_ref()
.map(|&Serde(ContentType(ref mimetype))| DOMString::from(mimetype.to_string()));
.map(|&Serde(ContentType(ref mimetype))| mimetype.clone());

let loader = DocumentLoader::new_with_threads(self.resource_threads.clone(),
Some(final_url.clone()));

0 comments on commit d024224

Please sign in to comment.
You can’t perform that action at this time.