Chromium Code Reviews| 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 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1370 | 1370 |
| 1371 // Elements that should not have children | 1371 // Elements that should not have children |
| 1372 switch (roleValue()) { | 1372 switch (roleValue()) { |
| 1373 case ImageRole: | 1373 case ImageRole: |
| 1374 case ButtonRole: | 1374 case ButtonRole: |
| 1375 case PopUpButtonRole: | 1375 case PopUpButtonRole: |
| 1376 case CheckBoxRole: | 1376 case CheckBoxRole: |
| 1377 case RadioButtonRole: | 1377 case RadioButtonRole: |
| 1378 case TabRole: | 1378 case TabRole: |
| 1379 case ToggleButtonRole: | 1379 case ToggleButtonRole: |
| 1380 case StaticTextRole: | |
| 1381 case ListBoxOptionRole: | 1380 case ListBoxOptionRole: |
| 1382 case ScrollBarRole: | 1381 case ScrollBarRole: |
| 1383 return false; | 1382 return false; |
| 1383 case StaticTextRole: | |
| 1384 if (!axObjectCache()->inlineTextBoxAccessibility()) | |
|
aboxhall
2013/09/06 17:19:21
return axObjectCache()->inlineTextBoxAccessibility
dmazzoni
2013/09/06 20:25:27
I find it slightly more clear to have it fall thro
aboxhall
2013/09/06 20:51:12
This is fine. I tend to prefer not to do things li
| |
| 1385 return false; | |
| 1384 default: | 1386 default: |
| 1385 return true; | 1387 return true; |
| 1386 } | 1388 } |
| 1387 } | 1389 } |
| 1388 | 1390 |
| 1389 Element* AccessibilityNodeObject::actionElement() const | 1391 Element* AccessibilityNodeObject::actionElement() const |
| 1390 { | 1392 { |
| 1391 Node* node = this->node(); | 1393 Node* node = this->node(); |
| 1392 if (!node) | 1394 if (!node) |
| 1393 return 0; | 1395 return 0; |
| (...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1797 useTextUnderElement = true; | 1799 useTextUnderElement = true; |
| 1798 | 1800 |
| 1799 if (useTextUnderElement) { | 1801 if (useTextUnderElement) { |
| 1800 String text = textUnderElement(); | 1802 String text = textUnderElement(); |
| 1801 if (!text.isEmpty()) | 1803 if (!text.isEmpty()) |
| 1802 textOrder.append(AccessibilityText(text, ChildrenText)); | 1804 textOrder.append(AccessibilityText(text, ChildrenText)); |
| 1803 } | 1805 } |
| 1804 } | 1806 } |
| 1805 | 1807 |
| 1806 } // namespace WebCore | 1808 } // namespace WebCore |
| OLD | NEW |