Changeset 193857 in webkit
- Timestamp:
- Dec 9, 2015 1:22:03 PM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r193841 r193857 1 2015-12-09 Zalan Bujtas <zalan@apple.com> 2 3 TextPainter: Rename start and end position to selectionStart and selectionEnd. 4 https://bugs.webkit.org/show_bug.cgi?id=152088 5 6 Reviewed by Myles C. Maxfield. 7 8 They actually mean selection start/end. 9 10 No change in functionality. 11 12 * rendering/InlineTextBox.cpp: 13 (WebCore::InlineTextBox::paint): 14 * rendering/TextPainter.cpp: 15 (WebCore::TextPainter::TextPainter): 16 (WebCore::TextPainter::paintText): 17 * rendering/TextPainter.h: 18 1 19 2015-12-09 Joanmarie Diggs <jdiggs@igalia.com> 2 20 -
trunk/Source/WebCore/rendering/InlineTextBox.cpp
r192259 r193857 582 582 length = textRun.length(); 583 583 584 int s Pos= 0;585 int ePos= 0;584 int selectionStart = 0; 585 int selectionEnd = 0; 586 586 if (haveSelection && (paintSelectedTextOnly || paintSelectedTextSeparately)) 587 selectionStartEnd(s Pos, ePos);587 selectionStartEnd(selectionStart, selectionEnd); 588 588 589 589 if (m_truncation != cNoTruncation) { 590 s Pos = std::min<int>(sPos, m_truncation);591 ePos = std::min<int>(ePos, m_truncation);590 selectionStart = std::min<int>(selectionStart, m_truncation); 591 selectionEnd = std::min<int>(selectionEnd, m_truncation); 592 592 length = m_truncation; 593 593 } … … 613 613 textOrigin.setX(roundToDevicePixel(LayoutUnit(textOrigin.x()), renderer().document().deviceScaleFactor())); 614 614 615 TextPainter textPainter(context, paintSelectedTextOnly, paintSelectedTextSeparately, font, s Pos, ePos, length, emphasisMark, combinedText, textRun, boxRect, textOrigin, emphasisMarkOffset, textShadow, selectionShadow, isHorizontal(), textPaintStyle, selectionPaintStyle);615 TextPainter textPainter(context, paintSelectedTextOnly, paintSelectedTextSeparately, font, selectionStart, selectionEnd, length, emphasisMark, combinedText, textRun, boxRect, textOrigin, emphasisMarkOffset, textShadow, selectionShadow, isHorizontal(), textPaintStyle, selectionPaintStyle); 616 616 textPainter.paintText(); 617 617 -
trunk/Source/WebCore/rendering/TextPainter.cpp
r193779 r193857 80 80 } 81 81 82 TextPainter::TextPainter(GraphicsContext& context, bool paintSelectedTextOnly, bool paintSelectedTextSeparately, const FontCascade& font, int s tartPositionInTextRun,83 int endPositionInTextBoxString, int length, const AtomicString& emphasisMark, RenderCombineText* combinedText, TextRun& textRun, FloatRect& boxRect,82 TextPainter::TextPainter(GraphicsContext& context, bool paintSelectedTextOnly, bool paintSelectedTextSeparately, const FontCascade& font, int selectionStart, 83 int selectionEnd, int length, const AtomicString& emphasisMark, RenderCombineText* combinedText, TextRun& textRun, FloatRect& boxRect, 84 84 FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow, bool textBoxIsHorizontal, 85 85 TextPaintStyle& textPaintStyle, TextPaintStyle& selectionPaintStyle) … … 92 92 , m_paintSelectedTextSeparately(paintSelectedTextSeparately) 93 93 , m_font(font) 94 , m_s tartPositionInTextRun(startPositionInTextRun)95 , m_ endPositionInTextRun(endPositionInTextBoxString)94 , m_selectionStart(selectionStart) 95 , m_selectionEnd(selectionEnd) 96 96 , m_length(length) 97 97 , m_emphasisMark(emphasisMark) … … 188 188 // For stroked painting, we have to change the text drawing mode. It's probably dangerous to leave that mutated as a side 189 189 // effect, so only when we know we're stroking, do a save/restore. 190 bool fullLengthPaint = !m_paintSelectedTextSeparately || m_endPositionInTextRun <= m_startPositionInTextRun; 191 int startOffset = fullLengthPaint ? 0 : m_endPositionInTextRun; 192 int endOffset = fullLengthPaint ? m_length : m_startPositionInTextRun; 193 paintTextWithStyle(m_textPaintStyle, startOffset, endOffset, m_textShadow); 190 int startPosition = m_paintSelectedTextSeparately ? m_selectionEnd : 0; 191 int endPosition = m_paintSelectedTextSeparately ? m_selectionStart : m_length; 192 paintTextWithStyle(m_textPaintStyle, startPosition, endPosition, m_textShadow); 194 193 } 195 194 196 195 // paint only the text that is selected 197 if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_s tartPositionInTextRun < m_endPositionInTextRun)198 paintTextWithStyle(m_selectionPaintStyle, m_s tartPositionInTextRun, m_endPositionInTextRun, m_selectionShadow);196 if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_selectionStart < m_selectionEnd) 197 paintTextWithStyle(m_selectionPaintStyle, m_selectionStart, m_selectionEnd, m_selectionShadow); 199 198 } 200 199 -
trunk/Source/WebCore/rendering/TextPainter.h
r193779 r193857 46 46 public: 47 47 TextPainter(GraphicsContext&, bool paintSelectedTextOnly, bool paintSelectedTextSeparately, const FontCascade&, 48 int startPositionInTextRun, int endPositionInTextBoxString, int length, const AtomicString& emphasisMark, RenderCombineText*,49 TextRun&, FloatRect& boxRect, FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow,50 bool textBoxIsHorizontal, TextPaintStyle& nonSelectionPaintStyle, TextPaintStyle& selectionPaintStyle);48 int selectionStart, int selectionEnd, int length, const AtomicString& emphasisMark, RenderCombineText*, 49 TextRun&, FloatRect& boxRect, FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow, 50 bool textBoxIsHorizontal, TextPaintStyle& nonSelectionPaintStyle, TextPaintStyle& selectionPaintStyle); 51 51 52 52 void paintText(); … … 71 71 bool m_paintSelectedTextSeparately; 72 72 const FontCascade& m_font; 73 int m_s tartPositionInTextRun;74 int m_ endPositionInTextRun;73 int m_selectionStart; 74 int m_selectionEnd; 75 75 int m_length; 76 76 const AtomicString& m_emphasisMark;
Note: See TracChangeset
for help on using the changeset viewer.