Auto merge of #17095 - servo:derive-all-the-things, r=emilio

Refactor a few CSS properties

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17095)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-31 11:08:56 -05:00 committed by GitHub
commit cd22fc6b90
13 changed files with 271 additions and 275 deletions

View file

@ -11,7 +11,7 @@ use style::context::QuirksMode;
use style::error_reporting::ParseErrorReporter;
use style::media_queries::*;
use style::servo::media_queries::*;
use style::shared_lock::{SharedRwLock, SharedRwLockReadGuard};
use style::shared_lock::SharedRwLock;
use style::stylearc::Arc;
use style::stylesheets::{AllRules, Stylesheet, Origin, CssRule};
use style::values::specified;

View file

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use parsing::parse;
use style::properties::longhands::{self, perspective_origin, transform_origin};
use style::properties::longhands::{perspective_origin, transform_origin};
use style_traits::ToCss;
#[test]
@ -30,16 +30,6 @@ fn test_clip() {
"rect(auto, auto, auto, auto)");
}
#[test]
fn test_longhands_parse_origin() {
assert_parser_exhausted!(longhands::parse_origin, "1px some-rubbish", false);
assert_parser_exhausted!(longhands::parse_origin, "1px 2px", true);
assert_parser_exhausted!(longhands::parse_origin, "center left", true);
assert_parser_exhausted!(longhands::parse_origin, "center right", true);
assert_parser_exhausted!(longhands::parse_origin, "center right 1px", true);
assert_parser_exhausted!(longhands::parse_origin, "1% right", false);
}
#[test]
fn test_effects_parser_exhaustion() {
assert_parser_exhausted!(perspective_origin::parse, "1px 1px", true);

View file

@ -25454,7 +25454,7 @@
"testharness"
],
"mozilla/calc.html": [
"47507adabc0d3642154b3ed4b1ab64d726fa682d",
"a1f441f7fd4b9ab3ae9e1cb5403cfe8de90bb71c",
"testharness"
],
"mozilla/canvas.initial.reset.2dstate.html": [

View file

@ -141,7 +141,7 @@ numberProperties.forEach(function(prop) {
var otherProperties = [
['border-width', 'calc(1px)', 'calc(1px)'],
['border-spacing', 'calc(1px)', 'calc(1px)'],
['transform-origin', 'calc(1px + 0%)', 'calc(1px + 0%) 50% 0px'],
['transform-origin', 'calc(1px + 0%)', 'calc(1px + 0%) center 0px'],
['perspective-origin', 'calc(1px + 0%)', 'calc(1px + 0%) center'],
['background-size', 'calc(1px + 0%)', 'calc(1px + 0%) auto'],
['background-position', 'calc(1px + 0%) calc(2px + 0%)', 'calc(1px + 0%) calc(2px + 0%)'],