Fix more corner cases for empty touch selection.

third_party/WebKit/Source/core/editing/SelectionController.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * 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
@@ skipping 285 matching lines @@
 {
     Node* innerNode = result.innerNode();
     VisibleSelectionInFlatTree newSelection;
 
     if (!innerNode || !innerNode->layoutObject())
         return;
 
     // Special-case image local offset to always be zero, to avoid triggering
     // LayoutReplaced::positionFromPoint's advancement of the position at the
     // mid-point of the the image (which was intended for mouse-drag selection
-    // and isn't desirable for long-press).
+    // and isn't desirable for touch).
     HitTestResult adjustedHitTestResult = result;
-    if (selectInputEventType == SelectInputEventType::GestureLongPress && result.image())
+    if (selectInputEventType == SelectInputEventType::Touch && result.image())
         adjustedHitTestResult.setNodeAndPosition(result.innerNode(), LayoutPoint(0, 0));
 
     const VisiblePositionInFlatTree& pos = visiblePositionOfHitTestResult(adjustedHitTestResult);
     if (pos.isNotNull()) {
         newSelection = VisibleSelectionInFlatTree(pos);
         newSelection.expandUsingGranularity(WordGranularity);
     }
 
-    if (selectInputEventType == SelectInputEventType::GestureLongPress) {
+    if (selectInputEventType == SelectInputEventType::Touch) {
         // If node doesn't have text except space, tab or line break, do not
         // select that 'empty' area.
         EphemeralRangeInFlatTree range(newSelection.start(), newSelection.end());
         const String& str = plainText(range, TextIteratorEmitsObjectReplacementCharacter);
         if (str.isEmpty() || str.simplifyWhiteSpace().containsOnlyWhitespace())
             return;
+
+        if (newSelection.rootEditableElement() && pos.deepEquivalent() == VisiblePositionInFlatTree::lastPositionInNode(newSelection.rootEditableElement()).deepEquivalent())
+            return;
     }
 
     if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend && newSelection.isRange())
         newSelection.appendTrailingWhitespace();
 
     updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), WordGranularity);
 }
 
 void SelectionController::selectClosestMisspellingFromHitTestResult(const HitTestResult& result, AppendTrailingWhitespace appendTrailingWhitespace)
 {
@@ skipping 21 matching lines @@
     updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), WordGranularity);
 }
 
 void SelectionController::selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults& result)
 {
     if (!m_mouseDownMayStartSelect)
         return;
 
     AppendTrailingWhitespace appendTrailingWhitespace = (result.event().clickCount() == 2 && m_frame->editor().isSelectTrailingWhitespaceEnabled()) ? AppendTrailingWhitespace::ShouldAppend : AppendTrailingWhitespace::DontAppend;
 
-    return selectClosestWordFromHitTestResult(result.hitTestResult(), appendTrailingWhitespace, SelectInputEventType::Mouse);
+    return selectClosestWordFromHitTestResult(result.hitTestResult(), appendTrailingWhitespace, result.event().fromTouch() ? SelectInputEventType::Touch : SelectInputEventType::Mouse);
 }
 
 void SelectionController::selectClosestMisspellingFromMouseEvent(const MouseEventWithHitTestResults& result)
 {
     if (!m_mouseDownMayStartSelect)
         return;
 
     selectClosestMisspellingFromHitTestResult(result.hitTestResult(),
         (result.event().clickCount() == 2 && m_frame->editor().isSelectTrailingWhitespaceEnabled()) ? AppendTrailingWhitespace::ShouldAppend : AppendTrailingWhitespace::DontAppend);
 
@@ skipping 196 matching lines @@
     if (!selection().isAvailable())
         return false;
     if (hitTestResult.isLiveLink())
         return false;
 
     Node* innerNode = hitTestResult.innerNode();
     bool innerNodeIsSelectable = innerNode && (innerNode->isContentEditable() || innerNode->isTextNode() || innerNode->canStartSelection());
     if (!innerNodeIsSelectable)
         return false;
 
-    selectClosestWordFromHitTestResult(hitTestResult, AppendTrailingWhitespace::DontAppend, SelectInputEventType::GestureLongPress);
+    selectClosestWordFromHitTestResult(hitTestResult, AppendTrailingWhitespace::DontAppend, SelectInputEventType::Touch);
     if (!selection().isAvailable()) {
         // "editing/selection/longpress-selection-in-iframe-removed-crash.html"
         // reach here.
         return false;
     }
     return selection().isRange();
 }
 
 void SelectionController::sendContextMenuEvent(const MouseEventWithHitTestResults& mev, const LayoutPoint& position)
 {
@@ skipping 68 matching lines @@
 {
     return m_frame->selection();
 }
 
 bool isLinkSelection(const MouseEventWithHitTestResults& event)
 {
     return event.event().altKey() && event.isOverLink();
 }
 
 } // namespace blink