Changeset 79900 in webkit

Timestamp:

Feb 28, 2011 12:51:44 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-28 Chang Shu <​cshu@webkit.org>

Reviewed by Adele Peterson.

REGRESSION (r79762): Items in <select multiple> have focus rings, but shouldn't
​https://bugs.webkit.org/show_bug.cgi?id=55323

Added test case to make sure no focus ring is drawn on selected items.

• fast/forms/select-listbox-multiple-no-focusring.html: Added.
• platform/mac/fast/forms/select-listbox-multiple-no-focusring-expected.checksum: Added.
• platform/mac/fast/forms/select-listbox-multiple-no-focusring-expected.png: Added.
• platform/mac/fast/forms/select-listbox-multiple-no-focusring-expected.txt: Added.

2011-02-28 Chang Shu <​cshu@webkit.org>

Reviewed by Adele Peterson.

REGRESSION (r79762): Items in <select multiple> have focus rings, but shouldn't
​https://bugs.webkit.org/show_bug.cgi?id=55323

Draw focus ring on selected items only if spatial navigation is enabled.

Test: fast/forms/select-listbox-multiple-no-focusring.html

• rendering/RenderBlock.h:
• rendering/RenderListBox.cpp: (WebCore::RenderListBox::addFocusRingRects):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/select-listbox-multiple-no-focusring.html (added)
• LayoutTests/platform/mac/fast/forms/select-listbox-multiple-no-focusring-expected.checksum (added)
• LayoutTests/platform/mac/fast/forms/select-listbox-multiple-no-focusring-expected.png (added)
• LayoutTests/platform/mac/fast/forms/select-listbox-multiple-no-focusring-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderListBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-28  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Adele Peterson.
+
+        REGRESSION (r79762): Items in <select multiple> have focus rings, but shouldn't
+        https://bugs.webkit.org/show_bug.cgi?id=55323
+
+        Added test case to make sure no focus ring is drawn on selected items.
+
+        * fast/forms/select-listbox-multiple-no-focusring.html: Added.
+        * platform/mac/fast/forms/select-listbox-multiple-no-focusring-expected.checksum: Added.
+        * platform/mac/fast/forms/select-listbox-multiple-no-focusring-expected.png: Added.
+        * platform/mac/fast/forms/select-listbox-multiple-no-focusring-expected.txt: Added.
+
 2011-02-28  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-28  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Adele Peterson.
+
+        REGRESSION (r79762): Items in <select multiple> have focus rings, but shouldn't
+        https://bugs.webkit.org/show_bug.cgi?id=55323
+
+        Draw focus ring on selected items only if spatial navigation is enabled.
+
+        Test: fast/forms/select-listbox-multiple-no-focusring.html
+
+        * rendering/RenderBlock.h:
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::addFocusRingRects):
+
 2011-02-28  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -303 +303 @@
     void addOverflowFromInlineChildren();
 
+    virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
+
 #if ENABLE(SVG)
 protected:
@@ -587 +589 @@
 
     virtual IntRect localCaretRect(InlineBox*, int caretOffset, int* extraWidthToEndOfLine = 0);
-
-    virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty);
 
     void adjustPointToColumnContents(IntPoint&) const;

trunk/Source/WebCore/rendering/RenderListBox.cpp

@@ -281 +281 @@
 void RenderListBox::addFocusRingRects(Vector<IntRect>& rects, int tx, int ty)
 {
+    if (!isSpatialNavigationEnabled(frame()))
+        return RenderBlock::addFocusRingRects(rects, tx, ty);
+
     SelectElement* select = toSelectElement(static_cast<Element*>(node()));