Allows fullscreen to be triggered with the key events used for scrolling.

content/renderer/render_widget.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 "content/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 29 matching lines @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHelperPlugin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPagePopup.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/skia/include/core/SkShader.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/surface/transport_dib.h"
 #include "webkit/compositor_bindings/web_rendering_stats_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #if defined(OS_ANDROID)
 #include "content/renderer/android/synchronous_compositor_output_surface.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #endif  // defined(OS_POSIX)
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h"
 
 using WebKit::WebCompositionUnderline;
 using WebKit::WebCursorInfo;
 using WebKit::WebGestureEvent;
 using WebKit::WebInputEvent;
+using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebPagePopup;
 using WebKit::WebPoint;
 using WebKit::WebPopupMenu;
 using WebKit::WebPopupMenuInfo;
 using WebKit::WebPopupType;
 using WebKit::WebRange;
 using WebKit::WebRect;
 using WebKit::WebScreenInfo;
@@ skipping 660 matching lines @@
     prevent_default = prevent_default || WillHandleGestureEvent(gesture_event);
   }
 
   if (input_event->type == WebInputEvent::GestureTap ||
       input_event->type == WebInputEvent::GestureLongPress)
     resetInputMethod();
 
   bool processed = prevent_default;
   if (input_event->type != WebInputEvent::Char || !suppress_next_char_events_) {
     suppress_next_char_events_ = false;
+    if (!processed)
+      processed = MaybeScrollTopControls(input_event);
     if (!processed && webwidget_)
       processed = webwidget_->handleInputEvent(*input_event);
   }
 
   // If this RawKeyDown event corresponds to a browser keyboard shortcut and
   // it's not processed by webkit, then we need to suppress the upcoming Char
   // events.
   if (!processed && is_keyboard_shortcut)
     suppress_next_char_events_ = true;
 
@@ skipping 51 matching lines @@
   if (!prevent_default) {
     if (WebInputEvent::isKeyboardEventType(input_event->type))
       DidHandleKeyEvent();
     if (WebInputEvent::isMouseEventType(input_event->type))
       DidHandleMouseEvent(*(static_cast<const WebMouseEvent*>(input_event)));
     if (WebInputEvent::isTouchEventType(input_event->type))
       DidHandleTouchEvent(*(static_cast<const WebTouchEvent*>(input_event)));
   }
 }
 
+bool RenderWidget::MaybeScrollTopControls(const WebInputEvent* event) {
+  if (event->type != WebInputEvent::RawKeyDown)
+    return false;
+  const WebKeyboardEvent* key_event =
+    static_cast<const WebKeyboardEvent *>(event);
+  if (key_event->isSystemKey)
+    return false;
+  int key = key_event->windowsKeyCode;
+  bool shift_pressed = key_event->modifiers & WebInputEvent::ShiftKey;
+  bool processed = false;
+  if (compositor_->GetTopControlsOffset() < 0.f) {
+    // Shows top controls upon scrolling up: Shift-space, up, pgup, home
+    if (shift_pressed) {
+      if (key == ui::VKEY_SPACE) processed = true;
+    } else {
+      if (key == ui::VKEY_UP || key == ui::VKEY_PRIOR || key == ui::VKEY_HOME)

[aelias_OOO_until_Jul13, 2013/05/21 05:51:41]

This is pretty complex and you're likely to miss some cases... I suggest instead
observing whether the scroll offset moved up or down in reaction to the key
event.

[Jinsuk Kim, 2013/05/24 09:57:13]

Done. Created a new CL on WebKit side for that
https://codereview.chromium.org/15735021/

+        processed = true;
+    }
+    if (processed)
+      compositor_->ShowTopControls(true);
+  } else {
+    // Hides top controls upon scrolling down: down, space, pgdn, end
+    if (!shift_pressed &&
+        (key == ui::VKEY_DOWN || key == ui::VKEY_SPACE ||
+         key == ui::VKEY_NEXT || key == ui::VKEY_END)) {
+      compositor_->ShowTopControls(false);
+      processed = true;
+    }
+  }
+  return processed;
+}
+
 void RenderWidget::OnCursorVisibilityChange(bool is_visible) {
   if (webwidget_)
     webwidget_->setCursorVisibilityState(is_visible);
 }
 
 void RenderWidget::OnMouseCaptureLost() {
   if (webwidget_)
     webwidget_->mouseCaptureLost();
 }
 
@@ skipping 1508 matching lines @@
 
   if (!context->Initialize(
           attributes,
           false /* bind generates resources */,
           CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE))
     return NULL;
   return context.release();
 }
 
 }  // namespace content