REGRESSION(r219640): Speedometer no longer runs on Safari 7

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

Reviewed by Joseph Pecoraro.

PerformanceTests:

Use regular string instead of template literal to make the script compatible with older versions of Safari.

* Speedometer/resources/benchmark-runner.js:
(BenchmarkRunner.prototype._runTest):

Websites/browserbench.org:

Fix the bug on browserbench.org.

* Speedometer/resources/benchmark-runner.js:
(BenchmarkRunner.prototype._runTest):

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

diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
index 26d5f9aee0c060ac7c0768747b32b1a19a8d1c2b..b8abd75aeddeb265200e67e5b708291974841d4d 100644 (file)
--- a/PerformanceTests/ChangeLog
+++ b/PerformanceTests/ChangeLog
@@ -1,3 +1,15 @@
+2017-08-18  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r219640): Speedometer no longer runs on Safari 7
+        https://bugs.webkit.org/show_bug.cgi?id=175749
+
+        Reviewed by Joseph Pecoraro.
+
+        Use regular string instead of template literal to make the script compatible with older versions of Safari.
+
+        * Speedometer/resources/benchmark-runner.js:
+        (BenchmarkRunner.prototype._runTest):
+
 2017-08-17  Mathias Bynens  <mathias@qiwi.be>
 
         Speedometer: Update to modern Vue.js version

diff --git a/PerformanceTests/Speedometer/resources/benchmark-runner.js b/PerformanceTests/Speedometer/resources/benchmark-runner.js
index 22f94fb51c6c916af9598f6e6bdbb7c09c4a4d9f..6808e4a124e9d841959ecd48828bc5fec4628ac8 100644 (file)
--- a/PerformanceTests/Speedometer/resources/benchmark-runner.js
+++ b/PerformanceTests/Speedometer/resources/benchmark-runner.js
@@ -126,18 +126,18 @@ BenchmarkRunner.prototype._runTest = function(suite, test, prepareReturnValue, c
     var contentWindow = self._frame.contentWindow;
     var contentDocument = self._frame.contentDocument;
 
-    self._writeMark(`${suite.name}.${test.name}-start`);
+    self._writeMark(suite.name + '.' + test.name + '-start');
     var startTime = now();
     test.run(prepareReturnValue, contentWindow, contentDocument);
     var endTime = now();
-    self._writeMark(`${suite.name}.${test.name}-sync-end`);
+    self._writeMark(suite.name + '.' + test.name + '-sync-end');
 
     var syncTime = endTime - startTime;
 
     var startTime = now();
     setTimeout(function () {
         var endTime = now();
-        self._writeMark(`${suite.name}.${test.name}-async-end`);
+        self._writeMark(suite.name + '.' + test.name + '-async-end');
         callback(syncTime, endTime - startTime);
     }, 0);
 }

diff --git a/Websites/browserbench.org/ChangeLog b/Websites/browserbench.org/ChangeLog
index 59e2d62dd03fa91c08cfced863276bfbe49f35cc..a036a58f1f8cff0f2e43c0bf48f813d55c6d7f00 100644 (file)
--- a/Websites/browserbench.org/ChangeLog
+++ b/Websites/browserbench.org/ChangeLog
@@ -1,3 +1,15 @@
+2017-08-18  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r219640): Speedometer no longer runs on Safari 7
+        https://bugs.webkit.org/show_bug.cgi?id=175749
+
+        Reviewed by Joseph Pecoraro.
+
+        Fix the bug on browserbench.org.
+
+        * Speedometer/resources/benchmark-runner.js:
+        (BenchmarkRunner.prototype._runTest):
+
 2017-07-18  Ryosuke Niwa  <rniwa@webkit.org>
 
         Merge r219640 into Speedometer 1.0.

diff --git a/Websites/browserbench.org/Speedometer/resources/benchmark-runner.js b/Websites/browserbench.org/Speedometer/resources/benchmark-runner.js
index aaaf6b4d4c16126eb153e1cdf8b395d46ae0fae6..f501dbf9fbedf3ced3f45019f237488e1f7c8d9a 100644 (file)
--- a/Websites/browserbench.org/Speedometer/resources/benchmark-runner.js
+++ b/Websites/browserbench.org/Speedometer/resources/benchmark-runner.js
@@ -126,18 +126,18 @@ BenchmarkRunner.prototype._runTest = function(suite, test, prepareReturnValue, c
     var contentWindow = self._frame.contentWindow;
     var contentDocument = self._frame.contentDocument;
 
-    self._writeMark(`${suite.name}.${test.name}-start`);
+    self._writeMark(suite.name + '.' + test.name + '-start');
     var startTime = now();
     test.run(prepareReturnValue, contentWindow, contentDocument);
     var endTime = now();
-    self._writeMark(`${suite.name}.${test.name}-sync-end`);
+    self._writeMark(suite.name + '.' + test.name + '-sync-end');
 
     var syncTime = endTime - startTime;
 
     var startTime = now();
     setTimeout(function () {
         var endTime = now();
-        self._writeMark(`${suite.name}.${test.name}-async-end`);
+        self._writeMark(suite.name + '.' + test.name + '-async-end');
         callback(syncTime, endTime - startTime);
     }, 0);
 }