| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <script src='../../../resources/testharness.js'></script> | 2 <script src='../../../resources/testharness.js'></script> |
| 3 <script src='../../../resources/testharnessreport.js'></script> | 3 <script src='../../../resources/testharnessreport.js'></script> |
| 4 <script src='resources/shadow-dom.js'></script> | 4 <script src='resources/shadow-dom.js'></script> |
| 5 <div id="log"></div> | 5 <div id="log"></div> |
| 6 <p> | 6 <p> |
| 7 document tree: [i0 -> [x-foo]]<br> | 7 document tree: [i0 -> [x-foo]]<br> |
| 8 x-foo's shadow tree: [j5 -> [x-bar] -> j6]<br> | 8 x-foo's shadow tree: [j5 -> [x-bar] -> j6]<br> |
| 9 x-bar's shadow tree: [k1 -> k0 -> [s2]]<br> | 9 x-bar's shadow tree: [k1 -> k0 -> [s2]]<br> |
| 10 slot #s2: [j1 -> j2 -> j3 -> j4 -> [s1] -> j0]<br><br> | 10 slot #s2: [j1 -> j2 -> j3 -> j4 -> [s1] -> j0]<br><br> |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 </template> | 32 </template> |
| 33 </div> | 33 </div> |
| 34 <input id="j6" tabindex=4 value="j6"> | 34 <input id="j6" tabindex=4 value="j6"> |
| 35 <input id="j5" tabindex=3 value="j5"> | 35 <input id="j5" tabindex=3 value="j5"> |
| 36 </template> | 36 </template> |
| 37 </div> | 37 </div> |
| 38 </div> | 38 </div> |
| 39 | 39 |
| 40 <script> | 40 <script> |
| 41 | 41 |
| 42 function shouldCustomNavigateFocus(from, to, direction) | |
| 43 { | |
| 44 var fromElement = getNodeInComposedTree(from); | |
| 45 if (!fromElement) { | |
| 46 return; | |
| 47 } | |
| 48 fromElement.focus(); | |
| 49 if (!isInnermostActiveElement(from)) { | |
| 50 return; | |
| 51 } | |
| 52 if (direction == 'forward') | |
| 53 navigateFocusForward(); | |
| 54 else | |
| 55 navigateFocusBackward(); | |
| 56 return isInnermostActiveElement(to); | |
| 57 } | |
| 58 | |
| 59 test(function() { | 42 test(function() { |
| 60 var xfoo = document.getElementById('x-foo'); | 43 var xfoo = document.getElementById('x-foo'); |
| 61 convertTemplatesToShadowRootsWithin(xfoo); | 44 convertTemplatesToShadowRootsWithin(xfoo); |
| 62 var sr = xfoo.shadowRoot; | 45 var sr = xfoo.shadowRoot; |
| 63 var xbar = sr.querySelector('div'); | 46 var xbar = sr.querySelector('div'); |
| 64 convertTemplatesToShadowRootsWithin(xbar); | 47 convertTemplatesToShadowRootsWithin(xbar); |
| 65 | 48 |
| 66 var elements = [ | 49 var elements = [ |
| 67 'i0', | 50 'i0', |
| 68 'x-foo/j5', | 51 'x-foo/j5', |
| 69 'x-foo/x-bar', | 52 'x-foo/x-bar', |
| 70 'x-foo/x-bar/k1', | 53 'x-foo/x-bar/k1', |
| 71 'x-foo/x-bar/k0', | 54 'x-foo/x-bar/k0', |
| 72 'x-foo/j1', | 55 'x-foo/j1', |
| 73 'x-foo/j2', | 56 'x-foo/j2', |
| 74 'x-foo/j3', | 57 'x-foo/j3', |
| 75 'x-foo/j4', | 58 'x-foo/j4', |
| 76 'i1', | 59 'i1', |
| 77 'i2', | 60 'i2', |
| 78 'x-foo/j0', | 61 'x-foo/j0', |
| 79 'x-foo/j6' | 62 'x-foo/j6' |
| 80 ]; | 63 ]; |
| 81 | 64 |
| 82 for (var i = 0; i + 1 < elements.length; ++i) | 65 for (var i = 0; i + 1 < elements.length; ++i) |
| 83 assert_true(shouldCustomNavigateFocus(elements[i], elements[i + 1], 'forwa
rd'), elements[i]+" to "+ elements[i+1]); | 66 assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'forward'),
elements[i]+" to "+ elements[i+1]); |
| 84 elements.reverse(); | 67 elements.reverse(); |
| 85 for (var i = 0; i + 1 < elements.length; ++i) | 68 for (var i = 0; i + 1 < elements.length; ++i) |
| 86 assert_true(shouldCustomNavigateFocus(elements[i], elements[i + 1], 'backw
ard'), elements[i]+" to "+ elements[i+1]); | 69 assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'backward'),
elements[i]+" to "+ elements[i+1]); |
| 87 }, 'Focus controller should treat slots as a focus scope.'); | 70 }, 'Focus controller should treat slots as a focus scope.'); |
| 88 | 71 |
| 89 </script> | 72 </script> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1773553003:
Removing dependency on js-test.js from shadow-dom.js (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master