Changeset 24853 in webkit

Timestamp:

Aug 3, 2007 2:21:03 PM (17 years ago)

Author:

spadma

Message:

yadavall, reviewed by <​sachin.padma@nokia.com>

DESC: Center key press must be sent to Engine
​http://bugs.webkit.org/show_bug.cgi?id=14593

• BrowserView/src/KeyEventHandler.cpp: (CKeyEventHandler::HandleOfferKeyEventL):

Location:

S60/trunk/WebKit

Files:

• BrowserView/src/KeyEventHandler.cpp (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

S60/trunk/WebKit/BrowserView/src/KeyEventHandler.cpp

@@ -188 +188 @@
                     if (iWebKitView->TabbedNavigation() && !iWebKitView->WebKitControl().InPageViewMode() && focused)
                         {
-                        // send keyevent to the webcore
-                        focused->WebKitBridge().WebCoreBridge().KeyEvent(iLastEventKey,EFalse);
+                        // send keyevent to the webcore & if webcore has consumed the event then there is no need to
+                        // apply our navigation mechanism, hence return
+                        if (focused->WebKitBridge().WebCoreBridge().KeyEvent(iLastEventKey,EFalse))
+                            {
+                            return EKeyWasConsumed;
+                            }
                         }
                     keyResponse = HandleArrowKeysL(aKeyEvent);
@@ -204 +208 @@
                     */
                     if( iElType == TBrCtlDefs::EElementNone
+                        && !iWebKitView->TabbedNavigation()
                         && iWebKitView->FocusedElementType() == TBrCtlDefs::EElementNone
                         && aKeyEvent.iRepeats
@@ -209 +214 @@
                         && iWebKitView->WebKitControl().BrCtl().Capabilities() & TBrCtlDefs::ECapabilityToolBar
                         && !iJoystickTimer->IsActive()
-                        && !iWebKitView->WebKitControl().InPageViewMode()                        
+                        && !iWebKitView->WebKitControl().InPageViewMode()
                         )
                         {
@@ -232 +237 @@
                         f->WebKitBridge().WebCoreBridge().PointerEvent(event);
                         return EKeyWasConsumed;
+                        }
+
+                    CWebKitFrame* focused = iWebKitView->MainFrame().FocusedFrame();
+                    if (iWebKitView->TabbedNavigation() && !iWebKitView->WebKitControl().InPageViewMode() && focused)
+                        {
+                        // send keyevent to the webcore & if webcore has consumed the event then set keyResponse
+                        if (focused->WebKitBridge().WebCoreBridge().KeyEvent(iLastEventKey,EFalse))
+                            {
+                            return EKeyWasConsumed;
+                            }
                         }
                     // fake key event down

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+yadavall, reviewed by <sachin.padma@nokia.com>
+ DESC: Center key press must be sent to Engine
+ http://bugs.webkit.org/show_bug.cgi?id=14593
+
+        * BrowserView/src/KeyEventHandler.cpp:
+        (CKeyEventHandler::HandleOfferKeyEventL):
+
 lebril, reviewed by Sachin
  DESC: ELFN-7535HR: Operator manu: Both time stamps in Link-1 and Link-2 are same when opening link is in Expires Date header 1A iteam