Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Encapsulate CSS error reporter creation for stylo.

Browse source
This commit is contained in:
Josh Matthews 2017-04-18 19:10:21 +10:00
parent fd6e54d9e3
commit 3773a4d499
4 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/style/error_reporting.rs
View file

@ -124,3 +124,15 @@ impl ParseErrorReporter for NullReporter {
// do nothing // do nothing
} }
} }
/// Create an instance of the default error reporter for Servo.
#[cfg(feature = "servo")]
pub fn create_error_reporter() -> RustLogReporter {
RustLogReporter
}
/// Create an instance of the default error reporter for Stylo.
#[cfg(feature = "gecko")]
pub fn create_error_reporter() -> RustLogReporter {
RustLogReporter
}

4
components/style/gecko/wrapper.rs
View file

@ -21,7 +21,7 @@ use data::ElementData;
use dom::{self, DescendantsBit, LayoutIterator, NodeInfo, TElement, TNode, UnsafeNode}; use dom::{self, DescendantsBit, LayoutIterator, NodeInfo, TElement, TNode, UnsafeNode};
use dom::{OpaqueNode, PresentationalHintsSynthesizer}; use dom::{OpaqueNode, PresentationalHintsSynthesizer};
use element_state::ElementState; use element_state::ElementState;
use error_reporting::RustLogReporter; use error_reporting::create_error_reporter;
use font_metrics::{FontMetrics, FontMetricsProvider, FontMetricsQueryResult}; use font_metrics::{FontMetrics, FontMetricsProvider, FontMetricsQueryResult};
use gecko::data::PerDocumentStyleData; use gecko::data::PerDocumentStyleData;
use gecko::global_style_data::GLOBAL_STYLE_DATA; use gecko::global_style_data::GLOBAL_STYLE_DATA;
@ -416,7 +416,7 @@ impl<'le> GeckoElement<'le> {
pub fn parse_style_attribute(value: &str, pub fn parse_style_attribute(value: &str,
url_data: &UrlExtraData, url_data: &UrlExtraData,
quirks_mode: QuirksMode) -> PropertyDeclarationBlock { quirks_mode: QuirksMode) -> PropertyDeclarationBlock {
parse_style_attribute(value, url_data, &RustLogReporter, quirks_mode) parse_style_attribute(value, url_data, &create_error_reporter(), quirks_mode)
} }
fn flags(&self) -> u32 { fn flags(&self) -> u32 {

4
components/style/properties/helpers/animated_properties.mako.rs
View file

@ -476,7 +476,7 @@ impl AnimationValue {
/// Construct an AnimationValue from a property declaration /// Construct an AnimationValue from a property declaration
pub fn from_declaration(decl: &PropertyDeclaration, context: &mut Context, pub fn from_declaration(decl: &PropertyDeclaration, context: &mut Context,
initial: &ComputedValues) -> Option<Self> { initial: &ComputedValues) -> Option<Self> {
use error_reporting::RustLogReporter; use error_reporting::create_error_reporter;
use properties::LonghandId; use properties::LonghandId;
use properties::DeclaredValue; use properties::DeclaredValue;
@ -539,7 +539,7 @@ impl AnimationValue {
}, },
PropertyDeclaration::WithVariables(id, ref variables) => { PropertyDeclaration::WithVariables(id, ref variables) => {
let custom_props = context.style().custom_properties(); let custom_props = context.style().custom_properties();
let reporter = RustLogReporter; let reporter = create_error_reporter();
match id { match id {
% for prop in data.longhands: % for prop in data.longhands:
% if prop.animatable: % if prop.animatable:

8
components/style/stylist.rs
View file

@ -10,7 +10,7 @@ use context::{QuirksMode, SharedStyleContext};
use data::ComputedStyle; use data::ComputedStyle;
use dom::TElement; use dom::TElement;
use element_state::ElementState; use element_state::ElementState;
use error_reporting::RustLogReporter; use error_reporting::create_error_reporter;
use font_metrics::FontMetricsProvider; use font_metrics::FontMetricsProvider;
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
use gecko_bindings::structs::{nsIAtom, StyleRuleInclusion}; use gecko_bindings::structs::{nsIAtom, StyleRuleInclusion};
@ -595,7 +595,7 @@ impl Stylist {
parent.map(|p| &**p), parent.map(|p| &**p),
None, None,
None, None,
&RustLogReporter, &create_error_reporter(),
font_metrics, font_metrics,
cascade_flags, cascade_flags,
self.quirks_mode); self.quirks_mode);
@ -676,7 +676,7 @@ impl Stylist {
Some(parent_style), Some(parent_style),
None, None,
None, None,
&RustLogReporter, &create_error_reporter(),
font_metrics, font_metrics,
CascadeFlags::empty(), CascadeFlags::empty(),
self.quirks_mode); self.quirks_mode);
@ -1216,7 +1216,7 @@ impl Stylist {
Some(parent_style), Some(parent_style),
None, None,
None, None,
&RustLogReporter, &create_error_reporter(),
&metrics, &metrics,
CascadeFlags::empty(), CascadeFlags::empty(),
self.quirks_mode)) self.quirks_mode))