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

third_party/WebKit/Source/core/html/HTMLDialogElement.cpp

 /*
  * Copyright (C) 2012 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:
  *
  * 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
@@ skipping 111 matching lines @@
 
     if (!returnValue.isNull())
         m_returnValue = returnValue;
 
     dispatchScopedEvent(Event::create(EventTypeNames::close));
 }
 
 void HTMLDialogElement::forceLayoutForCentering()
 {
     m_centeringMode = NeedsCentering;
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
     if (m_centeringMode == NeedsCentering)
         setNotCentered();
 }
 
 void HTMLDialogElement::show()
 {
     if (fastHasAttribute(openAttr))
         return;
     setBooleanAttribute(openAttr, true);
 
     // The layout must be updated here because setFocusForDialog calls
     // Element::isFocusable, which requires an up-to-date layout.
-    document().updateLayoutIgnorePendingStylesheets();
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
 
     setFocusForDialog(this);
 }
 
 void HTMLDialogElement::showModal(ExceptionState& exceptionState)
 {
     if (fastHasAttribute(openAttr)) {
         exceptionState.throwDOMException(InvalidStateError, "The element already has an 'open' attribute, and therefore cannot be opened modally.");
         return;
     }
@@ skipping 46 matching lines @@
 {
     if (event->type() == EventTypeNames::cancel) {
         closeDialog();
         event->setDefaultHandled();
         return;
     }
     HTMLElement::defaultEventHandler(event);
 }
 
 } // namespace blink