Changeset 19595 in webkit

Timestamp:

Feb 12, 2007, 8:49:26 PM (18 years ago)

Author:

hyatt

Message:

Fix for bug 12149 (Radar Bug#4928692), external CSS causes incomplete
text field focus.

Make sure to clear out the focus node in willRemove() rather than in
detach(), since detach/attach caused by style recalc should not affect
the focused node.

Reviewed by aroben

• dom/ContainerNode.cpp: (WebCore::ContainerNode::willRemove):
• dom/Document.cpp: (WebCore::Document::focusedNodeRemoved): (WebCore::Document::setFocusedNode):
• dom/Document.h:
• dom/Element.cpp: (WebCore::Element::updateFocusAppearance):
• dom/Node.cpp: (WebCore::Node::willRemove): (WebCore::Node::detach):
• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::updateFocusAppearance):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/Document.h (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)
• dom/Node.cpp (modified) (2 diffs)
• html/HTMLInputElement.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-12  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 12149 (Radar Bug#4928692), external CSS causes incomplete
+        text field focus.
+
+        Make sure to clear out the focus node in willRemove() rather than in
+        detach(), since detach/attach caused by style recalc should not affect
+        the focused node.
+
+        Reviewed by aroben
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::willRemove):
+        * dom/Document.cpp:
+        (WebCore::Document::focusedNodeRemoved):
+        (WebCore::Document::setFocusedNode):
+        * dom/Document.h:
+        * dom/Element.cpp:
+        (WebCore::Element::updateFocusAppearance):
+        * dom/Node.cpp:
+        (WebCore::Node::willRemove):
+        (WebCore::Node::detach):
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::updateFocusAppearance):
+
 2007-02-12  Kevin McCullough  <kmccullough@apple.com>
 

trunk/WebCore/dom/ContainerNode.cpp

@@ -331 +331 @@
     for (Node *n = m_firstChild; n != 0; n = n->nextSibling())
         n->willRemove();
+    EventTargetNode::willRemove();
 }
 

trunk/WebCore/dom/Document.cpp

@@ -2048 +2048 @@
 }
 
-void Document::focusedNodeDetached(Node* node)
+void Document::focusedNodeRemoved(Node* node)
 {
     setFocusedNode(0);
@@ -2169 +2169 @@
         }
         m_focusedNode->setFocus();
-        
-        if (m_focusedNode.get() == m_focusedNode->rootEditableElement())
-            frame()->editor()->didBeginEditing();
-        
+
         // eww, I suck. set the qt focus correctly
         // ### find a better place in the code for this

trunk/WebCore/dom/Document.h

@@ -420 +420 @@
     Node* activeNode() const { return m_activeNode.get(); }
 
-    void focusedNodeDetached(Node*);
+    void focusedNodeRemoved(Node*);
     void hoveredNodeDetached(Node*);
     void activeChainNodeDetached(Node*);

trunk/WebCore/dom/Element.cpp

@@ -29 +29 @@
 #include "cssstyleselector.h"
 #include "Document.h"
+#include "Editor.h"
 #include "ExceptionCode.h"
 #include "Frame.h"
@@ -890 +891 @@
             return;
         
+        frame->editor()->didBeginEditing();
+
         // FIXME: We should restore the previous selection if there is one.
         Selection newSelection = hasTagName(htmlTag) || hasTagName(bodyTag) ? Selection(Position(this, 0), DOWNSTREAM) : Selection::selectionFromContentsOfNode(this);

trunk/WebCore/dom/Node.cpp

@@ -813 +813 @@
 void Node::willRemove()
 {
+    if (m_focused)
+        document()->focusedNodeRemoved(this);
 }
 
@@ -824 +826 @@
 
     Document* doc = document();
-    if (m_focused)
-        doc->focusedNodeDetached(this);
     if (m_hovered)
         doc->hoveredNodeDetached(this);

trunk/WebCore/html/HTMLInputElement.cpp

@@ -30 +30 @@
 #include "CSSPropertyNames.h"
 #include "Document.h"
+#include "Editor.h"
 #include "Event.h"
 #include "EventHandler.h"
@@ -205 +206 @@
     if (isTextField()) {
         select();
-        if (document() && document()->frame())
+        if (document() && document()->frame()) {
+            document()->frame()->editor()->didBeginEditing();
             document()->frame()->revealSelection();
+        }
     } else
         HTMLGenericFormElement::updateFocusAppearance();