Add tooltip to date/time control picker indicator element

Prior to this change, the picker indicator element (the "icon" that can be clicked on to open the popup) did not have a tooltip. With this CL, we add a tooltip where the tooltip text matches the indicator element's aria-label (e.g. "Show X picker"). Bug: 1473774 Change-Id: I4a156753cea4d44722e8636492c90bce7e94fd87 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4767916 Commit-Queue: Stephanie Zhang <stephanie.zhang@microsoft.com> Reviewed-by: Mason Freed <masonf@chromium.org> Cr-Commit-Position: refs/heads/main@{#1184963}
chromium · Aug 17, 2023 · a1d53f1 · a1d53f1
1 parent 3dd7521
commit a1d53f1
Show file tree

Hide file tree

Showing 24 changed files with 83 additions and 41 deletions.
diff --git a/content/test/data/accessibility/html/input-date-expected-auralinux.txt b/content/test/data/accessibility/html/input-date-expected-auralinux.txt
@@ -8,7 +8,7 @@
 ++++++++++[spin button] name='Day' current=1.000000 minimum=1.000000 maximum=31.000000
 ++++++++++[static] name='/'
 ++++++++++[spin button] name='Year' current=2008.000000 minimum=1.000000 maximum=275760.000000
-++++++[push button] name='Show date picker'
+++++++[push button] name='Show date picker' description='Show date picker' description-from:tooltip
 ++++[dateeditor] name='When' text-input-type:date
 ++++++[section]
 ++++++++[section]
@@ -17,4 +17,4 @@
 ++++++++++[spin button] name='Day When' current=1.000000 minimum=1.000000 maximum=31.000000
 ++++++++++[static] name='/'
 ++++++++++[spin button] name='Year When' current=2008.000000 minimum=1.000000 maximum=275760.000000
-++++++[push button] name='Show date picker'
+++++++[push button] name='Show date picker' description='Show date picker' description-from:tooltip
diff --git a/content/test/data/accessibility/html/input-date-expected-blink.txt b/content/test/data/accessibility/html/input-date-expected-blink.txt
@@ -17,7 +17,7 @@ rootWebArea
 ++++++++++++spinButton name='Year' placeholder='yyyy' value='2008' valueForRange=2008.00 minValueForRange=1.00 maxValueForRange=275760.00
 ++++++++++++++staticText name='2008'
 ++++++++++++++++inlineTextBox name='2008'
-++++++++popUpButton name='Show date picker'
+++++++++popUpButton description='Show date picker' name='Show date picker' descriptionFrom=title
 ++++++date inputType='date' name='When' value='2008-09-01'
 ++++++++genericContainer
 ++++++++++genericContainer
@@ -34,4 +34,4 @@ rootWebArea
 ++++++++++++spinButton name='Year When' placeholder='yyyy' value='2008' valueForRange=2008.00 minValueForRange=1.00 maxValueForRange=275760.00
 ++++++++++++++staticText name='2008'
 ++++++++++++++++inlineTextBox name='2008'
-++++++++popUpButton name='Show date picker'
+++++++++popUpButton description='Show date picker' name='Show date picker' descriptionFrom=title
diff --git a/content/test/data/accessibility/html/input-date-expected-win.txt b/content/test/data/accessibility/html/input-date-expected-win.txt
@@ -8,7 +8,7 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ia2_hypertext='<obj0>'
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='Day' value='01' FOCUSABLE
 ++++++++++ROLE_SYSTEM_STATICTEXT name='/' ia2_hypertext='/'
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='Year' value='2008' FOCUSABLE
-++++++ROLE_SYSTEM_BUTTONMENU name='Show date picker' FOCUSABLE HASPOPUP
+++++++ROLE_SYSTEM_BUTTONMENU name='Show date picker' FOCUSABLE HASPOPUP description-from:tooltip description='Show date picker'
 ++++IA2_ROLE_DATE_EDITOR name='When' value='2008-09-01' FOCUSABLE text-input-type:date ia2_hypertext='<obj0><obj1>'
 ++++++IA2_ROLE_SECTION ia2_hypertext='<obj0>'
 ++++++++IA2_ROLE_SECTION ia2_hypertext='<obj0>/<obj2>/<obj4>'
