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

Bug 1328787 - Part 7: Implement From for specified TransitionTimingFunction. r=heycam

Browse source 
Now animation-timing-function in keyframe is stored as specified
TransitionTimingFunction.  We need a way to convert it to nsTimingFunction too.

MozReview-Commit-ID: C8j5PmJFm2i
This commit is contained in:
Hiroyuki Ikezoe 2017-01-28 18:47:25 +09:00
parent b7d7ec233b
commit 51faa53ee2
1 changed files with 77 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

109
components/style/gecko_bindings/sugar/ns_timing_function.rs
View file

@ -2,64 +2,109 @@
* 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/. */
use euclid::point::TypedPoint2D;
use euclid::point::{Point2D, TypedPoint2D};
use gecko_bindings::structs::{nsTimingFunction, nsTimingFunction_Type};
use properties::longhands::transition_timing_function::single_value::FunctionKeyword;
use properties::longhands::transition_timing_function::single_value::SpecifiedValue as SpecifiedTimingFunction;
use properties::longhands::transition_timing_function::single_value::computed_value::StartEnd;
use properties::longhands::transition_timing_function::single_value::computed_value::T as TransitionTimingFunction;
use properties::longhands::transition_timing_function::single_value::computed_value::T as ComputedTimingFunction;
use std::mem;
impl From<TransitionTimingFunction> for nsTimingFunction {
fn from(function: TransitionTimingFunction) -> nsTimingFunction {
impl nsTimingFunction {
fn set_as_step(&mut self, function_type: nsTimingFunction_Type, steps: u32) {
debug_assert!(function_type == nsTimingFunction_Type::StepStart ||
function_type == nsTimingFunction_Type::StepEnd,
"function_type should be step-start or step-end");
self.mType = function_type;
unsafe {
self.__bindgen_anon_1.__bindgen_anon_1.as_mut().mSteps = steps;
}
}
fn set_as_cubic_bezier(&mut self, p1: Point2D<f32>, p2: Point2D<f32>) {
self.mType = nsTimingFunction_Type::CubicBezier;
unsafe {
let ref mut gecko_cubic_bezier =
unsafe { self.__bindgen_anon_1.mFunc.as_mut() };
gecko_cubic_bezier.mX1 = p1.x;
gecko_cubic_bezier.mY1 = p1.y;
gecko_cubic_bezier.mX2 = p2.x;
gecko_cubic_bezier.mY2 = p2.y;
}
}
}
impl From<ComputedTimingFunction> for nsTimingFunction {
fn from(function: ComputedTimingFunction) -> nsTimingFunction {
let mut tf: nsTimingFunction = unsafe { mem::zeroed() };
match function {
TransitionTimingFunction::Steps(steps, StartEnd::Start) => {
tf.mType = nsTimingFunction_Type::StepStart;
unsafe {
tf.__bindgen_anon_1.__bindgen_anon_1.as_mut().mSteps = steps;
}
ComputedTimingFunction::Steps(steps, StartEnd::Start) => {
tf.set_as_step(nsTimingFunction_Type::StepStart, steps);
},
TransitionTimingFunction::Steps(steps, StartEnd::End) => {
tf.mType = nsTimingFunction_Type::StepEnd;
unsafe {
tf.__bindgen_anon_1.__bindgen_anon_1.as_mut().mSteps = steps;
}
ComputedTimingFunction::Steps(steps, StartEnd::End) => {
tf.set_as_step(nsTimingFunction_Type::StepEnd, steps);
},
TransitionTimingFunction::CubicBezier(p1, p2) => {
tf.mType = nsTimingFunction_Type::CubicBezier;
let ref mut gecko_cubic_bezier =
unsafe { tf.__bindgen_anon_1.mFunc.as_mut() };
gecko_cubic_bezier.mX1 = p1.x;
gecko_cubic_bezier.mY1 = p1.y;
gecko_cubic_bezier.mX2 = p2.x;
gecko_cubic_bezier.mY2 = p2.y;
ComputedTimingFunction::CubicBezier(p1, p2) => {
tf.set_as_cubic_bezier(p1, p2);
},
// FIXME: we need to add more types once TransitionTimingFunction
// has more types.
}
tf
}
}
impl From<nsTimingFunction> for TransitionTimingFunction {
fn from(function: nsTimingFunction) -> TransitionTimingFunction {
impl From<SpecifiedTimingFunction> for nsTimingFunction {
fn from(function: SpecifiedTimingFunction) -> nsTimingFunction {
let mut tf: nsTimingFunction = unsafe { mem::zeroed() };
match function {
SpecifiedTimingFunction::Steps(steps, StartEnd::Start) => {
tf.set_as_step(nsTimingFunction_Type::StepStart, steps);
},
SpecifiedTimingFunction::Steps(steps, StartEnd::End) => {
tf.set_as_step(nsTimingFunction_Type::StepEnd, steps);
},
SpecifiedTimingFunction::CubicBezier(p1, p2) => {
tf.set_as_cubic_bezier(p1, p2);
},
SpecifiedTimingFunction::Keyword(keyword) => {
match keyword {
FunctionKeyword::Ease => tf.mType = nsTimingFunction_Type::Ease,
FunctionKeyword::Linear => tf.mType = nsTimingFunction_Type::Linear,
FunctionKeyword::EaseIn => tf.mType = nsTimingFunction_Type::EaseIn,
FunctionKeyword::EaseOut => tf.mType = nsTimingFunction_Type::EaseOut,
FunctionKeyword::EaseInOut => tf.mType = nsTimingFunction_Type::EaseInOut,
FunctionKeyword::StepStart => {
tf.set_as_step(nsTimingFunction_Type::StepStart, 1);
},
FunctionKeyword::StepEnd => {
tf.set_as_step(nsTimingFunction_Type::StepEnd, 1);
},
}
},
}
tf
}
}
impl From<nsTimingFunction> for ComputedTimingFunction {
fn from(function: nsTimingFunction) -> ComputedTimingFunction {
match function.mType {
nsTimingFunction_Type::StepStart => {
TransitionTimingFunction::Steps(unsafe { function.__bindgen_anon_1.__bindgen_anon_1.as_ref().mSteps },
StartEnd::Start)
ComputedTimingFunction::Steps(unsafe { function.__bindgen_anon_1.__bindgen_anon_1.as_ref().mSteps },
StartEnd::Start)
},
nsTimingFunction_Type::StepEnd => {
TransitionTimingFunction::Steps(unsafe { function.__bindgen_anon_1.__bindgen_anon_1.as_ref().mSteps },
StartEnd::End)
ComputedTimingFunction::Steps(unsafe { function.__bindgen_anon_1.__bindgen_anon_1.as_ref().mSteps },
StartEnd::End)
},
// FIXME: As above, we need to fix here.
nsTimingFunction_Type::Ease |
nsTimingFunction_Type::Linear |
nsTimingFunction_Type::EaseIn |
nsTimingFunction_Type::EaseOut |
nsTimingFunction_Type::EaseInOut |
nsTimingFunction_Type::CubicBezier => {
TransitionTimingFunction::CubicBezier(
ComputedTimingFunction::CubicBezier(
TypedPoint2D::new(unsafe { function.__bindgen_anon_1.mFunc.as_ref().mX1 },
unsafe { function.__bindgen_anon_1.mFunc.as_ref().mY1 }),
TypedPoint2D::new(unsafe { function.__bindgen_anon_1.mFunc.as_ref().mX2 },