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

Side by Side Diff: Source/core/rendering/svg/RenderSVGInlineText.cpp

Issue 622253002: Pass start/length at InlineTextBox construction time. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: condense by one line Created 6 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
3 * Copyright (C) 2006 Apple Computer Inc. 3 * Copyright (C) 2006 Apple Computer Inc.
4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
5 * Copyright (C) 2008 Rob Buis <buis@kde.org> 5 * Copyright (C) 2008 Rob Buis <buis@kde.org>
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 } 91 }
92 92
93 if (!diff.needsFullLayout()) 93 if (!diff.needsFullLayout())
94 return; 94 return;
95 95
96 // The text metrics may be influenced by style changes. 96 // The text metrics may be influenced by style changes.
97 if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor (this)) 97 if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor (this))
98 textRenderer->setNeedsLayoutAndFullPaintInvalidation(); 98 textRenderer->setNeedsLayoutAndFullPaintInvalidation();
99 } 99 }
100 100
101 InlineTextBox* RenderSVGInlineText::createTextBox() 101 InlineTextBox* RenderSVGInlineText::createTextBox(int start, unsigned short leng th)
102 { 102 {
103 InlineTextBox* box = new SVGInlineTextBox(*this); 103 InlineTextBox* box = new SVGInlineTextBox(*this, start, length);
104 box->setHasVirtualLogicalHeight(); 104 box->setHasVirtualLogicalHeight();
105 return box; 105 return box;
106 } 106 }
107 107
108 LayoutRect RenderSVGInlineText::localCaretRect(InlineBox* box, int caretOffset, LayoutUnit*) 108 LayoutRect RenderSVGInlineText::localCaretRect(InlineBox* box, int caretOffset, LayoutUnit*)
109 { 109 {
110 if (!box || !box->isInlineTextBox()) 110 if (!box || !box->isInlineTextBox())
111 return LayoutRect(); 111 return LayoutRect();
112 112
113 InlineTextBox* textBox = toInlineTextBox(box); 113 InlineTextBox* textBox = toInlineTextBox(box);
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 Document& document = renderer->document(); 234 Document& document = renderer->document();
235 // FIXME: We need to better handle the case when we compute very small fonts below (below 1pt). 235 // FIXME: We need to better handle the case when we compute very small fonts below (below 1pt).
236 fontDescription.setComputedSize(FontSize::getComputedSizeFromSpecifiedSize(& document, scalingFactor, fontDescription.isAbsoluteSize(), fontDescription.speci fiedSize(), DoNotUseSmartMinimumForFontSize)); 236 fontDescription.setComputedSize(FontSize::getComputedSizeFromSpecifiedSize(& document, scalingFactor, fontDescription.isAbsoluteSize(), fontDescription.speci fiedSize(), DoNotUseSmartMinimumForFontSize));
237 237
238 scaledFont = Font(fontDescription); 238 scaledFont = Font(fontDescription);
239 scaledFont.update(document.styleEngine()->fontSelector()); 239 scaledFont.update(document.styleEngine()->fontSelector());
240 } 240 }
241 241
242 } 242 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698