Changeset 45257 in webkit

Timestamp:

Jun 26, 2009 3:06:33 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-06-26 Yongjun Zhang <​yongjun.zhang@nokia.com>

Reviewed by Eric Seidel.

Bug 20303: [Qt] Key events are not working in frames.

Add a layout test to test the event is sent to the right sub-frame.

• platform/qt/fast/events/event-sender-keydown-frame-expected.txt: Added.
• platform/qt/fast/events/event-sender-keydown-frame.html: Added.

2009-06-26 Yongjun Zhang <​yongjun.zhang@nokia.com>

Reviewed by Eric Seidel.

Test: platform/qt/fast/events/event-sender-keydown-frame.html

Bug 20303: [Qt] Key events are not working in frames.

Merge scrolling handling code in qt and win port, move it to
EventHandler.

• page/EventHandler.cpp: (WebCore::EventHandler::scrollRecursively):
• page/EventHandler.h:

2009-06-26 Yongjun Zhang <​yongjun.zhang@nokia.com>

Reviewed by Eric Seidel.

Bug 20303: [Qt] Key events are not working in frames.

Send scrolling events to current focused frame, bubble the event
up to parent frame if it is not handled. Use EventHandler's new
shared scrolling code.

• Api/qwebpage.cpp: (QWebPagePrivate::keyPressEvent): (QWebPagePrivate::handleScrolling):
• Api/qwebpage_p.h:

2009-06-26 Yongjun Zhang <​yongjun.zhang@nokia.com>

Reviewed by Eric Seidel.

Bug 20303: [Qt] Key events are not working in frames.

Move the scroll handling code to EventHandler so that other
ports can share the functionality.

• WebView.cpp: (WebView::keyDown): (EnumTextMatches::QueryInterface):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/fast/events/event-sender-keydown-frame-expected.txt (added)
• LayoutTests/platform/qt/fast/events/event-sender-keydown-frame.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (1 diff)
• WebCore/page/EventHandler.h (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (3 diffs)
• WebKit/qt/Api/qwebpage_p.h (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-06-26  Yongjun Zhang  <yongjun.zhang@nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Bug 20303: [Qt] Key events are not working in frames.
+
+        Add a layout test to test the event is sent to the right sub-frame.
+
+        * platform/qt/fast/events/event-sender-keydown-frame-expected.txt: Added.
+        * platform/qt/fast/events/event-sender-keydown-frame.html: Added.
+
 2009-06-26  Rob Buis  <rwlbuis@gmail.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-26  Yongjun Zhang  <yongjun.zhang@nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Test: platform/qt/fast/events/event-sender-keydown-frame.html
+
+        Bug 20303: [Qt] Key events are not working in frames.
+
+        Merge scrolling handling code in qt and win port, move it to
+        EventHandler.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::scrollRecursively):
+        * page/EventHandler.h:
+
 2009-06-26  Rob Buis  <rwlbuis@gmail.com>
 

trunk/WebCore/page/EventHandler.cpp

@@ -855 +855 @@
 
     return false;
+}
+
+bool EventHandler::scrollRecursively(ScrollDirection direction, ScrollGranularity granularity)
+{
+    bool handled = scrollOverflow(direction, granularity);
+    if (!handled) {
+        Frame* frame = m_frame;
+        do {
+            FrameView* view = frame->view();
+            handled = view ? view->scroll(direction, granularity) : false;
+            frame = frame->tree()->parent();
+        } while (!handled && frame);
+     }
+
+    return handled;
 }
 

trunk/WebCore/page/EventHandler.h

@@ -110 +110 @@
     bool scrollOverflow(ScrollDirection, ScrollGranularity);
 
+    bool scrollRecursively(ScrollDirection, ScrollGranularity);
+
     bool shouldDragAutoNode(Node*, const IntPoint&) const; // -webkit-user-drag == auto
 

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -797 +797 @@
         QFontMetrics fm(defaultFont);
         int fontHeight = fm.height();
-        if (!handleScrolling(ev)) {
+        if (!handleScrolling(ev, frame)) {
             switch (ev->key()) {
             case Qt::Key_Back:
@@ -1000 +1000 @@
 }
 
-bool QWebPagePrivate::handleScrolling(QKeyEvent *ev)
+bool QWebPagePrivate::handleScrolling(QKeyEvent *ev, Frame *frame)
 {
     ScrollDirection direction;
@@ -1047 +1047 @@
     }
 
-    if (!mainFrame->d->frame->eventHandler()->scrollOverflow(direction, granularity))
-        mainFrame->d->frame->view()->scroll(direction, granularity);
-
-    return true;
+    return frame->eventHandler()->scrollRecursively(direction, granularity);
 }
 

trunk/WebKit/qt/Api/qwebpage_p.h

@@ -46 +46 @@
     class Node;
     class Page;
+    class Frame;
 
 #ifndef QT_NO_CURSOR
@@ -114 +115 @@
     void shortcutOverrideEvent(QKeyEvent*);
     void leaveEvent(QEvent *);
-    bool handleScrolling(QKeyEvent*);
+    bool handleScrolling(QKeyEvent*, WebCore::Frame*);
 
 #ifndef QT_NO_SHORTCUT

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-06-26  Yongjun Zhang  <yongjun.zhang@nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Bug 20303: [Qt] Key events are not working in frames.
+
+        Send scrolling events to current focused frame, bubble the event
+        up to parent frame if it is not handled.  Use EventHandler's new
+        shared scrolling code.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::keyPressEvent):
+        (QWebPagePrivate::handleScrolling):
+        * Api/qwebpage_p.h:
+
 2009-06-25  Jakub Wieczorek  <faw217@gmail.com>
 

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-06-26  Yongjun Zhang  <yongjun.zhang@nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Bug 20303: [Qt] Key events are not working in frames.
+
+        Move the scroll handling code to EventHandler so that other
+        ports can share the functionality.
+
+        * WebView.cpp:
+        (WebView::keyDown):
+        (EnumTextMatches::QueryInterface):
+
 2009-06-23  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/win/WebView.cpp

@@ -1723 +1723 @@
     }
 
-    if (!frame->eventHandler()->scrollOverflow(direction, granularity)) {
-        handled = frame->view()->scroll(direction, granularity);
-        Frame* parent = frame->tree()->parent();
-        while(!handled && parent) {
-            handled = parent->view()->scroll(direction, granularity);
-            parent = parent->tree()->parent();
-        }
-    }
-    return handled;
+    return frame->eventHandler()->scrollRecursively(direction, granularity);
 }