@@ -17,4 +17,4 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ia2_hypertext='<obj0>'
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='Day When' value='01' FOCUSABLE
 ++++++++++ROLE_SYSTEM_STATICTEXT name='/' ia2_hypertext='/'
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='Year When' value='2008' FOCUSABLE
-++++++ROLE_SYSTEM_BUTTONMENU name='Show date picker' FOCUSABLE HASPOPUP
+++++++ROLE_SYSTEM_BUTTONMENU name='Show date picker' FOCUSABLE HASPOPUP description-from:tooltip description='Show date picker'
diff --git a/content/test/data/accessibility/html/input-datetime-local-expected-auralinux.txt b/content/test/data/accessibility/html/input-datetime-local-expected-auralinux.txt
@@ -14,4 +14,4 @@
 ++++++++++[spin button] name='Minutes' current=0.000000 minimum=0.000000 maximum=59.000000
 ++++++++++[static] name=' '
 ++++++++++[spin button] name='AM/PM' current=0.000000 minimum=1.000000 maximum=2.000000
-++++++[push button] name='Show local date and time picker' haspopup:menu
+++++++[push button] name='Show local date and time picker' description='Show local date and time picker' description-from:tooltip haspopup:menu
diff --git a/content/test/data/accessibility/html/input-datetime-local-expected-win.txt b/content/test/data/accessibility/html/input-datetime-local-expected-win.txt
@@ -14,4 +14,4 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ia2_hypertext='<obj0>'
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='Minutes' value='0' FOCUSABLE
 ++++++++++ROLE_SYSTEM_STATICTEXT name=' ' ia2_hypertext=' '
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='AM/PM' value='0' FOCUSABLE
-++++++ROLE_SYSTEM_BUTTONMENU name='Show local date and time picker' FOCUSABLE HASPOPUP haspopup:menu
+++++++ROLE_SYSTEM_BUTTONMENU name='Show local date and time picker' FOCUSABLE HASPOPUP description-from:tooltip haspopup:menu description='Show local date and time picker'
diff --git a/content/test/data/accessibility/html/input-month-expected-auralinux.txt b/content/test/data/accessibility/html/input-month-expected-auralinux.txt
@@ -6,4 +6,4 @@
 ++++++++++[spin button] name='Month' valuetext:0 current=0.000000 minimum=1.000000 maximum=12.000000
 ++++++++++[static] name=' '
 ++++++++++[spin button] name='Year' valuetext:0 current=0.000000 minimum=1.000000 maximum=275760.000000
-++++++[push button] name='Show month picker' haspopup:menu
+++++++[push button] name='Show month picker' description='Show month picker' description-from:tooltip haspopup:menu
diff --git a/content/test/data/accessibility/html/input-month-expected-blink.txt b/content/test/data/accessibility/html/input-month-expected-blink.txt
@@ -12,4 +12,4 @@ rootWebArea
 ++++++++++++spinButton name='Year' placeholder='----' valueForRange=0.00 minValueForRange=1.00 maxValueForRange=275760.00
 ++++++++++++++staticText name='----'
 ++++++++++++++++inlineTextBox name='----'
