Skip shadow hosts with negative tabindex in focus navigation

third_party/WebKit/LayoutTests/shadow-dom/focus-with-negative-index.html

Index: third_party/WebKit/LayoutTests/shadow-dom/focus-with-negative-index.html
diff --git a/third_party/WebKit/LayoutTests/shadow-dom/tabindex-slot.html b/third_party/WebKit/LayoutTests/shadow-dom/focus-with-negative-index.html
similarity index 52%
copy from third_party/WebKit/LayoutTests/shadow-dom/tabindex-slot.html
copy to third_party/WebKit/LayoutTests/shadow-dom/focus-with-negative-index.html
index 335076ba823665e5a9c7443227baf883754f8836..802f39ad4bb50ffd52a65d1131e44ee1a31c5ad2 100644
--- a/third_party/WebKit/LayoutTests/shadow-dom/tabindex-slot.html
+++ b/third_party/WebKit/LayoutTests/shadow-dom/focus-with-negative-index.html
@@ -10,7 +10,7 @@
   x-bar's shadow tree: [k1 -> k0 -> [s2]]<br>
   slot #s2: [j1 -> j2 -> j3 -> j4 -> [s1] -> j0]<br><br>
   slot #s1: [i1 -> i2]<br>
-  <b>v1 ideal nav forward:  [i0 -> j5 -> xbar -> k1 -> k0 -> j1 -> j2 -> j3 -> j4 -> i1 -> i2 -> j0 -> j6]</b><br>
+  <b>v1 ideal nav forward:  [i0 -> j5 -> xbar -> k1 -> k0 -> j6]</b><br>
 </p>
 
   <input id="i0" tabindex=0 value="i0">
@@ -28,10 +28,16 @@
         </div>
         <template data-mode="open">
           <input id="k0" tabindex=0 value="k0">
-          <slot id="s2" name="s2"></slot>
+          <slot id="s2" name="s2" tabindex=-1></slot>
           <input id="k1" tabindex=1 value="k1">
         </template>
       </div>
+      <div id="to-be-ignored-host" tabindex=-1>
+        <template data-mode="open">
+          <input id="ignored-input-in-shadow-host1" tabindex=1 value="ignored">
+          <input id="ignored-input-in-shadow-host2" tabindex=2 value="ignored">
+        </template>
+      </div>
       <input id="j6" tabindex=4 value="j6">
       <input id="j5" tabindex=3 value="j5">
     </template>
@@ -40,34 +46,47 @@
 
 <script>
 
+var xfoo = document.getElementById('x-foo');
+convertTemplatesToShadowRootsWithin(xfoo);
+var sr = xfoo.shadowRoot;
 test(function() {
-  var xfoo = document.getElementById('x-foo');
-  convertTemplatesToShadowRootsWithin(xfoo);
-  var sr = xfoo.shadowRoot;
-  var xbar = sr.querySelector('div');
-  convertTemplatesToShadowRootsWithin(xbar);
-
   var elements = [
     'i0',
     'x-foo/j5',
     'x-foo/x-bar',
     'x-foo/x-bar/k1',
     'x-foo/x-bar/k0',
-    'x-foo/j1',
-    'x-foo/j2',
-    'x-foo/j3',
-    'x-foo/j4',
-    'i1',
-    'i2',
-    'x-foo/j0',
     'x-foo/j6'
   ];
 
   for (var i = 0; i + 1 < elements.length; ++i)
-      assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'forward'), elements[i]+" to "+ elements[i+1]);
+      assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'forward'), elements[i] + " to " + elements[i + 1]);
   elements.reverse();
   for (var i = 0; i + 1 < elements.length; ++i)
-      assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'backward'), elements[i]+" to "+ elements[i+1]);
+      assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'backward'), elements[i] + " to " + elements[i + 1]);
 }, 'Focus controller should treat slots as a focus scope.');
 
+test(function() {
+  var ignoredHost = sr.getElementById('to-be-ignored-host');
+  var ignoredInput1 = ignoredHost.shadowRoot.querySelector('input');
+  var ignoredInput2 = ignoredInput1.nextElementSibling;
+
+  var elements = [
+    'x-foo/to-be-ignored-host/ignored-input-in-shadow-host1',
+    'x-foo/to-be-ignored-host/ignored-input-in-shadow-host2',
+    'x-foo/j6'
+  ];
+  for (var i = 0; i + 1 < elements.length; ++i)
+      assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'forward'), elements[i] + " to " + elements[i + 1]);
+
+  var elementsBackward = [
+    'x-foo/to-be-ignored-host/ignored-input-in-shadow-host2',
+    'x-foo/to-be-ignored-host/ignored-input-in-shadow-host1',
+    'x-foo/x-bar/k0'
+  ];
+  for (var i = 0; i + 1 < elements.length; ++i)
+      assert_true(shouldNavigateFocus(elementsBackward[i], elementsBackward[i + 1], 'backward'), elementsBackward[i] + " to " + elementsBackward[i + 1]);
+
+}, 'This is a regression test: After focusing negative tabindex-ed elements, focus moves in tree order.');
+
 </script>