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

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

Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-6
Patch Set: get-names-7: rebase Created 4 years, 10 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) 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 nameFrom = AXNameFromContents; 120 nameFrom = AXNameFromContents;
121 return m_inlineTextBox->text(); 121 return m_inlineTextBox->text();
122 } 122 }
123 123
124 AXObject* AXInlineTextBox::computeParent() const 124 AXObject* AXInlineTextBox::computeParent() const
125 { 125 {
126 ASSERT(!isDetached()); 126 ASSERT(!isDetached());
127 if (!m_inlineTextBox || !m_axObjectCache) 127 if (!m_inlineTextBox || !m_axObjectCache)
128 return 0; 128 return 0;
129 129
130 LineLayoutText lineLayoutText = m_inlineTextBox->lineLayoutItem(); 130 LineLayoutText lineLayoutText = m_inlineTextBox->getLineLayoutItem();
131 return m_axObjectCache->getOrCreate(lineLayoutText); 131 return m_axObjectCache->getOrCreate(lineLayoutText);
132 } 132 }
133 133
134 // In addition to LTR and RTL direction, edit fields also support 134 // In addition to LTR and RTL direction, edit fields also support
135 // top to bottom and bottom to top via the CSS writing-mode property. 135 // top to bottom and bottom to top via the CSS writing-mode property.
136 AccessibilityTextDirection AXInlineTextBox::textDirection() const 136 AccessibilityTextDirection AXInlineTextBox::textDirection() const
137 { 137 {
138 if (!m_inlineTextBox) 138 if (!m_inlineTextBox)
139 return AXObject::textDirection(); 139 return AXObject::textDirection();
140 140
(...skipping 29 matching lines...) Expand all
170 if (previousOnLine) 170 if (previousOnLine)
171 return m_axObjectCache->getOrCreate(previousOnLine.get()); 171 return m_axObjectCache->getOrCreate(previousOnLine.get());
172 172
173 if (!m_inlineTextBox->isFirst()) 173 if (!m_inlineTextBox->isFirst())
174 return 0; 174 return 0;
175 175
176 return parentObject()->previousOnLine(); 176 return parentObject()->previousOnLine();
177 } 177 }
178 178
179 } // namespace blink 179 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698