WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/platform/ContextMenu.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Christian Dywan <christian@imendio.com>
  *
  * 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
@@ skipping 174 matching lines @@
     textDirectionMenu.appendItem(ltr);
     textDirectionMenu.appendItem(rtl);
 
     textDirectionMenuItem.setSubMenu(&textDirectionMenu);
 }
 #endif
 
 static bool selectionContainsPossibleWord(Frame* frame)
 {
     // Current algorithm: look for a character that's not just a separator.
-    for (TextIterator it(frame->selection()->toRange().get()); !it.atEnd(); it.advance()) {
+    for (TextIterator it(frame->selection()->toNormalizedRange().get()); !it.atEnd(); it.advance()) {
         int length = it.length();
         const UChar* characters = it.characters();
         for (int i = 0; i < length; ++i)
             if (!(category(characters[i]) & (Separator_Space | Separator_Line | Separator_Paragraph)))
                 return true;
     }
     return false;
 }
 
 void ContextMenu::populate()
@@ skipping 442 matching lines @@
         case ContextMenuItemBaseApplicationTag:
             break;
     }
 
     item.setChecked(shouldCheck);
     item.setEnabled(shouldEnable);
 }
 
 }