Changeset 20434 in webkit

Timestamp:

Mar 23, 2007 8:05:15 AM (17 years ago)

Author:

spadma

Message:

2007-03-20 sareen

Reviewed by Zalan/Sachin.
DESC: Pointer cannot be moved after opening flash to player and returning to page ( MLIO-6YEGYC )
​http://bugs.webkit.org/show_bug.cgi?id=13014

WARNING: NO TEST CASES ADDED OR CHANGED

• bridge/WebCoreBridge.cpp: (CWebCoreBridge::NodeTypeB):

Location:

S60/trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/WebCoreBridge.cpp (modified) (1 diff)
• WebKit/BrowserView/src/KeyEventHandler.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+sareen, 
+
+        Reviewed by Zalan/Sachin.
+        DESC: Pointer cannot be moved after opening flash to player and returning to page ( MLIO-6YEGYC )
+        http://bugs.webkit.org/show_bug.cgi?id=13014
+ 
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * bridge/WebCoreBridge.cpp:
+        (CWebCoreBridge::NodeTypeB):
+
 2007-03-22  spadma 
 

S60/trunk/WebCore/bridge/WebCoreBridge.cpp

@@ -2886 +2886 @@
             if(aFocusNode->renderer()) {
               if(aFocusNode->renderer()->isWidget()) {
-            elType = EWebCoreElementObjectBox;
+                 QWidget *widget = static_cast<RenderWidget *>(aFocusNode->renderer())->widget();
+                 //Required to update the correct softkeys in the webkit.
+                 if( widget->isActive() )
+                     elType = EWebCoreElementActivatedObjectBox;
+                 else
+                     elType = EWebCoreElementObjectBox;
               }
               else {

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

@@ -258 +258 @@
                     // if it is activate key event and the key is consumed , the softkeys & cursor should be updated
                     iWebKitView->WebKitControl().BrCtl().UpdateDefaultSoftkeysL();
-                    if(iWebKitView->FocusedElementType() != TBrCtlDefs::EElementActivatedInputBox)
-                        iWebKitView->Cursor()->Reset();
+                    if( ( iWebKitView->FocusedElementType() != TBrCtlDefs::EElementActivatedInputBox ) &&
+                        ( iWebKitView->FocusedElementType() != TBrCtlDefs::EElementActivatedObjectBox ) )
+                          {
+                          iWebKitView->Cursor()->Reset();
+                          }
                     }
                 }

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+sareen 
+        Reviewed by Zalan/Sachin.
+        DESC: Pointer cannot be moved after opening flash to player and returning to page ( MLIO-6YEGYC )
+        http://bugs.webkit.org/show_bug.cgi?id=13014
+
+        * BrowserView/src/KeyEventHandler.cpp:
+        (CKeyEventHandler::HandleOfferKeyEventL):
+
 2007-03-22  hongzhao  <set EMAIL_ADDRESS environment variable>