PDF: Handle the space bar key like page down.

BUG=397624

Review URL: https://codereview.chromium.org/431303002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287520 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/pdf/pdf.js

@@ -164,8 +164,7 @@ PDFViewer.prototype = {
     // Certain scroll events may be sent from outside of the extension.
     var fromScriptingAPI = e.type == 'scriptingKeypress';
 
-    switch (e.keyCode) {
-      case 33:  // Page up key.
+    var pageUpHandler = function() {
       // Go to the previous page if we are fit-to-page.
       if (this.viewport_.fittingType == Viewport.FittingType.FIT_TO_PAGE) {
         this.viewport_.goToPage(this.viewport_.getMostVisiblePage() - 1);
@@ -175,8 +174,8 @@ PDFViewer.prototype = {
         position.y -= this.viewport.size.height;
         this.viewport.position = position;
       }
-        return;
-      case 34:  // Page down key.
+    };
+    var pageDownHandler = function() {
       // Go to the next page if we are fit-to-page.
       if (this.viewport_.fittingType == Viewport.FittingType.FIT_TO_PAGE) {
         this.viewport_.goToPage(this.viewport_.getMostVisiblePage() + 1);
@@ -186,6 +185,20 @@ PDFViewer.prototype = {
         position.y += this.viewport.size.height;
         this.viewport.position = position;
       }
+    };
+
+    switch (e.keyCode) {
+      case 32:  // Space key.
+        if (e.shiftKey)
+          pageUpHandler();
+        else
+          pageDownHandler();
+        return;
+      case 33:  // Page up key.
+        pageUpHandler();
+        return;
+      case 34:  // Page down key.
+        pageDownHandler();
         return;
       case 37:  // Left arrow key.
         // Go to the previous page if there are no horizontal scrollbars.

pdf/instance.cc

@@ -497,20 +497,20 @@ bool Instance::HandleInputEvent(const pp::InputEvent& event) {
   // Left/Right arrows should scroll to the beginning of the Prev/Next page if
   // there is no horizontal scroll bar.
   // If fit-to-height, PgDown/PgUp should scroll to the beginning of the
-  // Prev/Next page.
+  // Prev/Next page. Spacebar / shift+spacebar should do the same.
   if (v_scrollbar_.get() && event.GetType() == PP_INPUTEVENT_TYPE_KEYDOWN) {
     pp::KeyboardInputEvent keyboard_event(event);
-    bool page_down =
-        (!h_scrollbar_.get() &&
-            keyboard_event.GetKeyCode() == ui::VKEY_RIGHT) ||
-        (zoom_mode_ == ZOOM_FIT_TO_PAGE &&
-            keyboard_event.GetKeyCode() == ui::VKEY_NEXT);
-    bool page_up =
-        (!h_scrollbar_.get() &&
-            keyboard_event.GetKeyCode() == ui::VKEY_LEFT) ||
-        (zoom_mode_ == ZOOM_FIT_TO_PAGE &&
-            keyboard_event.GetKeyCode() == ui::VKEY_PRIOR);
-
+    bool no_h_scrollbar = !h_scrollbar_.get();
+    uint32_t key_code = keyboard_event.GetKeyCode();
+    bool page_down = no_h_scrollbar && key_code == ui::VKEY_RIGHT;
+    bool page_up = no_h_scrollbar && key_code == ui::VKEY_LEFT;
+    if (zoom_mode_ == ZOOM_FIT_TO_PAGE) {
+      bool has_shift =
+          keyboard_event.GetModifiers() & PP_INPUTEVENT_MODIFIER_SHIFTKEY;
+      bool key_is_space = key_code == ui::VKEY_SPACE;
+      page_down |= key_is_space || key_code == ui::VKEY_NEXT;
+      page_up |= (key_is_space && has_shift) || (key_code == ui::VKEY_PRIOR);
+    }
     if (page_down) {
       int page = engine_->GetFirstVisiblePage();
       // Engine calculates visible page including delimiter to the page size.