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

Side by Side Diff: Source/core/paint/TextPainter.cpp

Issue 1316163002: Make the LayoutRect->FloatRect constructor explicit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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/paint/TablePainter.cpp ('k') | Source/core/paint/VideoPainter.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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/paint/TextPainter.h" 6 #include "core/paint/TextPainter.h"
7 7
8 #include "core/CSSPropertyNames.h" 8 #include "core/CSSPropertyNames.h"
9 #include "core/frame/Settings.h" 9 #include "core/frame/Settings.h"
10 #include "core/layout/LayoutObject.h" 10 #include "core/layout/LayoutObject.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 } else { 195 } else {
196 ASSERT(step == PaintText); 196 ASSERT(step == PaintText);
197 m_graphicsContext->drawText(m_font, textRunPaintInfo, FloatPoint(m_textO rigin)); 197 m_graphicsContext->drawText(m_font, textRunPaintInfo, FloatPoint(m_textO rigin));
198 } 198 }
199 } 199 }
200 200
201 template <TextPainter::PaintInternalStep Step> 201 template <TextPainter::PaintInternalStep Step>
202 void TextPainter::paintInternal(int startOffset, int endOffset, int truncationPo int, TextBlobPtr* cachedTextBlob) 202 void TextPainter::paintInternal(int startOffset, int endOffset, int truncationPo int, TextBlobPtr* cachedTextBlob)
203 { 203 {
204 TextRunPaintInfo textRunPaintInfo(m_run); 204 TextRunPaintInfo textRunPaintInfo(m_run);
205 textRunPaintInfo.bounds = m_textBounds; 205 textRunPaintInfo.bounds = FloatRect(m_textBounds);
206 if (startOffset <= endOffset) { 206 if (startOffset <= endOffset) {
207 // FIXME: We should be able to use cachedTextBlob in more cases. 207 // FIXME: We should be able to use cachedTextBlob in more cases.
208 textRunPaintInfo.cachedTextBlob = cachedTextBlob; 208 textRunPaintInfo.cachedTextBlob = cachedTextBlob;
209 paintInternalRun<Step>(textRunPaintInfo, startOffset, endOffset); 209 paintInternalRun<Step>(textRunPaintInfo, startOffset, endOffset);
210 } else { 210 } else {
211 if (endOffset > 0) 211 if (endOffset > 0)
212 paintInternalRun<Step>(textRunPaintInfo, 0, endOffset); 212 paintInternalRun<Step>(textRunPaintInfo, 0, endOffset);
213 if (startOffset < truncationPoint) 213 if (startOffset < truncationPoint)
214 paintInternalRun<Step>(textRunPaintInfo, startOffset, truncationPoin t); 214 paintInternalRun<Step>(textRunPaintInfo, startOffset, truncationPoin t);
215 } 215 }
216 } 216 }
217 217
218 void TextPainter::paintEmphasisMarkForCombinedText() 218 void TextPainter::paintEmphasisMarkForCombinedText()
219 { 219 {
220 ASSERT(m_combinedText); 220 ASSERT(m_combinedText);
221 DEFINE_STATIC_LOCAL(TextRun, placeholderTextRun, (&ideographicFullStopCharac ter, 1)); 221 DEFINE_STATIC_LOCAL(TextRun, placeholderTextRun, (&ideographicFullStopCharac ter, 1));
222 FloatPoint emphasisMarkTextOrigin(m_textBounds.x().toFloat(), m_textBounds.y ().toFloat() + m_font.fontMetrics().ascent() + m_emphasisMarkOffset); 222 FloatPoint emphasisMarkTextOrigin(m_textBounds.x().toFloat(), m_textBounds.y ().toFloat() + m_font.fontMetrics().ascent() + m_emphasisMarkOffset);
223 TextRunPaintInfo textRunPaintInfo(placeholderTextRun); 223 TextRunPaintInfo textRunPaintInfo(placeholderTextRun);
224 textRunPaintInfo.bounds = m_textBounds; 224 textRunPaintInfo.bounds = FloatRect(m_textBounds);
225 m_graphicsContext->concatCTM(rotation(m_textBounds, Clockwise)); 225 m_graphicsContext->concatCTM(rotation(m_textBounds, Clockwise));
226 m_graphicsContext->drawEmphasisMarks(m_combinedText->originalFont(), textRun PaintInfo, m_emphasisMark, emphasisMarkTextOrigin); 226 m_graphicsContext->drawEmphasisMarks(m_combinedText->originalFont(), textRun PaintInfo, m_emphasisMark, emphasisMarkTextOrigin);
227 m_graphicsContext->concatCTM(rotation(m_textBounds, Counterclockwise)); 227 m_graphicsContext->concatCTM(rotation(m_textBounds, Counterclockwise));
228 } 228 }
229 229
230 } // namespace blink 230 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/TablePainter.cpp ('k') | Source/core/paint/VideoPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698