Don't change selection if some texts were already selected....

webkit/glue/context_menu_client_impl.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "ContextMenu.h"
 #include "Document.h"
@@ skipping 38 matching lines @@
   // Check for 0 words.
   if (!word_count)
     return false;
 
   // Has a single word.
   return true;
 }
 
 // Helper function to get misspelled word on which context menu
 // is to be evolked. This function also sets the word on which context menu
-// has been evoked to be the selected word, as required.
+// has been evoked to be the selected word, as required. This function changes
+// the selection only when there were no selected characters.
 std::wstring GetMisspelledWord(const WebCore::ContextMenu* default_menu,
                                WebCore::Frame* selected_frame) {
   std::wstring misspelled_word_string;
 
   // First select from selectedText to check for multiple word selection.
   misspelled_word_string = CollapseWhitespace(
       webkit_glue::StringToStdWString(selected_frame->selectedText()),
       false);
 
-  // Don't provide suggestions for multiple words.
-  if (!misspelled_word_string.empty() &&
-      !IsASingleWord(misspelled_word_string))
-    return L"";
+  // If some texts were already selected, we don't change the selection.
+  if (!misspelled_word_string.empty()) {
+    // Don't provide suggestions for multiple words.
+    if (!IsASingleWord(misspelled_word_string))
+      return L"";
+    else
+      return misspelled_word_string;
+  }
 
   WebCore::HitTestResult hit_test_result = selected_frame->eventHandler()->
       hitTestResultAtPoint(default_menu->hitTestResult().point(), true);
   WebCore::Node* inner_node = hit_test_result.innerNode();
   WebCore::VisiblePosition pos(inner_node->renderer()->positionForPoint(
       hit_test_result.localPoint()));
 
   WebCore::VisibleSelection selection;
   if (pos.isNotNull()) {
     selection = WebCore::VisibleSelection(pos);
@@ skipping 193 matching lines @@
 
 bool ContextMenuClientImpl::shouldIncludeInspectElementItem() {
     return false;  // TODO(jackson): Eventually include the inspector context menu item
 }
 
 #if defined(OS_MACOSX)
 void ContextMenuClientImpl::searchWithSpotlight() {
   // TODO(pinkerton): write this
 }
 #endif