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

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

Issue 856473002: Inherit Presentation role only when elements without a explicit role defined. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 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
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 2348 matching lines...) Expand 10 before | Expand all | Expand 10 after
2359 2359
2360 AXObject* parent = parentObject(); 2360 AXObject* parent = parentObject();
2361 if (!parent->isAXRenderObject()) 2361 if (!parent->isAXRenderObject())
2362 return false; 2362 return false;
2363 2363
2364 Node* elementNode = toAXRenderObject(parent)->node(); 2364 Node* elementNode = toAXRenderObject(parent)->node();
2365 if (!elementNode || !elementNode->isElementNode()) 2365 if (!elementNode || !elementNode->isElementNode())
2366 return false; 2366 return false;
2367 2367
2368 QualifiedName tagName = toElement(elementNode)->tagQName(); 2368 QualifiedName tagName = toElement(elementNode)->tagQName();
2369 if (tagName == ulTag || tagName == olTag || tagName == dlTag) 2369 if (tagName != ulTag && tagName != olTag && tagName != dlTag)
2370 return (parent->roleValue() == NoneRole || parent->roleValue() == Presen tationalRole); 2370 return false;
2371
2372 if (parent->roleValue() == NoneRole || parent->roleValue() == Presentational Role)
2373 return ariaRoleAttribute() == UnknownRole;
2371 2374
2372 return false; 2375 return false;
2373 } 2376 }
2374 2377
2375 LayoutRect AXRenderObject::computeElementRect() const 2378 LayoutRect AXRenderObject::computeElementRect() const
2376 { 2379 {
2377 RenderObject* obj = m_renderer; 2380 RenderObject* obj = m_renderer;
2378 2381
2379 if (!obj) 2382 if (!obj)
2380 return LayoutRect(); 2383 return LayoutRect();
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
2416 if (label && label->renderer()) { 2419 if (label && label->renderer()) {
2417 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR ect(); 2420 LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementR ect();
2418 result.unite(labelRect); 2421 result.unite(labelRect);
2419 } 2422 }
2420 } 2423 }
2421 2424
2422 return result; 2425 return result;
2423 } 2426 }
2424 2427
2425 } // namespace blink 2428 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698