Move HTMLSelectElement::ToggleSelection() to ListBoxSelectType

This CL has no behavior changes.

Bug: 1052232
Change-Id: I8ea8e3480edce7a34e06883c14692788c7868ce5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2094490
Commit-Queue: Kent Tamura <tkent@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Auto-Submit: Kent Tamura <tkent@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748586}

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

@@ -1255,12 +1255,6 @@ void HTMLSelectElement::HandleMouseRelease() {
   ListBoxOnChange();
 }
 
-void HTMLSelectElement::ToggleSelection(HTMLOptionElement& option) {
-  active_selection_state_ = !active_selection_state_;
-  UpdateSelectedState(&option, true /*multi*/, false /*shift*/);
-  ListBoxOnChange();
-}
-
 void HTMLSelectElement::DefaultEventHandler(Event& event) {
   if (!GetLayoutObject())
     return;

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

@@ -261,7 +261,6 @@ class CORE_EXPORT HTMLSelectElement final
   void UpdateListBoxSelection(bool deselect_other_options, bool scroll = true);
   void SetIndexToSelectOnCancel(int list_index);
   void SetSuggestedOption(HTMLOptionElement*);
-  void ToggleSelection(HTMLOptionElement&);
 
   // Returns nullptr if listIndex is out of bounds, or it doesn't point an
   // HTMLOptionElement.

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

@@ -614,6 +614,7 @@ class ListBoxSelectType final : public SelectType {
  private:
   HTMLOptionElement* NextSelectableOptionPageAway(HTMLOptionElement*,
                                                   SkipDirection) const;
+  void ToggleSelection(HTMLOptionElement& option);
 
   bool is_in_non_contiguous_selection_ = false;
 };
@@ -793,7 +794,7 @@ bool ListBoxSelectType::DefaultEventHandler(const Event& event) {
     if (select_->is_multiple_ && keyboard_event->keyCode() == ' ' &&
         is_control_key && select_->active_selection_end_) {
       // Use ctrl+space to toggle selection change.
-      select_->ToggleSelection(*select_->active_selection_end_);
+      ToggleSelection(*select_->active_selection_end_);
       return true;
     }
 
@@ -858,7 +859,7 @@ bool ListBoxSelectType::DefaultEventHandler(const Event& event) {
         option = NextSelectableOption(select_->LastSelectedOption());
       if (option) {
         // Use space to toggle selection change.
-        select_->ToggleSelection(*option);
+        ToggleSelection(*option);
         return true;
       }
     }
@@ -924,6 +925,12 @@ HTMLOptionElement* ListBoxSelectType::NextSelectableOptionPageAway(
   return NextValidOption(edge_index, direction, skip_amount);
 }
 
+void ListBoxSelectType::ToggleSelection(HTMLOptionElement& option) {
+  select_->active_selection_state_ = !select_->active_selection_state_;
+  select_->UpdateSelectedState(&option, true /*multi*/, false /*shift*/);
+  select_->ListBoxOnChange();
+}
+
 // ============================================================================
 
 SelectType::SelectType(HTMLSelectElement& select) : select_(select) {}