Changeset 19532 for S60/trunk/WebCore

Timestamp:

02/09/07 11:04:41 (2 years ago)

Author:

brmorris

Message:

yaharon, reviewed by zalan

DESC: [S60] Browser crashes when selecting the left Soft key Options when the cursor is in textarea field (SCHY-6Y7SHD)
http://bugs.webkit.org/show_bug.cgi?id=12706

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/html/html_formimpl.cpp (modified) (2 diffs)
• khtml/html/html_formimpl.h (modified) (1 diff)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+yaharon, reviewed by zalan
+ DESC: [S60] Browser crashes when selecting the left Soft key Options when the cursor is in textarea field (SCHY-6Y7SHD)
+ http://bugs.webkit.org/show_bug.cgi?id=12706
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/html/html_formimpl.cpp:
+        (DOM::):
+        * khtml/html/html_formimpl.h:
+
 yadavall, reviewed by zalan bujtas
  DESC: Unclosed object tag causing content to not appear 

S60/trunk/WebCore/khtml/html/html_formimpl.cpp

@@ -2878 +2878 @@
             return;
 
-#if NOKIA_CHANGES
-        if (m_render && static_cast<RenderWidget*>(m_render)->widget())
-            static_cast<RenderWidget*>(m_render)->widget()->activate();
-        evt->setDefaultHandled();
-#else
+#ifndef NOKIA_CHANGES
         DOMString key = static_cast<KeyboardEventImpl *>(evt)->keyIdentifier();
         
@@ -3427 +3423 @@
     m_valueMatchesRenderer = false;
 }
-#ifdef NOKIA_CHANGES
-void HTMLTextAreaElementImpl::defaultEventHandler(EventImpl *evt)
-{
-    if (evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyboardEvent()) {
-        if (m_render && static_cast<RenderWidget*>(m_render)->widget())
-            static_cast<RenderWidget*>(m_render)->widget()->activate();
-        evt->setDefaultHandled();
-     }
-
-    HTMLGenericFormElementImpl::defaultEventHandler(evt);
-}
-#endif
 
 // -------------------------------------------------------------------------

S60/trunk/WebCore/khtml/html/html_formimpl.h

@@ -679 +679 @@
     
     virtual void accessKeyAction(bool sendToAnyElement);
-#if NOKIA_CHANGES    
-    virtual void defaultEventHandler(EventImpl *evt);
-#endif
     
 protected: