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

Unified Diff: Source/core/editing/SelectionController.cpp

Issue 1191253002: Templatize handleMousePressEventSingleClick in SelectionController (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-06-19T17:58:51 Created 5 years, 6 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 | « Source/core/editing/SelectionController.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/SelectionController.cpp
diff --git a/Source/core/editing/SelectionController.cpp b/Source/core/editing/SelectionController.cpp
index 879285ebc0c4e1b5faee79b3bfc2af8c8ba626c4..2f0bae1eded7d0d971e29a4e87a384c8ab1e67bf 100644
--- a/Source/core/editing/SelectionController.cpp
+++ b/Source/core/editing/SelectionController.cpp
@@ -250,7 +250,14 @@ static int textDistance(const Position& start, const Position& end)
bool SelectionController::handleMousePressEventSingleClick(const MouseEventWithHitTestResults& event)
{
+ return handleMousePressEventSingleClickAlgorithm<VisibleSelection::InDOMTree>(event);
+}
+
+template <typename Strategy>
+bool SelectionController::handleMousePressEventSingleClickAlgorithm(const MouseEventWithHitTestResults& event)
+{
TRACE_EVENT0("blink", "SelectionController::handleMousePressEventSingleClick");
+ using PositionType = typename Strategy::PositionType;
m_frame->document()->updateLayoutIgnorePendingStylesheets();
Node* innerNode = event.innerNode();
@@ -273,7 +280,7 @@ bool SelectionController::handleMousePressEventSingleClick(const MouseEventWithH
VisiblePosition visiblePos(innerNode->layoutObject()->positionForPoint(event.localPoint()));
if (visiblePos.isNull())
visiblePos = VisiblePosition(firstPositionInOrBeforeNode(innerNode), DOWNSTREAM);
- Position pos = visiblePos.deepEquivalent();
+ PositionType pos = Strategy::toPositionType(visiblePos.deepEquivalent());
VisibleSelection newSelection = m_frame->selection().selection();
TextGranularity granularity = CharacterGranularity;
@@ -281,18 +288,18 @@ bool SelectionController::handleMousePressEventSingleClick(const MouseEventWithH
if (extendSelection && newSelection.isCaretOrRange()) {
VisibleSelection selectionInUserSelectAll(expandSelectionToRespectUserSelectAll(innerNode, VisibleSelection(VisiblePosition(pos))));
if (selectionInUserSelectAll.isRange()) {
- if (comparePositions(selectionInUserSelectAll.start(), newSelection.start()) < 0)
- pos = selectionInUserSelectAll.start();
- else if (comparePositions(newSelection.end(), selectionInUserSelectAll.end()) < 0)
- pos = selectionInUserSelectAll.end();
+ if (Strategy::selectionStart(selectionInUserSelectAll).compareTo(Strategy::selectionStart(newSelection)) < 0)
+ pos = Strategy::selectionStart(selectionInUserSelectAll);
+ else if (Strategy::selectionEnd(newSelection).compareTo(Strategy::selectionEnd(selectionInUserSelectAll)) < 0)
+ pos = Strategy::selectionEnd(selectionInUserSelectAll);
}
if (!m_frame->editor().behavior().shouldConsiderSelectionAsDirectional()) {
if (pos.isNotNull()) {
// See <rdar://problem/3668157> REGRESSION (Mail): shift-click deselects when selection
// was created right-to-left
- Position start = newSelection.start();
- Position end = newSelection.end();
+ PositionType start = Strategy::selectionStart(newSelection);
+ PositionType end = Strategy::selectionEnd(newSelection);
int distanceToStart = textDistance(start, pos);
int distanceToEnd = textDistance(pos, end);
if (distanceToStart <= distanceToEnd)
« no previous file with comments | « Source/core/editing/SelectionController.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698