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

Side by Side Diff: third_party/WebKit/Source/modules/accessibility/AXListBoxOption.cpp

Issue 2804383002: Replace ASSERT with DCHECK in modules/accessibility (Closed)
Patch Set: Created 3 years, 8 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 131
132 String AXListBoxOption::textAlternative(bool recursive, 132 String AXListBoxOption::textAlternative(bool recursive,
133 bool inAriaLabelledByTraversal, 133 bool inAriaLabelledByTraversal,
134 AXObjectSet& visited, 134 AXObjectSet& visited,
135 AXNameFrom& nameFrom, 135 AXNameFrom& nameFrom,
136 AXRelatedObjectVector* relatedObjects, 136 AXRelatedObjectVector* relatedObjects,
137 NameSources* nameSources) const { 137 NameSources* nameSources) const {
138 // If nameSources is non-null, relatedObjects is used in filling it in, so it 138 // If nameSources is non-null, relatedObjects is used in filling it in, so it
139 // must be non-null as well. 139 // must be non-null as well.
140 if (nameSources) 140 if (nameSources)
141 ASSERT(relatedObjects); 141 DCHECK(relatedObjects);
142 142
143 if (!getNode()) 143 if (!getNode())
144 return String(); 144 return String();
145 145
146 bool foundTextAlternative = false; 146 bool foundTextAlternative = false;
147 String textAlternative = ariaTextAlternative( 147 String textAlternative = ariaTextAlternative(
148 recursive, inAriaLabelledByTraversal, visited, nameFrom, relatedObjects, 148 recursive, inAriaLabelledByTraversal, visited, nameFrom, relatedObjects,
149 nameSources, &foundTextAlternative); 149 nameSources, &foundTextAlternative);
150 if (foundTextAlternative && !nameSources) 150 if (foundTextAlternative && !nameSources)
151 return textAlternative; 151 return textAlternative;
(...skipping 29 matching lines...) Expand all
181 if (!getNode()) 181 if (!getNode())
182 return 0; 182 return 0;
183 183
184 if (isHTMLOptionElement(getNode())) 184 if (isHTMLOptionElement(getNode()))
185 return toHTMLOptionElement(getNode())->ownerSelectElement(); 185 return toHTMLOptionElement(getNode())->ownerSelectElement();
186 186
187 return 0; 187 return 0;
188 } 188 }
189 189
190 } // namespace blink 190 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698