REGRESSION(r217118): Speedometer 2.0: Flight.js test is broken

https://bugs.webkit.org/show_bug.cgi?id=172394

Reviewed by Chris Dumez.

PerformanceTests:

Fixed the bug that we were never clearing window.checkLoadedTimeoutId.

* Speedometer/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js:
(newContext.checkLoaded):

Websites/browserbench.org:

Merge the fix.

* Speedometer2.0/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js:
(newContext.checkLoaded):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@217161 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
index 2a24887..91baae2 100644 (file)
--- a/PerformanceTests/ChangeLog
+++ b/PerformanceTests/ChangeLog
@@ -1,3 +1,15 @@
+2017-05-19  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r217118): Speedometer 2.0: Flight.js test is broken
+        https://bugs.webkit.org/show_bug.cgi?id=172394
+
+        Reviewed by Chris Dumez.
+
+        Fixed the bug that we were never clearing window.checkLoadedTimeoutId.
+
+        * Speedometer/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js:
+        (newContext.checkLoaded):
+
 2017-05-19  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         Add SixSpeed benchmark to PerformanceTests

diff --git a/PerformanceTests/Speedometer/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js b/PerformanceTests/Speedometer/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js
index e1b56d3..9072be9 100644 (file)
--- a/PerformanceTests/Speedometer/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js
+++ b/PerformanceTests/Speedometer/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js
@@ -716,6 +716,7 @@ var requirejs, require, define;
                 if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) {
                     checkLoadedTimeoutId = setTimeout(function () {
                         checkLoadedTimeoutId = 0;
+                        window.checkLoadedTimeoutId = 0;
                         checkLoaded();
                     }, 50);
                     window.checkLoadedTimeoutId = checkLoadedTimeoutId;

diff --git a/Websites/browserbench.org/ChangeLog b/Websites/browserbench.org/ChangeLog
index 9235fe1..86faad9 100644 (file)
--- a/Websites/browserbench.org/ChangeLog
+++ b/Websites/browserbench.org/ChangeLog
@@ -1,5 +1,17 @@
 2017-05-19  Ryosuke Niwa  <rniwa@webkit.org>
 
+        REGRESSION(r217118): Speedometer 2.0: Flight.js test is broken
+        https://bugs.webkit.org/show_bug.cgi?id=172394
+
+        Reviewed by Chris Dumez.
+
+        Merge the fix.
+
+        * Speedometer2.0/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js:
+        (newContext.checkLoaded):
+
+2017-05-19  Ryosuke Niwa  <rniwa@webkit.org>
+
         Merge Speedometer 2.0 fixes up to r217121 to browserbench.org
         https://bugs.webkit.org/show_bug.cgi?id=172389
 

diff --git a/Websites/browserbench.org/Speedometer2.0/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js b/Websites/browserbench.org/Speedometer2.0/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js
index e1b56d3..9072be9 100644 (file)
--- a/Websites/browserbench.org/Speedometer2.0/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js
+++ b/Websites/browserbench.org/Speedometer2.0/resources/todomvc/dependency-examples/flight/flight/node_modules/requirejs/require.js
@@ -716,6 +716,7 @@ var requirejs, require, define;
                 if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) {
                     checkLoadedTimeoutId = setTimeout(function () {
                         checkLoadedTimeoutId = 0;
+                        window.checkLoadedTimeoutId = 0;
                         checkLoaded();
                     }, 50);
                     window.checkLoadedTimeoutId = checkLoadedTimeoutId;