Auto merge of #15931 - emilio:die-defaultvalues-die, r=mbrubeck

style: Kill SharedStyleContext::default_computed_values.

This is on top of https://github.com/servo/servo/pull/15928.

Now that cascade() gets a Device ref, we can use the default computed values
from there to avoid propagating that state all over the place.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15931)
<!-- Reviewable:end -->

2 files changed, 12 insertions, 14 deletions

diff --git a/components/script_layout_interface/reporter.rs b/components/script_layout_interface/reporter.rs
index 171f96d9d06..1c84bd31fc5 100644
--- a/components/script_layout_interface/reporter.rs
+++ b/components/script_layout_interface/reporter.rs
@@ -11,7 +11,7 @@ use servo_url::ServoUrl;
 use std::sync::{Mutex, Arc};
 use style::error_reporting::ParseErrorReporter;
 
-#[derive(HeapSizeOf)]
+#[derive(HeapSizeOf, Clone)]
 pub struct CSSErrorReporter {
     pub pipelineid: PipelineId,
     // Arc+Mutex combo is necessary to make this struct Sync,
@@ -22,11 +22,18 @@ pub struct CSSErrorReporter {
 }
 
 impl ParseErrorReporter for CSSErrorReporter {
-     fn report_error(&self, input: &mut Parser, position: SourcePosition, message: &str,
-        url: &ServoUrl) {
+     fn report_error(&self,
+                     input: &mut Parser,
+                     position: SourcePosition,
+                     message: &str,
+                     url: &ServoUrl) {
         let location = input.source_location(position);
         if log_enabled!(log::LogLevel::Info) {
-             info!("Url:\t{}\n{}:{} {}", url.as_str(), location.line, location.column, message)
+             info!("Url:\t{}\n{}:{} {}",
+                   url.as_str(),
+                   location.line,
+                   location.column,
+                   message)
         }
 
          //TODO: report a real filename
@@ -37,11 +44,4 @@ impl ParseErrorReporter for CSSErrorReporter {
                                                      location.column,
                                                      message.to_owned()));
      }
-
-     fn clone(&self) -> Box<ParseErrorReporter + Send + Sync> {
-         box CSSErrorReporter {
-             pipelineid: self.pipelineid,
-             script_chan: self.script_chan.clone(),
-         }
-     }
 }
diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs
index d8768384245..0e7cb160334 100644
--- a/components/script_layout_interface/wrapper_traits.rs
+++ b/components/script_layout_interface/wrapper_traits.rs
@@ -407,7 +407,6 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug +
                                 context.stylist.precomputed_values_for_pseudo(
                                     &style_pseudo,
                                     Some(data.styles().primary.values()),
-                                    &context.default_computed_values,
                                     CascadeFlags::empty());
                             data.styles_mut().pseudos
                                 .insert(style_pseudo.clone(), new_style);
@@ -424,8 +423,7 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug +
                                        .lazily_compute_pseudo_element_style(
                                            unsafe { &self.unsafe_get() },
                                            &style_pseudo,
-                                           data.styles().primary.values(),
-                                           &context.default_computed_values);
+                                           data.styles().primary.values());
                             data.styles_mut().pseudos
                                 .insert(style_pseudo.clone(), new_style.unwrap());
                         }