[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[mjs at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 983bf7fa5c47f9504f892ec85b11d27d7a987e50
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 02:26:21 2009 +0000

    2009-12-15  Maciej Stachowiak  <mjs at apple.com>
    
            Reviewed by Darin Adler.
    
            Make SunSpider refuse to compare results across content versions
            https://bugs.webkit.org/show_bug.cgi?id=32573
    
            The results URL now includes a version indicator, and compare mode
            will refuse to compare between versions.
    
            * resources/driver-TEMPLATE.html:
            * resources/results-TEMPLATE.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52185 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog
index 35de0dd..5d1fcf9 100644
--- a/SunSpider/ChangeLog
+++ b/SunSpider/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-15  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Make SunSpider refuse to compare results across content versions
+        https://bugs.webkit.org/show_bug.cgi?id=32573
+        
+        The results URL now includes a version indicator, and compare mode
+        will refuse to compare between versions.
+
+        * resources/driver-TEMPLATE.html:
+        * resources/results-TEMPLATE.html:
+
 2009-12-14  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/SunSpider/resources/driver-TEMPLATE.html b/SunSpider/resources/driver-TEMPLATE.html
index 2f85e59..d8992ec 100644
--- a/SunSpider/resources/driver-TEMPLATE.html
+++ b/SunSpider/resources/driver-TEMPLATE.html
@@ -91,6 +91,7 @@ function recordResult(time)
 function finish()
 {
     var outputString = "{";
+    outputString += '"v": "@SUITE@", ';
     for (var test in output[0]) {
         outputString += '"' + test + '":[';
         for (var i = 0; i < output.length; i++) {
diff --git a/SunSpider/resources/results-TEMPLATE.html b/SunSpider/resources/results-TEMPLATE.html
index d210a11..e4d937e 100644
--- a/SunSpider/resources/results-TEMPLATE.html
+++ b/SunSpider/resources/results-TEMPLATE.html
@@ -55,7 +55,10 @@
 var selfUrlInput = document.getElementById("selfUrl");
 selfUrlInput.value = location;
 
-var output = pivot(JSON.parse(decodeURI(location.search.substring(1))));
+var outputJSON = JSON.parse(decodeURI(location.search.substring(1)));
+var version = outputJSON["v"];
+delete outputJSON["v"];
+var output = pivot(outputJSON);
 
 function pivot(input) {
     var output = [];
@@ -82,12 +85,21 @@ function print(str) {
 
 <script>
 var output2 = output;
+var version2 = version;
 
 function compare(other)
 {
     document.getElementById("console").innerHTML = "";
-    var output1 = pivot(JSON.parse(decodeURI(other.split("?")[1])));
-    sunspiderCompareResults(output1, output2);
+
+    var output1JSON = JSON.parse(decodeURI(other.split("?")[1]));
+    var version1 = output1JSON["v"];
+    delete output1JSON["v"];
+    if (version1 != version2) {
+        print("ERROR: cannot compare version " + version1 + ' with version ' + version2);
+    } else {
+        var output1 = pivot(output1JSON);
+        sunspiderCompareResults(output1, output2);
+    }
 }
 </script>
 

-- 
WebKit Debian packaging