<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193857] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193857">193857</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-12-09 13:22:03 -0800 (Wed, 09 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintercpp">trunk/Source/WebCore/rendering/TextPainter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPainterh">trunk/Source/WebCore/rendering/TextPainter.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193856 => 193857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-09 21:14:03 UTC (rev 193856)
+++ trunk/Source/WebCore/ChangeLog 2015-12-09 21:22:03 UTC (rev 193857)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-09 Zalan Bujtas <zalan@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2015-12-09 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [GTK] Anonymous render block flow elements should be exposed as ATK_ROLE_SECTION; not ATK_ROLE_PANEL
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (193856 => 193857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-12-09 21:14:03 UTC (rev 193856)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-12-09 21:22:03 UTC (rev 193857)
</span><span class="lines">@@ -581,14 +581,14 @@
</span><span class="cx"> if (hasHyphen())
</span><span class="cx"> length = textRun.length();
</span><span class="cx">
</span><del>- int sPos = 0;
- int ePos = 0;
</del><ins>+ int selectionStart = 0;
+ int selectionEnd = 0;
</ins><span class="cx"> if (haveSelection && (paintSelectedTextOnly || paintSelectedTextSeparately))
</span><del>- selectionStartEnd(sPos, ePos);
</del><ins>+ selectionStartEnd(selectionStart, selectionEnd);
</ins><span class="cx">
</span><span class="cx"> if (m_truncation != cNoTruncation) {
</span><del>- sPos = std::min<int>(sPos, m_truncation);
- ePos = std::min<int>(ePos, m_truncation);
</del><ins>+ selectionStart = std::min<int>(selectionStart, m_truncation);
+ selectionEnd = std::min<int>(selectionEnd, m_truncation);
</ins><span class="cx"> length = m_truncation;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx"> else
</span><span class="cx"> textOrigin.setX(roundToDevicePixel(LayoutUnit(textOrigin.x()), renderer().document().deviceScaleFactor()));
</span><span class="cx">
</span><del>- TextPainter textPainter(context, paintSelectedTextOnly, paintSelectedTextSeparately, font, sPos, ePos, length, emphasisMark, combinedText, textRun, boxRect, textOrigin, emphasisMarkOffset, textShadow, selectionShadow, isHorizontal(), textPaintStyle, selectionPaintStyle);
</del><ins>+ TextPainter textPainter(context, paintSelectedTextOnly, paintSelectedTextSeparately, font, selectionStart, selectionEnd, length, emphasisMark, combinedText, textRun, boxRect, textOrigin, emphasisMarkOffset, textShadow, selectionShadow, isHorizontal(), textPaintStyle, selectionPaintStyle);
</ins><span class="cx"> textPainter.paintText();
</span><span class="cx">
</span><span class="cx"> // Paint decorations
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (193856 => 193857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.cpp 2015-12-09 21:14:03 UTC (rev 193856)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp 2015-12-09 21:22:03 UTC (rev 193857)
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> m_context.clearShadow();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextPainter::TextPainter(GraphicsContext& context, bool paintSelectedTextOnly, bool paintSelectedTextSeparately, const FontCascade& font, int startPositionInTextRun,
- int endPositionInTextBoxString, int length, const AtomicString& emphasisMark, RenderCombineText* combinedText, TextRun& textRun, FloatRect& boxRect,
</del><ins>+TextPainter::TextPainter(GraphicsContext& context, bool paintSelectedTextOnly, bool paintSelectedTextSeparately, const FontCascade& font, int selectionStart,
+ int selectionEnd, int length, const AtomicString& emphasisMark, RenderCombineText* combinedText, TextRun& textRun, FloatRect& boxRect,
</ins><span class="cx"> FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow, bool textBoxIsHorizontal,
</span><span class="cx"> TextPaintStyle& textPaintStyle, TextPaintStyle& selectionPaintStyle)
</span><span class="cx"> : m_context(context)
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx"> , m_paintSelectedTextOnly(paintSelectedTextOnly)
</span><span class="cx"> , m_paintSelectedTextSeparately(paintSelectedTextSeparately)
</span><span class="cx"> , m_font(font)
</span><del>- , m_startPositionInTextRun(startPositionInTextRun)
- , m_endPositionInTextRun(endPositionInTextBoxString)
</del><ins>+ , m_selectionStart(selectionStart)
+ , m_selectionEnd(selectionEnd)
</ins><span class="cx"> , m_length(length)
</span><span class="cx"> , m_emphasisMark(emphasisMark)
</span><span class="cx"> , m_combinedText(combinedText)
</span><span class="lines">@@ -187,15 +187,14 @@
</span><span class="cx"> if (!m_paintSelectedTextOnly) {
</span><span class="cx"> // For stroked painting, we have to change the text drawing mode. It's probably dangerous to leave that mutated as a side
</span><span class="cx"> // effect, so only when we know we're stroking, do a save/restore.
</span><del>- bool fullLengthPaint = !m_paintSelectedTextSeparately || m_endPositionInTextRun <= m_startPositionInTextRun;
- int startOffset = fullLengthPaint ? 0 : m_endPositionInTextRun;
- int endOffset = fullLengthPaint ? m_length : m_startPositionInTextRun;
- paintTextWithStyle(m_textPaintStyle, startOffset, endOffset, m_textShadow);
</del><ins>+ int startPosition = m_paintSelectedTextSeparately ? m_selectionEnd : 0;
+ int endPosition = m_paintSelectedTextSeparately ? m_selectionStart : m_length;
+ paintTextWithStyle(m_textPaintStyle, startPosition, endPosition, m_textShadow);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // paint only the text that is selected
</span><del>- if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_startPositionInTextRun < m_endPositionInTextRun)
- paintTextWithStyle(m_selectionPaintStyle, m_startPositionInTextRun, m_endPositionInTextRun, m_selectionShadow);
</del><ins>+ if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_selectionStart < m_selectionEnd)
+ paintTextWithStyle(m_selectionPaintStyle, m_selectionStart, m_selectionEnd, m_selectionShadow);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPainterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.h (193856 => 193857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.h 2015-12-09 21:14:03 UTC (rev 193856)
+++ trunk/Source/WebCore/rendering/TextPainter.h 2015-12-09 21:22:03 UTC (rev 193857)
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx"> class TextPainter {
</span><span class="cx"> public:
</span><span class="cx"> TextPainter(GraphicsContext&, bool paintSelectedTextOnly, bool paintSelectedTextSeparately, const FontCascade&,
</span><del>- int startPositionInTextRun, int endPositionInTextBoxString, int length, const AtomicString& emphasisMark, RenderCombineText*,
- TextRun&, FloatRect& boxRect, FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow,
- bool textBoxIsHorizontal, TextPaintStyle& nonSelectionPaintStyle, TextPaintStyle& selectionPaintStyle);
</del><ins>+ int selectionStart, int selectionEnd, int length, const AtomicString& emphasisMark, RenderCombineText*,
+ TextRun&, FloatRect& boxRect, FloatPoint& textOrigin, int emphasisMarkOffset, const ShadowData* textShadow, const ShadowData* selectionShadow,
+ bool textBoxIsHorizontal, TextPaintStyle& nonSelectionPaintStyle, TextPaintStyle& selectionPaintStyle);
</ins><span class="cx">
</span><span class="cx"> void paintText();
</span><span class="cx"> #if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
</span><span class="lines">@@ -70,8 +70,8 @@
</span><span class="cx"> bool m_paintSelectedTextOnly;
</span><span class="cx"> bool m_paintSelectedTextSeparately;
</span><span class="cx"> const FontCascade& m_font;
</span><del>- int m_startPositionInTextRun;
- int m_endPositionInTextRun;
</del><ins>+ int m_selectionStart;
+ int m_selectionEnd;
</ins><span class="cx"> int m_length;
</span><span class="cx"> const AtomicString& m_emphasisMark;
</span><span class="cx"> RenderCombineText* m_combinedText;
</span></span></pre>
</div>
</div>
</body>
</html>