Changeset 41576 in webkit

Timestamp:

Mar 10, 2009 10:43:58 PM (15 years ago)

Author:

Simon Fraser

Message:

2009-03-10 Simon Fraser <Simon Fraser>

Reviewed by Darin Adler

​https://bugs.webkit.org/show_bug.cgi?id=24503

Fix hit testing of absolutely positioned single line text controls by
ensuring that we set result.innerNode() correctly. If the hit node is
a descendant of the inner text element or if it is the <input> itself,
then we say we hit the innerTextElement.

Rename hitInnerTextBlock() to hitInnerTextElement() to match the
'innerTextElement' terminology used elsewhere.

Assert that if renderer()->hitTest() returns false, no-one set
result.innerNode().

Test: fast/forms/search-abs-pos-cancel-button.html

• rendering/RenderLayer.cpp: (WebCore::RenderLayer::hitTestContents):
• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::hitInnerTextElement):
• rendering/RenderTextControl.h:
• rendering/RenderTextControlMultiLine.cpp: (WebCore::RenderTextControlMultiLine::nodeAtPoint):
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::nodeAtPoint):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/search-abs-pos-cancel-button-expected.txt (added)
• LayoutTests/fast/forms/search-abs-pos-cancel-button.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• WebCore/rendering/RenderTextControl.cpp (modified) (1 diff)
• WebCore/rendering/RenderTextControl.h (modified) (1 diff)
• WebCore/rendering/RenderTextControlMultiLine.cpp (modified) (1 diff)
• WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-03-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Darin Adler
+
+        https://bugs.webkit.org/show_bug.cgi?id=24503
+        
+        Test for hitting the cancel button of an absolutely-positioned form
+        control.
+
+        * fast/forms/search-abs-pos-cancel-button-expected.txt: Added.
+        * fast/forms/search-abs-pos-cancel-button.html: Added.
+
 2009-03-10  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-03-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Darin Adler
+
+        https://bugs.webkit.org/show_bug.cgi?id=24503
+        
+        Fix hit testing of absolutely positioned single line text controls by
+        ensuring that we set result.innerNode() correctly. If the hit node is
+        a descendant of the inner text element or if it is the <input> itself,
+        then we say we hit the innerTextElement.
+        
+        Rename hitInnerTextBlock() to hitInnerTextElement() to match the
+        'innerTextElement' terminology used elsewhere.
+        
+        Assert that if renderer()->hitTest() returns false, no-one set
+        result.innerNode().
+
+        Test: fast/forms/search-abs-pos-cancel-button.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::hitTestContents):
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::hitInnerTextElement):
+        * rendering/RenderTextControl.h:
+        * rendering/RenderTextControlMultiLine.cpp:
+        (WebCore::RenderTextControlMultiLine::nodeAtPoint):
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::nodeAtPoint):
+
 2009-03-10  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/rendering/RenderLayer.cpp

@@ -2401 +2401 @@
                             layerBounds.x() - renderBoxX(),
                             layerBounds.y() - renderBoxY(), 
-                            hitTestFilter))
+                            hitTestFilter)) {
+        // It's wrong to set innerNode, but then claim that you didn't hit anything.
+        ASSERT(!result.innerNode());
         return false;
+    }
 
     // For positioned generated content, we might still not have a

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -452 +452 @@
 }
 
-void RenderTextControl::hitInnerTextBlock(HitTestResult& result, int xPos, int yPos, int tx, int ty)
+void RenderTextControl::hitInnerTextElement(HitTestResult& result, int xPos, int yPos, int tx, int ty)
 {
     result.setInnerNode(m_innerText.get());

trunk/WebCore/rendering/RenderTextControl.h

@@ -93 +93 @@
 
     void createSubtreeIfNeeded(TextControlInnerElement* innerBlock);
-    void hitInnerTextBlock(HitTestResult&, int x, int y, int tx, int ty);
+    void hitInnerTextElement(HitTestResult&, int x, int y, int tx, int ty);
     void forwardEvent(Event*);
 

trunk/WebCore/rendering/RenderTextControlMultiLine.cpp

@@ -85 +85 @@
 
     if (result.innerNode() == node())
-        hitInnerTextBlock(result, x, y, tx, ty);
+        hitInnerTextElement(result, x, y, tx, ty);
 
     return true;

trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -271 +271 @@
         return false;
 
-    if (result.innerNode() != node() && result.innerNode() != innerTextElement())
-        return false;
-
-    hitInnerTextBlock(result, xPos, yPos, tx, ty);
-
-    if (!m_innerBlock)
+    // If we hit a node inside the inner text element, say that we hit that element,
+    // and if we hit our node (e.g. we're over the border or padding), also say that we hit the
+    // inner text element so that it gains focus.
+    if (result.innerNode()->isDescendantOf(innerTextElement()) || result.innerNode() == node())
+        hitInnerTextElement(result, xPos, yPos, tx, ty);
+
+    // If we're not a search field, or we already found the results or cancel buttons, we're done.
+    if (!m_innerBlock || result.innerNode() == m_resultsButton || result.innerNode() == m_cancelButton)
         return true;