Handle 3- and 4- valued <position>s in style #13042

canova · 2016-08-25T21:15:01Z

This is first part of fix #12690 and covers just specified style part for now.

r? @Manishearth

These changes fix Handle 3- and 4- valued <position>s in style #12690 (github issue number if applicable).

This change is

highfive · 2016-08-25T21:15:05Z

Heads up! This PR modifies the following files:

@bholley: components/style/properties/longhand/background.mako.rs, components/style/values/specified/basic_shape.rs, components/style/values/specified/position.rs

highfive · 2016-08-25T21:15:06Z

Warning

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

canova · 2016-08-25T21:16:48Z

@Manishearth Sorry accidentally deleted the branch and it closed the other pr :( (-d instead of -f) Updated the commit could you look at it when you are available?

This is not building yet. to_computed_value function needs to change because horiz_position and vert_position need unwrapping. But I wanted to wait until this function change.
Destructing the Option values messed the code :(

izgzhen · 2016-08-25T23:18:16Z

components/style/values/specified/position.rs

+            keyword == Keyword::Top => LengthOrPercentage::Percentage(Percentage(0.0)),
+            PositionComponent::Keyword(keyword) if keyword == Keyword::Right ||
+            keyword == Keyword::Bottom => LengthOrPercentage::Percentage(Percentage(1.0)),
+            PositionComponent::Keyword(_) => unimplemented!(), // TODO: All keywords are covered but rust forcing me to add this too?


Maybe match further on keyword looks better and eliminate the compiler's complain?

You are right. Probably this is better solution. I'll update soon, thanks!

Manishearth · 2016-08-26T06:27:45Z

Could you write tests for these in tests/unit/style/parsing/position.rs (by using the examples from the spec)?

Your changes may make the basic shape tests fail. That is okay, comment them out for now, I'll fix them later. basic-shape serializes positions differently.

Manishearth · 2016-08-26T06:36:59Z

components/style/values/specified/position.rs

+        if let Ok(third) = input.try(PositionComponent::parse) {
+            if let Ok(fourth) = input.try(PositionComponent::parse) {
+                // Handle 4 value background position
+                Position::new(Some(second), Some(fourth), Some(first), Some(third))


4-value can also be specified with the horizontal ones first.

Oh, nvm, Position::new solves that.

canova · 2016-08-27T18:54:41Z

@Manishearth Made a new commit can you review when you have time?

I made a new commit instead of squashing first, so you can review more easily. After last changes I can squash them.

canova · 2016-08-27T18:59:28Z

tests/unit/style/parsing/position.rs

+    assert_roundtrip!(Position::parse, "right 10px bottom", "right 10px bottom");
+    assert_roundtrip!(Position::parse, "bottom right 10px", "right 10px bottom");
+    assert_roundtrip!(Position::parse, "center right 10px", "right 10px center");
+    assert_roundtrip!(Position::parse, "center bottom 10px", "center bottom 10px");


Added some additional example apart from specs to cover most of cases.

Manishearth · 2016-08-27T19:19:24Z

Looking good, with a few small issues.

Manishearth · 2016-08-27T19:20:19Z

components/style/values/specified/position.rs

        };
+
+        // Unwrap positions from PositionComponent and wrap with Option
+        let (horiz_position, vert_position) = if let Some(PositionComponent::Length(horiz_pos)) = first_position {


You can use match first_position, second_position) here. But this is ok too.

Fixed it thanks!

Manishearth · 2016-08-28T01:26:18Z

@bors-servo try

bors-servo · 2016-08-28T01:26:21Z

⌛ Trying commit 8372f29 with merge 255da48...

@Manishearth

Handle 3- and 4- valued <position>s in style  This is first part of fix #12690 and covers just specified style part for now. r? @Manishearth --- - [X] These changes fix #12690 (github issue number if applicable).   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13042)

bors-servo · 2016-08-28T02:14:06Z

💔 Test failed - linux-rel

highfive · 2016-08-28T02:14:09Z

  ▶ FAIL [expected PASS] /css-transforms-1_dev/html/transform-table-007.htm
  └   → /css-transforms-1_dev/html/transform-table-007.htm a5c014b20ef1363bea6f24eda28c7efb7c45698a
/css-transforms-1_dev/html/reference/transform-blank-ref.htm fa6407b1acbbfea27e27061e7d1bdeca98e4a728
Testing a5c014b20ef1363bea6f24eda28c7efb7c45698a == fa6407b1acbbfea27e27061e7d1bdeca98e4a728

Manishearth · 2016-08-28T02:19:39Z

@bors-servo retry

Intermittent failure in /css-transforms-1_dev/html/transform-table-007.htm #11574

bors-servo · 2016-08-28T02:19:42Z

⌛ Trying commit 8372f29 with merge 832d01f...

@Manishearth

Handle 3- and 4- valued <position>s in style  This is first part of fix #12690 and covers just specified style part for now. r? @Manishearth --- - [X] These changes fix #12690 (github issue number if applicable).   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13042)

bors-servo · 2016-08-28T02:20:36Z

⌛ Trying commit 8372f29 with merge 3c995ab...

@Manishearth

Handle 3- and 4- valued <position>s in style  This is first part of fix #12690 and covers just specified style part for now. r? @Manishearth --- - [X] These changes fix #12690 (github issue number if applicable).   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13042)

bors-servo · 2016-08-28T03:58:33Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev

Manishearth · 2016-08-28T04:07:30Z

Needs to error on center NotKeyword and we're good

Manishearth · 2016-08-28T04:08:06Z

Oh, it already does, just not there.

@bors-servo r+

bors-servo · 2016-08-28T04:08:07Z

📌 Commit 8372f29 has been approved by Manishearth

canova · 2016-08-29T13:41:56Z

@Manishearth Is something wrong with bors? :)

Manishearth · 2016-08-29T13:48:54Z

@bors-servo r+ try- retry

it doesn't forget the try state.

bors-servo · 2016-08-29T13:48:55Z

💡 This pull request was already approved, no need to approve it again.

bors-servo · 2016-08-29T13:48:56Z

📌 Commit 8372f29 has been approved by Manishearth

bors-servo · 2016-08-29T13:48:57Z

⌛ Testing commit 8372f29 with merge b8d725d...

@Manishearth

Handle 3- and 4- valued <position>s in style  This is first part of fix #12690 and covers just specified style part for now. r? @Manishearth --- - [X] These changes fix #12690 (github issue number if applicable).   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13042)

bors-servo · 2016-08-29T14:45:54Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev

Manishearth · 2016-08-29T14:51:38Z

Thanks!

canova · 2016-08-29T15:21:04Z

@Manishearth Thank you also for mentoring me on this :) I learned so much and you helped me a lot. I'm sorry if I took a lot of your time :)

Manishearth · 2016-08-29T15:33:41Z

Not much of my time -- most of the time went into figuring out what we were supposed to do, which I would have had to do anyway if I'd have done it myself.

And mentoring is fun and it's great to see new contributors work on this project, so it's definitely not a waste of time 😄

@SimonSapin

…nSapin Handle specialized serialization of <position> in basic shapes Fixes #13083 We temporarily broke basic-shape serialization in #13042 when 4-value positions were implemented, since I didn't want to increase the scope of that PR too much. This fixes it. r? @SimonSapin cc @canaltinova  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13122)

Handle 3- and 4- valued <position>s in specified style

4eb93c8

highfive assigned Manishearth Aug 25, 2016

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 25, 2016

izgzhen reviewed Aug 25, 2016
View reviewed changes

Manishearth reviewed Aug 26, 2016
View reviewed changes

canova reviewed Aug 27, 2016
View reviewed changes

Manishearth reviewed Aug 27, 2016
View reviewed changes

Change parsing behavior and implement to_computed_value function

8372f29

canova force-pushed the position branch from 27fb9e6 to 8372f29 Compare August 27, 2016 20:01

canova mentioned this pull request Aug 27, 2016

Fix basic shape's position serialization #13083

Closed

highfive added the S-tests-failed The changes caused existing tests to fail. label Aug 28, 2016

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-tests-failed The changes caused existing tests to fail. labels Aug 28, 2016

bors-servo merged commit 8372f29 into servo:master Aug 29, 2016

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Aug 29, 2016

canova deleted the position branch August 29, 2016 15:21

Manishearth mentioned this pull request Aug 30, 2016

Handle specialized serialization of <position> in basic shapes #13122

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Handle 3- and 4- valued <position>s in style #13042

Handle 3- and 4- valued <position>s in style #13042

canova commented Aug 25, 2016 •

edited by larsbergstrom

highfive commented Aug 25, 2016

highfive commented Aug 25, 2016

canova commented Aug 25, 2016 •

edited

izgzhen Aug 25, 2016

canova Aug 26, 2016

Manishearth commented Aug 26, 2016 •

edited

Manishearth Aug 26, 2016

Manishearth Aug 26, 2016

canova commented Aug 27, 2016

canova Aug 27, 2016

Manishearth commented Aug 27, 2016

Manishearth Aug 27, 2016

canova Aug 27, 2016

Manishearth commented Aug 28, 2016

bors-servo commented Aug 28, 2016

bors-servo commented Aug 28, 2016

highfive commented Aug 28, 2016

Manishearth commented Aug 28, 2016 •

edited

bors-servo commented Aug 28, 2016

bors-servo commented Aug 28, 2016

bors-servo commented Aug 28, 2016

Manishearth commented Aug 28, 2016

Manishearth commented Aug 28, 2016

bors-servo commented Aug 28, 2016

canova commented Aug 29, 2016

Manishearth commented Aug 29, 2016

bors-servo commented Aug 29, 2016

bors-servo commented Aug 29, 2016

bors-servo commented Aug 29, 2016

bors-servo commented Aug 29, 2016

Manishearth commented Aug 29, 2016

canova commented Aug 29, 2016

Manishearth commented Aug 29, 2016

Handle 3- and 4- valued <position>s in style #13042

Handle 3- and 4- valued <position>s in style #13042

Conversation

canova commented Aug 25, 2016 • edited by larsbergstrom

highfive commented Aug 25, 2016

highfive commented Aug 25, 2016

canova commented Aug 25, 2016 • edited

izgzhen Aug 25, 2016

Choose a reason for hiding this comment

canova Aug 26, 2016

Choose a reason for hiding this comment

Manishearth commented Aug 26, 2016 • edited

Manishearth Aug 26, 2016

Choose a reason for hiding this comment

Manishearth Aug 26, 2016

Choose a reason for hiding this comment

canova commented Aug 27, 2016

canova Aug 27, 2016

Choose a reason for hiding this comment

Manishearth commented Aug 27, 2016

Manishearth Aug 27, 2016

Choose a reason for hiding this comment

canova Aug 27, 2016

Choose a reason for hiding this comment

Manishearth commented Aug 28, 2016

bors-servo commented Aug 28, 2016

bors-servo commented Aug 28, 2016

highfive commented Aug 28, 2016

Manishearth commented Aug 28, 2016 • edited

bors-servo commented Aug 28, 2016

bors-servo commented Aug 28, 2016

bors-servo commented Aug 28, 2016

Manishearth commented Aug 28, 2016

Manishearth commented Aug 28, 2016

bors-servo commented Aug 28, 2016

canova commented Aug 29, 2016

Manishearth commented Aug 29, 2016

bors-servo commented Aug 29, 2016

bors-servo commented Aug 29, 2016

bors-servo commented Aug 29, 2016

bors-servo commented Aug 29, 2016

Manishearth commented Aug 29, 2016

canova commented Aug 29, 2016

Manishearth commented Aug 29, 2016

canova commented Aug 25, 2016 •

edited by larsbergstrom

canova commented Aug 25, 2016 •

edited

Manishearth commented Aug 26, 2016 •

edited

Manishearth commented Aug 28, 2016 •

edited