stylo: Bug 1374233 - Clamp interpolated values for properties which need to be restricted #17783

BorisChiou · 2017-07-19T09:00:34Z

Some properties only accept non-negative values, or values greater than or equal to one. It is possible to produce an negative interpolated values while using negative timing functions, so we have to apply a restriction to these values to avoid getting invalid values.

For example, line-height must be non-negative, but the output progress of some timing functions (e,g. cubic-bezier(0.25, -2, 0.75, 1)) may be a negative value, so the interpolated result of line-height is also negative.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix Bug 1374233.
These changes do not require tests because we have tests in Gecko side already.

This change is

highfive · 2017-07-19T09:00:38Z

Heads up! This PR modifies the following files:

@bholley: components/style/properties/longhand/inherited_text.mako.rs, components/style/values/computed/text.rs, components/style/properties/longhand/padding.mako.rs, components/style/properties/longhand/position.mako.rs, components/style/properties/data.py and 13 more
@canaltinova: components/style/properties/longhand/inherited_text.mako.rs, components/style/values/computed/text.rs, components/style/properties/longhand/padding.mako.rs, components/style/properties/longhand/position.mako.rs, components/style/properties/data.py and 13 more
@emilio: components/style/properties/longhand/inherited_text.mako.rs, components/style/values/computed/text.rs, components/style/properties/longhand/padding.mako.rs, components/style/properties/longhand/position.mako.rs, components/style/properties/data.py and 13 more

highfive · 2017-07-19T09:00:40Z

Warning

These commits modify style code, but no tests are modified. Please consider adding a test!

BorisChiou · 2017-07-19T09:01:02Z

r? @nox

nox · 2017-07-19T09:01:28Z

So my first issue with this is: even if we clamp at conversion-time, what about the result of interpolation? When does that get clamped?

BorisChiou · 2017-07-19T09:01:48Z

cc @hiikezoe

BorisChiou · 2017-07-19T09:07:18Z

We don't change the result of interpolation. All we need to do is make sure we put the correct non-negative result into ServoComputedValues (by uncompute() and then cascade it to ServoComputedValues), with Animation/Transition cascade level, so we can see the correct animation on the screen.

The out of range interpolated values are still needed to be preserved during calculating AnimationValue in the case for additive or accumulative animations.

nox · 2017-07-19T09:08:19Z

components/style/properties/longhand/font.mako.rs

+
+        impl AnimatedValueAsComputed for T {
+            #[inline]
+            fn restrict_value(self, restriction_type: Restriction) -> Self {


AFAIK there is never a need for such a method given Animatable methods can clamp directly.

nox · 2017-07-19T09:08:19Z

components/style/values/animated/mod.rs

+/// Restriction types.
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+pub enum Restriction {


We already have a type for that, please replace by AllowedNumericType.

nox · 2017-07-19T09:08:19Z

components/style/values/generics/effects.rs

+    }}
+}
+
+impl<Angle, Factor, Length, DropShadow> ToAnimatedValue for Filter<Angle, Factor, Length, DropShadow>


No, define the Factor impl yourself instead of clamping from here.

nox · 2017-07-19T09:08:19Z

components/style/values/generics/effects.rs

+            color: ToAnimatedValue::from_animated_value(animated.color),
+            horizontal: ToAnimatedValue::from_animated_value(animated.horizontal),
+            vertical: ToAnimatedValue::from_animated_value(animated.vertical),
+            blur: convert_and_clamp_nonnegative_animated_value!(animated.blur)


Make the blur value its own wrapper type that clamps correctly.

nox · 2017-07-19T09:08:19Z

components/style/values/computed/text.rs

@@ -61,3 +62,18 @@ impl Animatable for LineHeight {
        }
    }
 }
+
+impl AnimatedValueAsComputed for LineHeight {


Why doesn't the computed type clamp itself during animation?

nox · 2017-07-19T09:08:19Z

components/style/values/computed/background.rs

@@ -50,3 +51,16 @@ impl Animatable for BackgroundSize {
        }
    }
 }
