Prune deprecated functions from BreakBlockquoteCommand

third_party/WebKit/Source/core/editing/commands/BreakBlockquoteCommand.cpp

 /*
  * Copyright (C) 2005 Apple Computer, 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 75 matching lines @@
   }
 
   // This is a scenario that should never happen, but we want to
   // make sure we don't dereference a null pointer below.
 
   DCHECK(!endingSelection().isNone());
 
   if (endingSelection().isNone())
     return;
 
-  VisiblePosition visiblePos = endingSelection().visibleStartDeprecated();
+  document().updateStyleAndLayoutIgnorePendingStylesheets();
+
+  VisiblePosition visiblePos = endingSelection().visibleStart();
 
   // pos is a position equivalent to the caret.  We use downstream() so that pos
   // will be in the first node that we need to move (there are a few exceptions
   // to this, see below).
   Position pos = mostForwardCaretPosition(endingSelection().start());
 
   // Find the top-most blockquote from the start.
   HTMLQuoteElement* topBlockquote = toHTMLQuoteElement(
       highestEnclosingNodeOfType(pos, isMailHTMLBlockquoteElement));
   if (!topBlockquote || !topBlockquote->parentNode())
     return;
 
   HTMLBRElement* breakElement = HTMLBRElement::create(document());
 
   bool isLastVisPosInNode =
       isLastVisiblePositionInNode(visiblePos, topBlockquote);
 
   // If the position is at the beginning of the top quoted content, we don't
   // need to break the quote. Instead, insert the break before the blockquote,
   // unless the position is as the end of the the quoted content.
   if (isFirstVisiblePositionInNode(visiblePos, topBlockquote) &&
       !isLastVisPosInNode) {
     insertNodeBefore(breakElement, topBlockquote, editingState);
     if (editingState->isAborted())
       return;
-    setEndingSelection(createVisibleSelectionDeprecated(
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
+    setEndingSelection(createVisibleSelection(
         Position::beforeNode(breakElement), TextAffinity::Downstream,
         endingSelection().isDirectional()));
     rebalanceWhitespace();
     return;
   }
 
   // Insert a break after the top blockquote.
   insertNodeAfter(breakElement, topBlockquote, editingState);
   if (editingState->isAborted())
     return;
 
+  document().updateStyleAndLayoutIgnorePendingStylesheets();
+
   // If we're inserting the break at the end of the quoted content, we don't
   // need to break the quote.
   if (isLastVisPosInNode) {
-    setEndingSelection(createVisibleSelectionDeprecated(
+    setEndingSelection(createVisibleSelection(
         Position::beforeNode(breakElement), TextAffinity::Downstream,
         endingSelection().isDirectional()));
     rebalanceWhitespace();
     return;
   }
 
   // Don't move a line break just after the caret.  Doing so would create an
   // extra, empty paragraph in the new blockquote.
   if (lineBreakExistsAtVisiblePosition(visiblePos)) {
     pos = nextPositionOf(pos, PositionMoveType::GraphemeCluster);
   }
 
   // Adjust the position so we don't split at the beginning of a quote.
-  while (isFirstVisiblePositionInNode(createVisiblePositionDeprecated(pos),
+  while (isFirstVisiblePositionInNode(createVisiblePosition(pos),
                                       toHTMLQuoteElement(enclosingNodeOfType(
                                           pos, isMailHTMLBlockquoteElement)))) {
     pos = previousPositionOf(pos, PositionMoveType::GraphemeCluster);
   }
 
   // startNode is the first node that we need to move to the new blockquote.
   Node* startNode = pos.anchorNode();
   DCHECK(startNode);
 
   // Split at pos if in the middle of a text node.
   if (startNode->isTextNode()) {
     Text* textNode = toText(startNode);
     int textOffset = pos.computeOffsetInContainerNode();
     if ((unsigned)textOffset >= textNode->length()) {
       startNode = NodeTraversal::next(*startNode);
       DCHECK(startNode);
     } else if (textOffset > 0) {
       splitTextNode(textNode, textOffset);
     }
   } else if (pos.computeEditingOffset() > 0) {
     Node* childAtOffset =
         NodeTraversal::childAt(*startNode, pos.computeEditingOffset());
     startNode = childAtOffset ? childAtOffset : NodeTraversal::next(*startNode);
     DCHECK(startNode);
   }
 
   // If there's nothing inside topBlockquote to move, we're finished.
   if (!startNode->isDescendantOf(topBlockquote)) {
-    setEndingSelection(createVisibleSelectionDeprecated(
-        createVisiblePositionDeprecated(firstPositionInOrBeforeNode(startNode)),
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
+    setEndingSelection(createVisibleSelection(
+        createVisiblePosition(firstPositionInOrBeforeNode(startNode)),
         endingSelection().isDirectional()));
     return;
   }
 
   // Build up list of ancestors in between the start node and the top
   // blockquote.
   HeapVector<Member<Element>> ancestors;
   for (Element* node = startNode->parentElement();
        node && node != topBlockquote; node = node->parentElement())
     ancestors.append(node);
@@ skipping 60 matching lines @@
       if (editingState->isAborted())
         return;
     }
   }
 
   // Make sure the cloned block quote renders.
   addBlockPlaceholderIfNeeded(clonedBlockquote, editingState);
   if (editingState->isAborted())
     return;
 
+  document().updateStyleAndLayoutIgnorePendingStylesheets();
+
   // Put the selection right before the break.
-  setEndingSelection(createVisibleSelectionDeprecated(
-      Position::beforeNode(breakElement), TextAffinity::Downstream,
-      endingSelection().isDirectional()));
+  setEndingSelection(createVisibleSelection(Position::beforeNode(breakElement),
+                                            TextAffinity::Downstream,
+                                            endingSelection().isDirectional()));
   rebalanceWhitespace();
 }
 
 }  // namespace blink