Material PDF: Improve layout of PDF viewer in very small windows

chrome/browser/resources/pdf/pdf.js

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /**
  * @return {number} Width of a scrollbar in pixels
  */
 function getScrollbarWidth() {
@@ skipping 77 matching lines @@
  */
 PDFViewer.MIN_TOOLBAR_OFFSET = 15;
 
 /**
  * The height of the toolbar along the top of the page. The document will be
  * shifted down by this much in the viewport.
  */
 PDFViewer.MATERIAL_TOOLBAR_HEIGHT = 56;
 
 /**
+ * Minimum height for the material toolbar to show (px). Should match the media
+ * query in index-material.css. If the window is smaller than this at load,
+ * leave no space for the toolbar.
+ */
+PDFViewer.TOOLBAR_WINDOW_MIN_HEIGHT = 250;
+
+/**
  * The light-gray background color used for print preview.
  */
 PDFViewer.LIGHT_BACKGROUND_COLOR = '0xFFCCCCCC';
 
 /**
  * The dark-gray background color used for the regular viewer.
  */
 PDFViewer.DARK_BACKGROUND_COLOR = '0xFF525659';
 
 /**
@@ skipping 28 matching lines @@
                                         this.onPasswordSubmitted_.bind(this));
   this.errorScreen_ = $('error-screen');
   // Can only reload if we are in a normal tab.
   if (chrome.tabs && this.browserApi_.getStreamInfo().tabId != -1) {
     this.errorScreen_.reloadFn = function() {
       chrome.tabs.reload(this.browserApi_.getStreamInfo().tabId);
     }.bind(this);
   }
 
   // Create the viewport.
+  var shortWindow = window.innerHeight < PDFViewer.TOOLBAR_WINDOW_MIN_HEIGHT;

[raymes, 2015/09/28 07:42:45]

Perhaps we should set the toolbar to display none when shortWindow is true to
avoid having the same constant in 2 places.

[tsergeant, 2015/09/30 01:26:48]

The media query is nice because it automatically updates when the window is
resized. I think the small amount of duplication is worth it for not having to
reimplement that ourselves. 

   var topToolbarHeight =
-      (this.isMaterial_ && !this.isPrintPreview_) ?
+      (this.isMaterial_ && !this.isPrintPreview_ && !shortWindow) ?
       PDFViewer.MATERIAL_TOOLBAR_HEIGHT : 0;
   this.viewport_ = new Viewport(window,
                                 this.sizer_,
                                 this.viewportChanged_.bind(this),
                                 this.beforeZoom_.bind(this),
                                 this.afterZoom_.bind(this),
                                 getScrollbarWidth(),
                                 this.browserApi_.getDefaultZoom(),
                                 topToolbarHeight);
 
@@ skipping 763 matching lines @@
    * Each bookmark is an Object containing a:
    * - title
    * - page (optional)
    * - array of children (themselves bookmarks)
    * @type {Array} the top-level bookmarks of the PDF.
    */
   get bookmarks() {
     return this.bookmarks_;
   }
 };