Merge inbound to mozilla-central. a=merge
authorCiure Andrei <aciure@mozilla.com>
Sun, 28 Oct 2018 11:52:04 +0200
changeset 443261 ba284d91a4bbec997102aecdf5b39c7999b5c127
parent 443257 39f9698391d0a83be6586ed20fcb2030a3fefb12 (current diff)
parent 443260 7216de8800bff60151b0b0db7184bedd19f5560a (diff)
child 443262 a2b59c32f04d3e6ef3e6fe083c5e33adb7455207
child 443276 89697dbd654a76380a910b5dc4c6c0f3afbaddc6
push id34949
push useraciure@mozilla.com
push dateSun, 28 Oct 2018 09:52:27 +0000
treeherdermozilla-central@ba284d91a4bb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone65.0a1
first release with
nightly linux32
ba284d91a4bb / 65.0a1 / 20181028102553 / files
nightly linux64
ba284d91a4bb / 65.0a1 / 20181028102553 / files
nightly mac
ba284d91a4bb / 65.0a1 / 20181028102553 / files
nightly win32
ba284d91a4bb / 65.0a1 / 20181028102553 / files
nightly win64
ba284d91a4bb / 65.0a1 / 20181028102553 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
--- a/gfx/cairo/libpixman/src/pixman-vmx.c
+++ b/gfx/cairo/libpixman/src/pixman-vmx.c
@@ -20,17 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  *
  * Author:  Luca Barbato (lu_zero@gentoo.org)
  *
  * Based on fbmmx.c by Owen Taylor, Søren Sandmann and Nicholas Miell
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include "pixman-private.h"
 #include "pixman-combine32.h"
 #include <altivec.h>
 
 #define AVV(x...) {x}
 
 static force_inline vector unsigned int
 splat_alpha (vector unsigned int pix)
--- a/netwerk/test/unit/test_mozTXTToHTMLConv.js
+++ b/netwerk/test/unit/test_mozTXTToHTMLConv.js
@@ -21,16 +21,29 @@ function run_test() {
       input: "RFC2396E: <http://mozilla.org/> then",
       url: "http://mozilla.org/"
     },
     // -- abbreviated
     {
       input: "see www.mozilla.org maybe",
       url: "http://www.mozilla.org"
     },
+    // -- delimiters
+    {
+      input: "see http://www.mozilla.org/maybe today",  // Spaces
+      url: "http://www.mozilla.org/maybe"
+    },
+    {
+      input: "see \"http://www.mozilla.org/maybe today\"",  // Double quotes
+      url: "http://www.mozilla.org/maybetoday"              // spaces ignored
+    },
+    {
+      input: "see <http://www.mozilla.org/maybe today>",  // Angle brackets
+      url: "http://www.mozilla.org/maybetoday"            // spaces ignored
+    },
     // -- freetext
     {
       input:"I mean http://www.mozilla.org/.",
       url: "http://www.mozilla.org/"
     },
     {
       input:"you mean http://mozilla.org:80, right?",
       url: "http://mozilla.org:80"
--- a/servo/components/style/properties/gecko.mako.rs
+++ b/servo/components/style/properties/gecko.mako.rs
@@ -2995,17 +2995,19 @@ fn static_assert() {
     #[allow(non_snake_case)]
     pub fn animation_${ident}_at(&self, index: usize)
         -> longhands::animation_${ident}::computed_value::SingleComputedValue {
         use properties::longhands::animation_${ident}::single_value::computed_value::T as Keyword;
         match self.gecko.mAnimations[index].m${gecko_ffi_name} ${keyword.maybe_cast("u32")} {
             % for value in keyword.gecko_values():
                 structs::${keyword.gecko_constant(value)} => Keyword::${to_camel_case(value)},
             % endfor
+            % if keyword.gecko_inexhaustive:
             _ => panic!("Found unexpected value for animation-${ident}"),
+            % endif
         }
     }
     ${impl_animation_count(ident, gecko_ffi_name)}
     ${impl_copy_animation_value(ident, gecko_ffi_name)}
 </%def>
 
 <%def name="impl_individual_transform(ident, type, gecko_ffi_name)">
     pub fn set_${ident}(&mut self, other: values::computed::${type}) {
--- a/servo/components/style/properties/longhands/box.mako.rs
+++ b/servo/components/style/properties/longhands/box.mako.rs
@@ -242,16 +242,17 @@
     "animation-direction",
     "normal reverse alternate alternate-reverse",
     need_index=True,
     animation_value_type="none",
     vector=True,
     gecko_enum_prefix="PlaybackDirection",
     custom_consts=animation_direction_custom_consts,
     extra_prefixes=animation_extra_prefixes,
+    gecko_inexhaustive=True,
     spec="https://drafts.csswg.org/css-animations/#propdef-animation-direction",
     allowed_in_keyframe_block=False,
 )}
 
 ${helpers.single_keyword(
     "animation-play-state",
     "running paused",
     need_index=True,
@@ -266,16 +267,17 @@
 ${helpers.single_keyword(
     "animation-fill-mode",
     "none forwards backwards both",
     need_index=True,
     animation_value_type="none",
     vector=True,
     gecko_enum_prefix="FillMode",
     extra_prefixes=animation_extra_prefixes,
+    gecko_inexhaustive=True,
     spec="https://drafts.csswg.org/css-animations/#propdef-animation-fill-mode",
     allowed_in_keyframe_block=False,
 )}
 
 ${helpers.predefined_type(
     "animation-delay",
     "Time",
     "computed::Time::zero()",