Merge inbound to mozilla-central. a=merge
authorshindli <shindli@mozilla.com>
Mon, 20 Aug 2018 12:50:23 +0300
changeset 490059 77433149bfdcc82287acaed94b942818785b556e
parent 490054 41993cf46d6ab0a21976edc9bbb3b69891684fb4 (current diff)
parent 490058 f2c0be296f6f10567864fcd0f4d2e7c5da342c34 (diff)
child 490064 aeeb2a50c987c18bd461507831c284c5575a32cb
child 490081 a616fc43a2e9339918f3ccfb1936662cf854fb88
push id1815
push userffxbld-merge
push dateMon, 15 Oct 2018 10:40:45 +0000
treeherdermozilla-release@18d4c09e9378 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone63.0a1
first release with
nightly linux32
77433149bfdc / 63.0a1 / 20180820100129 / files
nightly linux64
77433149bfdc / 63.0a1 / 20180820100129 / files
nightly mac
77433149bfdc / 63.0a1 / 20180820100129 / files
nightly win32
77433149bfdc / 63.0a1 / 20180820100129 / files
nightly win64
77433149bfdc / 63.0a1 / 20180820100129 / 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/build/build-clang/clang-win64.json
+++ b/build/build-clang/clang-win64.json
@@ -10,12 +10,12 @@
     "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/trunk",
     "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/trunk",
     "python_path": "c:/mozilla-build/python/python.exe",
     "cc": "cl.exe",
     "cxx": "cl.exe",
     "ml": "ml64.exe",
     "patches": [
       "loosen-msvc-detection.patch",
-      "r339636.patch",
-      "workaround-issue38586.patch"
+      "workaround-issue38586.patch",
+      "r339636.patch"
     ]
 }
--- a/devtools/client/inspector/animation/animation.js
+++ b/devtools/client/inspector/animation/animation.js
@@ -671,18 +671,18 @@ class AnimationInspector {
 
     this.stopAnimationsCurrentTimeTimer();
 
     // Although it is not possible to set a delay or end delay of infinity using
     // the animation API, if the value passed exceeds the limit of our internal
     // representation of times, it will be treated as infinity. Rather than
     // adding special case code to represent this very rare case, we simply omit
     // such animations from the graph.
-    animations = animations.filter(anim => anim.state.delay !== Infinity &&
-                                           anim.state.endDelay !== Infinity);
+    animations = animations.filter(anim => Math.abs(anim.state.delay) !== Infinity &&
+                                           Math.abs(anim.state.endDelay) !== Infinity);
 
     this.inspector.store.dispatch(updateAnimations(animations));
 
     if (hasRunningAnimation(animations)) {
       this.startAnimationsCurrentTimeTimer();
     } else {
       // Even no running animations, update the current time once
       // so as to show the state.
--- a/devtools/client/inspector/animation/test/browser.ini
+++ b/devtools/client/inspector/animation/test/browser.ini
@@ -63,16 +63,17 @@ skip-if = (verify && !debug)
 [browser_animation_logic_adjust-time-with-playback-rate.js]
 [browser_animation_logic_auto-stop.js]
 [browser_animation_logic_avoid-updating-during-hiding.js]
 [browser_animation_logic_created-time.js]
 [browser_animation_logic_mutations.js]
 [browser_animation_logic_mutations_fast.js]
 [browser_animation_logic_mutations_properties.js]
 [browser_animation_logic_overflowed_delay_end-delay.js]
+skip-if = debug #bug 1480027
 [browser_animation_logic_scroll-amount.js]
 [browser_animation_pause-resume-button.js]
 [browser_animation_pause-resume-button_end-time.js]
 [browser_animation_pause-resume-button_respectively.js]
 [browser_animation_pause-resume-button_spacebar.js]
 [browser_animation_playback-rate-selector.js]
 [browser_animation_pseudo-element.js]
 [browser_animation_rewind-button.js]
--- a/devtools/client/inspector/animation/test/doc_overflowed_delay_end_delay.html
+++ b/devtools/client/inspector/animation/test/doc_overflowed_delay_end_delay.html
@@ -35,16 +35,38 @@
         id: "big-end-delay",
         duration: 1000,
         endDelay: Number.MAX_VALUE,
         iterations: Infinity,
       });
 
     target.animate(
       {
+        marginLeft: ["0px", "100px"]
+      },
+      {
+        id: "negative-big-delay",
+        duration: 1000,
+        delay: -Number.MAX_VALUE,
+        iterations: Infinity,
+      });
+
+    target.animate(
+      {
+        paddingLeft: ["0px", "100px"]
+      },
+      {
+        id: "negative-big-end-delay",
+        duration: 1000,
+        endDelay: -Number.MAX_VALUE,
+        iterations: Infinity,
+      });
+
+    target.animate(
+      {
         backgroundColor: ["lime", "white"]
       },
       {
         id: "big-iteration-start",
         duration: 1000,
         iterations: Infinity,
         iterationStart: Number.MAX_VALUE,
       });