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

Side by Side Diff: Source/core/layout/svg/line/SVGInlineTextBox.cpp

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/core/layout/svg/SVGLayoutTreeAsText.cpp ('k') | Source/core/page/TouchAdjustment.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) 2007 Rob Buis <buis@kde.org> 2 * Copyright (C) 2007 Rob Buis <buis@kde.org>
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 return LayoutRect(enclosingIntRect(selectionRect.rawValue())); 165 return LayoutRect(enclosingIntRect(selectionRect.rawValue()));
166 } 166 }
167 167
168 void SVGInlineTextBox::paint(const PaintInfo& paintInfo, const LayoutPoint& pain tOffset, LayoutUnit, LayoutUnit) 168 void SVGInlineTextBox::paint(const PaintInfo& paintInfo, const LayoutPoint& pain tOffset, LayoutUnit, LayoutUnit)
169 { 169 {
170 SVGInlineTextBoxPainter(*this).paint(paintInfo, paintOffset); 170 SVGInlineTextBoxPainter(*this).paint(paintInfo, paintOffset);
171 } 171 }
172 172
173 TextRun SVGInlineTextBox::constructTextRun(const LayoutStyle& style, const SVGTe xtFragment& fragment) const 173 TextRun SVGInlineTextBox::constructTextRun(const LayoutStyle& style, const SVGTe xtFragment& fragment) const
174 { 174 {
175 RenderText* text = &renderer(); 175 LayoutText* text = &renderer();
176 176
177 // FIXME(crbug.com/264211): This should not be necessary but can occur if we 177 // FIXME(crbug.com/264211): This should not be necessary but can occur if we
178 // layout during layout. Remove this when 264211 is fixed. 178 // layout during layout. Remove this when 264211 is fixed.
179 RELEASE_ASSERT(!text->needsLayout()); 179 RELEASE_ASSERT(!text->needsLayout());
180 180
181 TextRun run(static_cast<const LChar*>(0) // characters, will be set below if non-zero. 181 TextRun run(static_cast<const LChar*>(0) // characters, will be set below if non-zero.
182 , 0 // length, will be set below if non-zero. 182 , 0 // length, will be set below if non-zero.
183 , 0 // xPos, only relevant with allowTabs=true 183 , 0 // xPos, only relevant with allowTabs=true
184 , 0 // padding, only relevant for justified text, not relevant for SVG 184 , 0 // padding, only relevant for justified text, not relevant for SVG
185 , TextRun::AllowTrailingExpansion 185 , TextRun::AllowTrailingExpansion
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 renderer().updateHitTestResult(result, locationInContainer.point () - toLayoutSize(accumulatedOffset)); 284 renderer().updateHitTestResult(result, locationInContainer.point () - toLayoutSize(accumulatedOffset));
285 if (!result.addNodeToListBasedTestResult(renderer().node(), requ est, locationInContainer, rect.rawValue())) 285 if (!result.addNodeToListBasedTestResult(renderer().node(), requ est, locationInContainer, rect.rawValue()))
286 return true; 286 return true;
287 } 287 }
288 } 288 }
289 } 289 }
290 return false; 290 return false;
291 } 291 }
292 292
293 } // namespace blink 293 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/svg/SVGLayoutTreeAsText.cpp ('k') | Source/core/page/TouchAdjustment.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698