Prune CreateVisiblePositionDeprecated from SelectionController

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 96 matching lines @@
         return true;
 
     if (!node->canStartSelection())
         return false;
 
     return true;
 }
 
 VisiblePositionInFlatTree visiblePositionOfHitTestResult(const HitTestResult& hitTestResult)
 {
-    return createVisiblePositionDeprecated(
+    return createVisiblePosition(
         fromPositionInDOMTree<EditingInFlatTreeStrategy>(hitTestResult.innerNode()->layoutObject()->positionForPoint(hitTestResult.localPoint())));
 }
 
 } // namespace
 
 bool SelectionController::handleMousePressEventSingleClick(const MouseEventWithHitTestResults& event)
 {
     TRACE_EVENT0("blink", "SelectionController::handleMousePressEventSingleClick");
 
     DCHECK(!m_frame->document()->needsLayoutTreeUpdate());
     Node* innerNode = event.innerNode();
     if (!(innerNode && innerNode->layoutObject() && m_mouseDownMayStartSelect))
         return false;
 
     // Extend the selection if the Shift key is down, unless the click is in a link or image.
     bool extendSelection = isExtendingSelection(event);
 
     // Don't restart the selection when the mouse is pressed on an
     // existing selection so we can allow for text dragging.
     if (FrameView* view = m_frame->view()) {
         LayoutPoint vPoint = view->rootFrameToContents(event.event().position());
         if (!extendSelection && selection().contains(vPoint)) {
             m_mouseDownWasSingleClickInSelection = true;
             return false;
         }
     }
 
     VisiblePositionInFlatTree visiblePos = visiblePositionOfHitTestResult(event.hitTestResult());
     if (visiblePos.isNull())
-        visiblePos = createVisiblePositionDeprecated(PositionInFlatTree::firstPositionInOrBeforeNode(innerNode));
+        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(createVisiblePositionDeprecated(pos))));
+        const VisibleSelectionInFlatTree selectionInUserSelectAll(expandSelectionToRespectUserSelectAll(innerNode, VisibleSelectionInFlatTree(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
@@ skipping 26 matching lines @@
 
 void SelectionController::updateSelectionForMouseDrag(const HitTestResult& hitTestResult, Node* mousePressNode, const LayoutPoint& dragStartPos, const IntPoint& lastKnownMousePosition)
 {
     if (!m_mouseDownMayStartSelect)
         return;
 
     Node* target = hitTestResult.innerNode();
     if (!target)
         return;
 
+    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  See http://crbug.com/590369 for more details.
+    m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
     const PositionWithAffinity& rawTargetPosition = positionRespectingEditingBoundary(selection().selection().start(), hitTestResult.localPoint(), target);
-    VisiblePositionInFlatTree targetPosition = createVisiblePositionDeprecated(fromPositionInDOMTree<EditingInFlatTreeStrategy>(rawTargetPosition));
+    VisiblePositionInFlatTree targetPosition = createVisiblePosition(fromPositionInDOMTree<EditingInFlatTreeStrategy>(rawTargetPosition));
     // Don't modify the selection if we're not on a node.
     if (targetPosition.isNull())
         return;
 
     // Restart the selection if this is the first mouse move. This work is usually
     // done in handleMousePressEvent, but not if the mouse press was on an existing selection.
     VisibleSelectionInFlatTree newSelection = selection().visibleSelection<EditingInFlatTreeStrategy>();
 
     // Special case to limit selection to the containing block for SVG text.
     // FIXME: Isn't there a better non-SVG-specific way to do this?
@@ skipping 297 matching lines @@
     bool handled = false;
     m_mouseDownMayStartSelect = false;
     // Clear the selection if the mouse didn't move after the last mouse
     // press and it's not a context menu click.  We do this so when clicking
     // on the selection, the selection goes away.  However, if we are
     // editing, place the caret.
     if (m_mouseDownWasSingleClickInSelection && m_selectionState != SelectionState::ExtendedSelection
         && dragStartPos == event.event().position()
         && selection().isRange()
         && 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);
         }
 
         setSelectionIfNeeded(selection(), newSelection);
 
@@ skipping 92 matching lines @@
 void SelectionController::passMousePressEventToSubframe(const MouseEventWithHitTestResults& mev)
 {
     // If we're clicking into a frame that is selected, the frame will appear
     // greyed out even though we're clicking on the selection.  This looks
     // really strange (having the whole frame be greyed out), so we deselect the
     // 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);
     selection().setSelection(newSelection);
 }
 
 void SelectionController::initializeSelectionState()
 {
     m_selectionState = SelectionState::HaveNotStartedSelection;
 }
 
@@ skipping 32 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