Revert "Treat any HTML element with a tabindex attribute as interacti…

…ve content" This reverts commit 7920b6e. It turns out that this change is not web compatible. In addition to reverting the original change, we will seek to change the spec to reflect this web reality. Only the changes to Blink code are fully reverted. The tests are kept, but adapted to reflect this change. A comment update is also kept. Original change's description: > Treat any HTML element with a tabindex attribute as interactive content > > According to the HTML Standard [1]: > > > An element with the tabindex attribute specified is interactive > > content. > > In a subsequent review [2], this clause is reaffirmed by the editor of > HTML. Thus, we implement this accordingly. > > This commit also adds comprehensive testing for all kinds of interactive > content, which have differential treatment by the <label> element > relative to other elements. > > [1]: https://html.spec.whatwg.org/C/#the-tabindex-attribute > [2]: whatwg/html#5414 > > Fixed: 1065048 > Change-Id: I8deff810fead2c9170e18dd4d06dc642f68e6742 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2122369 > Commit-Queue: Timothy Gu <timothygu@chromium.org> > Reviewed-by: Kent Tamura <tkent@chromium.org> > Reviewed-by: Mason Freed <masonfreed@chromium.org> > Cr-Commit-Position: refs/heads/master@{#757590} Bug: 1065048 Change-Id: Ic32dbb9ac8eafb9b92a131fde71c5459029260e2 Fixed: 1069615 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2146089 Reviewed-by: Kent Tamura <tkent@chromium.org> Reviewed-by: Mason Freed <masonfreed@chromium.org> Commit-Queue: Timothy Gu <timothygu@chromium.org> Cr-Commit-Position: refs/heads/master@{#758568}
blueboxd · Apr 13, 2020 · 0ef2cae · 0ef2cae
1 parent 2d3f45b
commit 0ef2cae
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 21 deletions.
diff --git a/third_party/blink/renderer/core/html/forms/html_input_element.cc b/third_party/blink/renderer/core/html/forms/html_input_element.cc
@@ -1989,8 +1989,7 @@ void HTMLInputElement::SetShouldRevealPassword(bool value) {
 }
 
 bool HTMLInputElement::IsInteractiveContent() const {
-  return input_type_->IsInteractiveContent() ||
-         HTMLElement::IsInteractiveContent();
+  return input_type_->IsInteractiveContent();
 }
 
 scoped_refptr<ComputedStyle> HTMLInputElement::CustomStyleForLayoutObject() {

diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third_party/blink/renderer/core/html/html_anchor_element.cc
@@ -582,7 +582,7 @@ bool HTMLAnchorElement::WillRespondToMouseClickEvents() {
 }
 
 bool HTMLAnchorElement::IsInteractiveContent() const {
-  return IsLink() || HTMLElement::IsInteractiveContent();
+  return IsLink();
 }
 
 Node::InsertionNotificationRequest HTMLAnchorElement::InsertedInto(

diff --git a/third_party/blink/renderer/core/html/html_element.cc b/third_party/blink/renderer/core/html/html_element.cc
@@ -1374,7 +1374,7 @@ LabelsNodeList* HTMLElement::labels() {
 }
 
 bool HTMLElement::IsInteractiveContent() const {
-  return FastHasAttribute(html_names::kTabindexAttr);
+  return false;
 }
 
 void HTMLElement::DefaultEventHandler(Event& event) {

diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_party/blink/renderer/core/html/html_image_element.cc
@@ -667,8 +667,7 @@ Image* HTMLImageElement::ImageContents() {
 }
 
 bool HTMLImageElement::IsInteractiveContent() const {
-  return FastHasAttribute(html_names::kUsemapAttr) ||
-         HTMLElement::IsInteractiveContent();
+  return FastHasAttribute(html_names::kUsemapAttr);
 }
 
 FloatSize HTMLImageElement::DefaultDestinationSize(

diff --git a/third_party/blink/renderer/core/html/html_object_element.cc b/third_party/blink/renderer/core/html/html_object_element.cc
@@ -408,8 +408,7 @@ HTMLFormElement* HTMLObjectElement::formOwner() const {
 }
 
 bool HTMLObjectElement::IsInteractiveContent() const {
-  return FastHasAttribute(html_names::kUsemapAttr) ||
-         HTMLElement::IsInteractiveContent();
+  return FastHasAttribute(html_names::kUsemapAttr);
 }
 
 bool HTMLObjectElement::UseFallbackContent() const {

diff --git a/third_party/blink/renderer/core/html/media/html_media_element.cc b/third_party/blink/renderer/core/html/media/html_media_element.cc
@@ -3998,8 +3998,7 @@ void HTMLMediaElement::MediaSourceOpened(WebMediaSource* web_media_source) {
 }
 
 bool HTMLMediaElement::IsInteractiveContent() const {
-  return FastHasAttribute(html_names::kControlsAttr) ||
-         HTMLElement::IsInteractiveContent();
+  return FastHasAttribute(html_names::kControlsAttr);
 }
 
 void HTMLMediaElement::Trace(Visitor* visitor) {

diff --git a/...sts/external/wpt/html/semantics/forms/the-label-element/clicking-interactive-content.html b/...sts/external/wpt/html/semantics/forms/the-label-element/clicking-interactive-content.html
@@ -19,17 +19,6 @@
   <select></select>
   <textarea></textarea>
   <video controls></video>
-
-  <div tabindex=""></div>
-
-  <!-- These are interesting in that even without tabindex, they could become
-  interactive with the addition/removal of an attribute. -->
-  <a tabindex=""></a>
-  <audio tabindex=""></audio>
-  <img tabindex="">
-  <input type=hidden tabindex="">
-  <object tabindex=""></object>
-  <video tabindex=""></video>
 </template>
 
 <script>

diff --git a/...t/html/semantics/forms/the-label-element/clicking-noninteractive-unlabelable-content.html b/...t/html/semantics/forms/the-label-element/clicking-noninteractive-unlabelable-content.html
@@ -17,6 +17,16 @@
   <input type=hidden>
   <object></object>
   <video></video>
+
+  <!-- These are considered interactive content for the purpose of <label> in a
+  previous version of the HTML Standard, but no longer. -->
+  <a tabindex=""></a>
+  <audio tabindex=""></audio>
+  <div tabindex=""></div>
+  <img tabindex="">
+  <input type=hidden tabindex="">
+  <object tabindex=""></object>
+  <video tabindex=""></video>
 </template>
 
 <script>