-++++++++popUpButton name='Show month picker' haspopup=menu
+++++++++popUpButton description='Show month picker' name='Show month picker' descriptionFrom=title haspopup=menu
diff --git a/content/test/data/accessibility/html/input-month-expected-win.txt b/content/test/data/accessibility/html/input-month-expected-win.txt
@@ -1,12 +1,9 @@
-ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
-++IA2_ROLE_SECTION READONLY
-++++IA2_ROLE_DATE_EDITOR FOCUSABLE
-++++++IA2_ROLE_SECTION
-++++++++IA2_ROLE_SECTION
-++++++++++ROLE_SYSTEM_SPINBUTTON name='Month' FOCUSABLE
-++++++++++ROLE_SYSTEM_STATICTEXT name=', '
-++++++++++ROLE_SYSTEM_SPINBUTTON name='Year' FOCUSABLE
-++++++ROLE_SYSTEM_BUTTONMENU FOCUSABLE
-++++++ROLE_SYSTEM_SPINBUTTON
-++++++++ROLE_SYSTEM_PUSHBUTTON
-++++++++ROLE_SYSTEM_PUSHBUTTON
+ROLE_SYSTEM_DOCUMENT value='http://a.test:57795/accessibility/html/input-month.html' READONLY FOCUSABLE ia2_hypertext='<obj0>'
+++IA2_ROLE_SECTION ia2_hypertext='<obj0>'
+++++IA2_ROLE_DATE_EDITOR FOCUSABLE text-input-type:month ia2_hypertext='<obj0><obj1>'
+++++++IA2_ROLE_SECTION ia2_hypertext='<obj0>'
+++++++++IA2_ROLE_SECTION ia2_hypertext='<obj0> <obj2>'
+++++++++++ROLE_SYSTEM_SPINBUTTON name='Month' value='0' FOCUSABLE valuetext:0
+++++++++++ROLE_SYSTEM_STATICTEXT name=' ' ia2_hypertext=' '
+++++++++++ROLE_SYSTEM_SPINBUTTON name='Year' value='0' FOCUSABLE valuetext:0
+++++++ROLE_SYSTEM_BUTTONMENU name='Show month picker' FOCUSABLE HASPOPUP description-from:tooltip haspopup:menu description='Show month picker'
diff --git a/content/test/data/accessibility/html/input-time-expected-auralinux.txt b/content/test/data/accessibility/html/input-time-expected-auralinux.txt
@@ -8,7 +8,7 @@
 ++++++++++[spin button] name='Minutes' xml-roles:spinbutton current=0.000000 minimum=0.000000 maximum=59.000000
 ++++++++++[static] name=' '
 ++++++++++[spin button] name='AM/PM' xml-roles:spinbutton current=1.000000 minimum=1.000000 maximum=2.000000
-++++++[push button] name='Show time picker' xml-roles:button
+++++++[push button] name='Show time picker' description='Show time picker' description-from:tooltip xml-roles:button
 ++++[dateeditor] name='Breakfast' text-input-type:time
 ++++++[section]
 ++++++++[section]
@@ -17,4 +17,4 @@
 ++++++++++[spin button] name='Minutes Breakfast' xml-roles:spinbutton current=0.000000 minimum=0.000000 maximum=59.000000
 ++++++++++[static] name=' '
 ++++++++++[spin button] name='AM/PM Breakfast' xml-roles:spinbutton current=1.000000 minimum=1.000000 maximum=2.000000
-++++++[push button] name='Show time picker' xml-roles:button
+++++++[push button] name='Show time picker' description='Show time picker' description-from:tooltip xml-roles:button
diff --git a/content/test/data/accessibility/html/input-time-expected-blink.txt b/content/test/data/accessibility/html/input-time-expected-blink.txt
@@ -17,7 +17,7 @@ rootWebArea
 ++++++++++++spinButton name='AM/PM' placeholder='--' value='AM' valueForRange=1.00 minValueForRange=1.00 maxValueForRange=2.00
 ++++++++++++++staticText name='AM'
 ++++++++++++++++inlineTextBox name='AM'
-++++++++popUpButton name='Show time picker'
+++++++++popUpButton description='Show time picker' name='Show time picker' descriptionFrom=title
 ++++++inputTime inputType='time' name='Breakfast' value='00:00:00'
 ++++++++genericContainer
 ++++++++++genericContainer
