[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 30fc12d16f0302be2f4608748d1330097e9ee570
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 05:14:16 2010 +0000

    2010-09-28  Simon Fraser  <simon.fraser at apple.com>
    
            No review
    
            Show which tests have been run by dimming them out in the test list.
    
            Adjust some element sizes.
    
            * CSSTestSuiteHarness/harness/harness.css:
            (#test-list > option.untested):
            (#test-list > option.completed):
            (#output):
            (.output-options):
            * CSSTestSuiteHarness/harness/harness.js:
            (Test):
            (TestSuite.prototype.fillTestList):
            (TestSuite.prototype.updateTestList):
            (TestSuite.prototype.setSelectedChapter):
            (TestSuite.prototype.recordResult):
            (TestSuite.prototype.markTestCompleted):
            (TestSuite.prototype.testCompletionStateChanged):
            (TestSuite.prototype.loadTestStatus):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68625 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/CSSTestSuiteHarness/harness/harness.css b/WebKitTools/CSSTestSuiteHarness/harness/harness.css
index 1e12965..8c0e7d1 100644
--- a/WebKitTools/CSSTestSuiteHarness/harness/harness.css
+++ b/WebKitTools/CSSTestSuiteHarness/harness/harness.css
@@ -107,6 +107,14 @@ body {
   color: darkgray;
 }
 
+#test-list > option.untested {
+  
+}
+
+#test-list > option.completed {
+  color: gray;
+}
+
 #test-content.with-ref {
 }
 
@@ -148,7 +156,7 @@ body {
 #output {
   border: 1px solid black;
   font-size: smaller;
-  height: 250px;
+  height: 220px;
   margin: 4px;
   padding: 4px;
   overflow-y: auto;
@@ -178,7 +186,7 @@ body {
   float: right;
   border: 1px solid black;
   width: 200px;
-  height: 250px;
+  height: 220px;
   margin: 4px;
   padding: 4px;
   font-size: smaller;
diff --git a/WebKitTools/CSSTestSuiteHarness/harness/harness.js b/WebKitTools/CSSTestSuiteHarness/harness/harness.js
index 79518c0..f7d7664 100644
--- a/WebKitTools/CSSTestSuiteHarness/harness/harness.js
+++ b/WebKitTools/CSSTestSuiteHarness/harness/harness.js
@@ -202,6 +202,8 @@ function Test(testInfoLine)
   this.links = fields[4];
   this.assertion = fields[5];
   
+  this.completed = false; // true if this test has a result (pass, fail or skip)
+  
   if (!this.links)
     this.links = "other.html"
 }
@@ -434,11 +436,23 @@ TestSuite.prototype.fillTestList = function()
 
     var option = document.createElement('option');
     option.innerText = currTest.id;
+    option.className = currTest.completed ? 'completed' : 'untested';
     option._test = currTest;
     testList.appendChild(option);
   }
 }
 
+TestSuite.prototype.updateTestList = function()
+{
+  var testList = document.getElementById('test-list');
+  
+  var options = testList.getElementsByTagName('option');
+  for (var i = 0; i < options.length; ++i) {
+    var currOption = options[i];
+    currOption.className = currOption._test.completed ? 'completed' : 'untested';
+  }
+}
+
 TestSuite.prototype.setSelectedChapter = function(chapter)
 {
   this.currentChapter = chapter;
@@ -447,10 +461,9 @@ TestSuite.prototype.setSelectedChapter = function(chapter)
   
   this.fillTestList();
   this.goToTestIndex(0);
-return;
   
   var chaptersPopup = document.getElementById('chapters');
-  chaptersPopup.selectedIndex = kChapterData.indexOf(chapterName)// FIXME:
+  chaptersPopup.selectedIndex = this.indexOfChapter(chapter);
 }
 
 /* ------------------------------------------------------- */
@@ -625,6 +638,9 @@ TestSuite.prototype.recordResult = function(testName, resolution, comment)
     comment = '';
   
   this.storeTestResult(testName, this.format, resolution, comment, navigator.userAgent);
+  this.markTestCompleted(testName);
+  this.updateTestList();
+
   this.updateSummaryData();
 }
 
@@ -967,6 +983,38 @@ TestSuite.prototype.exportResultsForTestsWithMismatchedResults = function()
 
 /* -------------------------------------------------------- */
 
+TestSuite.prototype.markTestCompleted = function(testID)
+{
+  var test = this.tests[testID];
+  if (!test) {
+    window.console.log('markTestCompleted to find test ' + testID);
+    return;
+  }
+  
+  test.completed = true;
+}
+
+TestSuite.prototype.testCompletionStateChanged = function()
+{
+  // update the test list
+  this.updateTestList();
+}
+
+TestSuite.prototype.loadTestStatus = function()
+{
+  var _self = this;
+  this.queryDatabaseForCompletedTests(
+      function(item) {
+        _self.markTestCompleted(item.test);
+      },
+      function() {
+        _self.testCompletionStateChanged();
+      }
+    );
+}
+
+/* -------------------------------------------------------- */
+
 TestSuite.prototype.updateSummaryData = function()
 {
   this.queryDatabaseForSummary(
@@ -1019,6 +1067,7 @@ TestSuite.prototype.openDatabase = function()
   }, errorHandler);
 
   this.updateSummaryData();
+  this.loadTestStatus();
 }
 
 TestSuite.prototype.databaseCreated = function(db)
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6a9c5a1..8c9add1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -6,6 +6,29 @@
 
 2010-09-28  Simon Fraser  <simon.fraser at apple.com>
 
+        No review
+        
+        Show which tests have been run by dimming them out in the test list.
+        
+        Adjust some element sizes.
+        
+        * CSSTestSuiteHarness/harness/harness.css:
+        (#test-list > option.untested):
+        (#test-list > option.completed):
+        (#output):
+        (.output-options):
+        * CSSTestSuiteHarness/harness/harness.js:
+        (Test):
+        (TestSuite.prototype.fillTestList):
+        (TestSuite.prototype.updateTestList):
+        (TestSuite.prototype.setSelectedChapter):
+        (TestSuite.prototype.recordResult):
+        (TestSuite.prototype.markTestCompleted):
+        (TestSuite.prototype.testCompletionStateChanged):
+        (TestSuite.prototype.loadTestStatus):
+
+2010-09-28  Simon Fraser  <simon.fraser at apple.com>
+
         No review.
         
         Implement export of various queries on the test database, sharing

-- 
WebKit Debian packaging