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

Unified Diff: third_party/WebKit/Source/core/editing/FrameSelection.cpp

Issue 2664253002: Revert "Blink handle selection handle visibility" (Closed)
Patch Set: Created 3 years, 11 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
Index: third_party/WebKit/Source/core/editing/FrameSelection.cpp
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.cpp b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
index 0238e0b185480ab4010b2ce338dc56d0336b45ea..7948a8a06b0a12b343c08bf0264c86a4a8cc3031 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
@@ -169,8 +169,7 @@ void FrameSelection::moveCaretSelection(const IntPoint& point) {
builder.setIsDirectional(selection().isDirectional());
if (position.isNotNull())
builder.collapse(position.toPositionWithAffinity());
- setSelection(builder.build(),
- CloseTyping | ClearTypingStyle | UserTriggered | HandleVisible);
+ setSelection(builder.build(), CloseTyping | ClearTypingStyle | UserTriggered);
}
template <typename Strategy>
@@ -187,9 +186,6 @@ void FrameSelection::setSelectionAlgorithm(
m_granularityStrategy->Clear();
bool closeTyping = options & CloseTyping;
bool shouldClearTypingStyle = options & ClearTypingStyle;
- const HandleVisibility handleVisibility = options & HandleVisible
- ? HandleVisibility::Visible
- : HandleVisibility::NotVisible;
EUserTriggered userTriggered = selectionOptionsToUserTriggered(options);
// TODO(editing-dev): We should rename variable |s| to another name to avoid
@@ -208,8 +204,7 @@ void FrameSelection::setSelectionAlgorithm(
if (shouldClearTypingStyle)
clearTypingStyle();
- if (m_selectionEditor->visibleSelection<Strategy>() == s &&
- m_handleVisibility == handleVisibility) {
+ if (m_selectionEditor->visibleSelection<Strategy>() == s) {
// Even if selection was not changed, selection offsets may have been
// changed.
m_frame->inputMethodController().cancelCompositionIfSelectionIsInvalid();
@@ -221,7 +216,6 @@ void FrameSelection::setSelectionAlgorithm(
visibleSelection<Strategy>();
const Position& oldSelectionStart = selection().start();
- m_handleVisibility = handleVisibility;
m_selectionEditor->setVisibleSelection(s, options);
m_frameCaret->setCaretRectNeedsUpdate();
@@ -1353,8 +1347,7 @@ void FrameSelection::moveRangeSelectionExtent(const IntPoint& contentsPoint) {
granularityStrategy()->updateExtent(contentsPoint, m_frame);
setSelection(newSelection,
FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle |
- FrameSelection::DoNotClearStrategy | UserTriggered |
- FrameSelection::HandleVisible,
+ FrameSelection::DoNotClearStrategy | UserTriggered,
CursorAlignOnScroll::IfNeeded, CharacterGranularity);
}
@@ -1375,11 +1368,8 @@ void FrameSelection::moveRangeSelection(const VisiblePosition& basePosition,
if (newSelection.isNone())
return;
- SetSelectionOptions options = CloseTyping | ClearTypingStyle;
- if (isHandleVisible())
- options |= HandleVisible;
- setSelection(newSelection, options, CursorAlignOnScroll::IfNeeded,
- granularity);
+ setSelection(newSelection, CloseTyping | ClearTypingStyle,
+ CursorAlignOnScroll::IfNeeded, granularity);
}
void FrameSelection::updateIfNeeded() {
« no previous file with comments | « third_party/WebKit/Source/core/editing/FrameSelection.h ('k') | third_party/WebKit/Source/core/editing/SelectionController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698