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

third_party/WebKit/Source/core/frame/VisualViewport.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 69 matching lines @@
 {
     sendUMAMetrics();
 }
 
 DEFINE_TRACE(VisualViewport)
 {
     visitor->trace(m_frameHost);
     ScrollableArea::trace(visitor);
 }
 
-void VisualViewport::updateLayoutIgnorePendingStylesheets()
+void VisualViewport::updateStyleAndLayoutIgnorePendingStylesheets()
 {
     if (!mainFrame())
         return;
 
     if (Document* document = mainFrame()->document())
-        document->updateLayoutIgnorePendingStylesheets();
+        document->updateStyleAndLayoutIgnorePendingStylesheets();
 }
 
 void VisualViewport::enqueueChangedEvent()
 {
     if (!RuntimeEnabledFeatures::visualViewportAPIEnabled())
         return;
 
     if (Document* document = mainFrame()->document())
         document->enqueueVisualViewportChangedEvent();
 }
@@ skipping 102 matching lines @@
 void VisualViewport::setScale(float scale)
 {
     setScaleAndLocation(scale, m_offset);
 }
 
 double VisualViewport::scrollLeft()
 {
     if (!mainFrame())
         return 0;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     return adjustScrollForAbsoluteZoom(visibleRect().x(), mainFrame()->pageZoomFactor());
 }
 
 double VisualViewport::scrollTop()
 {
     if (!mainFrame())
         return 0;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     return adjustScrollForAbsoluteZoom(visibleRect().y(), mainFrame()->pageZoomFactor());
 }
 
 void VisualViewport::setScrollLeft(double x)
 {
     if (!mainFrame())
         return;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     setLocation(FloatPoint(x * mainFrame()->pageZoomFactor(), location().y()));
 }
 
 void VisualViewport::setScrollTop(double y)
 {
     if (!mainFrame())
         return;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     setLocation(FloatPoint(location().x(), y * mainFrame()->pageZoomFactor()));
 }
 
 double VisualViewport::clientWidth()
 {
     if (!mainFrame())
         return 0;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     double width = adjustScrollForAbsoluteZoom(visibleSize().width(), mainFrame()->pageZoomFactor());
     return width - mainFrame()->view()->verticalScrollbarWidth();
 }
 
 double VisualViewport::clientHeight()
 {
     if (!mainFrame())
         return 0;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     double height = adjustScrollForAbsoluteZoom(visibleSize().height(), mainFrame()->pageZoomFactor());
     return height - mainFrame()->view()->horizontalScrollbarHeight();
 }
 
 double VisualViewport::pageScale()
 {
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     return m_scale;
 }
 
 void VisualViewport::setScaleAndLocation(float scale, const FloatPoint& location)
 {
     if (!mainFrame())
         return;
 
     bool valuesChanged = false;
@@ skipping 547 matching lines @@
     } else if (graphicsLayer == m_rootTransformLayer) {
         name =  "Root Transform Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink