Changeset 24336 in webkit

Timestamp:

Jul 16, 2007 4:21:11 PM (17 years ago)

Author:

justing

Message:

Correctly check for input fields and text areas.

File:

• trunk/WebCore/page/FocusController.cpp (modified) (3 diffs)

trunk/WebCore/page/FocusController.cpp

@@ -39 +39 @@
 #include "FrameTree.h"
 #include "HTMLFrameOwnerElement.h"
+#include "HTMLNames.h"
 #include "KeyboardEvent.h"
 #include "Page.h"
@@ -51 +52 @@
 
 using namespace EventNames;
+using namespace HTMLNames;
 
 FocusController::FocusController(Page* page)
@@ -239 +241 @@
     if (Node* mousePressNode = newFocusedFrame->eventHandler()->mousePressNode())
         if (mousePressNode->renderer() && mousePressNode->renderer()->style()->userSelect() == SELECT_IGNORE)
-            // Don't do this for textareas and text fields, when they lose focus their selections should be cleared
-            // and then restored when they regain focus, to match other browsers.
-            if (!s->rootEditableElement()->shadowAncestorNode())
-                return;
+            if (Node* root = s->rootEditableElement())
+                if (Node* shadowAncestorNode = root->shadowAncestorNode())
+                    // Don't do this for textareas and text fields, when they lose focus their selections should be cleared
+                    // and then restored when they regain focus, to match other browsers.
+                    if (!shadowAncestorNode->hasTagName(inputTag) && !shadowAncestorNode->hasTagName(textareaTag))
+                        return;
     
     s->clear();