Make non-null VisibleSelections creatable only by createVisibleSelection[Deprecated]

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 133 matching lines @@
 
     VisiblePositionInFlatTree visiblePos = visiblePositionOfHitTestResult(event.hitTestResult());
     if (visiblePos.isNull())
         visiblePos = createVisiblePosition(PositionInFlatTree::firstPositionInOrBeforeNode(innerNode));
     PositionInFlatTree pos = visiblePos.deepEquivalent();
 
     VisibleSelectionInFlatTree newSelection = selection().visibleSelection<EditingInFlatTreeStrategy>();
     TextGranularity granularity = CharacterGranularity;
 
     if (extendSelection && !newSelection.isNone()) {
-        const VisibleSelectionInFlatTree selectionInUserSelectAll(expandSelectionToRespectUserSelectAll(innerNode, VisibleSelectionInFlatTree(createVisiblePosition(pos))));
+        const VisibleSelectionInFlatTree selectionInUserSelectAll(expandSelectionToRespectUserSelectAll(innerNode, createVisibleSelectionDeprecated(createVisiblePosition(pos))));
         if (selectionInUserSelectAll.isRange()) {
             if (selectionInUserSelectAll.start().compareTo(newSelection.start()) < 0)
                 pos = selectionInUserSelectAll.start();
             else if (newSelection.end().compareTo(selectionInUserSelectAll.end()) < 0)
                 pos = selectionInUserSelectAll.end();
         }
 
         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
                 const PositionInFlatTree start = newSelection.start();
                 const PositionInFlatTree end = newSelection.end();
                 int distanceToStart = textDistance(start, pos);
                 int distanceToEnd = textDistance(pos, end);
                 if (distanceToStart <= distanceToEnd)
-                    newSelection = VisibleSelectionInFlatTree(end, pos);
+                    newSelection = createVisibleSelectionDeprecated(end, pos);
                 else
-                    newSelection = VisibleSelectionInFlatTree(start, pos);
+                    newSelection = createVisibleSelectionDeprecated(start, pos);
             }
         } else {
             newSelection.setExtent(pos);
         }
 
         if (selection().granularity() != CharacterGranularity) {
             granularity = selection().granularity();
             newSelection.expandUsingGranularity(selection().granularity());
         }
     } else if (m_selectionState != SelectionState::ExtendedSelection) {
-        newSelection = expandSelectionToRespectUserSelectAll(innerNode, VisibleSelectionInFlatTree(visiblePos));
+        newSelection = expandSelectionToRespectUserSelectAll(innerNode, createVisibleSelectionDeprecated(visiblePos));
     }
 
     // Updating the selection is considered side-effect of the event and so it doesn't impact the handled state.
     updateSelectionForMouseDownDispatchingSelectStart(innerNode, newSelection, granularity);
     return false;
 }
 
 void SelectionController::updateSelectionForMouseDrag(const HitTestResult& hitTestResult, Node* mousePressNode, const LayoutPoint& dragStartPos, const IntPoint& lastKnownMousePosition)
 {
     if (!m_mouseDownMayStartSelect)
@@ skipping 31 matching lines @@
     if (m_selectionState == SelectionState::HaveNotStartedSelection && dispatchSelectStart(target) != DispatchEventResult::NotCanceled)
         return;
 
     // TODO(yosin) We should check |mousePressNode|, |targetPosition|, and
     // |newSelection| are valid for |m_frame->document()|.
     // |dispatchSelectStart()| can change them by "selectstart" event handler.
 
     if (m_selectionState != SelectionState::ExtendedSelection) {
         // Always extend selection here because it's caused by a mouse drag
         m_selectionState = SelectionState::ExtendedSelection;
-        newSelection = VisibleSelectionInFlatTree(targetPosition);
+        newSelection = createVisibleSelectionDeprecated(targetPosition);
     }
 
     if (RuntimeEnabledFeatures::userSelectAllEnabled()) {
         // TODO(yosin) Should we use |Strategy::rootUserSelectAllForNode()|?
         Node* const rootUserSelectAllForMousePressNode = EditingInFlatTreeStrategy::rootUserSelectAllForNode(mousePressNode);
         Node* const rootUserSelectAllForTarget = EditingInFlatTreeStrategy::rootUserSelectAllForNode(target);
         if (rootUserSelectAllForMousePressNode && rootUserSelectAllForMousePressNode == rootUserSelectAllForTarget) {
             newSelection.setBase(mostBackwardCaretPosition(PositionInFlatTree::beforeNode(rootUserSelectAllForMousePressNode), CanCrossEditingBoundary));
             newSelection.setExtent(mostForwardCaretPosition(PositionInFlatTree::afterNode(rootUserSelectAllForMousePressNode), CanCrossEditingBoundary));
         } else {
@@ skipping 61 matching lines @@
     // 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 touch).
     HitTestResult adjustedHitTestResult = result;
     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 = createVisibleSelectionDeprecated(pos);
         newSelection.expandUsingGranularity(WordGranularity);
     }
 
     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, hasEditableStyle(*innerNode) ? TextIteratorEmitsObjectReplacementCharacter : TextIteratorDefaultBehavior);
         if (str.isEmpty() || str.simplifyWhiteSpace().containsOnlyWhitespace())
             return;
@@ skipping 17 matching lines @@
         return;
 
     const VisiblePositionInFlatTree& pos = visiblePositionOfHitTestResult(result);
     if (pos.isNotNull()) {
         const PositionInFlatTree& markerPosition = pos.deepEquivalent().parentAnchoredEquivalent();
         DocumentMarkerVector markers = innerNode->document().markers().markersInRange(EphemeralRange(toPositionInDOMTree(markerPosition)), DocumentMarker::MisspellingMarkers());
         if (markers.size() == 1) {
             Node* containerNode = markerPosition.computeContainerNode();
             const PositionInFlatTree start(containerNode, markers[0]->startOffset());
             const PositionInFlatTree end(containerNode, markers[0]->endOffset());
-            newSelection = VisibleSelectionInFlatTree(start, end);
+            newSelection = createVisibleSelectionDeprecated(start, end);
         }
     }
 
     if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend && newSelection.isRange())
         newSelection.appendTrailingWhitespace();
 
     updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), WordGranularity);
 }
 
 void SelectionController::selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults& result)
