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

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

Issue 1435113003: Make use of new AX name calc in Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix issue with ariaTextAlternative Created 5 years, 1 month 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) 2013, Google Inc. All rights reserved. 2 * Copyright (C) 2013, Google 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 if (!m_inlineTextBox) 106 if (!m_inlineTextBox)
107 return; 107 return;
108 108
109 Vector<AbstractInlineTextBox::WordBoundaries> wordBoundaries; 109 Vector<AbstractInlineTextBox::WordBoundaries> wordBoundaries;
110 m_inlineTextBox->wordBoundaries(wordBoundaries); 110 m_inlineTextBox->wordBoundaries(wordBoundaries);
111 words.resize(wordBoundaries.size()); 111 words.resize(wordBoundaries.size());
112 for (unsigned i = 0; i < wordBoundaries.size(); i++) 112 for (unsigned i = 0; i < wordBoundaries.size(); i++)
113 words[i] = AXRange(wordBoundaries[i].startIndex, wordBoundaries[i].endIn dex); 113 words[i] = AXRange(wordBoundaries[i].startIndex, wordBoundaries[i].endIn dex);
114 } 114 }
115 115
116 String AXInlineTextBox::stringValue() const 116 String AXInlineTextBox::name(AXNameFrom& nameFrom, AXObject::AXObjectVector* nam eObjects) const
117 { 117 {
118 if (!m_inlineTextBox) 118 if (!m_inlineTextBox)
119 return String(); 119 return String();
120 120
121 nameFrom = AXNameFromContents;
121 return m_inlineTextBox->text(); 122 return m_inlineTextBox->text();
122 } 123 }
123 124
124 AXObject* AXInlineTextBox::computeParent() const 125 AXObject* AXInlineTextBox::computeParent() const
125 { 126 {
126 ASSERT(!isDetached()); 127 ASSERT(!isDetached());
127 if (!m_inlineTextBox || !m_axObjectCache) 128 if (!m_inlineTextBox || !m_axObjectCache)
128 return 0; 129 return 0;
129 130
130 LayoutText* layoutText = m_inlineTextBox->layoutText(); 131 LayoutText* layoutText = m_inlineTextBox->layoutText();
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 if (previousOnLine) 171 if (previousOnLine)
171 return m_axObjectCache->getOrCreate(previousOnLine.get()); 172 return m_axObjectCache->getOrCreate(previousOnLine.get());
172 173
173 if (!m_inlineTextBox->isFirst()) 174 if (!m_inlineTextBox->isFirst())
174 return 0; 175 return 0;
175 176
176 return parentObject()->previousOnLine(); 177 return parentObject()->previousOnLine();
177 } 178 }
178 179
179 } // namespace blink 180 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698