Changeset 20072 in webkit

Timestamp:

Mar 8, 2007 6:12:43 PM (17 years ago)

Author:

mjs

Message:

LayoutTests:

Reviewed by Adele.

<rdar://problem/4646563> REGRESSION: Unable to send text message from Verizon text message website: vtext.com (12588)
​http://bugs.webkit.org/show_bug.cgi?id=12588

Carefully revised which focus operations restore previous selection, which clear it, and which
select the whole control contents, these test cases cover every focus call I could find.

• fast/forms/focus-selection-input-expected.txt: Added.
• fast/forms/focus-selection-input.html: Added.
• fast/forms/focus-selection-textarea-expected.txt: Added.
• fast/forms/focus-selection-textarea.html: Added.
• fast/forms/onselect-textfield-expected.txt:

WebCore:

Reviewed by Adele.

<rdar://problem/4646563> REGRESSION: Unable to send text message from Verizon text message website: vtext.com (12588)
​http://bugs.webkit.org/show_bug.cgi?id=12588

Carefully revised which focus operations restore previous selection, which clear it, and which
select the whole control contents.

Tests:
fast/forms/focus-selection-input.html
fast/forms/focus-selection-textarea.html

• dom/Element.cpp: (WebCore::Element::focus):
• dom/Element.h:
• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::focus): (WebCore::HTMLInputElement::accessKeyAction):
• html/HTMLInputElement.h:
• html/HTMLLabelElement.cpp: (WebCore::HTMLLabelElement::focus): (WebCore::HTMLLabelElement::accessKeyAction):
• html/HTMLLabelElement.h:
• html/HTMLLegendElement.cpp: (WebCore::HTMLLegendElement::focus):
• html/HTMLLegendElement.h:
• html/HTMLTextAreaElement.cpp: (WebCore::HTMLTextAreaElement::focus):
• html/HTMLTextAreaElement.h:
• page/FocusController.cpp: (WebCore::FocusController::advanceFocus):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/focus-selection-input-expected.txt (added)
• LayoutTests/fast/forms/focus-selection-input.html (added)
• LayoutTests/fast/forms/focus-selection-textarea-expected.txt (added)
• LayoutTests/fast/forms/focus-selection-textarea.html (added)
• LayoutTests/fast/forms/onselect-textfield-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Element.cpp (modified) (2 diffs)
• WebCore/dom/Element.h (modified) (1 diff)
• WebCore/html/HTMLInputElement.cpp (modified) (4 diffs)
• WebCore/html/HTMLInputElement.h (modified) (1 diff)
• WebCore/html/HTMLLabelElement.cpp (modified) (3 diffs)
• WebCore/html/HTMLLabelElement.h (modified) (1 diff)
• WebCore/html/HTMLLegendElement.cpp (modified) (1 diff)
• WebCore/html/HTMLLegendElement.h (modified) (1 diff)
• WebCore/html/HTMLTextAreaElement.cpp (modified) (1 diff)
• WebCore/html/HTMLTextAreaElement.h (modified) (1 diff)
• WebCore/page/FocusController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-03-08  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Adele.
+
+        <rdar://problem/4646563> REGRESSION: Unable to send text message from Verizon text message website: vtext.com (12588)
+        http://bugs.webkit.org/show_bug.cgi?id=12588
+
+        Carefully revised which focus operations restore previous selection, which clear it, and which
+        select the whole control contents, these test cases cover every focus call I could find.
+        
+        * fast/forms/focus-selection-input-expected.txt: Added.
+        * fast/forms/focus-selection-input.html: Added.
+        * fast/forms/focus-selection-textarea-expected.txt: Added.
+        * fast/forms/focus-selection-textarea.html: Added.
+        * fast/forms/onselect-textfield-expected.txt:
+
 2007-03-08  Justin Garcia  <justin.garcia@apple.com>
 

trunk/LayoutTests/fast/forms/onselect-textfield-expected.txt

@@ -17 +17 @@
 
 Calling focus on text field
-After focus: text field selection start: 0 end: 10
+After focus: text field selection start: 6 end: 10
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-08  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Adele.
+        
+        <rdar://problem/4646563> REGRESSION: Unable to send text message from Verizon text message website: vtext.com (12588)
+        http://bugs.webkit.org/show_bug.cgi?id=12588
+
+        Carefully revised which focus operations restore previous selection, which clear it, and which
+        select the whole control contents.
+        
+        Tests:
+        fast/forms/focus-selection-input.html
+        fast/forms/focus-selection-textarea.html
+        
+        * dom/Element.cpp:
+        (WebCore::Element::focus):
+        * dom/Element.h:
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::focus):
+        (WebCore::HTMLInputElement::accessKeyAction):
+        * html/HTMLInputElement.h:
+        * html/HTMLLabelElement.cpp:
+        (WebCore::HTMLLabelElement::focus):
+        (WebCore::HTMLLabelElement::accessKeyAction):
+        * html/HTMLLabelElement.h:
+        * html/HTMLLegendElement.cpp:
+        (WebCore::HTMLLegendElement::focus):
+        * html/HTMLLegendElement.h:
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::focus):
+        * html/HTMLTextAreaElement.h:
+        * page/FocusController.cpp:
+        (WebCore::FocusController::advanceFocus):
+
 2007-03-08  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/dom/Element.cpp