@@ -34,4 +34,4 @@ rootWebArea
 ++++++++++++spinButton name='AM/PM Breakfast' placeholder='--' value='AM' valueForRange=1.00 minValueForRange=1.00 maxValueForRange=2.00
 ++++++++++++++staticText name='AM'
 ++++++++++++++++inlineTextBox name='AM'
-++++++++popUpButton name='Show time picker'
+++++++++popUpButton description='Show time picker' name='Show time picker' descriptionFrom=title
diff --git a/content/test/data/accessibility/html/input-time-expected-win.txt b/content/test/data/accessibility/html/input-time-expected-win.txt
@@ -8,7 +8,7 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ia2_hypertext='<obj0>'
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='Minutes' value='00' FOCUSABLE xml-roles:spinbutton
 ++++++++++ROLE_SYSTEM_STATICTEXT name=' ' ia2_hypertext=' '
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='AM/PM' value='AM' FOCUSABLE xml-roles:spinbutton
-++++++ROLE_SYSTEM_BUTTONMENU name='Show time picker' FOCUSABLE HASPOPUP xml-roles:button
+++++++ROLE_SYSTEM_BUTTONMENU name='Show time picker' FOCUSABLE HASPOPUP xml-roles:button description-from:tooltip description='Show time picker'
 ++++ROLE_SYSTEM_GROUPING name='Breakfast' value='00:00:00' FOCUSABLE text-input-type:time ia2_hypertext='<obj0><obj1>'
 ++++++IA2_ROLE_SECTION ia2_hypertext='<obj0>'
 ++++++++IA2_ROLE_SECTION ia2_hypertext='<obj0>:<obj2> <obj4>'
@@ -17,4 +17,4 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ia2_hypertext='<obj0>'
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='Minutes Breakfast' value='00' FOCUSABLE xml-roles:spinbutton
 ++++++++++ROLE_SYSTEM_STATICTEXT name=' ' ia2_hypertext=' '
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='AM/PM Breakfast' value='AM' FOCUSABLE xml-roles:spinbutton
-++++++ROLE_SYSTEM_BUTTONMENU name='Show time picker' FOCUSABLE HASPOPUP xml-roles:button
+++++++ROLE_SYSTEM_BUTTONMENU name='Show time picker' FOCUSABLE HASPOPUP xml-roles:button description-from:tooltip description='Show time picker'
diff --git a/content/test/data/accessibility/html/input-time-with-popup-open-expected-blink.txt b/content/test/data/accessibility/html/input-time-with-popup-open-expected-blink.txt
@@ -27,7 +27,7 @@ rootWebArea
 ++++++++++++spinButton name='AM/PM' placeholder='--' value='PM' valueForRange=2.00 minValueForRange=1.00 maxValueForRange=2.00
 ++++++++++++++staticText name='PM'
 ++++++++++++++++inlineTextBox name='PM'
-++++++++popUpButton name='Show time picker'
+++++++++popUpButton description='Show time picker' name='Show time picker' descriptionFrom=title
 ++++++++group
 ++++++++++genericContainer ignored
 ++++++++++++genericContainer ignored

diff --git a/content/test/data/accessibility/html/input-time-with-popup-open-expected-win.txt b/content/test/data/accessibility/html/input-time-with-popup-open-expected-win.txt
@@ -12,7 +12,7 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ia2_hypertext='<obj0>'
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='Milliseconds' value='922' UNAVAILABLE
 ++++++++++ROLE_SYSTEM_STATICTEXT name=' ' ia2_hypertext=' '
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='AM/PM' value='PM' FOCUSABLE
-++++++ROLE_SYSTEM_BUTTONMENU name='Show time picker' FOCUSABLE HASPOPUP
+++++++ROLE_SYSTEM_BUTTONMENU name='Show time picker' FOCUSABLE HASPOPUP description-from:tooltip description='Show time picker'
 ++++++ROLE_SYSTEM_GROUPING ia2_hypertext='<obj0>'
 ++++++++IA2_ROLE_SECTION ia2_hypertext='<obj0>'
 ++++++++++IA2_ROLE_SECTION ia2_hypertext='<obj0><obj1><obj2><obj3><obj4>'

