[SelectMisspellingAsync #1] Move SelectMisspellingAsync() from ContextMenuClient.cpp to SpellChecker

third_party/WebKit/Source/core/page/ContextMenuClient.cpp

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 85 matching lines @@
       WebDataSource* ds = WebDataSourceImpl::FromDocumentLoader(dl);
       if (ds) {
         return ds->HasUnreachableURL() ? ds->UnreachableURL()
                                        : ds->GetRequest().Url();
       }
     }
   }
   return WebURL();
 }
 
-static bool IsWhiteSpaceOrPunctuation(UChar c) {
-  return IsSpaceOrNewline(c) || WTF::Unicode::IsPunct(c);
-}
-
-static String SelectMisspellingAsync(LocalFrame* selected_frame,
-                                     String& description) {
-  const Optional<std::pair<Node*, SpellCheckMarker*>>& node_and_marker =
-      selected_frame->GetSpellChecker().GetSpellCheckMarkerUnderSelection();
-  if (!node_and_marker)
-    return String();
-
-  Node* const marker_node = node_and_marker.value().first;
-  const SpellCheckMarker* const marker = node_and_marker.value().second;
-  description = marker->Description();
-
-  Range* const marker_range =
-      Range::Create(*selected_frame->GetDocument(), marker_node,
-                    marker->StartOffset(), marker_node, marker->EndOffset());
-
-  VisibleSelection selection =
-      selected_frame->Selection().ComputeVisibleSelectionInDOMTree();
-  // Caret and range selections (one of which we must have since we found a
-  // marker) always return valid normalized ranges.
-  const EphemeralRange& selection_range =
-      selection.ToNormalizedEphemeralRange();
-
-  if (marker_range->GetText().StripWhiteSpace(&IsWhiteSpaceOrPunctuation) !=
-      CreateRange(selection_range)
-          ->GetText()
-          .StripWhiteSpace(&IsWhiteSpaceOrPunctuation))
-    return String();
-
-  return marker_range->GetText();
-}
-
 // static
 int ContextMenuClient::ComputeEditFlags(Document& selected_document,
                                         Editor& editor) {
   int edit_flags = WebContextMenuData::kCanDoNone;
   if (!selected_document.IsHTMLDocument() &&
       !selected_document.IsXHTMLDocument())
     return edit_flags;
 
   edit_flags |= WebContextMenuData::kCanTranslate;
   if (editor.CanUndo())
@@ skipping 238 matching lines @@
   }
 
   if (r.IsContentEditable()) {
     data.is_editable = true;
 
     // Spellchecker adds spelling markers to misspelled words and attaches
     // suggestions to these markers in the background. Therefore, when a
     // user right-clicks a mouse on a word, Chrome just needs to find a
     // spelling marker on the word instead of spellchecking it.
     String description;
-    data.misspelled_word = SelectMisspellingAsync(selected_frame, description);
+    data.misspelled_word =
+        selected_frame->GetSpellChecker().SelectMisspellingAsync(description);
     if (description.length()) {
       Vector<String> suggestions;
       description.Split('\n', suggestions);
       data.dictionary_suggestions = suggestions;
     } else if (selected_web_frame->TextCheckClient()) {
       int misspelled_offset, misspelled_length;
       selected_web_frame->TextCheckClient()->CheckSpelling(
           data.misspelled_word, misspelled_offset, misspelled_length,
           &data.dictionary_suggestions);
     }
@@ skipping 132 matching lines @@
     output_items[i] = sub_items[i];
   sub_menu_items.Swap(output_items);
 }
 
 void ContextMenuClient::PopulateCustomMenuItems(const ContextMenu* default_menu,
                                                 WebContextMenuData* data) {
   PopulateSubMenuItems(default_menu->Items(), data->custom_items);
 }
 
 }  // namespace blink