@@ -890 +890 @@
 }
 
-void Element::focus()
+void Element::focus(bool restorePreviousSelection)
 {
     Document* doc = document();
@@ -906 +906 @@
     }
         
-    updateFocusAppearance();
+    updateFocusAppearance(restorePreviousSelection);
 }
 

trunk/WebCore/dom/Element.h

@@ -159 +159 @@
     virtual String target() const { return String(); }
         
-    virtual void focus();
+    virtual void focus(bool restorePreviousSelection = true);
     virtual void updateFocusAppearance(bool restorePreviousSelection = false);
     void blur();

trunk/WebCore/html/HTMLInputElement.cpp

@@ -183 +183 @@
 }
 
-void HTMLInputElement::focus()
+void HTMLInputElement::focus(bool restorePreviousSelection)
 {
     if (isTextField()) {
@@ -199 +199 @@
             return;
         }
-        updateFocusAppearance();
+        updateFocusAppearance(restorePreviousSelection);
         return;
     }
-    HTMLGenericFormElement::focus();
+    HTMLGenericFormElement::focus(restorePreviousSelection);
 }
 
@@ -535 +535 @@
         case RESET:
         case SUBMIT:
-            // focus
-            focus();
+            focus(false);
             // send the mouse button events iff the caller specified sendToAnyElement
             dispatchSimulatedClick(0, sendToAnyElement);
@@ -547 +546 @@
         case SEARCH:
         case TEXT:
-            focus();
+            // should never restore previous selection here
+            focus(false);
             break;
     }

trunk/WebCore/html/HTMLInputElement.h

@@ -62 +62 @@
     virtual bool isMouseFocusable() const;
     virtual bool isEnumeratable() const { return inputType() != IMAGE; }
-    virtual void focus();
+    virtual void focus(bool restorePreviousSelection = true);
     virtual void dispatchFocusEvent();
     virtual void dispatchBlurEvent();

trunk/WebCore/html/HTMLLabelElement.cpp

@@ -27 +27 @@
 #include "config.h"
 #include "HTMLLabelElement.h"
+
+#include "Document.h"
+#include "Event.h"
+#include "EventNames.h"
 #include "HTMLFormElement.h"
-
 #include "HTMLNames.h"
-#include "EventNames.h"
-#include "Event.h"
-#include "Document.h"
 
 namespace WebCore {
@@ -131 +131 @@
 }
 
-void HTMLLabelElement::focus()
+void HTMLLabelElement::focus(bool)
 {
+    // to match other browsers, always restore previous selection
     if (Element* element = formElement())
         element->focus();
@@ -139 +140 @@
 void HTMLLabelElement::accessKeyAction(bool sendToAnyElement)
 {
-    Element *element = formElement();
-    if (element)
+    if (Element* element = formElement())
         element->accessKeyAction(sendToAnyElement);
 }

trunk/WebCore/html/HTMLLabelElement.h

@@ -65 +65 @@
     void setHtmlFor(const String &);
 
-    void focus();
+    void focus(bool restorePreviousSelection = true);
 
  private:

trunk/WebCore/html/HTMLLegendElement.cpp

@@ -106 +106 @@
 }
 
-void HTMLLegendElement::focus()
+void HTMLLegendElement::focus(bool)
 {
+    // to match other browsers, never restore previous selection
     if (Element *element = formElement())
-        element->focus();
+        element->focus(false);
 }
 

trunk/WebCore/html/HTMLLegendElement.h

@@ -52 +52 @@
     void setAlign(const String &);
     
-    void focus();
+    void focus(bool restorePreviousSelection = true);
 };
 

trunk/WebCore/html/HTMLTextAreaElement.cpp

@@ -201 +201 @@
 }
 
-void HTMLTextAreaElement::focus()
+void HTMLTextAreaElement::focus(bool)
 {
     Document* doc = document();

trunk/WebCore/html/HTMLTextAreaElement.h

@@ -73 +73 @@
     virtual bool isMouseFocusable() const;
     virtual bool isKeyboardFocusable(KeyboardEvent*) const;
-    virtual void focus();
+    virtual void focus(bool restorePreviousSelection = true);
     virtual void updateFocusAppearance(bool restorePreviousSelection = true);
 

trunk/WebCore/page/FocusController.cpp

@@ -204 +204 @@
         setFocusedFrame(newDocument->frame());
 
-    static_cast<Element*>(node)->focus();
+    static_cast<Element*>(node)->focus(false);
     return true;
 }