Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2734943005: Remove moveCursorToSelectionEnd() (Closed)
Patch Set: For dtrainor@'s review Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index db3193f26adcf690a6f252fba7e0a16914608a2d..1af5e8ec904fbf531e3912d9e2bd7e42acad2c7d 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1523,7 +1523,7 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(InputMsg_SelectRange, OnSelectRange)
IPC_MESSAGE_HANDLER(InputMsg_AdjustSelectionByCharacterOffset,
OnAdjustSelectionByCharacterOffset)
- IPC_MESSAGE_HANDLER(InputMsg_Unselect, OnUnselect)
+ IPC_MESSAGE_HANDLER(InputMsg_CollapseSelection, OnCollapseSelection)
IPC_MESSAGE_HANDLER(InputMsg_MoveRangeSelectionExtent,
OnMoveRangeSelectionExtent)
IPC_MESSAGE_HANDLER(InputMsg_Replace, OnReplace)
@@ -1898,9 +1898,14 @@ void RenderFrameImpl::OnAdjustSelectionByCharacterOffset(int start_adjust,
range.length() + end_adjust - start_adjust));
}
-void RenderFrameImpl::OnUnselect() {
+void RenderFrameImpl::OnCollapseSelection() {
+ const WebRange& range =
+ GetRenderWidget()->GetWebWidget()->caretOrSelectionRange();
+ if (range.isNull())
+ return;
+
base::AutoReset<bool> handling_select_range(&handling_select_range_, true);
- frame_->executeCommand(WebString::fromUTF8("Unselect"));
+ frame_->selectRange(WebRange(range.endOffset(), 0));
}
void RenderFrameImpl::OnMoveRangeSelectionExtent(const gfx::Point& point) {
@@ -5633,7 +5638,7 @@ void RenderFrameImpl::OnFind(int request_id,
}
void RenderFrameImpl::OnClearActiveFindMatch() {
- frame_->executeCommand(WebString::fromUTF8("Unselect"));
+ frame_->executeCommand(WebString::fromUTF8("CollapseSelection"));
frame_->clearActiveFindMatch();
}
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698