Move HTMLSelectElement::UpdateMultiSelectListBoxFocus() to SelectType

This CL has no behavior changes.

Bug: 1052232
Change-Id: I9417bbe69cc2de2a171b537d50a487923165bafe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2065569Reviewed-by: Koji Ishii <kojii@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742953}

third_party/blink/renderer/core/html/forms/html_select_element.cc

@@ -95,7 +95,6 @@ HTMLSelectElement::HTMLSelectElement(Document& document)
       size_(0),
       last_on_change_option_(nullptr),
       is_multiple_(false),
-      is_in_non_contiguous_selection_(false),
       active_selection_state_(false),
       should_recalc_list_items_(false),
       is_autofilled_by_preview_(false),
@@ -665,7 +664,7 @@ void HTMLSelectElement::UpdateListBoxSelection(bool deselect_other_options,
     ++i;
   }
 
-  UpdateMultiSelectListBoxFocus();
+  select_type_->UpdateMultiSelectFocus();
   SetNeedsValidityCheck();
   if (scroll)
     ScrollToSelection();
@@ -703,20 +702,6 @@ void HTMLSelectElement::ListBoxOnChange() {
   }
 }
 
-void HTMLSelectElement::UpdateMultiSelectListBoxFocus() {
-  if (!is_multiple_)
-    return;
-
-  for (auto* const option : GetOptionList()) {
-    if (option->IsDisabledFormControl() || !option->GetLayoutObject())
-      continue;
-    bool is_focused =
-        (option == active_selection_end_) && is_in_non_contiguous_selection_;
-    option->SetMultiSelectFocusedState(is_focused);
-  }
-  ScrollToSelection();
-}
-
 void HTMLSelectElement::DispatchInputAndChangeEventForMenuList() {
   DCHECK(UsesMenuList());
 

third_party/blink/renderer/core/html/forms/html_select_element.h

@@ -265,7 +265,6 @@ class CORE_EXPORT HTMLSelectElement final
                                    wtf_size_t list_index_start,
                                    wtf_size_t list_index_end) const;
   void UpdateListBoxSelection(bool deselect_other_options, bool scroll = true);
-  void UpdateMultiSelectListBoxFocus();
   void SetIndexToSelectOnCancel(int list_index);
   void SetSuggestedOption(HTMLOptionElement*);
   void ToggleSelection(HTMLOptionElement&);
@@ -319,7 +318,6 @@ class CORE_EXPORT HTMLSelectElement final
   Member<HTMLOptionElement> suggested_option_;
   bool uses_menu_list_ = true;
   bool is_multiple_;
-  bool is_in_non_contiguous_selection_;
   bool active_selection_state_;
   mutable bool should_recalc_list_items_;
   bool is_autofilled_by_preview_;

third_party/blink/renderer/core/html/forms/select_type.cc

@@ -335,6 +335,10 @@ class ListBoxSelectType final : public SelectType {
  public:
   explicit ListBoxSelectType(HTMLSelectElement& select) : SelectType(select) {}
   bool DefaultEventHandler(const Event& event) override;
+  void UpdateMultiSelectFocus() override;
+
+ private:
+  bool is_in_non_contiguous_selection_ = false;
 };
 
 bool ListBoxSelectType::DefaultEventHandler(const Event& event) {
@@ -527,12 +531,11 @@ bool ListBoxSelectType::DefaultEventHandler(const Event& event) {
 
       select_->SetActiveSelectionEnd(end_option);
 
-      select_->is_in_non_contiguous_selection_ =
-          select_->is_multiple_ && is_control_key;
+      is_in_non_contiguous_selection_ = select_->is_multiple_ && is_control_key;
       bool select_new_item =
           !select_->is_multiple_ || keyboard_event->shiftKey() ||
           (!IsSpatialNavigationEnabled(select_->GetDocument().GetFrame()) &&
-           !select_->is_in_non_contiguous_selection_);
+           !is_in_non_contiguous_selection_);
       if (select_new_item)
         select_->active_selection_state_ = true;
       // If the anchor is uninitialized, or if we're going to deselect all
@@ -546,12 +549,12 @@ bool ListBoxSelectType::DefaultEventHandler(const Event& event) {
       }
 
       select_->ScrollToOption(end_option);
-      if (select_new_item || select_->is_in_non_contiguous_selection_) {
+      if (select_new_item || is_in_non_contiguous_selection_) {
         if (select_new_item) {
           select_->UpdateListBoxSelection(deselect_others);
           select_->ListBoxOnChange();
         }
-        select_->UpdateMultiSelectListBoxFocus();
+        UpdateMultiSelectFocus();
       } else {
         select_->ScrollToSelection();
       }
@@ -572,7 +575,7 @@ bool ListBoxSelectType::DefaultEventHandler(const Event& event) {
       return true;
     } else if (select_->is_multiple_ && key_code == ' ' &&
                (IsSpatialNavigationEnabled(select_->GetDocument().GetFrame()) ||
-                select_->is_in_non_contiguous_selection_)) {
+                is_in_non_contiguous_selection_)) {
       HTMLOptionElement* option = select_->active_selection_end_;
       // If there's no active selection,
       // act as if "ArrowDown" had been pressed.
@@ -589,6 +592,20 @@ bool ListBoxSelectType::DefaultEventHandler(const Event& event) {
   return false;
 }
 
+void ListBoxSelectType::UpdateMultiSelectFocus() {
+  if (!select_->is_multiple_)
+    return;
+
+  for (auto* const option : select_->GetOptionList()) {
+    if (option->IsDisabledFormControl() || !option->GetLayoutObject())
+      continue;
+    bool is_focused = (option == select_->active_selection_end_) &&
+                      is_in_non_contiguous_selection_;
+    option->SetMultiSelectFocusedState(is_focused);
+  }
+  select_->ScrollToSelection();
+}
+
 // ============================================================================
 
 SelectType::SelectType(HTMLSelectElement& select) : select_(select) {}
@@ -624,4 +641,6 @@ const ComputedStyle* SelectType::OptionStyle() const {
   return nullptr;
 }
 
+void SelectType::UpdateMultiSelectFocus() {}
+
 }  // namespace blink

third_party/blink/renderer/core/html/forms/select_type.h

@@ -36,6 +36,9 @@ class SelectType : public GarbageCollected<SelectType> {
 
   virtual const ComputedStyle* OptionStyle() const;
 
+  // Update :-internal-multi-select-focus state of selected OPTIONs.
+  virtual void UpdateMultiSelectFocus();
+
   // TODO(crbug.com/1052232): Add more virtual functions.
 
  protected: