Exclude scrollbars from visual viewport dimensions

third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  * Copyright (C) 2008, 2011 Apple 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.
@@ skipping 528 matching lines @@
     return true;
 }
 
 DoubleRect ScrollableArea::visibleContentRectDouble(IncludeScrollbarsInRect scrollbarInclusion) const
 {
     return visibleContentRect(scrollbarInclusion);
 }
 
 IntRect ScrollableArea::visibleContentRect(IncludeScrollbarsInRect scrollbarInclusion) const
 {
-    int verticalScrollbarWidth = 0;
-    int horizontalScrollbarHeight = 0;
+    int scrollbarWidth = scrollbarInclusion == IncludeScrollbars ? verticalScrollbarWidth() : 0;
+    int scrollbarHeight = scrollbarInclusion == IncludeScrollbars ? 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));
+    return IntRect(
+        scrollPosition().x(),
+        scrollPosition().y(),
+        std::max(0, visibleWidth() + scrollbarWidth),
+        std::max(0, visibleHeight() + scrollbarHeight));
 }
 
 IntPoint ScrollableArea::clampScrollPosition(const IntPoint& scrollPosition) const
 {
     return scrollPosition.shrunkTo(maximumScrollPosition()).expandedTo(minimumScrollPosition());
 }
 
 DoublePoint ScrollableArea::clampScrollPosition(const DoublePoint& scrollPosition) const
 {
     return scrollPosition.shrunkTo(maximumScrollPositionDouble()).expandedTo(minimumScrollPositionDouble());
@@ skipping 17 matching lines @@
 int ScrollableArea::documentStep(ScrollbarOrientation orientation) const
 {
     return scrollSize(orientation);
 }
 
 float ScrollableArea::pixelStep(ScrollbarOrientation) const
 {
     return 1;
 }
 
+int ScrollableArea::verticalScrollbarWidth() const
+{
+    if (Scrollbar* verticalBar = verticalScrollbar())
+        return !verticalBar->isOverlayScrollbar() ? verticalBar->width() : 0;
+    return 0;
+}
+
+int ScrollableArea::horizontalScrollbarHeight() const
+{
+    if (Scrollbar* horizontalBar = horizontalScrollbar())
+        return !horizontalBar->isOverlayScrollbar() ? horizontalBar->height() : 0;
+    return 0;
+}
+
 IntSize ScrollableArea::excludeScrollbars(const IntSize& size) const
 {
-    int verticalScrollbarWidth = 0;
-    int horizontalScrollbarHeight = 0;
-
-    if (Scrollbar* verticalBar = verticalScrollbar())
-        verticalScrollbarWidth = !verticalBar->isOverlayScrollbar() ? verticalBar->width() : 0;
-    if (Scrollbar* horizontalBar = horizontalScrollbar())
-        horizontalScrollbarHeight = !horizontalBar->isOverlayScrollbar() ? horizontalBar->height() : 0;
-
-    return IntSize(std::max(0, size.width() - verticalScrollbarWidth),
-        std::max(0, size.height() - horizontalScrollbarHeight));
+    return IntSize(std::max(0, size.width() - verticalScrollbarWidth()),
+        std::max(0, size.height() - horizontalScrollbarHeight()));
 }
 
 DEFINE_TRACE(ScrollableArea)
 {
     visitor->trace(m_scrollAnimator);
     visitor->trace(m_programmaticScrollAnimator);
 }
 
 } // namespace blink