From 34106d7e45518d4ecaf444c227385646341aa704 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Fri, 19 Jul 2013 15:18:45 -0600
Subject: [PATCH 1/3] Fix broken inline CSS parsing and add a iterator for
 children.

If '\r' appears in an inline <style> element, libhubbub splits the text nodes
there, creating multiple text children. The inline style logic assumed that
each <style> element had only one child.

The logic was moved to trigger when the style element is finished parsing
completely (including the children), and then the children are concatenated
before sending it to the parser.
---
 src/components/script/dom/node.rs             | 22 +++++++++-
 .../script/html/hubbub_html_parser.rs         | 44 ++++++++++---------
 src/test/html/bad-line-ends.html              |  1 +
 3 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 src/test/html/bad-line-ends.html

diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs
index 0671bbd8bf7..e2716bfca83 100644
--- a/src/components/script/dom/node.rs
+++ b/src/components/script/dom/node.rs
@@ -46,6 +46,10 @@ pub struct AbstractNode<View> {
     priv obj: *mut Node<View>,
 }
 
+pub struct AbstractNodeChildrenIterator<View> {
+    priv current_node: Option<AbstractNode<View>>,
+}
+
 /// An HTML node.
 ///
 /// `View` describes extra data associated with this node that this task has access to. For
@@ -200,7 +204,7 @@ impl<View> TreeNodeRef<Node<View>> for AbstractNode<View> {
     }
 }
 
-impl<View> AbstractNode<View> {
+impl<'self, View> AbstractNode<View> {
     // Unsafe accessors
 
     /// Returns the layout data, unsafely cast to whatever type layout wishes. Only layout is
@@ -396,6 +400,22 @@ impl<View> AbstractNode<View> {
     pub fn debug_str(&self) -> ~str {
         fmt!("%?", self.type_id())
     }
+
+    pub fn children(&self) -> AbstractNodeChildrenIterator<View> {
+        AbstractNodeChildrenIterator {
+            current_node: self.first_child(),
+        }
+    }
+}
+
+impl<View> Iterator<AbstractNode<View>> for AbstractNodeChildrenIterator<View> {
+    pub fn next(&mut self) -> Option<AbstractNode<View>> {
+        self.current_node = match self.current_node {
+            None => None,
+            Some(node) => node.next_sibling(),
+        };
+        self.current_node
+    }
 }
 
 impl Node<ScriptView> {
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 72eac9c51ed..675819fbc37 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -275,24 +275,7 @@ pub fn parse_html(url: Url,
     parser.set_document_node(unsafe { root.to_hubbub_node() });
     parser.enable_scripting(true);
 
-    // Performs various actions necessary after appending has taken place. Currently, this
-    // consists of processing inline stylesheets, but in the future it might perform
-    // prefetching, etc.
-    let css_chan2 = css_chan.clone();
-    let append_hook: ~fn(AbstractNode<ScriptView>, AbstractNode<ScriptView>) = |parent_node, child_node| {
-        if parent_node.is_style_element() && child_node.is_text() {
-            debug!("found inline CSS stylesheet");
-            let url = url::from_str("http://example.com/"); // FIXME
-            let url_cell = Cell::new(url);
-            do child_node.with_imm_text |text_node| {
-                let data = text_node.parent.data.to_str();  // FIXME: Bad copy.
-                let provenance = InlineProvenance(result::unwrap(url_cell.take()), data);
-                css_chan2.send(CSSTaskNewFile(provenance));
-            }
-        }
-    };
-
-    let (css_chan2, js_chan2) = (css_chan.clone(), js_chan.clone());
+    let (css_chan2, css_chan3, js_chan2) = (css_chan.clone(), css_chan.clone(), js_chan.clone());
     parser.set_tree_handler(~hubbub::TreeHandler {
         create_comment: |data: ~str| {
             debug!("create comment");
@@ -393,15 +376,34 @@ pub fn parse_html(url: Url,
                 Node::as_abstract_node(~Text::new(data)).to_hubbub_node()
             }
         },
-        ref_node: |_| {},
-        unref_node: |_| {},
+        ref_node: |_| { debug!("ref node"); },
+        unref_node: |node| {
+            // check for the end of a <style> so we can submit all the text to the parser.
+            unsafe {
+                let node: AbstractNode<ScriptView> = NodeWrapping::from_hubbub_node(node);
+                if node.is_style_element() {
+                    let url = url::from_str("http://example.com/"); // FIXME
+                    let url_cell = Cell::new(url);
+
+                    let mut data = ~[];
+                    for node.children().advance |child| {
+                        do child.with_imm_text() |text| {
+                            data.push(text.parent.data.to_str());  // FIXME: Bad copy.
+                        }
+                    }
+                    let provenance = InlineProvenance(result::unwrap(url_cell.take()), data.concat());
+                    css_chan3.send(CSSTaskNewFile(provenance));
+                }
+
+
+            }
+        },
         append_child: |parent: hubbub::NodeDataPtr, child: hubbub::NodeDataPtr| {
             unsafe {
                 debug!("append child %x %x", cast::transmute(parent), cast::transmute(child));
                 let parent: AbstractNode<ScriptView> = NodeWrapping::from_hubbub_node(parent);
                 let child: AbstractNode<ScriptView> = NodeWrapping::from_hubbub_node(child);
                 parent.add_child(child);
-                append_hook(parent, child);
             }
             child
         },
diff --git a/src/test/html/bad-line-ends.html b/src/test/html/bad-line-ends.html
new file mode 100644
index 00000000000..f5fc543c9cc
--- /dev/null
+++ b/src/test/html/bad-line-ends.html
@@ -0,0 +1 @@
+<html>
  <head>
    <style>
      p {
        color: white;
      }
      p.blue {
        background-color: blue;
      }
      p.red {
        background-color: red;
      }
    </style>
  </head>
  <body>
    <p class="blue">
      I am a paragraph. My background color is blue.
    </p>
    <p class="red">
      I am a paragraph. My background color is red.
    </p>
  </body>
</html>

\ No newline at end of file

From a6bcd5595fec8b404c090b2fbe80e1f1a7486984 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Fri, 19 Jul 2013 15:24:27 -0600
Subject: [PATCH 2/3] Bump rust-css.

---
 src/support/css/rust-css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/support/css/rust-css b/src/support/css/rust-css
index 7a584804a98..8b9cf93fb03 160000
--- a/src/support/css/rust-css
+++ b/src/support/css/rust-css
@@ -1 +1 @@
-Subproject commit 7a584804a98b5731fb53d216c3f059e5a0c7ea5c
+Subproject commit 8b9cf93fb03027d0f125afbd84cf758bd8d2d676

From 2b44efbbef5b90125fcf31b5ca97bc8675803132 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Fri, 19 Jul 2013 15:36:42 -0600
Subject: [PATCH 3/3] Remove spurious whitespace.

---
 src/components/script/html/hubbub_html_parser.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 675819fbc37..d9dd9cc5636 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -394,8 +394,6 @@ pub fn parse_html(url: Url,
                     let provenance = InlineProvenance(result::unwrap(url_cell.take()), data.concat());
                     css_chan3.send(CSSTaskNewFile(provenance));
                 }
-
-
             }
         },
         append_child: |parent: hubbub::NodeDataPtr, child: hubbub::NodeDataPtr| {