From 8c98b0e49c1b9a4c7ffc3cd7a2f4a62a82cba4ec Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 30 Oct 2012 23:51:09 -0700
Subject: [PATCH] Use newcss::Stylesheet for the stylesheet type

---
 src/rust-css                         |  2 +-
 src/rust-netsurfcss                  |  2 +-
 src/servo/content/content_task.rs    |  2 +-
 src/servo/css/matching.rs            |  1 +
 src/servo/css/styles.rs              |  2 +-
 src/servo/html/cssparse.rs           | 18 ++++++++----------
 src/servo/html/hubbub_html_parser.rs |  2 +-
 src/servo/layout/layout_task.rs      |  2 +-
 8 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/rust-css b/src/rust-css
index b0f9bd32d9d..8d8836e5afc 160000
--- a/src/rust-css
+++ b/src/rust-css
@@ -1 +1 @@
-Subproject commit b0f9bd32d9de0e2fb3eca6ed02d58c4709a28693
+Subproject commit 8d8836e5afc7afaac869e099c0ffa8f68c3b87bf
diff --git a/src/rust-netsurfcss b/src/rust-netsurfcss
index 593aed78096..31697a75038 160000
--- a/src/rust-netsurfcss
+++ b/src/rust-netsurfcss
@@ -1 +1 @@
-Subproject commit 593aed78096b2d322a10315e6d9bcdda39f50e90
+Subproject commit 31697a75038e7aa8c5e5b5e86002c4e42dc19712
diff --git a/src/servo/content/content_task.rs b/src/servo/content/content_task.rs
index 7a74b8ade00..3451fd8e452 100644
--- a/src/servo/content/content_task.rs
+++ b/src/servo/content/content_task.rs
@@ -23,7 +23,7 @@ use layout::layout_task;
 use layout_task::{LayoutTask, BuildMsg, BuildData, AddStylesheet};
 use resource::image_cache_task::ImageCacheTask;
 
-use newcss::values::Stylesheet;
+use newcss::Stylesheet;
 
 use jsrt = js::rust::rt;
 use js::rust::{cx, methods};
diff --git a/src/servo/css/matching.rs b/src/servo/css/matching.rs
index 2a7403b450a..76f6dd49834 100644
--- a/src/servo/css/matching.rs
+++ b/src/servo/css/matching.rs
@@ -6,6 +6,7 @@ use dom::node::{LayoutData, Node, Text};
 use dom::element::ElementData;
 
 use newcss::values::*;
+use newcss::Stylesheet;
 use styles::{SpecifiedStyle};
 
 /** 
diff --git a/src/servo/css/styles.rs b/src/servo/css/styles.rs
index c1e770a327b..db0fc44090e 100644
--- a/src/servo/css/styles.rs
+++ b/src/servo/css/styles.rs
@@ -5,7 +5,7 @@ use std::arc::{ARC, get, clone};
 
 use core::dvec::DVec;
 use newcss::values::*;
-use newcss::values::Stylesheet;
+use newcss::Stylesheet;
 use dom::element::{HTMLDivElement, HTMLHeadElement, HTMLImageElement, UnknownElement, HTMLScriptElement};
 use dom::node::{Comment, Doctype, Element, Text,
                 Node, NodeKind, NodeTree, LayoutData};
diff --git a/src/servo/html/cssparse.rs b/src/servo/html/cssparse.rs
index 0f0c7a0bd48..0ac0d7c2c2d 100644
--- a/src/servo/html/cssparse.rs
+++ b/src/servo/html/cssparse.rs
@@ -5,27 +5,25 @@ Some little helpers for hooking up the HTML parser with the CSS parser
 use std::net::url::Url;
 use std::cell::Cell;
 use resource::resource_task::{ResourceTask, ProgressMsg, Load, Payload, Done};
-use newcss::values::Stylesheet;
-use newcss::util::{DataStream, DataStreamFactory};
+use newcss::Stylesheet;
+use newcss::util::DataStream;
 
 pub fn spawn_css_parser(url: Url, resource_task: ResourceTask) -> comm::Port<Stylesheet> {
     let result_port = comm::Port();
     let result_chan = comm::Chan(&result_port);
     do task::spawn |move url, copy resource_task| {
-        let sheet = newcss::parser::parse_stylesheet(copy url, data_stream_factory(copy url, resource_task));
+        
+        let sheet = Stylesheet::new(copy url, data_stream(copy url, resource_task));
         result_chan.send(move sheet);
     }
 
     return result_port;
 }
 
-fn data_stream_factory(url: Url, resource_task: ResourceTask) -> DataStreamFactory {
-    let url = Cell(move url);
-    return |move url| {
-        let input_port = Port();
-        resource_task.send(Load(url.take(), input_port.chan()));
-        resource_port_to_data_stream(input_port)
-    }
+fn data_stream(url: Url, resource_task: ResourceTask) -> DataStream {
+    let input_port = Port();
+    resource_task.send(Load(move url, input_port.chan()));
+    resource_port_to_data_stream(input_port)
 }
 
 fn resource_port_to_data_stream(input_port: comm::Port<ProgressMsg>) -> DataStream {
diff --git a/src/servo/html/hubbub_html_parser.rs b/src/servo/html/hubbub_html_parser.rs
index d14a0a60fb7..9addf671429 100644
--- a/src/servo/html/hubbub_html_parser.rs
+++ b/src/servo/html/hubbub_html_parser.rs
@@ -1,6 +1,6 @@
 use au = gfx::geometry;
 use content::content_task::ContentTask;
-use newcss::values::Stylesheet;
+use newcss::Stylesheet;
 use dom::cow;
 use dom::element::*;
 use dom::event::{Event, ReflowEvent};
diff --git a/src/servo/layout/layout_task.rs b/src/servo/layout/layout_task.rs
index e34bf6fd32f..5faba84f661 100644
--- a/src/servo/layout/layout_task.rs
+++ b/src/servo/layout/layout_task.rs
@@ -8,7 +8,7 @@ use au::Au;
 use content::content_task;
 use core::dvec::DVec;
 use css::styles::apply_style;
-use newcss::values::Stylesheet;
+use newcss::Stylesheet;
 use dl = gfx::display_list;
 use dom::event::{Event, ReflowEvent};
 use dom::node::{Node, LayoutData};