servo: Merge #16232 - Fix justify-content values (from hiikezoe:justify-content-fix); r=bholley
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Sun, 02 Apr 2017 17:47:09 -0500
changeset 350875 5d08dda78aec172cb1d1f955a04b6b2ba6bfa9bf
parent 350874 e379ec1f1feffc4677f1cf3a4e47709dee67990c
child 350876 433ddda62563f167557ab2fd53d8b9582e697034
push id39964
push userservo-vcs-sync@mozilla.com
push dateSun, 02 Apr 2017 23:31:24 +0000
treeherderautoland@5d08dda78aec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #16232 - Fix justify-content values (from hiikezoe:justify-content-fix); r=bholley <!-- Please describe your changes on the following line: --> This is a PR for https://bugzilla.mozilla.org/show_bug.cgi?id=1352771 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors <!-- Either: --> - [X] These changes do not require tests because it's for stylo <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: eb1865070a8324016c369104afa159fdec345bea
servo/components/style/values/specified/align.rs
--- a/servo/components/style/values/specified/align.rs
+++ b/servo/components/style/values/specified/align.rs
@@ -353,19 +353,19 @@ fn parse_normal_or_baseline(input: &mut 
     }
 }
 
 // <content-distribution>
 fn parse_content_distribution(input: &mut Parser) -> Result<AlignFlags, ()> {
     let ident = input.expect_ident()?;
     match_ignore_ascii_case! { &ident,
       "stretch" => Ok(ALIGN_STRETCH),
-      "space_between" => Ok(ALIGN_SPACE_BETWEEN),
-      "space_around" => Ok(ALIGN_SPACE_AROUND),
-      "space_evenly" => Ok(ALIGN_SPACE_EVENLY),
+      "space-between" => Ok(ALIGN_SPACE_BETWEEN),
+      "space-around" => Ok(ALIGN_SPACE_AROUND),
+      "space-evenly" => Ok(ALIGN_SPACE_EVENLY),
       _ => Err(())
     }
 }
 
 // [ <overflow-position>? && <content-position> ]
 fn parse_overflow_content_position(input: &mut Parser) -> Result<AlignFlags, ()> {
     // <content-position> followed by optional <overflow-position>
     if let Ok(mut content) = input.try(|input| parse_content_position(input)) {