diff options
Diffstat (limited to 'webkit/glue/context_menu_client_impl.cc')
-rw-r--r-- | webkit/glue/context_menu_client_impl.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/webkit/glue/context_menu_client_impl.cc b/webkit/glue/context_menu_client_impl.cc index 79ee0a4..64222c2 100644 --- a/webkit/glue/context_menu_client_impl.cc +++ b/webkit/glue/context_menu_client_impl.cc @@ -46,16 +46,16 @@ bool IsASingleWord(const std::wstring& text) { return false; } } - + // 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 +// 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. std::wstring GetMisspelledWord(const WebCore::ContextMenu* default_menu, @@ -68,7 +68,7 @@ std::wstring GetMisspelledWord(const WebCore::ContextMenu* default_menu, false); // Don't provide suggestions for multiple words. - if (!misspelled_word_string.empty() && + if (!misspelled_word_string.empty() && !IsASingleWord(misspelled_word_string)) return L""; @@ -83,16 +83,16 @@ std::wstring GetMisspelledWord(const WebCore::ContextMenu* default_menu, selection = WebCore::VisibleSelection(pos); selection.expandUsingGranularity(WebCore::WordGranularity); } - - if (selection.isRange()) { + + if (selection.isRange()) { selected_frame->setSelectionGranularity(WebCore::WordGranularity); } - + if (selected_frame->shouldChangeSelection(selection)) selected_frame->selection()->setSelection(selection); - + misspelled_word_string = CollapseWhitespace( - webkit_glue::StringToStdWString(selected_frame->selectedText()), + webkit_glue::StringToStdWString(selected_frame->selectedText()), false); // If misspelled word is empty, then that portion should not be selected. @@ -140,7 +140,7 @@ WebCore::PlatformMenuDescription ContextMenuClientImpl::getCustomMenuFromDefaultItems( WebCore::ContextMenu* default_menu) { // Displaying the context menu in this function is a big hack as we don't - // have context, i.e. whether this is being invoked via a script or in + // have context, i.e. whether this is being invoked via a script or in // response to user input (Mouse event WM_RBUTTONDOWN, // Keyboard events KeyVK_APPS, Shift+F10). Check if this is being invoked // in response to the above input events before popping up the context menu. @@ -172,7 +172,7 @@ WebCore::PlatformMenuDescription GURL frame_url; GURL page_url; std::string security_info; - + std::wstring frame_encoding; // Send the frame and page URLs in any case. ContextNode frame_node = ContextNode(ContextNode::NONE); @@ -203,7 +203,7 @@ WebCore::PlatformMenuDescription selected_frame); } } - + if (node.type == ContextNode::NONE) { if (selected_frame != webview_->main_frame()->frame()) { node = frame_node; |