<!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>[193891] 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/193891">193891</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-12-09 20:59:56 -0800 (Wed, 09 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>TextPainter: Make before and after selection painting more explicit.
https://bugs.webkit.org/show_bug.cgi?id=152104
Reviewed by Myles C. Maxfield.
Instead of swapping start end end positions and expecting TextPainter::drawTextOrEmphasisMarks()
to recognize it, we call painting with 0 - startPosition and endPosition - length.
No change in functionality.
* rendering/TextPainter.cpp:
(WebCore::TextPainter::drawTextOrEmphasisMarks):
(WebCore::TextPainter::paintTextAndEmphasisMarksIfNeeded):
(WebCore::TextPainter::paintText):
(WebCore::TextPainter::paintEmphasisMarksIfNeeded): Deleted.
(WebCore::TextPainter::paintTextWithStyle): Deleted.
* rendering/TextPainter.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (193890 => 193891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-10 03:50:07 UTC (rev 193890)
+++ trunk/Source/WebCore/ChangeLog 2015-12-10 04:59:56 UTC (rev 193891)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-09 Zalan Bujtas <zalan@apple.com>
+
+ TextPainter: Make before and after selection painting more explicit.
+ https://bugs.webkit.org/show_bug.cgi?id=152104
+
+ Reviewed by Myles C. Maxfield.
+
+ Instead of swapping start end end positions and expecting TextPainter::drawTextOrEmphasisMarks()
+ to recognize it, we call painting with 0 - startPosition and endPosition - length.
+
+ No change in functionality.
+
+ * rendering/TextPainter.cpp:
+ (WebCore::TextPainter::drawTextOrEmphasisMarks):
+ (WebCore::TextPainter::paintTextAndEmphasisMarksIfNeeded):
+ (WebCore::TextPainter::paintText):
+ (WebCore::TextPainter::paintEmphasisMarksIfNeeded): Deleted.
+ (WebCore::TextPainter::paintTextWithStyle): Deleted.
+ * rendering/TextPainter.h:
+
</ins><span class="cx"> 2015-12-09 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Suspend and resume device motion and device orientation updates when page is hidden and visible, respectively
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (193890 => 193891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.cpp 2015-12-10 03:50:07 UTC (rev 193890)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp 2015-12-10 04:59:56 UTC (rev 193891)
</span><span class="lines">@@ -107,23 +107,11 @@
</span><span class="cx"> void TextPainter::drawTextOrEmphasisMarks(const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark,
</span><span class="cx"> int emphasisMarkOffset, const FloatPoint& textOrigin, int startOffset, int endOffset)
</span><span class="cx"> {
</span><del>- auto drawText = [&](int from, int to)
- {
- if (emphasisMark.isEmpty())
- m_context.drawText(font, textRun, textOrigin, from, to);
- else
- m_context.drawEmphasisMarks(font, textRun, emphasisMark, textOrigin + IntSize(0, emphasisMarkOffset), from, to);
- };
-
- if (startOffset <= endOffset) {
- drawText(startOffset, endOffset);
- return;
- }
-
- if (endOffset > 0)
- drawText(0, endOffset);
- if (startOffset < m_length)
- drawText(startOffset, m_length);
</del><ins>+ ASSERT(startOffset < endOffset);
+ if (emphasisMark.isEmpty())
+ m_context.drawText(font, textRun, textOrigin, startOffset, endOffset);
+ else
+ m_context.drawEmphasisMarks(font, textRun, emphasisMark, textOrigin + IntSize(0, emphasisMarkOffset), startOffset, endOffset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextPainter::paintTextWithShadows(const ShadowData* shadow, const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark,
</span><span class="lines">@@ -153,8 +141,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TextPainter::paintEmphasisMarksIfNeeded(int startOffset, int endOffset, const TextPaintStyle& paintStyle, const ShadowData* shadow)
</del><ins>+void TextPainter::paintTextAndEmphasisMarksIfNeeded(int startOffset, int endOffset, const TextPaintStyle& paintStyle, const ShadowData* shadow)
</ins><span class="cx"> {
</span><ins>+ // FIXME: Truncate right-to-left text correctly.
+ paintTextWithShadows(shadow, m_font, m_textRun, nullAtom, 0, startOffset, endOffset, m_textOrigin, paintStyle.strokeWidth > 0);
+
</ins><span class="cx"> if (m_emphasisMark.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -172,29 +163,30 @@
</span><span class="cx"> if (m_combinedText)
</span><span class="cx"> m_context.concatCTM(rotation(m_boxRect, Counterclockwise));
</span><span class="cx"> }
</span><del>-
-void TextPainter::paintTextWithStyle(const TextPaintStyle& paintStyle, int startOffset, int endOffset, const ShadowData* shadow)
-{
- GraphicsContextStateSaver stateSaver(m_context, paintStyle.strokeWidth > 0);
- updateGraphicsContext(m_context, paintStyle);
- // FIXME: Truncate right-to-left text correctly.
- paintTextWithShadows(shadow, m_font, m_textRun, nullAtom, 0, startOffset, endOffset, m_textOrigin, paintStyle.strokeWidth > 0);
- paintEmphasisMarksIfNeeded(startOffset, endOffset, paintStyle, shadow);
-}
</del><span class="cx">
</span><span class="cx"> void TextPainter::paintText()
</span><span class="cx"> {
</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>- int startPosition = m_paintSelectedTextSeparately ? m_selectionEnd : 0;
- int endPosition = m_paintSelectedTextSeparately ? m_selectionStart : m_length;
- paintTextWithStyle(m_textPaintStyle, startPosition, endPosition, m_textShadow);
</del><ins>+ GraphicsContextStateSaver stateSaver(m_context, m_textPaintStyle.strokeWidth > 0);
+ updateGraphicsContext(m_context, m_textPaintStyle);
+ if (m_paintSelectedTextSeparately) {
+ // Paint the before and after selection parts.
+ if (m_selectionStart > 0)
+ paintTextAndEmphasisMarksIfNeeded(0, m_selectionStart, m_textPaintStyle, m_textShadow);
+ if (m_selectionEnd < m_length)
+ paintTextAndEmphasisMarksIfNeeded(m_selectionEnd, m_length, m_textPaintStyle, m_textShadow);
+ } else
+ paintTextAndEmphasisMarksIfNeeded(0, m_length, m_textPaintStyle, m_textShadow);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // paint only the text that is selected
- if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_selectionStart < m_selectionEnd)
- paintTextWithStyle(m_selectionPaintStyle, m_selectionStart, m_selectionEnd, m_selectionShadow);
</del><ins>+ // Paint only the text that is selected.
+ if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_selectionStart < m_selectionEnd) {
+ GraphicsContextStateSaver stateSaver(m_context, m_selectionPaintStyle.strokeWidth > 0);
+ updateGraphicsContext(m_context, m_selectionPaintStyle);
+ paintTextAndEmphasisMarksIfNeeded(m_selectionStart, m_selectionEnd, m_selectionPaintStyle, 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 (193890 => 193891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.h 2015-12-10 03:50:07 UTC (rev 193890)
+++ trunk/Source/WebCore/rendering/TextPainter.h 2015-12-10 04:59:56 UTC (rev 193891)
</span><span class="lines">@@ -59,8 +59,7 @@
</span><span class="cx"> const FloatPoint& textOrigin, int startOffset, int endOffset);
</span><span class="cx"> void paintTextWithShadows(const ShadowData*, const FontCascade&, const TextRun&, const AtomicString& emphasisMark, int emphasisMarkOffset,
</span><span class="cx"> int startOffset, int endOffset, const FloatPoint& textOrigin, bool stroked);
</span><del>- void paintTextWithStyle(const TextPaintStyle&, int startOffset, int endOffset, const ShadowData*);
- void paintEmphasisMarksIfNeeded(int startOffset, int endOffset, const TextPaintStyle&, const ShadowData*);
</del><ins>+ void paintTextAndEmphasisMarksIfNeeded(int startOffset, int endOffset, const TextPaintStyle&, const ShadowData*);
</ins><span class="cx">
</span><span class="cx"> GraphicsContext& m_context;
</span><span class="cx"> TextPaintStyle& m_textPaintStyle;
</span></span></pre>
</div>
</div>
</body>
</html>