Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Solving merge conficts related to the html5ever_atoms -> html5ever change

Browse source
This commit is contained in:
Christian Poveda 2017-05-03 12:57:49 -05:00
commit 62821a6915
188 changed files with 1130 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/create.rs
View file

@ -76,7 +76,7 @@ use dom::htmlulistelement::HTMLUListElement;
use dom::htmlunknownelement::HTMLUnknownElement;
use dom::htmlvideoelement::HTMLVideoElement;
use dom::svgsvgelement::SVGSVGElement;
use html5ever_atoms::{Prefix, QualName};
use html5ever::{QualName, Prefix};
use servo_config::prefs::PREFS;
fn create_svg_element(name: QualName,
@ -273,14 +273,10 @@ fn create_html_element(name: QualName,
}
pub fn create_element(name: QualName,
prefix: Option<Prefix>,
document: &Document,
creator: ElementCreator)
-> Root<Element> {
// FIXME(ajeffrey): Convert directly from Prefix to DOMString.
// let prefix = prefix.map(|p| DOMString::from(&*p));
let prefix = name.prefix.clone();
match name.ns {
ns!(html) => create_html_element(name, prefix, document, creator),
ns!(svg) => create_svg_element(name, prefix, document),