Changeset 19411 in webkit

Timestamp:

Feb 5, 2007 2:55:25 PM (17 years ago)

Author:

weinig

Message:

LayoutTests:

Reviewed by Adele.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=12618 REGRESSION (SearchField): Dragging across the text and releasing over the clear button clears the field

• fast/forms/search-cancel-button-mouseup-expected.txt: Added.
• fast/forms/search-cancel-button-mouseup.html: Added.

WebCore:

Reviewed by Adele.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=12618 REGRESSION (SearchField): Dragging across the text and releasing over the clear button clears the field

Test: fast/forms/search-cancel-button-mouseup.html

Made the cancel button capturing.

• html/HTMLTextFieldInnerElement.cpp: (WebCore::HTMLSearchFieldCancelButtonElement::HTMLSearchFieldCancelButtonElement): (WebCore::HTMLSearchFieldCancelButtonElement::defaultEventHandler):
• html/HTMLTextFieldInnerElement.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/search-cancel-button-mouseup-expected.txt (added)
• LayoutTests/fast/forms/search-cancel-button-mouseup.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLTextFieldInnerElement.cpp (modified) (3 diffs)
• WebCore/html/HTMLTextFieldInnerElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-02-05  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Adele.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=12618
+          REGRESSION (SearchField): Dragging across the text and releasing over the clear button clears the field
+
+        * fast/forms/search-cancel-button-mouseup-expected.txt: Added.
+        * fast/forms/search-cancel-button-mouseup.html: Added.
+
 2007-02-05  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-05  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Adele.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=12618
+          REGRESSION (SearchField): Dragging across the text and releasing over the clear button clears the field
+
+        Test: fast/forms/search-cancel-button-mouseup.html
+
+        Made the cancel button capturing.
+
+        * html/HTMLTextFieldInnerElement.cpp:
+        (WebCore::HTMLSearchFieldCancelButtonElement::HTMLSearchFieldCancelButtonElement):
+        (WebCore::HTMLSearchFieldCancelButtonElement::defaultEventHandler):
+        * html/HTMLTextFieldInnerElement.h:
+
 2007-02-05  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/html/HTMLTextFieldInnerElement.cpp

@@ -28 +28 @@
 
 #include "BeforeTextInsertedEvent.h"
+#include "Document.h"
+#include "EventHandler.h"
 #include "EventNames.h"
+#include "Frame.h"
 #include "HTMLInputElement.h"
 #include "HTMLTextAreaElement.h"
@@ -89 +92 @@
 HTMLSearchFieldCancelButtonElement::HTMLSearchFieldCancelButtonElement(Document* doc)
     : HTMLTextFieldInnerElement(doc)
+    , m_capturing(false)
 {
 }
@@ -100 +104 @@
         input->select();
         evt->setDefaultHandled();
+        if (Frame* frame = document()->frame())
+            frame->eventHandler()->setCapturingMouseEventsNode(this);
+        m_capturing = true;
     } else if (evt->type() == mouseupEvent) {
-        if (renderer() && renderer()->style()->visibility() == VISIBLE) {
-            input->setValue("");
-            input->onSearch();
-            evt->setDefaultHandled();
+        if (m_capturing && renderer() && renderer()->style()->visibility() == VISIBLE) {
+            if (hovered()) {
+                input->setValue("");
+                input->onSearch();
+                evt->setDefaultHandled();
+            }
+            if (Frame* frame = document()->frame())
+                frame->eventHandler()->setCapturingMouseEventsNode(0);
+            m_capturing = false;
         }
     }

trunk/WebCore/html/HTMLTextFieldInnerElement.h

@@ -63 +63 @@
     HTMLSearchFieldCancelButtonElement(Document*);
     virtual void defaultEventHandler(Event*);
+private:
+    bool m_capturing;
 };