From f2b1ef4e45164b03a621ae5a9b7b96f5025006c1 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Tue, 24 May 2016 14:03:55 +1000
Subject: [PATCH] fixup! Add an extra data field to ParserContext.

---
 tests/unit/style/media_queries.rs | 7 +++++--
 tests/unit/style/stylesheets.rs   | 7 +++++--
 tests/unit/style/viewport.rs      | 5 +++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/unit/style/media_queries.rs b/tests/unit/style/media_queries.rs
index daa6f1c2569..c806f4ee8ad 100644
--- a/tests/unit/style/media_queries.rs
+++ b/tests/unit/style/media_queries.rs
@@ -8,6 +8,7 @@ use euclid::size::Size2D;
 use std::borrow::ToOwned;
 use style::error_reporting::ParseErrorReporter;
 use style::media_queries::*;
+use style::parser::ParserContextExtraData;
 use style::servo::Stylesheet;
 use style::stylesheets::{Origin, CSSRuleIteratorExt};
 use style::values::specified;
@@ -25,7 +26,8 @@ impl ParseErrorReporter for CSSErrorReporterTest {
 
 fn test_media_rule<F>(css: &str, callback: F) where F: Fn(&MediaQueryList, &str) {
     let url = Url::parse("http://localhost").unwrap();
-    let stylesheet = Stylesheet::from_str(css, url, Origin::Author, Box::new(CSSErrorReporterTest));
+    let stylesheet = Stylesheet::from_str(css, url, Origin::Author, Box::new(CSSErrorReporterTest),
+                                          ParserContextExtraData::default());
     let mut rule_count = 0;
     for rule in stylesheet.rules().media() {
         rule_count += 1;
@@ -36,7 +38,8 @@ fn test_media_rule<F>(css: &str, callback: F) where F: Fn(&MediaQueryList, &str)
 
 fn media_query_test(device: &Device, css: &str, expected_rule_count: usize) {
     let url = Url::parse("http://localhost").unwrap();
-    let ss = Stylesheet::from_str(css, url, Origin::Author, Box::new(CSSErrorReporterTest));
+    let ss = Stylesheet::from_str(css, url, Origin::Author, Box::new(CSSErrorReporterTest),
+                                  ParserContextExtraData::default());
     let rule_count = ss.effective_rules(device).style().count();
     assert!(rule_count == expected_rule_count, css.to_owned());
 }
diff --git a/tests/unit/style/stylesheets.rs b/tests/unit/style/stylesheets.rs
index 91822093ea2..a771cae0800 100644
--- a/tests/unit/style/stylesheets.rs
+++ b/tests/unit/style/stylesheets.rs
@@ -9,6 +9,7 @@ use std::borrow::ToOwned;
 use std::sync::Arc;
 use std::sync::Mutex;
 use string_cache::{Atom, Namespace};
+use style::parser::ParserContextExtraData;
 use style::properties::{PropertyDeclaration, PropertyDeclarationBlock, DeclaredValue, longhands};
 use style::stylesheets::{CSSRule, StyleRule, Origin};
 use style::error_reporting::ParseErrorReporter;
@@ -26,7 +27,8 @@ fn test_parse_stylesheet() {
     ";
     let url = Url::parse("about::test").unwrap();
     let stylesheet = Stylesheet::from_str(css, url, Origin::UserAgent,
-                                          Box::new(CSSErrorReporterTest));
+                                          Box::new(CSSErrorReporterTest),
+                                          ParserContextExtraData::default());
     assert_eq!(stylesheet, Stylesheet {
         origin: Origin::UserAgent,
         media: None,
@@ -205,7 +207,8 @@ fn test_report_error_stylesheet() {
 
     let errors = error_reporter.errors.clone();
 
-    Stylesheet::from_str(css, url, Origin::UserAgent, error_reporter);
+    Stylesheet::from_str(css, url, Origin::UserAgent, error_reporter,
+                         ParserContextExtraData::default());
 
     let mut errors = errors.lock().unwrap();
 
diff --git a/tests/unit/style/viewport.rs b/tests/unit/style/viewport.rs
index 316e7c25340..61168d65ad5 100644
--- a/tests/unit/style/viewport.rs
+++ b/tests/unit/style/viewport.rs
@@ -8,7 +8,7 @@ use euclid::size::Size2D;
 use media_queries::CSSErrorReporterTest;
 use style::error_reporting::ParseErrorReporter;
 use style::media_queries::{Device, MediaType};
-use style::parser::ParserContext;
+use style::parser::{ParserContext, ParserContextExtraData};
 use style::servo::Stylesheet;
 use style::stylesheets::{Origin, CSSRuleIteratorExt};
 use style::values::specified::Length::{self, ViewportPercentage};
@@ -20,7 +20,8 @@ use url::Url;
 
 macro_rules! stylesheet {
     ($css:expr, $origin:ident, $error_reporter:expr) => {
-        Stylesheet::from_str($css, Url::parse("http://localhost").unwrap(), Origin::$origin, $error_reporter);
+        Stylesheet::from_str($css, Url::parse("http://localhost").unwrap(), Origin::$origin, $error_reporter,
+                              ParserContextExtraData::default());
     }
 }