Add viewport with assumption that browser controls always show

chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
index 0b6b6ad602070ee521e044da6fdb51c578b94a44..fd3ce1dc0b963abbc9b80887bb37dbca6da1e37c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
@@ -531,17 +531,26 @@ public class CompositorViewHolder extends CoordinatorLayout
 
     @Override
     public void getVisibleViewport(RectF outRect) {
-        // All of these values are in pixels.
-        float viewportTop = 0;
+        getWindowViewport(outRect);
+
         float bottomControlOffset = 0;
         if (mFullscreenManager != null) {
-            viewportTop = mFullscreenManager.getTopVisibleContentOffset();
+            // All of these values are in pixels.
+            outRect.top += mFullscreenManager.getTopVisibleContentOffset();
             bottomControlOffset = mFullscreenManager.getBottomControlOffset();
         }
-        float viewportBottom =
-                getHeight() - (getBottomControlsHeightPixels() - bottomControlOffset);
+        outRect.bottom -= (getBottomControlsHeightPixels() - bottomControlOffset);
+    }
+
+    @Override
+    public void getViewportFullControls(RectF outRect) {
+        getWindowViewport(outRect);
 
-        outRect.set(0, viewportTop, getWidth(), viewportBottom);
+        if (mFullscreenManager != null) {
+            // All of these values are in pixels.
+            outRect.top += mFullscreenManager.getTopControlsHeight();
+            outRect.bottom -= mFullscreenManager.getBottomControlsHeight();
+        }
     }
 
     @Override