WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/page/ContextMenuController.cpp

 /*
  * Copyright (C) 2006, 2007 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 175 matching lines @@
 #if PLATFORM(GTK)
         case ContextMenuItemTagDelete:
             frame->editor()->performDelete();
             break;
         case ContextMenuItemTagSelectAll:
             frame->editor()->command("SelectAll").execute();
             break;
 #endif
         case ContextMenuItemTagSpellingGuess:
             ASSERT(frame->selectedText().length());
-            if (frame->editor()->shouldInsertText(item->title(), frame->selection()->toRange().get(),
+            if (frame->editor()->shouldInsertText(item->title(), frame->selection()->toNormalizedRange().get(),
                 EditorInsertActionPasted)) {
                 Document* document = frame->document();
                 RefPtr<ReplaceSelectionCommand> command =
                     ReplaceSelectionCommand::create(document, createFragmentFromMarkup(document, item->title(), ""),
                                                                                    true, false, true);
                 applyCommand(command);
                 frame->revealSelection(RenderLayer::gAlignToEdgeIfNeeded);
             }
             break;
         case ContextMenuItemTagIgnoreSpelling:
@@ skipping 24 matching lines @@
             break;
         case ContextMenuItemTagUnderline:
             frame->editor()->toggleUnderline();
             break;
         case ContextMenuItemTagOutline:
             // We actually never enable this because CSS does not have a way to specify an outline font,
             // which may make this difficult to implement. Maybe a special case of text-shadow?
             break;
         case ContextMenuItemTagStartSpeaking: {
             ExceptionCode ec;
-            RefPtr<Range> selectedRange = frame->selection()->toRange();
+            RefPtr<Range> selectedRange = frame->selection()->toNormalizedRange();
             if (!selectedRange || selectedRange->collapsed(ec)) {
                 Document* document = result.innerNonSharedNode()->document();
                 selectedRange = document->createRange();
                 selectedRange->selectNode(document->documentElement(), ec);
             }
             m_client->speak(plainText(selectedRange.get()));
             break;
         }
         case ContextMenuItemTagStopSpeaking:
             m_client->stopSpeaking();
@@ skipping 50 matching lines @@
             if (Page* page = frame->page())
                 page->inspectorController()->inspect(result.innerNonSharedNode());
             break;
         default:
             break;
     }
 }
 
 } // namespace WebCore