Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 15:18:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Remove pretty useless layer of abstraction.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-12-01 20:10:09 +01:00
parent 49e6594bc9
commit d570fc8164
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,6 @@ use context::{QuirksMode, SharedStyleContext, PostAnimationTasks, UpdateAnimatio
use data::ElementData;
use dom::{LayoutIterator, NodeInfo, OpaqueNode, TElement, TDocument, TNode};
use element_state::{ElementState, DocumentState};
use error_reporting::ParseErrorReporter;
use font_metrics::{FontMetrics, FontMetricsProvider, FontMetricsQueryResult};
use gecko::data::PerDocumentStyleData;
use gecko::global_style_data::GLOBAL_STYLE_DATA;
@ -68,7 +67,7 @@ use gecko_bindings::sugar::ownership::{HasArcFFI, HasSimpleFFI};
use hash::FnvHashMap;
use logical_geometry::WritingMode;
use media_queries::Device;
use properties::{ComputedValues, LonghandId, parse_style_attribute};
use properties::{ComputedValues, LonghandId};
use properties::{Importance, PropertyDeclaration, PropertyDeclarationBlock};
use properties::animated_properties::{AnimationValue, AnimationValueMap};
use properties::animated_properties::TransitionProperty;
@ -89,7 +88,6 @@ use std::mem;
use std::ops::DerefMut;
use std::ptr;
use string_cache::{Atom, Namespace, WeakAtom, WeakNamespace};
use stylesheets::UrlExtraData;
use stylist::Stylist;
/// A simple wrapper over `nsIDocument`.
@ -495,19 +493,7 @@ impl<'le> GeckoElement<'le> {
self.as_node().get_bool_flag(nsINode_BooleanFlag::ElementMayHaveAnonymousChildren)
}
/// Parse the style attribute of an element.
pub fn parse_style_attribute<R>(
value: &str,
url_data: &UrlExtraData,
quirks_mode: QuirksMode,
reporter: &R,
) -> PropertyDeclarationBlock
where
R: ParseErrorReporter,
{
parse_style_attribute(value, url_data, reporter, quirks_mode)
}
#[inline]
fn flags(&self) -> u32 {
self.raw_node()._base._base_1.mFlags
}

11
ports/geckolib/glue.rs
View file

@ -121,9 +121,9 @@ use style::properties::{CascadeFlags, ComputedValues, DeclarationSource, Importa
use style::properties::{LonghandId, LonghandIdSet, PropertyDeclaration, PropertyDeclarationBlock, PropertyId};
use style::properties::{PropertyDeclarationId, ShorthandId};
use style::properties::{SourcePropertyDeclaration, StyleBuilder};
use style::properties::{parse_one_declaration_into, parse_style_attribute};
use style::properties::animated_properties::AnimationValue;
use style::properties::animated_properties::compare_property_priority;
use style::properties::parse_one_declaration_into;
use style::rule_cache::RuleCacheConditions;
use style::rule_tree::{CascadeLevel, StrongRuleNode, StyleSource};
use style::selector_parser::{PseudoElementCascadeType, SelectorImpl};
@ -2583,8 +2583,13 @@ pub extern "C" fn Servo_ParseStyleAttribute(
let reporter = ErrorReporter::new(ptr::null_mut(), loader, raw_extra_data);
let url_data = unsafe { RefPtr::from_ptr_ref(&raw_extra_data) };
Arc::new(global_style_data.shared_lock.wrap(
GeckoElement::parse_style_attribute(value, url_data, quirks_mode.into(), &reporter)))
.into_strong()
parse_style_attribute(
value,
url_data,
&reporter,
quirks_mode.into(),
)
)).into_strong()
}
#[no_mangle]