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

Side by Side Diff: Source/core/layout/svg/SVGTextLayoutEngine.cpp

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/svg/SVGTextChunkBuilder.cpp ('k') | Source/core/layout/svg/SVGTextQuery.cpp » ('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) Research In Motion Limited 2010-2012. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 m_textPathStartOffset = 0; 233 m_textPathStartOffset = 0;
234 m_textPathCurrentOffset = 0; 234 m_textPathCurrentOffset = 0;
235 m_textPathSpacing = 0; 235 m_textPathSpacing = 0;
236 m_textPathScaling = 1; 236 m_textPathScaling = 1;
237 } 237 }
238 238
239 void SVGTextLayoutEngine::layoutInlineTextBox(SVGInlineTextBox* textBox) 239 void SVGTextLayoutEngine::layoutInlineTextBox(SVGInlineTextBox* textBox)
240 { 240 {
241 ASSERT(textBox); 241 ASSERT(textBox);
242 242
243 LayoutSVGInlineText& text = toLayoutSVGInlineText(textBox->renderer()); 243 LayoutSVGInlineText& text = toLayoutSVGInlineText(textBox->layoutObject());
244 ASSERT(text.parent()); 244 ASSERT(text.parent());
245 ASSERT(text.parent()->node()); 245 ASSERT(text.parent()->node());
246 ASSERT(text.parent()->node()->isSVGElement()); 246 ASSERT(text.parent()->node()->isSVGElement());
247 247
248 const LayoutStyle& style = text.styleRef(); 248 const LayoutStyle& style = text.styleRef();
249 249
250 textBox->clearTextFragments(); 250 textBox->clearTextFragments();
251 m_isVerticalText = style.svgStyle().isVerticalWritingMode(); 251 m_isVerticalText = style.svgStyle().isVerticalWritingMode();
252 layoutTextOnLineOrPath(textBox, text, style); 252 layoutTextOnLineOrPath(textBox, text, style);
253 253
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 } 634 }
635 635
636 if (!didStartTextFragment) 636 if (!didStartTextFragment)
637 return; 637 return;
638 638
639 // Close last open fragment, if needed. 639 // Close last open fragment, if needed.
640 recordTextFragment(textBox, visualMetricsValues); 640 recordTextFragment(textBox, visualMetricsValues);
641 } 641 }
642 642
643 } 643 }
OLDNEW
« no previous file with comments | « Source/core/layout/svg/SVGTextChunkBuilder.cpp ('k') | Source/core/layout/svg/SVGTextQuery.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698