| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2011 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 { "menuitem", MenuListOptionRole }, | 268 { "menuitem", MenuListOptionRole }, |
| 269 { "progressbar", MeterRole }, | 269 { "progressbar", MeterRole }, |
| 270 { "textbox", TextFieldRole } | 270 { "textbox", TextFieldRole } |
| 271 }; | 271 }; |
| 272 | 272 |
| 273 static ARIARoleMap* createARIARoleMap() | 273 static ARIARoleMap* createARIARoleMap() |
| 274 { | 274 { |
| 275 ARIARoleMap* roleMap = new ARIARoleMap; | 275 ARIARoleMap* roleMap = new ARIARoleMap; |
| 276 | 276 |
| 277 for (size_t i = 0; i < WTF_ARRAY_LENGTH(roles); ++i) | 277 for (size_t i = 0; i < WTF_ARRAY_LENGTH(roles); ++i) |
| 278 roleMap->set(roles[i].ariaRole, roles[i].webcoreRole); | 278 roleMap->set(String(roles[i].ariaRole), roles[i].webcoreRole); |
| 279 return roleMap; | 279 return roleMap; |
| 280 } | 280 } |
| 281 | 281 |
| 282 static Vector<AtomicString>* createRoleNameVector() | 282 static Vector<AtomicString>* createRoleNameVector() |
| 283 { | 283 { |
| 284 Vector<AtomicString>* roleNameVector = new Vector<AtomicString>(NumRoles); | 284 Vector<AtomicString>* roleNameVector = new Vector<AtomicString>(NumRoles); |
| 285 for (int i = 0; i < NumRoles; i++) | 285 for (int i = 0; i < NumRoles; i++) |
| 286 (*roleNameVector)[i] = nullAtom; | 286 (*roleNameVector)[i] = nullAtom; |
| 287 | 287 |
| 288 for (size_t i = 0; i < WTF_ARRAY_LENGTH(roles); ++i) | 288 for (size_t i = 0; i < WTF_ARRAY_LENGTH(roles); ++i) |
| (...skipping 1399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1688 | 1688 |
| 1689 DEFINE_TRACE(AXObject) | 1689 DEFINE_TRACE(AXObject) |
| 1690 { | 1690 { |
| 1691 visitor->trace(m_children); | 1691 visitor->trace(m_children); |
| 1692 visitor->trace(m_parent); | 1692 visitor->trace(m_parent); |
| 1693 visitor->trace(m_cachedLiveRegionRoot); | 1693 visitor->trace(m_cachedLiveRegionRoot); |
| 1694 visitor->trace(m_axObjectCache); | 1694 visitor->trace(m_axObjectCache); |
| 1695 } | 1695 } |
| 1696 | 1696 |
| 1697 } // namespace blink | 1697 } // namespace blink |
| OLD | NEW |