Changeset 85796 in webkit

Timestamp:

May 4, 2011 3:44:27 PM (13 years ago)

Author:

ojan@chromium.org

Message:

2011-05-04 Ojan Vafai <​ojan@chromium.org>

Reviewed by Eric Seidel.

[results.html] fix apply options on page load
​https://bugs.webkit.org/show_bug.cgi?id=60217

This broke when we started storing options in localstorage.
Also fixes regressions exposed by fixing this.

• fast/harness/resources/results-test.js:
• fast/harness/results.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/harness/resources/results-test.js (modified) (2 diffs)
• fast/harness/results-expected.txt (modified) (1 diff)
• fast/harness/results.html (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-04  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [results.html] fix apply options on page load
+        https://bugs.webkit.org/show_bug.cgi?id=60217
+
+        This broke when we started storing options in localstorage.
+        Also fixes regressions exposed by fixing this.
+
+        * fast/harness/resources/results-test.js:
+        * fast/harness/results.html:
+
 2011-05-04  Rob Buis  <rbuis@rim.com>
 

trunk/LayoutTests/fast/harness/resources/results-test.js

@@ -140 +140 @@
         assertTrue(document.querySelector('#new-tests-table .result-link:nth-child(1)').textContent == 'audio result');
         assertTrue(document.querySelector('#new-tests-table .result-link:nth-child(2)').textContent == 'result');
-        assertTrue(document.querySelector('#new-tests-table .result-link:nth-child(3)').textContent == 'png result');
+        assertTrue(document.querySelector('#new-tests-table .result-link:nth-child(3)').textContent == 'images');
     });
 
@@ -221 +221 @@
         assertTrue(document.querySelector('.expected .test-link').textContent == 'foo/bar-expected-fail.html');
 
+        assertTrue(window.getComputedStyle(document.querySelectorAll('tbody')[0], null)['display'] == 'none');
+
         expandAllExpectations();
         assertTrue(visibleExpandLinks().length == 1);
         assertTrue(document.querySelectorAll('.results-row').length == 1);
+        assertTrue(window.getComputedStyle(document.querySelectorAll('tbody')[0], null)['display'] == 'none');
         
         document.getElementById('unexpected-results').checked = false;
+        document.getElementById('unexpected-results').onchange();
 
         assertTrue(visibleExpandLinks().length == 2);
         assertTrue(document.querySelectorAll('.results-row').length == 1);
+        assertTrue(window.getComputedStyle(document.querySelectorAll('tbody')[0], null)['display'] != 'none');
         
         expandAllExpectations();
         assertTrue(document.querySelectorAll('.results-row').length == 2);
+        assertTrue(window.getComputedStyle(document.querySelectorAll('tbody')[0], null)['display'] != 'none');
     });
 

trunk/LayoutTests/fast/harness/results-expected.txt

@@ -34 +34 @@
 TEST-5: PASS
 TEST-5: PASS
+TEST-6: PASS
+TEST-6: PASS
+TEST-6: PASS
+TEST-6: PASS
 TEST-6: PASS
 TEST-6: PASS

trunk/LayoutTests/fast/harness/results.html

@@ -465 +465 @@
     if (globalState().results.uses_expectations_file)
         row += ' class="' + (testObject.isExpected ? 'expected' : '') + '"';
+    if (testObject.is_mismatch_reftest)
+        row += ' mismatchreftest=true';
     row += '><tr>';
 
@@ -824 +826 @@
 {
     var json = localStorage.getItem(OptionWriter._key);
-    if (!json)
-        return;
+    if (!json) {
+        updateAllOptions();
+        return;
+    }
 
     var data = JSON.parse(json);
     for (var id in data) {
         var input = document.getElementById(id);
-        if (input) {
+        if (input)
             input.checked = data[id];
-            input.onchange();
-        }
-    }
+    }
+    updateAllOptions();
+}
+
+function updateAllOptions()
+{
+    forEach(document.querySelectorAll('#options-menu input'), function(input) { input.onchange(); });
 }
 
@@ -849 +857 @@
     
     if (shouldToggle) {
-        forEach(document.querySelectorAll('a[href$=".png"]'), convertToTogglingHandler(function(prefix) {
+        forEach(document.querySelectorAll('tbody:not([mismatchreftest]) a[href$=".png"]'), convertToTogglingHandler(function(prefix) {
             return resultLink(prefix, '-diffs.html', 'images');
         }));
-        forEach(document.querySelectorAll('img[src$=".png"]'), convertToTogglingHandler(togglingImage));
+        forEach(document.querySelectorAll('tbody:not([mismatchreftest]) img[src$=".png"]'), convertToTogglingHandler(togglingImage));
     } else {
         forEach(document.querySelectorAll('a[href$="-diffs.html"]'), convertToNonTogglingHandler(resultLink));
@@ -950 +958 @@
 
     document.body.innerHTML = html;
-
-    OptionWriter.apply();
 
     if (document.getElementById('results-table')) {
@@ -965 +971 @@
         }
     }
+
+    OptionWriter.apply();
 }
 </script>