--- a/servo/ports/geckolib/glue.rs
+++ b/servo/ports/geckolib/glue.rs
@@ -13,17 +13,17 @@ use std::fmt::Write;
use std::ptr;
use style::context::{QuirksMode, SharedStyleContext, StyleContext};
use style::context::ThreadLocalStyleContext;
use style::data::{ElementData, ElementStyles, RestyleData};
use style::dom::{AnimationOnlyDirtyDescendants, DirtyDescendants};
use style::dom::{ShowSubtreeData, TElement, TNode};
use style::element_state::ElementState;
use style::error_reporting::RustLogReporter;
-use style::font_metrics::get_metrics_provider_for_product;
+use style::font_metrics::{FontMetricsProvider, get_metrics_provider_for_product};
use style::gecko::data::{PerDocumentStyleData, PerDocumentStyleDataImpl};
use style::gecko::global_style_data::{GLOBAL_STYLE_DATA, GlobalStyleData};
use style::gecko::restyle_damage::GeckoRestyleDamage;
use style::gecko::selector_parser::PseudoElement;
use style::gecko::traversal::RecalcStyleOnly;
use style::gecko::wrapper::GeckoElement;
use style::gecko_bindings::bindings;
use style::gecko_bindings::bindings::{RawGeckoElementBorrowed, RawGeckoElementBorrowedOrNull};
@@ -107,16 +107,17 @@ use style::stylesheets::StylesheetLoader
use style::stylist::RuleInclusion;
use style::supports::parse_condition_or_declaration;
use style::thread_state;
use style::timer::Timer;
use style::traversal::{ANIMATION_ONLY, DomTraversal, FOR_CSS_RULE_CHANGES, FOR_RECONSTRUCT};
use style::traversal::{FOR_DEFAULT_STYLES, TraversalDriver, TraversalFlags, UNSTYLED_CHILDREN_ONLY};
use style::traversal::{resolve_style, resolve_default_style};
use style::values::{CustomIdent, KeyframesName};
+use style::values::computed::Context;
use style_traits::ToCss;
use super::stylesheet_loader::StylesheetLoader;
/*
* For Gecko->Servo function calls, we need to redeclare the same signature that was declared in
* the C header in Gecko. In order to catch accidental mismatches, we run rust-bindgen against
* those signatures as well, giving us a second declaration of all the Servo_* functions in this
* crate. If there's a mismatch, LLVM will assert and abort, which is a rather awful thing to
@@ -2431,51 +2432,57 @@ fn simulate_compute_values_failure(prope
id.as_shorthand().is_ok() && property.mSimulateComputeValuesFailure
}
#[cfg(not(feature = "gecko_debug"))]
fn simulate_compute_values_failure(_: &PropertyValuePair) -> bool {
false
}
+fn create_context<'a>(per_doc_data: &'a PerDocumentStyleDataImpl,
+ font_metrics_provider: &'a FontMetricsProvider,
+ style: &'a Arc<ComputedValues>,
+ parent_style: &'a Option<&ComputedValues>)
+ -> Context<'a> {
+ let default_values = per_doc_data.default_computed_values();
+
+ Context {
+ is_root_element: false,
+ device: per_doc_data.stylist.device(),
+ inherited_style: parent_style.unwrap_or(default_values),
+ layout_parent_style: parent_style.unwrap_or(default_values),
+ style: StyleBuilder::for_derived_style(&style),
+ font_metrics_provider: font_metrics_provider,
+ cached_system_font: None,
+ in_media_query: false,
+ quirks_mode: per_doc_data.stylist.quirks_mode(),
+ }
+}
+
#[no_mangle]
pub extern "C" fn Servo_GetComputedKeyframeValues(keyframes: RawGeckoKeyframeListBorrowed,
style: ServoComputedValuesBorrowed,
parent_style: ServoComputedValuesBorrowedOrNull,
raw_data: RawServoStyleSetBorrowed,
computed_keyframes: RawGeckoComputedKeyframeValuesListBorrowedMut)
{
use std::mem;
use style::properties::LonghandIdSet;
use style::properties::declaration_block::Importance;
- use style::values::computed::Context;
-
- let global_style_data = &*GLOBAL_STYLE_DATA;
- let guard = global_style_data.shared_lock.read();
-
let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
-
+ let metrics = get_metrics_provider_for_product();
let style = ComputedValues::as_arc(&style);
let parent_style = parent_style.as_ref().map(|r| &**ComputedValues::as_arc(&r));
- let default_values = data.default_computed_values();
- let metrics = get_metrics_provider_for_product();
+ let mut context = create_context(&data, &metrics, style, &parent_style);
- let mut context = Context {
- is_root_element: false,
- device: data.stylist.device(),
- inherited_style: parent_style.unwrap_or(default_values),
- layout_parent_style: parent_style.unwrap_or(default_values),
- style: StyleBuilder::for_derived_style(&style),
- font_metrics_provider: &metrics,
- cached_system_font: None,
- in_media_query: false,
- quirks_mode: data.stylist.quirks_mode(),
- };
+ let global_style_data = &*GLOBAL_STYLE_DATA;
+ let guard = global_style_data.shared_lock.read();
+ let default_values = data.default_computed_values();
for (index, keyframe) in keyframes.iter().enumerate() {
let ref mut animation_values = computed_keyframes[index];
let mut seen = LonghandIdSet::new();
// mServoDeclarationBlock is null in the case where we have an invalid css property.
let iter = keyframe.mPropertyValues.iter()
@@ -2530,35 +2537,23 @@ pub extern "C" fn Servo_GetComputedKeyfr
}
#[no_mangle]
pub extern "C" fn Servo_AnimationValue_Compute(declarations: RawServoDeclarationBlockBorrowed,
style: ServoComputedValuesBorrowed,
parent_style: ServoComputedValuesBorrowedOrNull,
raw_data: RawServoStyleSetBorrowed)
-> RawServoAnimationValueStrong {
- use style::values::computed::Context;
-
let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
let style = ComputedValues::as_arc(&style);
let parent_style = parent_style.as_ref().map(|r| &**ComputedValues::as_arc(&r));
+ let metrics = get_metrics_provider_for_product();
+ let mut context = create_context(&data, &metrics, style, &parent_style);
+
let default_values = data.default_computed_values();
- let metrics = get_metrics_provider_for_product();
- let mut context = Context {
- is_root_element: false,
- device: data.stylist.device(),
- inherited_style: parent_style.unwrap_or(default_values),
- layout_parent_style: parent_style.unwrap_or(default_values),
- style: StyleBuilder::for_derived_style(&style),
- font_metrics_provider: &metrics,
- cached_system_font: None,
- in_media_query: false,
- quirks_mode: data.stylist.quirks_mode(),
- };
-
let global_style_data = &*GLOBAL_STYLE_DATA;
let guard = global_style_data.shared_lock.read();
let declarations = Locked::<PropertyDeclarationBlock>::as_arc(&declarations);
// We only compute the first element in declarations.
match declarations.read_with(&guard).declarations().first() {
Some(&(ref decl, imp)) if imp == Importance::Normal => {
let animation = AnimationValue::from_declaration(decl, &mut context, default_values);
animation.map_or(RawServoAnimationValueStrong::null(), |value| {