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

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

 /*
  * Copyright (C) 2006, 2008 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 99 matching lines @@
     m_embedElement->setAttribute(nameAttr, "plugin");
     m_embedElement->setAttribute(idAttr, "plugin");
     m_embedElement->setAttribute(srcAttr, AtomicString(document()->url().getString()));
     m_embedElement->setAttribute(typeAttr, document()->loader()->mimeType());
     body->appendChild(m_embedElement);
     if (isStopped())
         return; // Possibly detached by a mutation event listener installed in runScriptsAtDocumentElementAvailable.
 
     toPluginDocument(document())->setPluginNode(m_embedElement.get());
 
-    document()->updateLayout();
+    document()->updateStyleAndLayout();
 
     // We need the plugin to load synchronously so we can get the PluginView
     // below so flush the layout tasks now instead of waiting on the timer.
     frame->view()->flushAnyPendingPostLayoutTasks();
     // Focus the plugin here, as the line above is where the plugin is created.
     if (frame->isMainFrame()) {
         m_embedElement->focus();
         if (isStopped())
             return; // Possibly detached by a focus event listener installed in runScriptsAtDocumentElementAvailable.
     }
@@ skipping 67 matching lines @@
     HTMLDocument::detach(context);
 }
 
 DEFINE_TRACE(PluginDocument)
 {
     visitor->trace(m_pluginNode);
     HTMLDocument::trace(visitor);
 }
 
 } // namespace blink