Changeset 193857 in webkit


Ignore:
Timestamp:
Dec 9, 2015 1:22:03 PM (8 years ago)
Author:
Alan Bujtas
Message:

TextPainter: Rename start and end position to selectionStart and selectionEnd.
https://bugs.webkit.org/show_bug.cgi?id=152088

Reviewed by Myles C. Maxfield.

They actually mean selection start/end.

No change in functionality.

  • rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::paint):

  • rendering/TextPainter.cpp:

(WebCore::TextPainter::TextPainter):
(WebCore::TextPainter::paintText):

  • rendering/TextPainter.h:
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r193841 r193857  
     12015-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
    1192015-12-09  Joanmarie Diggs  <jdiggs@igalia.com>
    220
  • trunk/Source/WebCore/rendering/InlineTextBox.cpp

    r192259 r193857  
    582582        length = textRun.length();
    583583
    584     int sPos = 0;
    585     int ePos = 0;
     584    int selectionStart = 0;
     585    int selectionEnd = 0;
    586586    if (haveSelection && (paintSelectedTextOnly || paintSelectedTextSeparately))
    587         selectionStartEnd(sPos, ePos);
     587        selectionStartEnd(selectionStart, selectionEnd);
    588588
    589589    if (m_truncation != cNoTruncation) {
    590         sPos = 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);
    592592        length = m_truncation;
    593593    }
     
    613613        textOrigin.setX(roundToDevicePixel(LayoutUnit(textOrigin.x()), renderer().document().deviceScaleFactor()));
    614614
    615     TextPainter textPainter(context, paintSelectedTextOnly, paintSelectedTextSeparately, font, sPos, 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);
    616616    textPainter.paintText();
    617617
  • trunk/Source/WebCore/rendering/TextPainter.cpp

    r193779 r193857  
    8080}
    8181
    82 TextPainter::TextPainter(GraphicsContext& context, bool paintSelectedTextOnly, bool paintSelectedTextSeparately, const FontCascade& font, int startPositionInTextRun,
    83     int endPositionInTextBoxString, int length, const AtomicString& emphasisMark, RenderCombineText* combinedText, TextRun& textRun, FloatRect& boxRect,
     82TextPainter::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,
    8484    FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow, bool textBoxIsHorizontal,
    8585    TextPaintStyle& textPaintStyle, TextPaintStyle& selectionPaintStyle)
     
    9292    , m_paintSelectedTextSeparately(paintSelectedTextSeparately)
    9393    , m_font(font)
    94     , m_startPositionInTextRun(startPositionInTextRun)
    95     , m_endPositionInTextRun(endPositionInTextBoxString)
     94    , m_selectionStart(selectionStart)
     95    , m_selectionEnd(selectionEnd)
    9696    , m_length(length)
    9797    , m_emphasisMark(emphasisMark)
     
    188188        // For stroked painting, we have to change the text drawing mode. It's probably dangerous to leave that mutated as a side
    189189        // 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);
    194193    }
    195194
    196195    // paint only the text that is selected
    197     if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_startPositionInTextRun < m_endPositionInTextRun)
    198         paintTextWithStyle(m_selectionPaintStyle, m_startPositionInTextRun, m_endPositionInTextRun, m_selectionShadow);
     196    if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_selectionStart < m_selectionEnd)
     197        paintTextWithStyle(m_selectionPaintStyle, m_selectionStart, m_selectionEnd, m_selectionShadow);
    199198}
    200199
  • trunk/Source/WebCore/rendering/TextPainter.h

    r193779 r193857  
    4646public:
    4747    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);
    5151   
    5252    void paintText();
     
    7171    bool m_paintSelectedTextSeparately;
    7272    const FontCascade& m_font;
    73     int m_startPositionInTextRun;
    74     int m_endPositionInTextRun;
     73    int m_selectionStart;
     74    int m_selectionEnd;
    7575    int m_length;
    7676    const AtomicString& m_emphasisMark;
Note: See TracChangeset for help on using the changeset viewer.