Changeset 69237 in webkit

Timestamp:

Oct 6, 2010 3:09:04 PM (14 years ago)

Author:

Chris Fleizach

Message:

REGRESSION (r53857): AREA tag with tabindex="-1" displays focus ring after multiple mouse clicks.
​https://bugs.webkit.org/show_bug.cgi?id=45832

Reviewed by Beth Dakin.

WebCore:

Test: fast/events/mouse-focus-imagemap.html

• html/HTMLAreaElement.cpp:

(WebCore::HTMLAreaElement::isKeyboardFocusable):
(WebCore::HTMLAreaElement::isMouseFocusable):
(WebCore::HTMLAreaElement::isFocusable):
(WebCore::HTMLAreaElement::updateFocusAppearance):

• html/HTMLAreaElement.h:

LayoutTests:

• fast/events/mouse-focus-imagemap-expected.txt: Added.
• fast/events/mouse-focus-imagemap.html: Added.
• fast/events/resources/tabindex-focus-blur-all.js:

(testProgrammaticFocus):

• fast/events/tabindex-focus-blur-all-expected.txt:

Update test to reflect that AREA with tabindex=-1 should not be focusable.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/mouse-focus-imagemap-expected.txt (added)
• LayoutTests/fast/events/mouse-focus-imagemap.html (added)
• LayoutTests/fast/events/resources/tabindex-focus-blur-all.js (modified) (2 diffs)
• LayoutTests/fast/events/tabindex-focus-blur-all-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLAreaElement.cpp (modified) (2 diffs)
• WebCore/html/HTMLAreaElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-06  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Beth Dakin.
+
+        REGRESSION (r53857): AREA tag with tabindex="-1" displays focus ring after multiple mouse clicks.
+        https://bugs.webkit.org/show_bug.cgi?id=45832
+
+        * fast/events/mouse-focus-imagemap-expected.txt: Added.
+        * fast/events/mouse-focus-imagemap.html: Added.
+        * fast/events/resources/tabindex-focus-blur-all.js:
+        (testProgrammaticFocus):
+        * fast/events/tabindex-focus-blur-all-expected.txt:
+            Update test to reflect that AREA with tabindex=-1 should not be focusable.
+
 2010-10-06  Albert J. Wong  <ajwong@chromium.org>
 

trunk/LayoutTests/fast/events/resources/tabindex-focus-blur-all.js

@@ -53 +53 @@
     homeBase[0].focus();
 
-    var resultSummary = focusCount+" focus / "+blurCount+" blur events dispatched, and should be 337 / 337 ";
+    var resultSummary = focusCount+" focus / "+blurCount+" blur events dispatched, and should be 331 / 331 ";
     resultSummary += (focusCount==blurCount) ? "<span style='color:green'>PASSED</span><br>" : "<span style='color:red'>FAILED</span><br>";
     resultSummary += "Total of "+failedTestCount+" focus test(s) failed.";
@@ -111 +111 @@
         elemThatShouldFocus = null;
 
+    // AREA elements with tabindex = -1 should not be focusable.
+    if (elem.tabIndex == -1 && elem.tagName == "AREA")
+        elemThatShouldFocus = null;
+
     if (tagNamesTransferFocused.find(elem.tagName)) {
         elemThatShouldFocus = null;

trunk/LayoutTests/fast/events/tabindex-focus-blur-all-expected.txt

@@ -1 @@
-333 focus / 333 blur events dispatched, and should be 337 / 337 PASSED
+331 focus / 331 blur events dispatched, and should be 331 / 331 PASSED
 Total of 0 focus test(s) failed. PASSED

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-06  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Beth Dakin.
+
+        REGRESSION (r53857): AREA tag with tabindex="-1" displays focus ring after multiple mouse clicks.
+        https://bugs.webkit.org/show_bug.cgi?id=45832
+
+        Test: fast/events/mouse-focus-imagemap.html
+
+        * html/HTMLAreaElement.cpp:
+        (WebCore::HTMLAreaElement::isKeyboardFocusable):
+        (WebCore::HTMLAreaElement::isMouseFocusable):
+        (WebCore::HTMLAreaElement::isFocusable):
+        (WebCore::HTMLAreaElement::updateFocusAppearance):
+        * html/HTMLAreaElement.h:
+
 2010-10-06  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/html/HTMLAreaElement.cpp

@@ -175 +175 @@
 bool HTMLAreaElement::isKeyboardFocusable(KeyboardEvent*) const
 {
-    return supportsFocus();
+    return isFocusable();
+}
+    
+bool HTMLAreaElement::isMouseFocusable() const
+{
+    return isFocusable();
 }
 
 bool HTMLAreaElement::isFocusable() const
 {
-    return supportsFocus();
+    return supportsFocus() && Element::tabIndex() >= 0;
 }
     
@@ -193 +198 @@
 void HTMLAreaElement::updateFocusAppearance(bool restorePreviousSelection)
 {
+    if (!isFocusable())
+        return;
+    
     Node* parent = parentNode();
     if (!parent || !parent->hasTagName(mapTag))

trunk/WebCore/html/HTMLAreaElement.h

@@ -55 +55 @@
     virtual String target() const;
     virtual bool isKeyboardFocusable(KeyboardEvent*) const;
+    virtual bool isMouseFocusable() const;
     virtual bool isFocusable() const;
     virtual void updateFocusAppearance(bool /*restorePreviousSelection*/);