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

third_party/WebKit/Source/web/ExternalPopupMenu.cpp

 /*
  * Copyright (C) 2010 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 144 matching lines @@
         // cases.  e.g. Updating ComputedStyle of the SELECT element affects
         // popup position and OPTION style.
         break;
     }
 }
 
 void ExternalPopupMenu::update()
 {
     if (!m_webExternalPopupMenu || !m_ownerElement)
         return;
-    m_ownerElement->document().updateLayoutTree();
+    m_ownerElement->document().updateStyleAndLayoutTree();
     // disconnectClient() might have been called.
     if (!m_ownerElement)
         return;
     m_needsUpdate = false;
 
     if (showInternal())
         return;
     // We failed to show a popup.  Notify it to the owner.
     hide();
 }
@@ skipping 117 matching lines @@
         if (ownerElement.itemIsDisplayNone(*items[i]))
             continue;
         if (popupMenuItemIndex == i)
             return indexTracker;
         ++indexTracker;
     }
     return -1;
 }
 
 } // namespace blink