From ece146988c695bcf432bffb606116ba9504e80e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 17 Mar 2020 21:48:33 +0000
Subject: [PATCH] style: Change the parsing order of border shorthands.

It's not ambiguous, and <width> <style> <color> seems like a more common order.

This is just a minor perf tweak, as the CSS parser token cache will most often
kick in to avoid re-tokenizing values.

Also remove a redundant continue statement.

Differential Revision: https://phabricator.services.mozilla.com/D67224
---
 .../style/properties/shorthands/border.mako.rs      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/style/properties/shorthands/border.mako.rs b/components/style/properties/shorthands/border.mako.rs
index 1f77b905021..e5122153db7 100644
--- a/components/style/properties/shorthands/border.mako.rs
+++ b/components/style/properties/shorthands/border.mako.rs
@@ -70,11 +70,10 @@ pub fn parse_border<'i, 't>(
     let mut width = None;
     let mut any = false;
     loop {
-        if color.is_none() {
-            if let Ok(value) = input.try(|i| Color::parse(context, i)) {
-                color = Some(value);
+        if width.is_none() {
+            if let Ok(value) = input.try(|i| BorderSideWidth::parse(context, i)) {
+                width = Some(value);
                 any = true;
-                continue
             }
         }
         if style.is_none() {
@@ -84,9 +83,9 @@ pub fn parse_border<'i, 't>(
                 continue
             }
         }
-        if width.is_none() {
-            if let Ok(value) = input.try(|i| BorderSideWidth::parse(context, i)) {
-                width = Some(value);
+        if color.is_none() {
+            if let Ok(value) = input.try(|i| Color::parse(context, i)) {
+                color = Some(value);
                 any = true;
                 continue
             }