Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #15863 - stylo: update ns_timing_function (from BorisChiou:animation/ns_timing_function); r=heycam

Browse Source 
This is an interdependent binding fix for [Bug 1248340](https://bugzilla.mozilla.org/show_bug.cgi?id=1248340).

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix [Bug 1248340](https://bugzilla.mozilla.org/show_bug.cgi?id=1248340)
- [X] These changes do not require tests because Bug 1248340 will merge some wpt tests for frames timing function.

Source-Repo: https://github.com/servo/servo
Source-Revision: ee3af09a8cdbb7329386baf9eb4c1fe167a51aac

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 3bdd8bd2979d7bfa5770c3a138206ff35f6b216e
This commit is contained in:
Boris Chiou 2017-03-07 23:03:21 -08:00
parent 2df35d6eb8
commit ecd6711c69
3 changed files with 1491 additions and 1408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1620
servo/components/style/gecko_bindings/structs_debug.rs
View File

File diff suppressed because it is too large Load Diff

1263
servo/components/style/gecko_bindings/structs_release.rs
View File

File diff suppressed because it is too large Load Diff

16
servo/components/style/gecko_bindings/sugar/ns_timing_function.rs
View File

@ -17,7 +17,7 @@ impl nsTimingFunction {
"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;
self.__bindgen_anon_1.__bindgen_anon_1.as_mut().mStepsOrFrames = steps;
}
}
@ -91,13 +91,19 @@ impl From<nsTimingFunction> for ComputedTimingFunction {
fn from(function: nsTimingFunction) -> ComputedTimingFunction {
match function.mType {
nsTimingFunction_Type::StepStart => {
ComputedTimingFunction::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().mStepsOrFrames },
StartEnd::Start)
},
nsTimingFunction_Type::StepEnd => {
ComputedTimingFunction::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().mStepsOrFrames },
StartEnd::End)
},
nsTimingFunction_Type::Frames => {
// https://github.com/servo/servo/issues/15740
panic!("Frames timing function is not support yet");
}
nsTimingFunction_Type::Ease |
nsTimingFunction_Type::Linear |
nsTimingFunction_Type::EaseIn |