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

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple 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 @@
     // FIXME (9535):  Canonicalizing to the leftmost candidate means that if
     // we're at a line wrap, we will ask layoutObjects to paint downstream
     // carets for other layoutObjects. To fix this, we need to either a) add
     // code to all paintCarets to pass the responsibility off to the appropriate
     // layoutObject for VisiblePosition's like these, or b) canonicalize to the
     // rightmost candidate unless the affinity is upstream.
     if (position.isNull())
         return PositionType();
 
     DCHECK(position.document());
-    position.document()->updateLayoutIgnorePendingStylesheets();
+    position.document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
     Node* node = position.computeContainerNode();
 
     PositionType candidate = mostBackwardCaretPosition(position);
     if (isVisuallyEquivalentCandidate(candidate))
         return candidate;
     candidate = mostForwardCaretPosition(position);
     if (isVisuallyEquivalentCandidate(candidate))
         return candidate;
 
@@ skipping 693 matching lines @@
         // context, but there is no further text. Force a search with what's
         // available.
         // TODO(xiaochengh): Do we still have to search the whole string?
         next = searchFunction(string.data(), string.size(), prefixLength, DontHaveMoreContext, needMoreContext);
         DCHECK(!needMoreContext);
     }
 
     if (it.atEnd() && next == string.size()) {
         pos = it.startPositionInCurrentContainer();
     } else if (next != invalidOffset && next != prefixLength) {
-        // 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.
-        searchStart.document()->updateLayoutIgnorePendingStylesheets();
+        searchStart.document()->updateStyleAndLayoutIgnorePendingStylesheets();
         // Use the character iterator to translate the next value into a DOM
         // position.
         CharacterIteratorAlgorithm<Strategy> charIt(searchStart, searchEnd, TextIteratorEmitsCharactersBetweenAllVisiblePositions);
         charIt.advance(next - prefixLength - 1);
         pos = charIt.endPosition();
 
         if (charIt.characterAt(0) == '\n') {
             // TODO(yosin) workaround for collapsed range (where only start
             // position is correct) emitted for some emitted newlines
             // (see rdar://5192593)
@@ skipping 457 matching lines @@
 }
 
 VisiblePosition previousLinePosition(const VisiblePosition& visiblePosition, LayoutUnit lineDirectionPoint, EditableType editableType)
 {
     Position p = visiblePosition.deepEquivalent();
     Node* node = p.anchorNode();
 
     if (!node)
         return VisiblePosition();
 
-    node->document().updateLayoutIgnorePendingStylesheets();
+    node->document().updateStyleAndLayoutIgnorePendingStylesheets();
 
     LayoutObject* layoutObject = node->layoutObject();
     if (!layoutObject)
         return VisiblePosition();
 
     RootInlineBox* root = 0;
     InlineBox* box = computeInlineBoxPosition(visiblePosition).inlineBox;
     if (box) {
         root = box->root().prevRootBox();
         // We want to skip zero height boxes.
@@ skipping 32 matching lines @@
 }
 
 VisiblePosition nextLinePosition(const VisiblePosition& visiblePosition, LayoutUnit lineDirectionPoint, EditableType editableType)
 {
     Position p = visiblePosition.deepEquivalent();
     Node* node = p.anchorNode();
 
     if (!node)
         return VisiblePosition();
 
-    node->document().updateLayoutIgnorePendingStylesheets();
+    node->document().updateStyleAndLayoutIgnorePendingStylesheets();
 
     LayoutObject* layoutObject = node->layoutObject();
     if (!layoutObject)
         return VisiblePosition();
 
     RootInlineBox* root = 0;
     InlineBox* box = computeInlineBoxPosition(visiblePosition).inlineBox;
     if (box) {
         root = box->root().nextRootBox();
         // We want to skip zero height boxes.
@@ skipping 1885 matching lines @@
 {
     return previousPositionOfAlgorithm<EditingStrategy>(visiblePosition, rule);
 }
 
 VisiblePositionInFlatTree previousPositionOf(const VisiblePositionInFlatTree& visiblePosition, EditingBoundaryCrossingRule rule)
 {
     return previousPositionOfAlgorithm<EditingInFlatTreeStrategy>(visiblePosition, rule);
 }
 
 } // namespace blink