Exclude scrollbars from visual viewport dimensions

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 240 matching lines @@
     setLocation(FloatPoint(location().x(), y * mainFrame()->pageZoomFactor()));
 }
 
 double VisualViewport::clientWidth()
 {
     if (!mainFrame())
         return 0;
 
     updateLayoutIgnorePendingStylesheets();
 
-    return adjustScrollForAbsoluteZoom(visibleSize().width(), mainFrame()->pageZoomFactor());
+    double width = adjustScrollForAbsoluteZoom(visibleSize().width(), mainFrame()->pageZoomFactor());
+    return width - mainFrame()->view()->verticalScrollbarWidth();
 }
 
 double VisualViewport::clientHeight()
 {
     if (!mainFrame())
         return 0;
 
     updateLayoutIgnorePendingStylesheets();
 
-    return adjustScrollForAbsoluteZoom(visibleSize().height(), mainFrame()->pageZoomFactor());
+    double height = adjustScrollForAbsoluteZoom(visibleSize().height(), mainFrame()->pageZoomFactor());
+    return height - mainFrame()->view()->horizontalScrollbarHeight();
 }
 
 double VisualViewport::pageScale()
 {
     updateLayoutIgnorePendingStylesheets();
 
     return m_scale;
 }
 
 void VisualViewport::setScaleAndLocation(float scale, const FloatPoint& location)
@@ skipping 552 matching lines @@
     } else if (graphicsLayer == m_rootTransformLayer) {
         name =  "Root Transform Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink