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

third_party/WebKit/Source/core/animation/EffectInput.cpp

 /*
  * Copyright (C) 2013 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 84 matching lines @@
     const QualifiedName* svgAttribute = AnimationInputHelpers::keyframeAttributeToSVGAttribute(property, element);
     if (svgAttribute)
         keyframe.setSVGAttributeValue(*svgAttribute, value);
     return false;
 }
 
 EffectModel* createEffectModelFromKeyframes(Element& element, const StringKeyframeVector& keyframes, bool encounteredCompositableProperty, ExceptionState& exceptionState)
 {
     // TODO(alancutter): Remove this once composited animations no longer depend on AnimatableValues.
     if (encounteredCompositableProperty && element.inActiveDocument())
-        element.document().updateLayoutTreeForNode(&element);
+        element.document().updateStyleAndLayoutTreeForNode(&element);
 
     StringKeyframeEffectModel* keyframeEffectModel = StringKeyframeEffectModel::create(keyframes, LinearTimingFunction::shared());
     if (!RuntimeEnabledFeatures::cssAdditiveAnimationsEnabled()) {
         for (const auto& keyframeGroup : keyframeEffectModel->getPropertySpecificKeyframeGroups()) {
             PropertyHandle property = keyframeGroup.key;
             if (!property.isCSSProperty())
                 continue;
 
             for (const auto& keyframe : keyframeGroup.value->keyframes()) {
                 if (keyframe->isNeutral()) {
@@ skipping 178 matching lines @@
     }
 
     std::sort(keyframes.begin(), keyframes.end(), compareKeyframes);
 
     ASSERT(!exceptionState.hadException());
 
     return createEffectModelFromKeyframes(element, keyframes, encounteredCompositableProperty, exceptionState);
 }
 
 } // namespace blink