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

Side by Side Diff: Source/core/svg/SVGFontData.cpp

Issue 121173004: Make calls to AtomicString(const String&) explicit in svg/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Take feedback into consideration Created 6 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
« no previous file with comments | « Source/core/svg/SVGFETileElement.cpp ('k') | Source/core/svg/SVGGlyphRefElement.h » ('j') | 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 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 SVGFontElement* associatedFontElement = svgFontFaceElement->associatedFontEl ement(); 159 SVGFontElement* associatedFontElement = svgFontFaceElement->associatedFontEl ement();
160 ASSERT(associatedFontElement); 160 ASSERT(associatedFontElement);
161 161
162 RenderObject* renderObject = 0; 162 RenderObject* renderObject = 0;
163 if (TextRun::RenderingContext* renderingContext = run.renderingContext()) 163 if (TextRun::RenderingContext* renderingContext = run.renderingContext())
164 renderObject = static_cast<SVGTextRunRenderingContext*>(renderingContext )->renderer(); 164 renderObject = static_cast<SVGTextRunRenderingContext*>(renderingContext )->renderer();
165 165
166 String language; 166 String language;
167 bool isVerticalText = false; 167 bool isVerticalText = false;
168 Vector<String> altGlyphNames; 168 Vector<AtomicString> altGlyphNames;
169 169
170 if (renderObject) { 170 if (renderObject) {
171 RenderObject* parentRenderObject = renderObject->isText() ? renderObject ->parent() : renderObject; 171 RenderObject* parentRenderObject = renderObject->isText() ? renderObject ->parent() : renderObject;
172 ASSERT(parentRenderObject); 172 ASSERT(parentRenderObject);
173 173
174 isVerticalText = parentRenderObject->style()->svgStyle()->isVerticalWrit ingMode(); 174 isVerticalText = parentRenderObject->style()->svgStyle()->isVerticalWrit ingMode();
175 if (Element* parentRenderObjectElement = toElement(parentRenderObject->n ode())) { 175 if (Element* parentRenderObjectElement = toElement(parentRenderObject->n ode())) {
176 language = parentRenderObjectElement->getAttribute(XMLNames::langAtt r); 176 language = parentRenderObjectElement->getAttribute(XMLNames::langAtt r);
177 177
178 if (parentRenderObjectElement->hasTagName(SVGNames::altGlyphTag)) { 178 if (parentRenderObjectElement->hasTagName(SVGNames::altGlyphTag)) {
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 mirroredCharacters.append(mirroredChar(character)); 313 mirroredCharacters.append(mirroredChar(character));
314 } 314 }
315 } 315 }
316 316
317 return mirroredCharacters.toString(); 317 return mirroredCharacters.toString();
318 } 318 }
319 319
320 } // namespace WebCore 320 } // namespace WebCore
321 321
322 #endif 322 #endif
OLDNEW
« no previous file with comments | « Source/core/svg/SVGFETileElement.cpp ('k') | Source/core/svg/SVGGlyphRefElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698