Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <style> | 3 <style> |
| 4 .layer { | 4 .layer { |
| 5 -webkit-transform: translateZ(10px); | 5 -webkit-transform: translateZ(10px); |
| 6 opacity: 0.8; | 6 opacity: 0.8; |
| 7 } | 7 } |
| 8 </style> | 8 </style> |
| 9 <script src="../http/tests/inspector/inspector-test.js"></script> | 9 <script src="../http/tests/inspector/inspector-test.js"></script> |
| 10 <script src="../http/tests/inspector/layers-test.js"></script> | 10 <script src="../http/tests/inspector/layers-test.js"></script> |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 35 { | 35 { |
| 36 function addDepthMarker(layer) | 36 function addDepthMarker(layer) |
| 37 { | 37 { |
| 38 layer.__extraData = layer.parent() ? layer.parent().__extraData + 1 : 0; | 38 layer.__extraData = layer.parent() ? layer.parent().__extraData + 1 : 0; |
| 39 } | 39 } |
| 40 | 40 |
| 41 InspectorTest.requestLayers(step1); | 41 InspectorTest.requestLayers(step1); |
| 42 | 42 |
| 43 function step1() | 43 function step1() |
| 44 { | 44 { |
| 45 // Assure layer objects are not re-created during updates. | 45 // Assure layer objects are not re-created during updates. |
| 46 InspectorTest._layerTreeModel.forEachLayer(addDepthMarker); | 46 InspectorTest._layerTreeModel.forEachLayer(addDepthMarker); |
| 47 InspectorTest.addResult("Initial layer tree"); | 47 InspectorTest.addResult("Initial layer tree"); |
| 48 InspectorTest.dumpLayerTree(); | 48 InspectorTest.dumpLayerTree(); |
| 49 InspectorTest.evaluateAndRunWhenTreeChanges("updateTree()", step2); | 49 // Before calling updateTree(), wait for the tree change generated by du mping the layer tree. |
| 50 InspectorTest.evaluateAndRunWhenTreeChanges("void(0)", function() { | |
| 51 InspectorTest.evaluateAndRunWhenTreeChanges("updateTree()", step2); | |
| 52 }); | |
| 50 } | 53 } |
| 51 | 54 |
| 52 function step2() | 55 function step2() |
| 53 { | 56 { |
| 54 InspectorTest.addResult("Updated layer tree"); | 57 InspectorTest.addResult("Updated layer tree"); |
| 55 InspectorTest.dumpLayerTree(); | 58 InspectorTest.dumpLayerTree(); |
| 56 InspectorTest.evaluateAndRunWhenTreeChanges("updateGeometry()", step3); | 59 // Before calling updateGeometry(), wait for the tree change generated b y dumping the layer tree. |
| 60 InspectorTest.evaluateAndRunWhenTreeChanges("void(0)", function() { | |
|
esprehn
2014/01/27 20:49:42
Woah, crazy.
| |
| 61 InspectorTest.evaluateAndRunWhenTreeChanges("updateGeometry()", step 3); | |
| 62 }); | |
| 57 } | 63 } |
| 58 | 64 |
| 59 function step3() | 65 function step3() |
| 60 { | 66 { |
| 61 InspectorTest.addResult("Updated layer geometry"); | 67 InspectorTest.addResult("Updated layer geometry"); |
| 62 InspectorTest.dumpLayerTree(); | 68 InspectorTest.dumpLayerTree(); |
| 63 InspectorTest.completeTest(); | 69 InspectorTest.completeTest(); |
| 64 } | 70 } |
| 65 } | 71 } |
| 66 | 72 |
| 67 </script> | 73 </script> |
| 68 </head> | 74 </head> |
| 69 <body onload="runTest()"> | 75 <body onload="runTest()"> |
| 70 <div id="a" style="width: 200px; height: 200px" class="layer"> | 76 <div id="a" style="width: 200px; height: 200px" class="layer"> |
| 71 <div class="layer" id="b1" style="width: 150; height: 100"></div> | 77 <div class="layer" id="b1" style="width: 150; height: 100"></div> |
| 72 <div id="b2" class="layer" style="width: 140; height: 110"> | 78 <div id="b2" class="layer" style="width: 140; height: 110"> |
| 73 <div id="c" class="layer" style="width: 100; height: 90"></div> | 79 <div id="c" class="layer" style="width: 100; height: 90"></div> |
| 74 </div> | 80 </div> |
| 75 <div id="b3" class="layer" style="width: 140; height: 110"></div> | 81 <div id="b3" class="layer" style="width: 140; height: 110"></div> |
| 76 </div> | 82 </div> |
| 77 <iframe id="frame" src="resources/composited-iframe.html" width="200" height="20 0"></div> | 83 <iframe id="frame" src="resources/composited-iframe.html" width="200" height="20 0"></div> |
| 78 </body> | 84 </body> |
| 79 </html> | 85 </html> |
| OLD | NEW |