window.visualViewport.clientWidth|Height shouldn't assume scaled scrollbar

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