Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.()

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

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2010 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 76 matching lines @@
     DCHECK(!endOfSelection.isNull());
     ContainerNode* startScope = nullptr;
     int startIndex = indexForVisiblePosition(startOfSelection, startScope);
     ContainerNode* endScope = nullptr;
     int endIndex = indexForVisiblePosition(endOfSelection, endScope);
 
     formatSelection(startOfSelection, endOfSelection, editingState);
     if (editingState->isAborted())
         return;
 
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
 
     DCHECK_EQ(startScope, endScope);
     DCHECK_GE(startIndex, 0);
     DCHECK_LE(startIndex, endIndex);
     if (startScope == endScope && startIndex >= 0 && startIndex <= endIndex) {
         VisiblePosition start(visiblePositionForIndex(startIndex, startScope));
         VisiblePosition end(visiblePositionForIndex(endIndex, endScope));
         if (start.isNotNull() && end.isNotNull())
             setEndingSelection(VisibleSelection(start, end, endingSelection().isDirectional()));
     }
@@ skipping 77 matching lines @@
     if (!position.isOffsetInAnchor() || !position.computeContainerNode() || !position.computeContainerNode()->isTextNode())
         return 0;
     return position.computeContainerNode()->computedStyle();
 }
 
 void ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded(const VisiblePosition& endOfCurrentParagraph, Position& start, Position& end)
 {
     start = startOfParagraph(endOfCurrentParagraph).deepEquivalent();
     end = endOfCurrentParagraph.deepEquivalent();
 
-    document().updateLayoutTree();
+    document().updateStyleAndLayoutTree();
 
     bool isStartAndEndOnSameNode = false;
     if (const ComputedStyle* startStyle = computedStyleOfEnclosingTextNode(start)) {
         isStartAndEndOnSameNode = computedStyleOfEnclosingTextNode(end) && start.computeContainerNode() == end.computeContainerNode();
         bool isStartAndEndOfLastParagraphOnSameNode = computedStyleOfEnclosingTextNode(m_endOfLastParagraph) && start.computeContainerNode() == m_endOfLastParagraph.computeContainerNode();
 
         // Avoid obtanining the start of next paragraph for start
         // TODO(yosin) We should use |PositionMoveType::CodePoint| for
         // |previousPositionOf()|.
         if (startStyle->preserveNewline() && isNewLineAtPosition(start) && !isNewLineAtPosition(previousPositionOf(start, PositionMoveType::CodeUnit)) && start.offsetInContainerNode() > 0)
             start = startOfParagraph(createVisiblePosition(previousPositionOf(end, PositionMoveType::CodeUnit))).deepEquivalent();
 
         // If start is in the middle of a text node, split.
         if (!startStyle->collapseWhiteSpace() && start.offsetInContainerNode() > 0) {
             int startOffset = start.offsetInContainerNode();
             Text* startText = toText(start.computeContainerNode());
             splitTextNode(startText, startOffset);
             start = firstPositionInNode(startText);
             if (isStartAndEndOnSameNode) {
                 DCHECK_GE(end.offsetInContainerNode(), startOffset);
                 end = Position(startText, end.offsetInContainerNode() - startOffset);
             }
             if (isStartAndEndOfLastParagraphOnSameNode) {
                 DCHECK_GE(m_endOfLastParagraph.offsetInContainerNode(), startOffset);
                 m_endOfLastParagraph = Position(startText, m_endOfLastParagraph.offsetInContainerNode() - startOffset);
             }
         }
     }
 
-    document().updateLayoutTree();
+    document().updateStyleAndLayoutTree();
 
     if (const ComputedStyle* endStyle = computedStyleOfEnclosingTextNode(end)) {
         bool isEndAndEndOfLastParagraphOnSameNode = computedStyleOfEnclosingTextNode(m_endOfLastParagraph) && end.anchorNode() == m_endOfLastParagraph.anchorNode();
         // Include \n at the end of line if we're at an empty paragraph
         if (endStyle->preserveNewline() && start == end && end.offsetInContainerNode() < end.computeContainerNode()->maxCharacterOffset()) {
             int endOffset = end.offsetInContainerNode();
             // TODO(yosin) We should use |PositionMoveType::CodePoint| for
             // |previousPositionOf()|.
             if (!isNewLineAtPosition(previousPositionOf(end, PositionMoveType::CodeUnit)) && isNewLineAtPosition(end))
                 end = Position(end.computeContainerNode(), endOffset + 1);
@@ skipping 65 matching lines @@
     return element;
 }
 
 DEFINE_TRACE(ApplyBlockElementCommand)
 {
     visitor->trace(m_endOfLastParagraph);
     CompositeEditCommand::trace(visitor);
 }
 
 } // namespace blink