Exclude scrollbars from visual viewport dimensions

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..6e0ae3869f6bf868987a1961fe715a323424c1a1 100644
--- a/third_party/WebKit/Source/core/frame/VisualViewport.cpp
+++ b/third_party/WebKit/Source/core/frame/VisualViewport.cpp
@@ -258,7 +258,8 @@ double VisualViewport::clientWidth()
 
     updateLayoutIgnorePendingStylesheets();
 
-    return adjustScrollForAbsoluteZoom(visibleSize().width(), mainFrame()->pageZoomFactor());
+    double width = adjustScrollForAbsoluteZoom(visibleSize().width(), mainFrame()->pageZoomFactor());
+    return width - mainFrame()->view()->verticalScrollbarWidth();
 }
 
 double VisualViewport::clientHeight()
@@ -268,7 +269,8 @@ double VisualViewport::clientHeight()
 
     updateLayoutIgnorePendingStylesheets();
 
-    return adjustScrollForAbsoluteZoom(visibleSize().height(), mainFrame()->pageZoomFactor());
+    double height = adjustScrollForAbsoluteZoom(visibleSize().height(), mainFrame()->pageZoomFactor());
+    return height - mainFrame()->view()->horizontalScrollbarHeight();
 }
 
 double VisualViewport::pageScale()