Changeset 64091 in webkit

Timestamp:

Jul 26, 2010 5:00:51 PM (14 years ago)

Author:

weinig@apple.com

Message:

Part 2 of ​https://bugs.webkit.org/show_bug.cgi?id=43013
<rdar://problem/8152434>
Add support for scrolling using the keyboard in WebKit2

Reviewed by Anders Carlsson.

Add support for scrolling with the space bar and ensure that we don't scroll
if WebCore is handling the event in another way.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::keyEvent):
(WebKit::getScrollMapping):
(WebKit::WebPage::performDefaultBehaviorForKeyEvent):

• WebProcess/WebPage/WebPage.h:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-26  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Part 2 of https://bugs.webkit.org/show_bug.cgi?id=43013
+        <rdar://problem/8152434>
+        Add support for scrolling using the keyboard in WebKit2
+
+        Add support for scrolling with the space bar and ensure that we don't scroll
+        if WebCore is handling the event in another way.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::keyEvent):
+        (WebKit::getScrollMapping):
+        (WebKit::WebPage::performDefaultBehaviorForKeyEvent):
+        * WebProcess/WebPage/WebPage.h:
+
 2010-07-26  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -345 +345 @@
 }
 
-static bool getScrollMapping(const WebKeyboardEvent& event, ScrollDirection& direction, ScrollGranularity& granularity)
-{
-    if (event.type() != WebEvent::KeyDown && event.type() != WebEvent::RawKeyDown)
-        return false;
-
-    switch (event.windowsVirtualKeyCode()) {
-    case VK_LEFT:
-        granularity = ScrollByLine;
-        direction = ScrollLeft;
-        break;
-    case VK_RIGHT:
-        granularity = ScrollByLine;
-        direction = ScrollRight;
-        break;
-    case VK_UP:
-        granularity = ScrollByLine;
-        direction = ScrollUp;
-        break;
-    case VK_DOWN:
-        granularity = ScrollByLine;
-        direction = ScrollDown;
-        break;
-    case VK_HOME:
-        granularity = ScrollByDocument;
-        direction = ScrollUp;
-        break;
-    case VK_END:
-        granularity = ScrollByDocument;
-        direction = ScrollDown;
-        break;
-    case VK_PRIOR:
-        granularity = ScrollByPage;
-        direction = ScrollUp;
-        break;
-    case VK_NEXT:
-        granularity = ScrollByPage;
-        direction = ScrollDown;
-        break;
-    default:
-        return false;
-    }
-
-    return true;
-}
 
 void WebPage::keyEvent(const WebKeyboardEvent& keyboardEvent)
@@ -400 +356 @@
 
     PlatformKeyboardEvent platformKeyboardEvent = platform(keyboardEvent);
-
-    Frame* frame = m_page->focusController()->focusedOrMainFrame();
-    frame->eventHandler()->keyEvent(platformKeyboardEvent);
-
-    ScrollDirection direction;
-    ScrollGranularity granularity;
-    if (getScrollMapping(keyboardEvent, direction, granularity))
-        frame->eventHandler()->scrollRecursively(direction, granularity);
+    if (m_page->focusController()->focusedOrMainFrame()->eventHandler()->keyEvent(platformKeyboardEvent))
+        return;
+
+    performDefaultBehaviorForKeyEvent(keyboardEvent);
 }
 
@@ -499 +451 @@
 }
 
+static bool getScrollMapping(const WebKeyboardEvent& event, ScrollDirection& direction, ScrollGranularity& granularity)
+{
+    if (event.type() != WebEvent::KeyDown && event.type() != WebEvent::RawKeyDown)
+        return false;
+
+    switch (event.windowsVirtualKeyCode()) {
+    case VK_SPACE:
+        granularity = ScrollByPage;
+        direction = event.shiftKey() ? ScrollUp : ScrollDown;
+        break;
+    case VK_LEFT:
+        granularity = ScrollByLine;
+        direction = ScrollLeft;
+        break;
+    case VK_RIGHT:
+        granularity = ScrollByLine;
+        direction = ScrollRight;
+        break;
+    case VK_UP:
+        granularity = ScrollByLine;
+        direction = ScrollUp;
+        break;
+    case VK_DOWN:
+        granularity = ScrollByLine;
+        direction = ScrollDown;
+        break;
+    case VK_HOME:
+        granularity = ScrollByDocument;
+        direction = ScrollUp;
+        break;
+    case VK_END:
+        granularity = ScrollByDocument;
+        direction = ScrollDown;
+        break;
+    case VK_PRIOR:
+        granularity = ScrollByPage;
+        direction = ScrollUp;
+        break;
+    case VK_NEXT:
+        granularity = ScrollByPage;
+        direction = ScrollDown;
+        break;
+    default:
+        return false;
+    }
+
+    return true;
+}
+
+void WebPage::performDefaultBehaviorForKeyEvent(const WebKeyboardEvent& keyboardEvent)
+{
+    ScrollDirection direction;
+    ScrollGranularity granularity;
+    if (getScrollMapping(keyboardEvent, direction, granularity))
+        m_page->focusController()->focusedOrMainFrame()->eventHandler()->scrollRecursively(direction, granularity);
+}
+
 void WebPage::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder& arguments)
 {

trunk/WebKit2/WebProcess/WebPage/WebPage.h

@@ -118 +118 @@
     void platformInitialize();
     static const char* interpretKeyEvent(const WebCore::KeyboardEvent*);
+    void performDefaultBehaviorForKeyEvent(const WebKeyboardEvent&);
 
     // Actions