+
+impl AnimatedValueAsComputed for BackgroundSize {


Why doesn't the computed type clamp itself during animation?

nox · 2017-07-19T09:08:19Z

components/style/values/animated/mod.rs

 use values::computed::Angle as ComputedAngle;
+use values::computed::BorderCornerRadius as ComputedBorderCornerRadius;


Please no, make a submodule border just like there is one in computed and specified.

This still isn't addressed, I think.

nox · 2017-07-19T09:09:40Z

We don't change the result of interpolation. All we need to do is make sure we put the correct non-negative result into ServoComputedValues (by uncompute() function), with Animation/Transition cascade level, so we can see the correct animation on the screen.

Why wasn't the computed value clamped itself, then?

BorisChiou · 2017-07-19T09:31:24Z

Per our talk on irc, I will try to add new types for those non-negative or greater-than-or-equal-to-one, to avoid additional conditional clamping.

bors-servo · 2017-07-19T10:04:59Z

☔ The latest upstream changes (presumably #17774) made this pull request unmergeable. Please resolve the merge conflicts.

BorisChiou · 2017-07-25T03:14:28Z

I've finished re-writing my patches locally (by introducing some non-negative types and greater-than-or-equal-to-one types, and updating some existing types, e.g. LineHeight), so will update this PR soon.

BorisChiou · 2017-07-26T06:56:20Z

Gecko try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=d9faa25293b43b3fc8ec44cf2e7f0f1194e10f6e

BorisChiou · 2017-07-26T07:26:35Z

r? @nox again. Thanks.
I add some types for NonNegtaive and Greater-than-Or-Equal-To-One values, and then use these types as the specified/computed values of these properties which need to be clamped.

BorisChiou · 2017-07-26T07:41:43Z

@bors-servo try

bors-servo · 2017-07-26T07:41:49Z

⌛ Trying commit e066336 with merge 6a757dd...


        Auto merge of #17783 - BorisChiou:stylo/animation/restrictions, r=<try>

stylo: Bug 1374233 - Clamp interpolated values for properties which need to be restricted Some properties only accept non-negative values, or values greater than or equal to one. It is possible to produce an negative interpolated values while using negative timing functions, so we have to apply a restriction to these values to avoid getting invalid values. For example, line-height must be non-negative, but the output progress of some timing functions (e,g. cubic-bezier(0.25, -2, 0.75, 1)) may be a negative value, so the interpolated result of line-height is also negative. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix Bug 1374233. - [X] These changes do not require tests because we have tests in Gecko side already.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17783)

bors-servo · 2017-07-26T08:47:16Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
State: approved= try=True

BorisChiou · 2017-08-01T01:57:27Z

There are some conflicts now, but I'd like to rebase my patches after making sure the design is accepted or knowing what should I fix.

BorisChiou · 2017-08-01T06:05:19Z

@emilio, nox is still on PTO, so do you feel comfortable with reviewing these patches?

emilio

Looks fine over all. There's a fair amount of boilerplate (disclaimer: I don't know how previous versions of the patch were). Most of it could go away with derive, I think.

I wonder if some kind of NonNegative<T>, etc would be doable.

This also needs a rebase.

@nox does this patch address your comments properly? I'm not aware of the full discussion. I know you're on PTO, but it'd be nice if you could take a quick look. Thanks!

emilio · 2017-08-02T07:47:17Z

components/style/properties/gecko.mako.rs

