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

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

 /*
  * Copyright (C) 2004, 2005, 2006 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 87 matching lines @@
 
 template <typename Strategy>
 static SelectionType computeSelectionType(const PositionTemplate<Strategy>& start, const PositionTemplate<Strategy>& end)
 {
     if (start.isNull()) {
         DCHECK(end.isNull());
         return NoSelection;
     }
     if (start == end)
         return CaretSelection;
-    // TODO(yosin) We should call |Document::updateLayout()| here for
+    // TODO(yosin) We should call |Document::updateStyleAndLayout()| here for
     // |mostBackwardCaretPosition()|. However, we are here during
     // |Node::removeChild()|.
     start.anchorNode()->updateDistribution();
     end.anchorNode()->updateDistribution();
     if (mostBackwardCaretPosition(start) == mostBackwardCaretPosition(end))
         return CaretSelection;
     return RangeSelection;
 }
 
 template <typename Strategy>
@@ skipping 95 matching lines @@
 template <typename Strategy>
 EphemeralRangeTemplate<Strategy> VisibleSelectionTemplate<Strategy>::toNormalizedEphemeralRange() const
 {
     if (isNone())
         return EphemeralRangeTemplate<Strategy>();
 
     // Make sure we have an updated layout since this function is called
     // in the course of running edit commands which modify the DOM.
     // Failing to call this can result in equivalentXXXPosition calls returning
     // incorrect results.
-    m_start.document()->updateLayout();
+    m_start.document()->updateStyleAndLayout();
 
     // Check again, because updating layout can clear the selection.
     if (isNone())
         return EphemeralRangeTemplate<Strategy>();
 
     if (isCaret()) {
         // If the selection is a caret, move the range start upstream. This
         // helps us match the conventions of text editors tested, which make
         // style determinations based on the character before the caret, if any.
         const PositionTemplate<Strategy> start = mostBackwardCaretPosition(m_start).parentAnchoredEquivalent();
@@ skipping 48 matching lines @@
 }
 
 template <typename Strategy>
 void VisibleSelectionTemplate<Strategy>::appendTrailingWhitespace()
 {
     DCHECK_EQ(m_granularity, WordGranularity);
     const EphemeralRangeTemplate<Strategy> searchRange = makeSearchRange(end());
     if (searchRange.isNull())
         return;
 
-    // TODO(dglazkov): The use of updateLayoutIgnorePendingStylesheets needs to be audited.
+    // TODO(dglazkov): The use of updateStyleAndLayoutIgnorePendingStylesheets needs to be audited.
     // see http://crbug.com/590369 for more details.
-    searchRange.startPosition().document()->updateLayoutIgnorePendingStylesheets();
+    searchRange.startPosition().document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
     CharacterIteratorAlgorithm<Strategy> charIt(searchRange.startPosition(), searchRange.endPosition(), TextIteratorEmitsCharactersBetweenAllVisiblePositions);
     bool changed = false;
 
     for (; charIt.length(); charIt.advance(1)) {
         UChar c = charIt.characterAt(0);
         if ((!isSpaceOrNewline(c) && c != noBreakSpaceCharacter) || c == '\n')
             break;
         m_end = charIt.endPosition();
         changed = true;
@@ skipping 530 matching lines @@
     const unsigned nodeLength = position.anchorNode()->lengthOfContents();
     return offset <= nodeLength;
 }
 
 template <typename Strategy>
 void VisibleSelectionTemplate<Strategy>::updateIfNeeded()
 {
     Document* document = m_base.document();
     if (!document)
         return;
-    document->updateLayoutIgnorePendingStylesheets();
+    document->updateStyleAndLayoutIgnorePendingStylesheets();
     const bool hasTrailingWhitespace = m_hasTrailingWhitespace;
     validate(m_granularity);
     if (!hasTrailingWhitespace)
         return;
     appendTrailingWhitespace();
 }
 
 template <typename Strategy>
 void VisibleSelectionTemplate<Strategy>::validatePositionsIfNeeded()
 {
@@ skipping 119 matching lines @@
 {
     sel.showTreeForThis();
 }
 
 void showTree(const blink::VisibleSelectionInFlatTree* sel)
 {
     if (sel)
         sel->showTreeForThis();
 }
 #endif