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

third_party/WebKit/Source/core/frame/VisualViewport.cpp

Index: third_party/WebKit/Source/core/frame/VisualViewport.cpp
diff --git a/third_party/WebKit/Source/core/frame/VisualViewport.cpp b/third_party/WebKit/Source/core/frame/VisualViewport.cpp
index 65b80677087df051fdbea24cfdaa560cdbee2220..e67ea36403f4ddbc7941d069e7e6509c9593d86f 100644
--- a/third_party/WebKit/Source/core/frame/VisualViewport.cpp
+++ b/third_party/WebKit/Source/core/frame/VisualViewport.cpp
@@ -87,13 +87,13 @@ DEFINE_TRACE(VisualViewport)
     ScrollableArea::trace(visitor);
 }
 
-void VisualViewport::updateLayoutIgnorePendingStylesheets()
+void VisualViewport::updateStyleAndLayoutIgnorePendingStylesheets()
 {
     if (!mainFrame())
         return;
 
     if (Document* document = mainFrame()->document())
-        document->updateLayoutIgnorePendingStylesheets();
+        document->updateStyleAndLayoutIgnorePendingStylesheets();
 }
 
 void VisualViewport::enqueueChangedEvent()
@@ -216,7 +216,7 @@ double VisualViewport::scrollLeft()
     if (!mainFrame())
         return 0;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     return adjustScrollForAbsoluteZoom(visibleRect().x(), mainFrame()->pageZoomFactor());
 }
@@ -226,7 +226,7 @@ double VisualViewport::scrollTop()
     if (!mainFrame())
         return 0;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     return adjustScrollForAbsoluteZoom(visibleRect().y(), mainFrame()->pageZoomFactor());
 }
@@ -236,7 +236,7 @@ void VisualViewport::setScrollLeft(double x)
     if (!mainFrame())
         return;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     setLocation(FloatPoint(x * mainFrame()->pageZoomFactor(), location().y()));
 }
@@ -246,7 +246,7 @@ void VisualViewport::setScrollTop(double y)
     if (!mainFrame())
         return;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     setLocation(FloatPoint(location().x(), y * mainFrame()->pageZoomFactor()));
 }
@@ -256,7 +256,7 @@ double VisualViewport::clientWidth()
     if (!mainFrame())
         return 0;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     return adjustScrollForAbsoluteZoom(visibleSize().width(), mainFrame()->pageZoomFactor());
 }
@@ -266,14 +266,14 @@ double VisualViewport::clientHeight()
     if (!mainFrame())
         return 0;
 
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     return adjustScrollForAbsoluteZoom(visibleSize().height(), mainFrame()->pageZoomFactor());
 }
 
 double VisualViewport::pageScale()
 {
-    updateLayoutIgnorePendingStylesheets();
+    updateStyleAndLayoutIgnorePendingStylesheets();
 
     return m_scale;
 }