Changeset 20451 for S60/trunk/WebCore

Timestamp:

03/23/07 13:48:16 (22 months ago)

Author:

zbujtas

Message:

2007-03-23 bujtas <zbujtas@gmail.com>

Reviewed by Sachin.
DESC: onFocus/onClick could destroy the node (and the associated rendered) under the cursor. fix to check
if the renderer is still valid.
http://bugs.webkit.org/show_bug.cgi?id=13172

• kwq/KWQKHTMLPart.cpp:

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• kwq/KWQKHTMLPart.cpp (modified) (1 diff)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-23  bujtas  <zbujtas@gmail.com>
+
+        Reviewed by Sriram.
+        DESC: onFocus/onClick could destroy the node (and the associated rendered) under the cursor. fix to check
+        if the renderer is still valid.
+        http://bugs.webkit.org/show_bug.cgi?id=13172
+
+        * kwq/KWQKHTMLPart.cpp:
+
 yadavall, reviewed by <zbujtas@gmail.com>
         DESC: Fix NULL pointer check for CacheImage

S60/trunk/WebCore/kwq/KWQKHTMLPart.cpp

@@ -1951 +1951 @@
 
     if(navNode) {
-       navNode->ref();
-       if(navNode->renderer() && navNode->renderer()->isWidget()) {
+        navNode->ref();
+        if(navNode->renderer() && navNode->renderer()->isWidget()) {
             QWidget* w = static_cast<RenderWidget*>(navNode->renderer())->widget();
             if (w) {
                 w->clicked();
-        xmlDocImpl()->setFocusNode( navNode );
-                //Get the focus node again as it may have to set to NULL because of onfocus="blur()"
-              NodeImpl* focusNode = xmlDocImpl()->focusNode();
-              if(focusNode && activate && !w->isActive())
+                xmlDocImpl()->setFocusNode( navNode );
+                // onClick or onFocus could destroy the renderer
+                if (navNode->renderer()) {
+                    //Get the focus node again as it may have to set to NULL because of onfocus="blur()"
+                    NodeImpl* focusNode = xmlDocImpl()->focusNode();
+                    if(focusNode && activate && !w->isActive())
                     w->activate();
+                }
             }
-       }
-       else if(navNode->isHTMLElement())  {
-          static_cast<HTMLElementImpl*>(navNode)->click(false);
-      xmlDocImpl()->setFocusNode( navNode );
-       }
-       navNode->deref();
+        }
+        else if(navNode->isHTMLElement())  {
+            static_cast<HTMLElementImpl*>(navNode)->click(false);
+            xmlDocImpl()->setFocusNode( navNode );
+        }
+        navNode->deref();
     }
 }