diff --git a/content/test/data/accessibility/html/input-week-expected-auralinux.txt b/content/test/data/accessibility/html/input-week-expected-auralinux.txt
@@ -7,4 +7,4 @@
 ++++++++++[spin button] name='Week' current=0.000000 minimum=1.000000 maximum=53.000000
 ++++++++++[static] name=', '
 ++++++++++[spin button] name='Year' current=0.000000 minimum=1.000000 maximum=275760.000000
-++++++[push button] name='Show week picker' haspopup:menu
+++++++[push button] name='Show week picker' description='Show week picker' description-from:tooltip haspopup:menu
diff --git a/content/test/data/accessibility/html/input-week-expected-blink.txt b/content/test/data/accessibility/html/input-week-expected-blink.txt
@@ -14,4 +14,4 @@ rootWebArea
 ++++++++++++spinButton name='Year' placeholder='----' valueForRange=0.00 minValueForRange=1.00 maxValueForRange=275760.00
 ++++++++++++++staticText name='----'
 ++++++++++++++++inlineTextBox name='----'
-++++++++popUpButton name='Show week picker' haspopup=menu
+++++++++popUpButton description='Show week picker' name='Show week picker' descriptionFrom=title haspopup=menu
diff --git a/content/test/data/accessibility/html/input-week-expected-win.txt b/content/test/data/accessibility/html/input-week-expected-win.txt
@@ -7,4 +7,4 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ia2_hypertext='<obj0>'
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='Week' value='0' FOCUSABLE
 ++++++++++ROLE_SYSTEM_STATICTEXT name=', ' ia2_hypertext=', '
 ++++++++++ROLE_SYSTEM_SPINBUTTON name='Year' value='0' FOCUSABLE
-++++++ROLE_SYSTEM_BUTTONMENU name='Show week picker' FOCUSABLE HASPOPUP haspopup:menu
+++++++ROLE_SYSTEM_BUTTONMENU name='Show week picker' FOCUSABLE HASPOPUP description-from:tooltip haspopup:menu description='Show week picker'
diff --git a/content/test/data/accessibility/html/interactive-controls-with-labels-expected-auralinux.txt b/content/test/data/accessibility/html/interactive-controls-with-labels-expected-auralinux.txt
@@ -37,7 +37,7 @@
 ++++++++[spin button] name='Minutes aria label' current=5.000000 minimum=0.000000 maximum=59.000000
 ++++++++[static] name=' '
 ++++++++[spin button] name='AM/PM aria label' current=2.000000 minimum=1.000000 maximum=2.000000
-++++[push button] name='Show time picker'
+++++[push button] name='Show time picker' description='Show time picker' description-from:tooltip
 ++[dateeditor] name='Test label' labelled-by=[label]
 ++++[section]
 ++++++[section]
@@ -46,6 +46,6 @@
 ++++++++[spin button] name='Minutes Test label' labelled-by=[label] current=5.000000 minimum=0.000000 maximum=59.000000
 ++++++++[static] name=' '
 ++++++++[spin button] name='AM/PM Test label' labelled-by=[label] current=2.000000 minimum=1.000000 maximum=2.000000
-++++[push button] name='Show time picker'
+++++[push button] name='Show time picker' description='Show time picker' description-from:tooltip
 ++[push button] name='aria label'
-++[push button] name='Test label' labelled-by=[label]
+++[push button] name='Test label' labelled-by=[label]
diff --git a/content/test/data/accessibility/html/interactive-controls-with-labels-expected-blink.txt b/content/test/data/accessibility/html/interactive-controls-with-labels-expected-blink.txt
@@ -100,7 +100,7 @@ rootWebArea
 ++++++++++++spinButton name='AM/PM aria label' placeholder='--' value='PM' valueForRange=2.00 minValueForRange=1.00 maxValueForRange=2.00
 ++++++++++++++staticText name='PM'
 ++++++++++++++++inlineTextBox name='PM'
