| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012, Google Inc. All rights reserved. | 2 * Copyright (C) 2012, Google 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 1363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1374 | 1374 |
| 1375 // Elements that should not have children | 1375 // Elements that should not have children |
| 1376 switch (roleValue()) { | 1376 switch (roleValue()) { |
| 1377 case ImageRole: | 1377 case ImageRole: |
| 1378 case ButtonRole: | 1378 case ButtonRole: |
| 1379 case PopUpButtonRole: | 1379 case PopUpButtonRole: |
| 1380 case CheckBoxRole: | 1380 case CheckBoxRole: |
| 1381 case RadioButtonRole: | 1381 case RadioButtonRole: |
| 1382 case TabRole: | 1382 case TabRole: |
| 1383 case ToggleButtonRole: | 1383 case ToggleButtonRole: |
| 1384 case StaticTextRole: | |
| 1385 case ListBoxOptionRole: | 1384 case ListBoxOptionRole: |
| 1386 case ScrollBarRole: | 1385 case ScrollBarRole: |
| 1387 return false; | 1386 return false; |
| 1387 case StaticTextRole: |
| 1388 if (!axObjectCache()->inlineTextBoxAccessibility()) |
| 1389 return false; |
| 1388 default: | 1390 default: |
| 1389 return true; | 1391 return true; |
| 1390 } | 1392 } |
| 1391 } | 1393 } |
| 1392 | 1394 |
| 1393 Element* AccessibilityNodeObject::actionElement() const | 1395 Element* AccessibilityNodeObject::actionElement() const |
| 1394 { | 1396 { |
| 1395 Node* node = this->node(); | 1397 Node* node = this->node(); |
| 1396 if (!node) | 1398 if (!node) |
| 1397 return 0; | 1399 return 0; |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1802 useTextUnderElement = true; | 1804 useTextUnderElement = true; |
| 1803 | 1805 |
| 1804 if (useTextUnderElement) { | 1806 if (useTextUnderElement) { |
| 1805 String text = textUnderElement(); | 1807 String text = textUnderElement(); |
| 1806 if (!text.isEmpty()) | 1808 if (!text.isEmpty()) |
| 1807 textOrder.append(AccessibilityText(text, ChildrenText)); | 1809 textOrder.append(AccessibilityText(text, ChildrenText)); |
| 1808 } | 1810 } |
| 1809 } | 1811 } |
| 1810 | 1812 |
| 1811 } // namespace WebCore | 1813 } // namespace WebCore |
| OLD | NEW |