OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
938 // RenderMenuList will go straight to the text() of its selected item. | 938 // RenderMenuList will go straight to the text() of its selected item. |
939 // This has to be overridden in the case where the selected item has an
ARIA label. | 939 // This has to be overridden in the case where the selected item has an
ARIA label. |
940 HTMLSelectElement* selectElement = toHTMLSelectElement(m_renderer->node(
)); | 940 HTMLSelectElement* selectElement = toHTMLSelectElement(m_renderer->node(
)); |
941 int selectedIndex = selectElement->selectedIndex(); | 941 int selectedIndex = selectElement->selectedIndex(); |
942 const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& listItems = sel
ectElement->listItems(); | 942 const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& listItems = sel
ectElement->listItems(); |
943 if (selectedIndex >= 0 && static_cast<size_t>(selectedIndex) < listItems
.size()) { | 943 if (selectedIndex >= 0 && static_cast<size_t>(selectedIndex) < listItems
.size()) { |
944 const AtomicString& overriddenDescription = listItems[selectedIndex]
->fastGetAttribute(aria_labelAttr); | 944 const AtomicString& overriddenDescription = listItems[selectedIndex]
->fastGetAttribute(aria_labelAttr); |
945 if (!overriddenDescription.isNull()) | 945 if (!overriddenDescription.isNull()) |
946 return overriddenDescription; | 946 return overriddenDescription; |
947 } | 947 } |
948 return toRenderMenuList(m_renderer)->text(); | 948 return selectElement->value(); |
949 } | 949 } |
950 | 950 |
951 if (m_renderer->isListMarker()) | 951 if (m_renderer->isListMarker()) |
952 return toRenderListMarker(m_renderer)->text(); | 952 return toRenderListMarker(m_renderer)->text(); |
953 | 953 |
954 if (isWebArea()) { | 954 if (isWebArea()) { |
955 // FIXME: Why would a renderer exist when the Document isn't attached to
a frame? | 955 // FIXME: Why would a renderer exist when the Document isn't attached to
a frame? |
956 if (m_renderer->frame()) | 956 if (m_renderer->frame()) |
957 return String(); | 957 return String(); |
958 | 958 |
(...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2411 if (label && label->renderer()) { | 2411 if (label && label->renderer()) { |
2412 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR
ect(); | 2412 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR
ect(); |
2413 result.unite(labelRect); | 2413 result.unite(labelRect); |
2414 } | 2414 } |
2415 } | 2415 } |
2416 | 2416 |
2417 return result; | 2417 return result; |
2418 } | 2418 } |
2419 | 2419 |
2420 } // namespace blink | 2420 } // namespace blink |
OLD | NEW |