Prune CreateVisiblePositionDeprecated from Editor::firstRectForRange

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 1145 matching lines @@
     // WebCore inserts <div><br></div> *before* the current block, which correctly moves the paragraph down but which doesn't
     // change the caret's DOM position (["hello", 0]). In these situations the above FrameSelection::setSelection call
     // does not call EditorClient::respondToChangedSelection(), which, on the Mac, sends selection change notifications and
     // starts a new kill ring sequence, but we want to do these things (matches AppKit).
     if (selectionDidNotChangeDOMPosition)
         client().respondToChangedSelection(m_frame, frame().selection().getSelectionType());
 }
 
 IntRect Editor::firstRectForRange(const EphemeralRange& range) const
 {
+    DCHECK(!frame().document()->needsLayoutTreeUpdate());
+    DocumentLifecycle::DisallowTransitionScope disallowTransition(frame().document()->lifecycle());
+
     LayoutUnit extraWidthToEndOfLine;
     DCHECK(range.isNotNull());
 
-    IntRect startCaretRect = RenderedPosition(createVisiblePositionDeprecated(range.startPosition()).deepEquivalent(), TextAffinity::Downstream).absoluteRect(&extraWidthToEndOfLine);
+    IntRect startCaretRect = RenderedPosition(createVisiblePosition(range.startPosition()).deepEquivalent(), TextAffinity::Downstream).absoluteRect(&extraWidthToEndOfLine);
     if (startCaretRect.isEmpty())
         return IntRect();
 
-    IntRect endCaretRect = RenderedPosition(createVisiblePositionDeprecated(range.endPosition()).deepEquivalent(), TextAffinity::Upstream).absoluteRect();
+    IntRect endCaretRect = RenderedPosition(createVisiblePosition(range.endPosition()).deepEquivalent(), TextAffinity::Upstream).absoluteRect();
     if (endCaretRect.isEmpty())
         return IntRect();
 
     if (startCaretRect.y() == endCaretRect.y()) {
         // start and end are on the same line
         return IntRect(std::min(startCaretRect.x(), endCaretRect.x()),
             startCaretRect.y(),
             abs(endCaretRect.x() - startCaretRect.x()),
             std::max(startCaretRect.height(), endCaretRect.height()));
     }
 
     // start and end aren't on the same line, so go from start to the end of its line
     return IntRect(startCaretRect.x(),
         startCaretRect.y(),
         (startCaretRect.width() + extraWidthToEndOfLine).toInt(),
         startCaretRect.height());
 }
 
-IntRect Editor::firstRectForRange(const Range* range) const
-{
-    DCHECK(range);
-    return firstRectForRange(EphemeralRange(range));
-}
-
 void Editor::computeAndSetTypingStyle(StylePropertySet* style, InputEvent::InputType inputType)
 {
     if (!style || style->isEmpty()) {
         frame().selection().clearTypingStyle();
         return;
     }
 
     // Calculate the current typing style.
     EditingStyle* typingStyle = nullptr;
     if (frame().selection().typingStyle()) {
@@ skipping 212 matching lines @@
 
 DEFINE_TRACE(Editor)
 {
     visitor->trace(m_frame);
     visitor->trace(m_lastEditCommand);
     visitor->trace(m_undoStack);
     visitor->trace(m_mark);
 }
 
 } // namespace blink