-++++++++popUpButton name='Show time picker'
+++++++++popUpButton description='Show time picker' name='Show time picker' descriptionFrom=title
 ++++++inputTime name='Test label' value='12:05'
 ++++++++genericContainer
 ++++++++++genericContainer
@@ -117,7 +117,7 @@ rootWebArea
 ++++++++++++spinButton name='AM/PM Test label' placeholder='--' value='PM' valueForRange=2.00 minValueForRange=1.00 maxValueForRange=2.00
 ++++++++++++++staticText name='PM'
 ++++++++++++++++inlineTextBox name='PM'
-++++++++popUpButton name='Show time picker'
+++++++++popUpButton description='Show time picker' name='Show time picker' descriptionFrom=title
 ++++++colorWell name='aria label' value='#e4e4e4'
 ++++++++genericContainer ignored
 ++++++++++genericContainer ignored

diff --git a/content/test/data/accessibility/html/interactive-controls-with-labels-expected-win.txt b/content/test/data/accessibility/html/interactive-controls-with-labels-expected-win.txt
@@ -37,7 +37,7 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
 ++++++++ROLE_SYSTEM_SPINBUTTON name='Minutes aria label' value='05' FOCUSABLE
 ++++++++ROLE_SYSTEM_STATICTEXT name=' '
 ++++++++ROLE_SYSTEM_SPINBUTTON name='AM/PM aria label' value='PM' FOCUSABLE
-++++ROLE_SYSTEM_BUTTONMENU name='Show time picker' FOCUSABLE HASPOPUP
+++++ROLE_SYSTEM_BUTTONMENU name='Show time picker' FOCUSABLE HASPOPUP description-from:tooltip description='Show time picker'
 ++ROLE_SYSTEM_GROUPING name='Test label' value='12:05' FOCUSABLE
 ++++IA2_ROLE_SECTION
 ++++++IA2_ROLE_SECTION
@@ -46,6 +46,6 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
 ++++++++ROLE_SYSTEM_SPINBUTTON name='Minutes Test label' value='05' FOCUSABLE
 ++++++++ROLE_SYSTEM_STATICTEXT name=' '
 ++++++++ROLE_SYSTEM_SPINBUTTON name='AM/PM Test label' value='PM' FOCUSABLE
-++++ROLE_SYSTEM_BUTTONMENU name='Show time picker' FOCUSABLE HASPOPUP
+++++ROLE_SYSTEM_BUTTONMENU name='Show time picker' FOCUSABLE HASPOPUP description-from:tooltip description='Show time picker'
 ++IA2_ROLE_COLOR_CHOOSER name='aria label' value='89% red 89% green 89% blue' FOCUSABLE
 ++IA2_ROLE_COLOR_CHOOSER name='Test label' value='89% red 89% green 89% blue' FOCUSABLE
