Removed line_number parameter from create function and added argument…

… to ParserCreated. Added comment to xml.rs

components/script/dom/create.rs

@@ -276,8 +276,7 @@ fn create_html_element(name: QualName,
 pub fn create_element(name: QualName,
                       prefix: Option<Prefix>,
                       document: &Document,
-                      creator: ElementCreator,
-                      line_number: u64)
+                      creator: ElementCreator)
                       -> Root<Element> {
     // FIXME(ajeffrey): Convert directly from Prefix to DOMString.
 

components/script/dom/document.rs

@@ -2427,7 +2427,7 @@ impl DocumentMethods for Document {
             local_name.make_ascii_lowercase();
         }
         let name = QualName::new(ns!(html), LocalName::from(local_name));
-        Ok(Element::create(name, None, self, ElementCreator::ScriptCreated, 1))
+        Ok(Element::create(name, None, self, ElementCreator::ScriptCreated))
     }
 
     // https://dom.spec.whatwg.org/#dom-document-createelementns
@@ -2438,7 +2438,7 @@ impl DocumentMethods for Document {
         let (namespace, prefix, local_name) = try!(validate_and_extract(namespace,
                                                                         &qualified_name));
         let name = QualName::new(namespace, local_name);
-        Ok(Element::create(name, prefix, self, ElementCreator::ScriptCreated, 1))
+        Ok(Element::create(name, prefix, self, ElementCreator::ScriptCreated))
     }
 
     // https://dom.spec.whatwg.org/#dom-document-createattribute
@@ -2691,7 +2691,7 @@ impl DocumentMethods for Document {
                 Some(elem) => Root::upcast::<Node>(elem),
                 None => {
                     let name = QualName::new(ns!(svg), local_name!("title"));
-                    let elem = Element::create(name, None, self, ElementCreator::ScriptCreated, 1);
+                    let elem = Element::create(name, None, self, ElementCreator::ScriptCreated);
                     let parent = root.upcast::<Node>();
                     let child = elem.upcast::<Node>();
                     parent.InsertBefore(child, parent.GetFirstChild().r())
@@ -2711,7 +2711,7 @@ impl DocumentMethods for Document {
                             let elem = Element::create(name,
                                                        None,
                                                        self,
-                                                       ElementCreator::ScriptCreated, 1);
+                                                       ElementCreator::ScriptCreated);
                             head.upcast::<Node>()
                                 .AppendChild(elem.upcast())
                                 .unwrap()

components/script/dom/element.rs

@@ -143,7 +143,7 @@ impl fmt::Debug for Element {
 
 #[derive(PartialEq, HeapSizeOf)]
 pub enum ElementCreator {
-    ParserCreated,
+    ParserCreated(u64),
     ScriptCreated,
 }
 
@@ -173,9 +173,9 @@ impl<'a> TryFrom<&'a str> for AdjacentPosition {
 //
 impl Element {
     pub fn create(name: QualName, prefix: Option<Prefix>,
-                  document: &Document, creator: ElementCreator, line_number: u64)
+                  document: &Document, creator: ElementCreator)
                   -> Root<Element> {
-        create_element(name, prefix, document, creator, line_number)
+        create_element(name, prefix, document, creator)
     }
 
     pub fn new_inherited(local_name: LocalName,
@@ -1884,7 +1884,7 @@ impl ElementMethods for Element {
             NodeTypeId::DocumentFragment => {
                 let body_elem = Element::create(QualName::new(ns!(html), local_name!("body")),
                                                 None, &context_document,
-                                                ElementCreator::ScriptCreated, 1);
+                                                ElementCreator::ScriptCreated);
                 Root::upcast(body_elem)
             },
             _ => context_node.GetParentElement().unwrap()

components/script/dom/htmllinkelement.rs

@@ -70,7 +70,7 @@ impl HTMLLinkElement {
         HTMLLinkElement {
             htmlelement: HTMLElement::new_inherited(local_name, prefix, document),
             rel_list: Default::default(),
-            parser_inserted: Cell::new(creator == ElementCreator::ParserCreated),
+            parser_inserted: Cell::new(creator == ElementCreator::ParserCreated(1)),
             stylesheet: DOMRefCell::new(None),
             cssom_stylesheet: MutNullableJS::new(None),
         }

components/script/dom/htmlscriptelement.rs

@@ -73,8 +73,8 @@ impl HTMLScriptElement {
             htmlelement:
                 HTMLElement::new_inherited(local_name, prefix, document),
             already_started: Cell::new(false),
-            parser_inserted: Cell::new(creator == ElementCreator::ParserCreated),
-            non_blocking: Cell::new(creator != ElementCreator::ParserCreated),
+            parser_inserted: Cell::new(creator == ElementCreator::ParserCreated(1)),
+            non_blocking: Cell::new(creator != ElementCreator::ParserCreated(1)),
             ready_to_be_parser_executed: Cell::new(false),
             parser_document: JS::from_ref(document),
             load: DOMRefCell::new(None),

components/script/dom/node.rs

@@ -1737,7 +1737,7 @@ impl Node {
                 };
                 let element = Element::create(name,
                     element.prefix().map(|p| Prefix::from(&**p)),
-                    &document, ElementCreator::ScriptCreated, 1);
+                    &document, ElementCreator::ScriptCreated);
                 Root::upcast::<Node>(element)
             },
         };

components/script/dom/servoparser/html.rs

@@ -157,7 +157,7 @@ impl<'a> TreeSink for Sink {
     fn create_element(&mut self, name: QualName, attrs: Vec<Attribute>)
             -> JS<Node> {
         let elem = Element::create(name, None, &*self.document,
-                                   ElementCreator::ParserCreated, 1);
+                                   ElementCreator::ParserCreated(self.current_line));
 
         for attr in attrs {
             elem.set_attribute_from_parser(attr.name, DOMString::from(String::from(attr.value)), None);

components/script/dom/servoparser/xml.rs

@@ -100,6 +100,7 @@ struct Sink {
     script: MutNullableJS<HTMLScriptElement>,
 }
 
+//TODO: Add ability to track lines to API of xml5ever
 impl<'a> TreeSink for Sink {
     type Handle = JS<Node>;
 
@@ -129,7 +130,7 @@ impl<'a> TreeSink for Sink {
             local: name.local,
         };
         let elem = Element::create(name, prefix, &*self.document,
-                                   ElementCreator::ParserCreated, 1);
+                                   ElementCreator::ParserCreated(1));
 
         for attr in attrs {
             let name = QualName {