Changeset 12345 in webkit

Timestamp:

Jan 24, 2006 11:35:27 PM (18 years ago)

Author:

adele

Message:

LayoutTests:

Test for focus and blur for new text fields.

• fast/forms/input-appearance-focus.html: Added.
• fast/forms/input-appearance-focus-expected.txt: Added.
• fast/forms/input-appearance-focus-expected.png: Added.
• fast/forms/input-appearance-focus-expected.checksum: Added.

WebCore:

Reviewed by Hyatt.

This change will allow the new text field elements to get focus, and to respond to the focus and blur events.

Added: fast/forms/input-appearance-focus.html

• khtml/html/HTMLElementImpl.cpp: (WebCore::HTMLElementImpl::isFocusable): Removed recently added code that allowed editable elements with no parent to be focusable. We don't need to do this now that we try to focus the input element, instead of the inner div.
• khtml/html/HTMLGenericFormElementImpl.cpp: (WebCore::HTMLGenericFormElementImpl::isMouseFocusable): Added case to for text fields.
• khtml/html/HTMLInputElementImpl.cpp: (WebCore::HTMLInputElementImpl::focus): Added. Selects contents of text field. (WebCore::HTMLInputElementImpl::setSelectionStart): Added break; in switch statement. (WebCore::HTMLInputElementImpl::setSelectionEnd): ditto. (WebCore::HTMLInputElementImpl::select): ditto. (WebCore::HTMLInputElementImpl::setSelectionRange): ditto.
• khtml/html/HTMLInputElementImpl.h: Added focus()
• khtml/xml/dom_elementimpl.h: Made focus() virtual.
• page/Frame.cpp: (Frame::setFocusNodeIfNeeded): Walk up the Render Tree instead of the DOM tree when trying to find a node to focus. This will let us choose the input node instead of one of the nodes in the shadow tree.
• page/FrameView.cpp: (FrameView::dispatchMouseEvent): ditto.
• rendering/RenderContainer.cpp: (WebCore::RenderContainer::destroyLeftoverChildren): Corrected misspelling.
• rendering/RenderTextField.cpp: (WebCore::RenderTextField::select): Implemented. Select contents of inner div.
• rendering/RenderTextField.h: (WebCore::RenderTextField::renderName): Changed order. (WebCore::RenderTextField::removeLeftoverAnonymousBoxes): ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-appearance-focus-expected.checksum (added)
• LayoutTests/fast/forms/input-appearance-focus-expected.png (added)
• LayoutTests/fast/forms/input-appearance-focus-expected.txt (added)
• LayoutTests/fast/forms/input-appearance-focus.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• WebCore/khtml/html/HTMLElementImpl.cpp (modified) (1 diff)
• WebCore/khtml/html/HTMLGenericFormElementImpl.cpp (modified) (1 diff)
• WebCore/khtml/html/HTMLInputElementImpl.cpp (modified) (6 diffs)
• WebCore/khtml/html/HTMLInputElementImpl.h (modified) (1 diff)
• WebCore/khtml/xml/dom_elementimpl.h (modified) (1 diff)
• WebCore/page/Frame.cpp (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (1 diff)
• WebCore/rendering/RenderContainer.cpp (modified) (1 diff)
• WebCore/rendering/RenderTextField.cpp (modified) (2 diffs)
• WebCore/rendering/RenderTextField.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-01-24  Adele Peterson <adele@apple.com>
+
+        Test for focus and blur for new text fields.
+
+        * fast/forms/input-appearance-focus.html: Added.
+        * fast/forms/input-appearance-focus-expected.txt: Added.
+        * fast/forms/input-appearance-focus-expected.png: Added.
+        * fast/forms/input-appearance-focus-expected.checksum: Added.
+
 2006-01-24  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-01-24  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Hyatt.
+
+        This change will allow the new text field elements to get focus, and to respond to the focus and blur events.
+
+        Added: fast/forms/input-appearance-focus.html
+
+        * khtml/html/HTMLElementImpl.cpp: (WebCore::HTMLElementImpl::isFocusable): 
+          Removed recently added code that allowed editable elements with no parent to be focusable.  
+          We don't need to do this now that we try to focus the input element, instead of the inner div.
+        * khtml/html/HTMLGenericFormElementImpl.cpp: (WebCore::HTMLGenericFormElementImpl::isMouseFocusable): Added case to for text fields.
+        * khtml/html/HTMLInputElementImpl.cpp:
+        (WebCore::HTMLInputElementImpl::focus): Added. Selects contents of text field.
+        (WebCore::HTMLInputElementImpl::setSelectionStart): Added break; in switch statement.
+        (WebCore::HTMLInputElementImpl::setSelectionEnd): ditto.
+        (WebCore::HTMLInputElementImpl::select): ditto.
+        (WebCore::HTMLInputElementImpl::setSelectionRange): ditto.
+        * khtml/html/HTMLInputElementImpl.h: Added focus()
+        * khtml/xml/dom_elementimpl.h: Made focus() virtual.
+        * page/Frame.cpp: (Frame::setFocusNodeIfNeeded):
+          Walk up the Render Tree instead of the DOM tree when trying to find a node to focus.  
+          This will let us choose the input node instead of one of the nodes in the shadow tree.
+        * page/FrameView.cpp: (FrameView::dispatchMouseEvent): ditto.
+        * rendering/RenderContainer.cpp: (WebCore::RenderContainer::destroyLeftoverChildren): Corrected misspelling. 
+        * rendering/RenderTextField.cpp:
+        (WebCore::RenderTextField::select): Implemented.  Select contents of inner div.
+        * rendering/RenderTextField.h:
+        (WebCore::RenderTextField::renderName): Changed order.
+        (WebCore::RenderTextField::removeLeftoverAnonymousBoxes): ditto.
+
 2006-01-24  Darin Adler  <darin@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1246 +1246 @@
                 93E62D980985F41600E1B5E3 /* SystemTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SystemTime.cpp; path = platform/mac/SystemTime.cpp; sourceTree = "<group>"; };
                 93E62D990985F41600E1B5E3 /* SystemTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemTime.h; path = platform/SystemTime.h; sourceTree = "<group>"; };
-                93ECDB7E03ABE65B008635CE /* KWQColorData.gperf */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = text; path = KWQColorData.gperf; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                 93F19B1908245E59001E9ABC /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                 93F19B1A08245E5A001E9ABC /* WebCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };

trunk/WebCore/khtml/html/HTMLElementImpl.cpp

@@ -451 +451 @@
 bool HTMLElementImpl::isFocusable() const
 {
-    // Added the check for !parent() so shadow elements, like those in engine-based textfields, can get focus.
-    // We may reevaluate this when we resolve outstanding focus issues with these shadow elements.
-    return isContentEditable() && ((parent() && !parent()->isContentEditable()) || !parent());
+    return isContentEditable() && parent() && !parent()->isContentEditable();
 }
 

trunk/WebCore/khtml/html/HTMLGenericFormElementImpl.cpp

@@ -218 +218 @@
 {
     if (isFocusable()) {
-        if (renderer()->isWidget()) {
+        if (renderer()->style()->appearance() == TextFieldAppearance)
+            return true;
+        else if (renderer()->isWidget()) {
             return static_cast<RenderWidget*>(renderer())->widget() &&
                 (static_cast<RenderWidget*>(renderer())->widget()->focusPolicy() & QWidget::ClickFocus);
-        }
+        } 
         // For <input type=image> and <button>, we will assume no mouse focusability.  This is
         // consistent with OS X behavior for buttons.

trunk/WebCore/khtml/html/HTMLInputElementImpl.cpp

@@ -33 +33 @@
 
 #include "cssproperties.h"
+#include "Frame.h"
 #include "render_form.h"
 #include "render_button.h"
@@ -126 +127 @@
     
     return true;
+}
+
+void HTMLInputElementImpl::focus()
+{
+    if ((m_type == TEXT) || (m_type == PASSWORD) && renderer()->style()->appearance() == TextFieldAppearance) {
+        DocumentImpl* doc = getDocument();
+        if (doc) {
+            doc->updateLayout();
+            if (isFocusable()) {
+                doc->setFocusNode(this);
+                select();
+                doc->frame()->revealSelection();
+            }
+        }
+    } else
+        HTMLGenericFormElementImpl::focus();
+
 }
 
@@ -324 +342 @@
         case PASSWORD:
         case TEXT:
-            if (renderer()->style()->appearance() == TextFieldAppearance)
+            if (renderer()->style()->appearance() == TextFieldAppearance) {
                  static_cast<RenderTextField *>(renderer())->setSelectionStart(start);
+                 break;
+            }
             // Fall through for text fields that don't specify appearance
         case SEARCH:
@@ -343 +363 @@
         case PASSWORD:
         case TEXT:
-            if (renderer()->style()->appearance() == TextFieldAppearance)
+            if (renderer()->style()->appearance() == TextFieldAppearance) {
                  static_cast<RenderTextField *>(renderer())->setSelectionEnd(end);
+                 break;
+            }
             // Fall through for text fields that don't specify appearance
         case SEARCH:
@@ -365 +387 @@
         case PASSWORD:
         case TEXT:
-            if (renderer()->style()->appearance() == TextFieldAppearance)
+            if (renderer()->style()->appearance() == TextFieldAppearance) {
                  static_cast<RenderTextField *>(renderer())->select();
+                 break;
+            }
             // Fall through for text fields that don't specify appearance
         case SEARCH:
@@ -392 +416 @@
         case PASSWORD:
         case TEXT:
-            if (renderer()->style()->appearance() == TextFieldAppearance)
+            if (renderer()->style()->appearance() == TextFieldAppearance) {
                 static_cast<RenderTextField *>(renderer())->setSelectionRange(start, end);
+                break;
+            }
             // Fall through for text fields that don't specify appearance
         case SEARCH:

trunk/WebCore/khtml/html/HTMLInputElementImpl.h

@@ -75 +75 @@
     virtual bool isKeyboardFocusable() const;
     virtual bool isEnumeratable() const { return inputType() != IMAGE; }
+    virtual void focus();
 
     virtual const AtomicString& name() const;

trunk/WebCore/khtml/xml/dom_elementimpl.h

@@ -264 +264 @@
     virtual bool isURLAttribute(AttributeImpl *attr) const;
         
-    void focus();
+    virtual void focus();
     void blur();
     

trunk/WebCore/page/Frame.cpp

@@ -1448 +1448 @@
     
     if (target) {
-        for ( ; target; target = target->parentNode()) {
+        RenderObject* renderer = target->renderer();
+
+        // Walk up the render tree to search for a node to focus.
+        // Walking up the DOM tree wouldn't work for shadow trees, like those behind the engine-based text fields.
+        while (renderer) {
             // We don't want to set focus on a subframe when selecting in a parent frame,
             // so add the !isFrameElement check here. There's probably a better way to make this
             // work in the long term, but this is the safest fix at this time.
-            if (target->isMouseFocusable() && !::isFrameElement(target)) {
+            if (target && target->isMouseFocusable() && !::isFrameElement(target)) {
                 document()->setFocusNode(target);
                 return;
             }
+            renderer = renderer->parent();
+            if (renderer)
+                target = renderer->element();
         }
         document()->setFocusNode(0);

trunk/WebCore/page/FrameView.cpp

@@ -1087 +1087 @@
         // from form fields before the button click is processed.
         NodeImpl* node = targetNode;
-        for ( ; node && !node->isFocusable(); node = node->parentNode());
+        RenderObject* renderer = node->renderer();
+                
+        // Walk up the render tree to search for a node to focus.
+        // Walking up the DOM tree wouldn't work for shadow trees, like those behind the engine-based text fields.
+        while (renderer) {
+            node = renderer->element();
+            if (node && node->isFocusable())
+                break;
+            renderer = renderer->parent();
+        }
         // If focus shift is blocked, we eat the event.  Note we should never clear swallowEvent
         // if the page already set it (e.g., by canceling default behavior).

trunk/WebCore/rendering/RenderContainer.cpp

@@ -66 +66 @@
             m_first->remove();  // List markers are owned by their enclosing list and so don't get destroyed by this container.
         else {
-        // Destroy any anonymous children remaining in the render tree, as well as implicit (shadow) DOM elements like those used in the engine-based textfields.
+        // Destroy any anonymous children remaining in the render tree, as well as implicit (shadow) DOM elements like those used in the engine-based text fields.
             if (m_first->element())
                 m_first->element()->setRenderer(0);

trunk/WebCore/rendering/RenderTextField.cpp

@@ -20 +20 @@
 
 #include "config.h"
+#include "RenderTextField.h"
+
 #include "DocumentImpl.h"
-#include "RenderTextField.h"
+#include "Frame.h"
 #include "RenderText.h"
 #include "htmlnames.h"
 #include "HTMLInputElementImpl.h"
 
-using namespace DOM;
+namespace WebCore {
+
 using namespace HTMLNames;
-
-namespace WebCore {
 
 RenderTextField::RenderTextField(NodeImpl* node)
@@ -148 +149 @@
 void RenderTextField::select()
 {
-    // FIXME: Implement this.
+    DocumentImpl* doc = document();
+    if (doc && m_div)
+        doc->frame()->selectContentsOfNode(m_div.get());
 }
 

trunk/WebCore/rendering/RenderTextField.h

@@ -30 +30 @@
 {
 public:
-    RenderTextField(DOM::NodeImpl* node);
+    RenderTextField(NodeImpl* node);
     virtual ~RenderTextField();
 
+    virtual const char *renderName() const { return "RenderTextField"; }
     virtual void removeLeftoverAnonymousBoxes() {};
+    virtual void setStyle(RenderStyle* style);
+    virtual void updateFromElement();
+    
+    RenderStyle* createDivStyle(RenderStyle* startStyle);
 
-    virtual void setStyle(RenderStyle* style);
-    RenderStyle* createDivStyle(RenderStyle* startStyle);
-    virtual void updateFromElement();
-
-    virtual const char *renderName() const { return "RenderTextField"; }
-    
     int selectionStart();
     int selectionEnd();
     void setSelectionStart(int);
-    void setSelectionEnd(int);
-    
+    void setSelectionEnd(int);    
     void select();
     void setSelectionRange(int, int);