diff --git a/third_party/blink/renderer/core/html/forms/picker_indicator_element.cc b/third_party/blink/renderer/core/html/forms/picker_indicator_element.cc
@@ -51,6 +51,11 @@ PickerIndicatorElement::PickerIndicatorElement(
       picker_indicator_owner_(&picker_indicator_owner) {
   SetShadowPseudoId(shadow_element_names::kPseudoCalendarPickerIndicator);
   setAttribute(html_names::kIdAttr, shadow_element_names::kIdPickerIndicator);
+  // Set the tooltip title.
+  setAttribute(
+      html_names::kTitleAttr,
+      AtomicString(
+          this->picker_indicator_owner_->AriaLabelForPickerIndicator()));
 }
 
 PickerIndicatorElement::~PickerIndicatorElement() {

diff --git a/third_party/blink/renderer/core/input/event_handler.cc b/third_party/blink/renderer/core/input/event_handler.cc
@@ -90,6 +90,7 @@
 #include "third_party/blink/renderer/core/style/cursor_data.h"
 #include "third_party/blink/renderer/core/svg/graphics/svg_image.h"
 #include "third_party/blink/renderer/core/svg/graphics/svg_image_for_container.h"
+#include "third_party/blink/renderer/core/svg/svg_use_element.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/cursors.h"
 #include "third_party/blink/renderer/platform/graphics/image_orientation.h"
@@ -173,6 +174,30 @@ gfx::Point DetermineHotSpot(const Image& image,
   return gfx::Point();
 }
 
+// Returns whether the hit element contains a title and isn't a SVGUseElement or
+// part of an SVGUseElement.
+bool HasTitleAndNotSVGUseElement(const HitTestResult& hovered_node_result) {
+  // TODO(crbug.com/1473774): Remove flag check if no issues arise.
+  if (!RuntimeEnabledFeatures::SkipShadowHostWhenHoveringForTooltipEnabled()) {
+    return false;
+  }
+  Node* inner_node = hovered_node_result.InnerNode();
+  if (!inner_node) {
+    return false;
+  }
+  auto* element = DynamicTo<Element>(inner_node);
+  if (!element || element->title().IsNull()) {
+    return false;
+  }
+  ShadowRoot* containing_shadow_root = inner_node->ContainingShadowRoot();
+  if (IsA<SVGUseElement>(element) ||
+      (containing_shadow_root &&
+       IsA<SVGUseElement>(containing_shadow_root->host()))) {
+    return false;
+  }
+  return true;
+}
+
 }  // namespace
 
 // The amount of time to wait for a cursor update on style and layout changes
@@ -955,7 +980,11 @@ WebInputEventResult EventHandler::HandleMouseMoveEvent(
       layer_scrollable_area->MouseMovedInContentArea();
   }
 
-  hovered_node_result.SetToShadowHostIfInUAShadowRoot();
+  // Should not convert the hit shadow element to its shadow host, so that
+  // tooltips in the shadow tree appear correctly.
+  if (!HasTitleAndNotSVGUseElement(hovered_node_result)) {
+    hovered_node_result.SetToShadowHostIfInUAShadowRoot();
+  }
   page->GetChromeClient().MouseDidMoveOverElement(*frame_, location,
                                                   hovered_node_result);
 

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3342,6 +3342,15 @@
       status: "experimental",
       base_feature: "none",
     },
+    {
+      // When hovering on an element that contains a title, skip converting the
+      // HitTestResult to the shadow host. This is used to ensure tooltips in
+      // the shadow tree appear correctly. This is to be used as a killswitch in
+      // case of any issues.
+      // TODO(crbug.com/1473774): Remove flag if no issues arise.
+      name: "SkipShadowHostWhenHoveringForTooltip",
+      status: "stable",
+    },
     {
       // Skips the browser touch event filter, ensuring that events that reach
       // the queue and would otherwise be filtered out will instead be passed

diff --git a/third_party/blink/web_tests/fast/forms/suggested-value-expected.txt b/third_party/blink/web_tests/fast/forms/suggested-value-expected.txt
@@ -60,6 +60,7 @@ instead of "initial value".
 |       <div>
 |         id="picker"
 |         pseudo="-webkit-calendar-picker-indicator"
+|         title="Show month picker"
 |         shadow:pseudoId="-webkit-calendar-picker-indicator"
 | <textarea>
 |   id="textarea"

diff --git a/...eb_tests/virtual/date-input-inline-block-disabled/fast/forms/suggested-value-expected.txt b/...eb_tests/virtual/date-input-inline-block-disabled/fast/forms/suggested-value-expected.txt
@@ -57,6 +57,7 @@ instead of "initial value".
 |     <div>
 |       id="picker"
 |       pseudo="-webkit-calendar-picker-indicator"
+|       title="Show month picker"
 |       shadow:pseudoId="-webkit-calendar-picker-indicator"
 | <textarea>
 |   id="textarea"