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

third_party/WebKit/Source/web/mac/WebSubstringUtil.mm

 /*
  * Copyright (C) 2005, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 48 matching lines @@
 using namespace blink;
 
 static NSAttributedString* attributedSubstringFromRange(const EphemeralRange& range)
 {
     NSMutableAttributedString* string = [[NSMutableAttributedString alloc] init];
     NSMutableDictionary* attrs = [NSMutableDictionary dictionary];
     size_t length = range.endPosition().computeOffsetInContainerNode() - range.startPosition().computeOffsetInContainerNode();
 
     unsigned position = 0;
 
-    // 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.
-    range.startPosition().document()->updateLayoutIgnorePendingStylesheets();
+    range.startPosition().document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
     for (TextIterator it(range.startPosition(), range.endPosition()); !it.atEnd() && [string length] < length; it.advance()) {
         unsigned numCharacters = it.length();
         if (!numCharacters)
             continue;
 
         Node* container = it.currentContainer();
         LayoutObject* layoutObject = container->layoutObject();
         DCHECK(layoutObject);
         if (!layoutObject)
@@ skipping 93 matching lines @@
     if (ephemeralRange.isNull())
         return nil;
 
     NSAttributedString* result = attributedSubstringFromRange(ephemeralRange);
     if (baselinePoint)
         *baselinePoint = getBaselinePoint(frame->view(), ephemeralRange, result);
     return result;
 }
 
 } // namespace blink