| OLD | NEW | 
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> | 
| 2 <style> | 2 <style> | 
| 3 .outerBlock { | 3 .outerBlock { | 
| 4     border: 1px solid black; | 4     border: 1px solid black; | 
| 5     -webkit-transition: all 1s linear; | 5     -webkit-transition: all 1s linear; | 
| 6     -moz-transition: all 1s linear; | 6     -moz-transition: all 1s linear; | 
| 7 } | 7 } | 
| 8 | 8 | 
| 9 .innerBlock { | 9 .innerBlock { | 
| 10     background-color: green; | 10     background-color: green; | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 35 | 35 | 
| 36 </style> | 36 </style> | 
| 37 | 37 | 
| 38 This tests that calc() expressions depending on transitioning elements behave co
     rrectly. | 38 This tests that calc() expressions depending on transitioning elements behave co
     rrectly. | 
| 39 <div class="outerBlock" id="outer"> | 39 <div class="outerBlock" id="outer"> | 
| 40     <div class="innerBlock" id="inner"></div> | 40     <div class="innerBlock" id="inner"></div> | 
| 41     <div class="innerBlock" id="innerTransition"></div> | 41     <div class="innerBlock" id="innerTransition"></div> | 
| 42 </div> | 42 </div> | 
| 43 <div id="result"></div> | 43 <div id="result"></div> | 
| 44 | 44 | 
| 45 <script src="../../transitions/resources/transition-test-helpers.js"></script> | 45 <script src="../../animations/resources/animation-test-helpers.js"></script> | 
| 46 <script> | 46 <script> | 
| 47 | 47 | 
| 48 if (window.testRunner) | 48 if (window.testRunner) | 
| 49     window.testRunner.dumpAsText(); | 49     window.testRunner.dumpAsText(); | 
| 50 | 50 | 
| 51 const transitioningElements = ["outer", "innerTransition"]; | 51 const transitioningElements = ["outer", "innerTransition"]; | 
| 52 | 52 | 
| 53 expectedValues = [ | 53 expectedValues = [ | 
| 54     // time, element, property, expected-value, depends-on | 54     // time, element, property, expected-value, tolerance | 
| 55     [0.00, "inner", 'width', 60, "outer"], | 55     [0.00, "inner", 'width', 60, 10], | 
| 56     [0.25, "inner", 'width', 110, "outer"], | 56     [0.25, "inner", 'width', 110, 10], | 
| 57     [0.50, "inner", 'width', 160, "outer"], | 57     [0.50, "inner", 'width', 160, 10], | 
| 58     [0.75, "inner", 'width', 210, "outer"], | 58     [0.75, "inner", 'width', 210, 10], | 
| 59     [1.00, "inner", 'width', 260, "outer"], | 59     [1.00, "inner", 'width', 260, 10], | 
| 60 | 60 | 
| 61     [0.00, "innerTransition", 'width', 20, "outer"], | 61     [0.00, "innerTransition", 'width', 20, 10], | 
| 62     [0.25, "innerTransition", 'width', 70, "outer"], | 62     [0.25, "innerTransition", 'width', 70, 10], | 
| 63     [0.50, "innerTransition", 'width', 165, "outer"], | 63     [0.50, "innerTransition", 'width', 165, 10], | 
| 64     [0.75, "innerTransition", 'width', 305, "outer"], | 64     [0.75, "innerTransition", 'width', 305, 10], | 
| 65     [1.00, "innerTransition", 'width', 490, "outer"], | 65     [1.00, "innerTransition", 'width', 490, 10], | 
| 66 ]; | 66 ]; | 
| 67 | 67 | 
| 68 function runTest(expected) | 68 runTransitionTest(expectedValues, setupTest, usePauseAPI); | 
| 69 { | 69 | 
| 70     for (var i = 0; i < expected.length; ++i) { | 70 | 
| 71         var time = expected[i][0]; | 71 function setupTest() { | 
| 72         var elementId = expected[i][1]; | 72     for (var i = 0; i < transitioningElements.length; i++) { | 
| 73         var property = expected[i][2]; | 73         var element = document.getElementById(transitioningElements[i]); | 
| 74         var expectedValue = expected[i][3]; | 74         element.className += " go"; | 
| 75         var dependsOn = expected[i][4]; |  | 
| 76         if (window.internals) { |  | 
| 77             internals.pauseAnimations(time); |  | 
| 78             var actual = window.getComputedStyle(document.getElementById(element
     Id)).getPropertyCSSValue(property).getFloatValue(CSSPrimitiveValue.CSS_NUMBER); |  | 
| 79             var result = document.getElementById("result"); |  | 
| 80             if (actual == expectedValue) |  | 
| 81                 result.innerHTML += 'PASS - "' + property + '" property for "' +
      elementId +'" element at ' + time + 's was: ' + actual + '<br/>'; |  | 
| 82             else |  | 
| 83                 result.innerHTML += 'FAIL - "' + property + '" property for "' +
      elementId +'" element at ' + time + 's expected: ' + expectedValue + ' but saw:
      ' + actual + '<br/>'; |  | 
| 84         } |  | 
| 85     } | 75     } | 
| 86     if (window.testRunner) |  | 
| 87         testRunner.notifyDone(); |  | 
| 88 } | 76 } | 
| 89 | 77 | 
| 90 function loadListener() |  | 
| 91 { |  | 
| 92     waitForAnimationStart(function(){runTest(expectedValues);}); |  | 
| 93 } |  | 
| 94 |  | 
| 95 for (var i = 0; i < transitioningElements.length; i++) { |  | 
| 96     var element = document.getElementById(transitioningElements[i]); |  | 
| 97     element.className += " go"; |  | 
| 98 } |  | 
| 99 |  | 
| 100 window.addEventListener("load", loadListener, false); |  | 
| 101 window.testRunner.waitUntilDone(); |  | 
| 102 | 78 | 
| 103 </script> | 79 </script> | 
| OLD | NEW | 
|---|