Remove scrollbar width/height computations from layout.

sky/engine/platform/scroll/ScrollableArea.cpp

Index: sky/engine/platform/scroll/ScrollableArea.cpp
diff --git a/sky/engine/platform/scroll/ScrollableArea.cpp b/sky/engine/platform/scroll/ScrollableArea.cpp
index d467c57ef89e9f49c43c0ea6dd56bef33b6d1fd4..b4a046d7264b0279cb3b6b1e2a67f8d76e34c1aa 100644
--- a/sky/engine/platform/scroll/ScrollableArea.cpp
+++ b/sky/engine/platform/scroll/ScrollableArea.cpp
@@ -422,20 +422,10 @@ void ScrollableArea::cancelProgrammaticScrollAnimation()
 
 IntRect ScrollableArea::visibleContentRect(IncludeScrollbarsInRect scrollbarInclusion) const
 {
-    int verticalScrollbarWidth = 0;
-    int horizontalScrollbarHeight = 0;
-
-    if (scrollbarInclusion == IncludeScrollbars) {
-        if (Scrollbar* verticalBar = verticalScrollbar())
-            verticalScrollbarWidth = !verticalBar->isOverlayScrollbar() ? verticalBar->width() : 0;
-        if (Scrollbar* horizontalBar = horizontalScrollbar())
-            horizontalScrollbarHeight = !horizontalBar->isOverlayScrollbar() ? horizontalBar->height() : 0;
-    }
-
     return IntRect(scrollPosition().x(),
                    scrollPosition().y(),
-                   std::max(0, visibleWidth() + verticalScrollbarWidth),
-                   std::max(0, visibleHeight() + horizontalScrollbarHeight));
+                   std::max(0, visibleWidth()),
+                   std::max(0, visibleHeight()));
 }
 
 IntPoint ScrollableArea::clampScrollPosition(const IntPoint& scrollPosition) const