Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(725)

Side by Side Diff: Source/core/accessibility/AXRenderObject.cpp

Issue 649073002: Removing redundant names introduced for input type checkbox with menu as parent and aria role menui… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/accessibility/AXObject.h ('k') | Source/web/AssertMatchingEnums.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 if (isHTMLInputElement(node)) { 313 if (isHTMLInputElement(node)) {
314 HTMLInputElement& input = toHTMLInputElement(*node); 314 HTMLInputElement& input = toHTMLInputElement(*node);
315 const AtomicString& type = input.type(); 315 const AtomicString& type = input.type();
316 if (type == InputTypeNames::button) { 316 if (type == InputTypeNames::button) {
317 if ((node->parentNode() && isHTMLMenuElement(node->parentNode())) || (parentObject() && parentObject()->roleValue() == MenuRole)) 317 if ((node->parentNode() && isHTMLMenuElement(node->parentNode())) || (parentObject() && parentObject()->roleValue() == MenuRole))
318 return MenuItemRole; 318 return MenuItemRole;
319 return buttonRoleType(); 319 return buttonRoleType();
320 } 320 }
321 if (type == InputTypeNames::checkbox) { 321 if (type == InputTypeNames::checkbox) {
322 if ((node->parentNode() && isHTMLMenuElement(node->parentNode())) || (parentObject() && parentObject()->roleValue() == MenuRole)) 322 if ((node->parentNode() && isHTMLMenuElement(node->parentNode())) || (parentObject() && parentObject()->roleValue() == MenuRole))
323 return CheckBoxMenuItemRole; 323 return MenuItemCheckBoxRole;
324 return CheckBoxRole; 324 return CheckBoxRole;
325 } 325 }
326 if (type == InputTypeNames::date) 326 if (type == InputTypeNames::date)
327 return DateRole; 327 return DateRole;
328 if (type == InputTypeNames::datetime 328 if (type == InputTypeNames::datetime
329 || type == InputTypeNames::datetime_local 329 || type == InputTypeNames::datetime_local
330 || type == InputTypeNames::month 330 || type == InputTypeNames::month
331 || type == InputTypeNames::week) 331 || type == InputTypeNames::week)
332 return DateTimeRole; 332 return DateTimeRole;
333 if (type == InputTypeNames::radio) 333 if (type == InputTypeNames::radio)
(...skipping 2040 matching lines...) Expand 10 before | Expand all | Expand 10 after
2374 if (label && label->renderer()) { 2374 if (label && label->renderer()) {
2375 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR ect(); 2375 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR ect();
2376 result.unite(labelRect); 2376 result.unite(labelRect);
2377 } 2377 }
2378 } 2378 }
2379 2379
2380 return result; 2380 return result;
2381 } 2381 }
2382 2382
2383 } // namespace blink 2383 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/accessibility/AXObject.h ('k') | Source/web/AssertMatchingEnums.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698