@@ skipping 78 matching lines @@
     if (event.event().pointerProperties().button != WebPointerProperties::Button::Left)
         return false;
 
     Node* innerNode = event.innerNode();
     if (!(innerNode && innerNode->layoutObject() && m_mouseDownMayStartSelect))
         return false;
 
     VisibleSelectionInFlatTree newSelection;
     const VisiblePositionInFlatTree& pos = visiblePositionOfHitTestResult(event.hitTestResult());
     if (pos.isNotNull()) {
-        newSelection = VisibleSelectionInFlatTree(pos);
+        newSelection = createVisibleSelectionDeprecated(pos);
         newSelection.expandUsingGranularity(ParagraphGranularity);
     }
 
     return updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), ParagraphGranularity);
 }
 
 void SelectionController::handleMousePressEvent(const MouseEventWithHitTestResults& event)
 {
     // If we got the event back, that must mean it wasn't prevented,
     // so it's allowed to start a drag or selection if it wasn't in a scrollbar.
@@ skipping 57 matching lines @@
         && event.event().pointerProperties().button != WebPointerProperties::Button::Right) {
         // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
         // needs to be audited.  See http://crbug.com/590369 for more details.
         m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
         VisibleSelectionInFlatTree newSelection;
         Node* node = event.innerNode();
         bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
         if (node && node->layoutObject() && (caretBrowsing || hasEditableStyle(*node))) {
             const VisiblePositionInFlatTree pos = visiblePositionOfHitTestResult(event.hitTestResult());
-            newSelection = VisibleSelectionInFlatTree(pos);
+            newSelection = createVisibleSelectionDeprecated(pos);
         }
 
         setSelectionIfNeeded(selection(), newSelection);
 
         handled = true;
     }
 
     selection().notifyLayoutObjectOfSelectionChange(UserTriggered);
 
     selection().selectFrameElementInParentIfFullySelected();
@@ skipping 103 matching lines @@
     // selection.
     IntPoint p = m_frame->view()->rootFrameToContents(mev.event().position());
     if (!selection().contains(p))
         return;
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
     const VisiblePositionInFlatTree& visiblePos = visiblePositionOfHitTestResult(mev.hitTestResult());
-    VisibleSelectionInFlatTree newSelection(visiblePos);
+    VisibleSelectionInFlatTree newSelection = createVisibleSelectionDeprecated(visiblePos);
     selection().setSelection(newSelection);
 }
 
 void SelectionController::initializeSelectionState()
 {
     m_selectionState = SelectionState::HaveNotStartedSelection;
 }
 
 void SelectionController::setMouseDownMayStartSelect(bool mayStartSelect)
 {
@@ skipping 30 matching lines @@
     return event.event().altKey() && event.isOverLink();
 }
 
 bool isExtendingSelection(const MouseEventWithHitTestResults& event)
 {
     bool isMouseDownOnLinkOrImage = event.isOverLink() || event.hitTestResult().image();
     return event.event().shiftKey() && !isMouseDownOnLinkOrImage;
 }
 
 } // namespace blink