PDF: Handle the space bar key like page down.

pdf/instance.cc

 // Copyright (c) 2012 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.
 
 #include "pdf/instance.h"
 
 #include <algorithm>  // for min()
 #define _USE_MATH_DEFINES  // for M_PI
 #include <cmath>      // for log() and pow()
 #include <math.h>
@@ skipping 482 matching lines @@
   }
   if (try_engine_first && engine_->HandleEvent(offset_event))
     return true;
 
   // 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.
   if (v_scrollbar_.get() && event.GetType() == PP_INPUTEVENT_TYPE_KEYDOWN) {
     pp::KeyboardInputEvent keyboard_event(event);
+    bool is_fit_to_page = zoom_mode_ == ZOOM_FIT_TO_PAGE;
+    bool no_h_scrollbar = !h_scrollbar_.get();
+    uint32_t key_code = keyboard_event.GetKeyCode();
     bool page_down =
-        (!h_scrollbar_.get() &&
-            keyboard_event.GetKeyCode() == ui::VKEY_RIGHT) ||
-        (zoom_mode_ == ZOOM_FIT_TO_PAGE &&
-            keyboard_event.GetKeyCode() == ui::VKEY_NEXT);
+        (no_h_scrollbar && key_code == ui::VKEY_RIGHT) ||
+        (is_fit_to_page &&
+         (key_code == ui::VKEY_NEXT || key_code == ui::VKEY_SPACE));
     bool page_up =
-        (!h_scrollbar_.get() &&
-            keyboard_event.GetKeyCode() == ui::VKEY_LEFT) ||
-        (zoom_mode_ == ZOOM_FIT_TO_PAGE &&
-            keyboard_event.GetKeyCode() == ui::VKEY_PRIOR);
+        (no_h_scrollbar && key_code == ui::VKEY_LEFT) ||
+        (is_fit_to_page && key_code == ui::VKEY_PRIOR);

[Peter Kasting, 2014/08/01 07:23:08]

You also need to treat shift-space as page up.  (Try it in normal web content.)

[Lei Zhang, 2014/08/01 19:41:21]

Neat. Never knew you can do that. Onwards to patch set 2.

 
     if (page_down) {
       int page = engine_->GetFirstVisiblePage();
       // Engine calculates visible page including delimiter to the page size.
       // We need to check here if the page itself is completely out of view and
       // scroll to the next one in that case.
       if (engine_->GetPageRect(page).bottom() * zoom_ <=
           v_scrollbar_->GetValue())
         page++;
       ScrollToPage(page + 1);
@@ skipping 2200 matching lines @@
   return instance_->HasScriptableMethod(name, exception);
 }
 
 pp::Var PDFScriptableObject::Call(const pp::Var& method,
                                   const std::vector<pp::Var>& args,
                                   pp::Var* exception) {
   return instance_->CallScriptableMethod(method, args, exception);
 }
 
 }  // namespace chrome_pdf