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

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

Issue 773213003: Revert of Do the early return when role is different than UnknownRole (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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 | « no previous file | no next file » | 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 PassRefPtr<AXTableRow> AXTableRow::create(RenderObject* renderer) 49 PassRefPtr<AXTableRow> AXTableRow::create(RenderObject* renderer)
50 { 50 {
51 return adoptRef(new AXTableRow(renderer)); 51 return adoptRef(new AXTableRow(renderer));
52 } 52 }
53 53
54 AccessibilityRole AXTableRow::determineAccessibilityRole() 54 AccessibilityRole AXTableRow::determineAccessibilityRole()
55 { 55 {
56 if (!isTableRow()) 56 if (!isTableRow())
57 return AXRenderObject::determineAccessibilityRole(); 57 return AXRenderObject::determineAccessibilityRole();
58 58
59 if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole) 59 m_ariaRole = determineAriaRoleAttribute();
60 return m_ariaRole; 60
61 AccessibilityRole ariaRole = ariaRoleAttribute();
62 if (ariaRole != UnknownRole)
63 return ariaRole;
61 64
62 return RowRole; 65 return RowRole;
63 } 66 }
64 67
65 bool AXTableRow::isTableRow() const 68 bool AXTableRow::isTableRow() const
66 { 69 {
67 AXObject* table = parentTable(); 70 AXObject* table = parentTable();
68 if (!table || !table->isAXTable()) 71 if (!table || !table->isAXTable())
69 return false; 72 return false;
70 73
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 return 0; 122 return 0;
120 123
121 Node* cellNode = cellRenderer->node(); 124 Node* cellNode = cellRenderer->node();
122 if (!cellNode || !cellNode->hasTagName(thTag)) 125 if (!cellNode || !cellNode->hasTagName(thTag))
123 return 0; 126 return 0;
124 127
125 return cell; 128 return cell;
126 } 129 }
127 130
128 } // namespace blink 131 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698