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

Bug 1303229: Get the proper viewport size for animations. r=hiro,heycam

Browse source 
While we're here, don't re-recompute the default computed values, just grab them
from the device.

MozReview-Commit-ID: GqqnPLIwN2F
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
This commit is contained in:
Emilio Cobos Álvarez 2017-03-11 02:40:47 +01:00
parent 95ccfa748e
commit 396fb62ca8
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/gecko_bindings/bindings.rs
View file

@ -1373,8 +1373,7 @@ extern "C" {
style: ServoComputedValuesBorrowed, style: ServoComputedValuesBorrowed,
parent_style: parent_style:
ServoComputedValuesBorrowedOrNull, ServoComputedValuesBorrowedOrNull,
pres_context: set: RawServoStyleSetBorrowed,
RawGeckoPresContextBorrowed,
result: result:
RawGeckoComputedKeyframeValuesListBorrowedMut); RawGeckoComputedKeyframeValuesListBorrowedMut);
} }

18
ports/geckolib/glue.rs
View file

@ -2,12 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use app_units::Au;
use atomic_refcell::AtomicRefMut; use atomic_refcell::AtomicRefMut;
use cssparser::Parser; use cssparser::Parser;
use cssparser::ToCss as ParserToCss; use cssparser::ToCss as ParserToCss;
use env_logger::LogBuilder; use env_logger::LogBuilder;
use euclid::Size2D;
use num_cpus; use num_cpus;
use parking_lot::RwLock; use parking_lot::RwLock;
use rayon; use rayon;
@ -43,7 +41,6 @@ use style::gecko_bindings::bindings::{nsACString, nsAString};
use style::gecko_bindings::bindings::Gecko_AnimationAppendKeyframe; use style::gecko_bindings::bindings::Gecko_AnimationAppendKeyframe;
use style::gecko_bindings::bindings::RawGeckoComputedKeyframeValuesListBorrowedMut; use style::gecko_bindings::bindings::RawGeckoComputedKeyframeValuesListBorrowedMut;
use style::gecko_bindings::bindings::RawGeckoElementBorrowed; use style::gecko_bindings::bindings::RawGeckoElementBorrowed;
use style::gecko_bindings::bindings::RawGeckoPresContextBorrowed;
use style::gecko_bindings::bindings::RawServoAnimationValueBorrowed; use style::gecko_bindings::bindings::RawServoAnimationValueBorrowed;
use style::gecko_bindings::bindings::RawServoAnimationValueStrong; use style::gecko_bindings::bindings::RawServoAnimationValueStrong;
use style::gecko_bindings::bindings::RawServoImportRuleBorrowed; use style::gecko_bindings::bindings::RawServoImportRuleBorrowed;
@ -1333,23 +1330,24 @@ pub extern "C" fn Servo_ResolveStyleLazily(element: RawGeckoElementBorrowed,
pub extern "C" fn Servo_GetComputedKeyframeValues(keyframes: RawGeckoKeyframeListBorrowed, pub extern "C" fn Servo_GetComputedKeyframeValues(keyframes: RawGeckoKeyframeListBorrowed,
style: ServoComputedValuesBorrowed, style: ServoComputedValuesBorrowed,
parent_style: ServoComputedValuesBorrowedOrNull, parent_style: ServoComputedValuesBorrowedOrNull,
pres_context: RawGeckoPresContextBorrowed, raw_data: RawServoStyleSetBorrowed,
computed_keyframes: RawGeckoComputedKeyframeValuesListBorrowedMut) computed_keyframes: RawGeckoComputedKeyframeValuesListBorrowedMut)
{ {
use style::properties::LonghandIdSet; use style::properties::LonghandIdSet;
use style::properties::declaration_block::Importance; use style::properties::declaration_block::Importance;
use style::values::computed::Context; use style::values::computed::Context;
let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
let style = ComputedValues::as_arc(&style); let style = ComputedValues::as_arc(&style);
let parent_style = parent_style.as_ref().map(|r| &**ComputedValues::as_arc(&r)); let parent_style = parent_style.as_ref().map(|r| &**ComputedValues::as_arc(&r));
let init = ComputedValues::default_values(pres_context);
let default_values = data.stylist.device.default_values();
let context = Context { let context = Context {
is_root_element: false, is_root_element: false,
// FIXME (bug 1303229): Use the actual viewport size here. viewport_size: data.stylist.device.au_viewport_size(),
viewport_size: Size2D::new(Au(0), Au(0)), inherited_style: parent_style.unwrap_or(default_values),
inherited_style: parent_style.unwrap_or(&init), layout_parent_style: parent_style.unwrap_or(default_values),
layout_parent_style: parent_style.unwrap_or(&init),
style: (**style).clone(), style: (**style).clone(),
font_metrics_provider: None, font_metrics_provider: None,
}; };
@ -1372,7 +1370,7 @@ pub extern "C" fn Servo_GetComputedKeyframeValues(keyframes: RawGeckoKeyframeLis
.filter_map(|&(ref decl, imp)| { .filter_map(|&(ref decl, imp)| {
if imp == Importance::Normal { if imp == Importance::Normal {
let property = TransitionProperty::from_declaration(decl); let property = TransitionProperty::from_declaration(decl);
let animation = AnimationValue::from_declaration(decl, &context, &init); let animation = AnimationValue::from_declaration(decl, &context, default_values);
debug_assert!(property.is_none() == animation.is_none(), debug_assert!(property.is_none() == animation.is_none(),
"The failure condition of TransitionProperty::from_declaration \ "The failure condition of TransitionProperty::from_declaration \
and AnimationValue::from_declaration should be the same"); and AnimationValue::from_declaration should be the same");