+<%def name="impl_simple_wrapper_setter(ident, gecko_ffi_name)">
+    #[allow(non_snake_case)]
+    pub fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) {
+        ${set_gecko_property(gecko_ffi_name, "v.0")}


We have something to implement stuff with conversions. Perhaps we should implement From and remove this mako code instead, wdyt?

Sounds great, I can try it.

emilio · 2017-08-02T07:47:17Z

components/style/values/specified/mod.rs

+
+    #[inline]
+    fn from_computed_value(computed: &Self::ComputedValue) -> Self {
+        GreaterThanOrEqualToOneNumber(Number::from_computed_value(&computed.0))


Ick, that's a decent amount of boilerplate...

emilio · 2017-08-02T07:47:17Z

components/style/properties/helpers/animated_properties.mako.rs

+impl Animatable for NonNegativeNumber {
+    #[inline]
+    fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result<Self, ()> {
+        self.0.add_weighted(&other.0, self_portion, other_portion).map(NonNegativeNumber)


So, we're not clamping here, and I think that's the intention, right? If so, some comments about it would be nice.

emilio · 2017-08-02T07:47:17Z

components/style/values/specified/mod.rs

+no_viewport_percentage!(GreaterThanOrEqualToOneNumber);
+
+impl Parse for GreaterThanOrEqualToOneNumber {
+    fn parse<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i>> {


Can we remove Number::parse_at_least_one and Number::parse_non_negative now?

Not all non-negative properties are animated, so I didn't replace the type of all non-negative properties with NonNegativeNumber. I will try to check it.

OK. I can do it, but if you don't mind, I'd like to remove Number::parse_at_least_one() and Number::parse_non_negative() in a follow-up PR to keep this not too complicated because it seems I have to update more types from Number to NonNegativeNumber.

emilio · 2017-08-02T07:47:17Z

components/style/properties/longhand/inherited_table.mako.rs

+
+            #[inline]
+            fn from_animated_value(animated: Self::AnimatedValue) -> Self {
+                T { horizontal: NonNegativeAu::from_animated_value(animated.horizontal),


nit: indentation here is weird.

T { horizontal: ..., vertical: ..., }

emilio · 2017-08-02T07:47:17Z

components/style/values/animated/mod.rs

 use values::computed::Angle as ComputedAngle;
+use values::computed::BorderCornerRadius as ComputedBorderCornerRadius;


This still isn't addressed, I think.

BorisChiou · 2017-08-02T10:03:33Z

NonNegative<T> might be a good way to refactor these patches (in the same PR or others). I'd like to know what nox think.

BorisChiou · 2017-08-03T10:06:43Z

I just tried to use NonNegative<T> as the type of NonNegativeXXX, and it looks much better because lots of code could be written as template. I'd like to update a newer version by this way. Thanks for the suggestion, Emilio.


        Bug 1374233 - Part 1: Add NonNegativeNumber and GreaterThanOrEqualToO…

…neNumber. NonNegativeNumber: for -moz-box-flex, flex-grow, and flex-shrink. GreaterThanOrEqualToOneNumber: for stroke-miterlimit. MozReview-Commit-ID: Kgbt99BPdVA

BorisChiou · 2017-08-04T06:30:29Z

gecko try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=a2db4c2a8d83bd0d837350505cb5046edb029f0c

The test failures on the try is not related to these patches, so the overall status looks good now.

BorisChiou · 2017-08-04T06:30:41Z

@bors-servo try

bors-servo · 2017-08-04T06:30:46Z

⌛ Trying commit 8651acd with merge d1f22c0...


        Auto merge of #17783 - BorisChiou:stylo/animation/restrictions, r=<try>

stylo: Bug 1374233 - Clamp interpolated values for properties which need to be restricted Some properties only accept non-negative values, or values greater than or equal to one. It is possible to produce an negative interpolated values while using negative timing functions, so we have to apply a restriction to these values to avoid getting invalid values. For example, line-height must be non-negative, but the output progress of some timing functions (e,g. cubic-bezier(0.25, -2, 0.75, 1)) may be a negative value, so the interpolated result of line-height is also negative. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix Bug 1374233. - [X] These changes do not require tests because we have tests in Gecko side already.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17783)

BorisChiou · 2017-08-04T06:33:31Z

I rebased the patches and use NonNegative<T> as the boilerplate to remove lots of redundant code.

bors-servo · 2017-08-04T07:40:18Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
State: approved= try=True

nox · 2017-08-07T12:16:20Z

r=me if geckotry is green.

(Comments addressed)

BorisChiou · 2017-08-07T13:54:06Z

Thanks for the review. I just push these commits to gecko try again. (Gecko try tree is closed now, so I will put the try link later.)

BorisChiou · 2017-08-07T14:21:21Z

Gecko try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=297b4aab13b3

BorisChiou · 2017-08-07T15:49:18Z

@bors-servo r=nox

bors-servo · 2017-08-07T15:49:19Z

📌 Commit 8651acd has been approved by nox

BorisChiou · 2017-08-07T15:50:00Z

@bors-servo p=1

bors-servo · 2017-08-07T16:05:19Z

⌛ Testing commit 8651acd with merge 016ea11...


        Auto merge of #17783 - BorisChiou:stylo/animation/restrictions, r=nox

stylo: Bug 1374233 - Clamp interpolated values for properties which need to be restricted Some properties only accept non-negative values, or values greater than or equal to one. It is possible to produce an negative interpolated values while using negative timing functions, so we have to apply a restriction to these values to avoid getting invalid values. For example, line-height must be non-negative, but the output progress of some timing functions (e,g. cubic-bezier(0.25, -2, 0.75, 1)) may be a negative value, so the interpolated result of line-height is also negative. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix Bug 1374233. - [X] These changes do not require tests because we have tests in Gecko side already.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17783)

bors-servo · 2017-08-07T16:40:12Z

💔 Test failed - linux-rel-wpt

jdm · 2017-08-07T16:48:57Z

That's #17168; you can retry.

BorisChiou · 2017-08-07T16:57:47Z

@bors-servo retry

bors-servo · 2017-08-07T16:57:50Z

⚡ Previous build results for android, arm32, arm64, linux-dev, linux-rel-css, mac-dev-unit, mac-rel-css1, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only linux-rel-wpt, mac-rel-css2, mac-rel-wpt3...

bors-servo · 2017-08-07T17:29:51Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: nox
Pushing 016ea11 to master...

highfive assigned wafflespeanut Jul 19, 2017

highfive added the S-awaiting-review label Jul 19, 2017

highfive assigned nox and unassigned wafflespeanut Jul 19, 2017

nox reviewed Jul 19, 2017

View changes

highfive added the S-needs-rebase label Jul 19, 2017

BorisChiou force-pushed the BorisChiou:stylo/animation/restrictions branch 2 times, most recently from 4f0f67d to e066336 Jul 26, 2017

emilio reviewed Aug 2, 2017

View changes

Bug 1374233 - Part 1: Add NonNegativeNumber and GreaterThanOrEqualToO…

4cc9774

…neNumber. NonNegativeNumber: for -moz-box-flex, flex-grow, and flex-shrink. GreaterThanOrEqualToOneNumber: for stroke-miterlimit. MozReview-Commit-ID: Kgbt99BPdVA

BorisChiou force-pushed the BorisChiou:stylo/animation/restrictions branch from e066336 to 8651acd Aug 4, 2017

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Aug 7, 2017

highfive added S-tests-failed and removed S-awaiting-merge labels Aug 7, 2017

bors-servo merged commit 8651acd into servo:master Aug 7, 2017
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

This was referenced Aug 7, 2017

Add animation value related with stroke-dasharray / stroke-dashoffset / stroke-width. #17704

Merged

Introduce ComputedUrl #17812

Merged

emilio mentioned this pull request Dec 3, 2017

style: Move mask-size outside of mako #19470

Closed

4 of 4 tasks complete

		use values::computed::Angle as ComputedAngle;
		use values::computed::BorderCornerRadius as ComputedBorderCornerRadius;

servo / servo

Join GitHub today

stylo: Bug 1374233 - Clamp interpolated values for properties which need to be restricted #17783

stylo: Bug 1374233 - Clamp interpolated values for properties which need to be restricted #17783

Conversation

BorisChiou commented Jul 19, 2017 • edited by larsbergstrom

highfive commented Jul 19, 2017

highfive commented Jul 19, 2017

BorisChiou commented Jul 19, 2017

nox commented Jul 19, 2017

BorisChiou commented Jul 19, 2017

BorisChiou commented Jul 19, 2017 • edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

nox commented Jul 19, 2017

BorisChiou commented Jul 19, 2017

bors-servo commented Jul 19, 2017

BorisChiou commented Jul 25, 2017 • edited

BorisChiou commented Jul 26, 2017

BorisChiou commented Jul 26, 2017

BorisChiou commented Jul 26, 2017

bors-servo commented Jul 26, 2017

bors-servo commented Jul 26, 2017

BorisChiou commented Aug 1, 2017

BorisChiou commented Aug 1, 2017

emilio left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

BorisChiou Aug 2, 2017 • edited

This comment has been minimized.

This comment has been minimized.

BorisChiou commented Aug 2, 2017

BorisChiou commented Aug 3, 2017

BorisChiou commented Aug 4, 2017

BorisChiou commented Aug 4, 2017

bors-servo commented Aug 4, 2017

BorisChiou commented Aug 4, 2017

bors-servo commented Aug 4, 2017

nox commented Aug 7, 2017

BorisChiou commented Aug 7, 2017

BorisChiou commented Aug 7, 2017

BorisChiou commented Aug 7, 2017

bors-servo commented Aug 7, 2017

BorisChiou commented Aug 7, 2017

bors-servo commented Aug 7, 2017

bors-servo commented Aug 7, 2017

jdm commented Aug 7, 2017

BorisChiou commented Aug 7, 2017

bors-servo commented Aug 7, 2017

bors-servo commented Aug 7, 2017

BorisChiou commented Jul 19, 2017 •

edited by larsbergstrom

BorisChiou commented Jul 19, 2017 •

edited

BorisChiou commented Jul 25, 2017 •

edited

BorisChiou Aug 2, 2017 •

edited