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

third_party/WebKit/Source/core/testing/Internals.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 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.
@@ skipping 118 matching lines @@
     bool hasSelectorForClassInShadow(Element* host, const AtomicString& className, ExceptionState&);
     bool hasSelectorForAttributeInShadow(Element* host, const AtomicString& attributeName, ExceptionState&);
     unsigned short compareTreeScopePosition(const Node*, const Node*, ExceptionState&) const;
 
     Node* nextSiblingInFlatTree(Node*, ExceptionState&);
     Node* firstChildInFlatTree(Node*, ExceptionState&);
     Node* lastChildInFlatTree(Node*, ExceptionState&);
     Node* nextInFlatTree(Node*, ExceptionState&);
     Node* previousInFlatTree(Node*, ExceptionState&);
 
-    unsigned updateStyleAndReturnAffectedElementCount(ExceptionState&) const;
+    unsigned updateStyleAndLayoutAndReturnAffectedElementCount(ExceptionState&) const;
     unsigned needsLayoutCount(ExceptionState&) const;
     unsigned hitTestCount(Document*, ExceptionState&) const;
     unsigned hitTestCacheHits(Document*, ExceptionState&) const;
     Element* elementFromPoint(Document*, double x, double y, bool ignoreClipping, bool allowChildFrameContent, ExceptionState&) const;
     void clearHitTestCache(Document*, ExceptionState&) const;
 
     String visiblePlaceholder(Element*);
     void selectColorInColorChooser(Element*, const String& colorValue);
     void endColorChooser(Element*);
     bool hasAutofocusRequest(Document*);
@@ skipping 128 matching lines @@
 
     TypeConversions* typeConversions() const;
     PrivateScriptTest* privateScriptTest() const;
     DictionaryTest* dictionaryTest() const;
     UnionTypesTest* unionTypesTest() const;
 
     Vector<String> getReferencedFilePaths() const;
 
     void startTrackingRepaints(Document*, ExceptionState&);
     void stopTrackingRepaints(Document*, ExceptionState&);
-    void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(Node*, ExceptionState&);
+    void updateStyleAndLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(Node*, ExceptionState&);
     void forceFullRepaint(Document*, ExceptionState&);
 
     void startTrackingPaintInvalidationObjects();
     void stopTrackingPaintInvalidationObjects();
     Vector<String> trackedPaintInvalidationObjects();
 
     ClientRectList* draggableRegions(Document*, ExceptionState&);
     ClientRectList* nonDraggableRegions(Document*, ExceptionState&);
 
     DOMArrayBuffer* serializeObject(PassRefPtr<SerializedScriptValue>) const;
@@ skipping 114 matching lines @@
 
     DocumentMarker* markerAt(Node*, const String& markerType, unsigned index, ExceptionState&);
     Member<InternalRuntimeFlags> m_runtimeFlags;
 
     IterationSource* startIteration(ScriptState*, ExceptionState&) override;
 };
 
 } // namespace blink
 
 #endif // Internals_h