<!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>[193656] 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/193656">193656</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 15:01:13 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor TextPainter::paintText() into sub methods.
https://bugs.webkit.org/show_bug.cgi?id=151962
Reviewed by Myles C. Maxfield.
No change in functionality.
* rendering/TextPainter.cpp:
(WebCore::TextPainter::paintTextWithEmphasisIfNeeded):
(WebCore::TextPainter::paintTextWithStyle):
(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="#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 (193655 => 193656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-07 22:52:07 UTC (rev 193655)
+++ trunk/Source/WebCore/ChangeLog 2015-12-07 23:01:13 UTC (rev 193656)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-07 Zalan Bujtas <zalan@apple.com>
+
+ Refactor TextPainter::paintText() into sub methods.
+ https://bugs.webkit.org/show_bug.cgi?id=151962
+
+ Reviewed by Myles C. Maxfield.
+
+ No change in functionality.
+
+ * rendering/TextPainter.cpp:
+ (WebCore::TextPainter::paintTextWithEmphasisIfNeeded):
+ (WebCore::TextPainter::paintTextWithStyle):
+ (WebCore::TextPainter::paintText):
+ * rendering/TextPainter.h:
+
</ins><span class="cx"> 2015-12-07 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Clean up virtual functions in MediaPlayerPrivateGStreamerBase
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (193655 => 193656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.cpp 2015-12-07 22:52:07 UTC (rev 193655)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp 2015-12-07 23:01:13 UTC (rev 193656)
</span><span class="lines">@@ -150,63 +150,49 @@
</span><span class="cx"> } while (shadow || !lastShadowIterationShouldDrawText);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TextPainter::paintText()
</del><ins>+void TextPainter::paintEmphasisMarksIfNeeded(int startOffset, int endOffset, const TextPaintStyle& paintStyle, const ShadowData* shadow)
</ins><span class="cx"> {
</span><ins>+ if (m_emphasisMark.isEmpty())
+ return;
+
</ins><span class="cx"> FloatPoint boxOrigin = m_boxRect.location();
</span><ins>+ updateGraphicsContext(m_context, paintStyle, UseEmphasisMarkColor);
+ static NeverDestroyed<TextRun> objectReplacementCharacterTextRun(StringView(&objectReplacementCharacter, 1));
+ TextRun& emphasisMarkTextRun = m_combinedText ? objectReplacementCharacterTextRun.get() : m_textRun;
+ FloatPoint emphasisMarkTextOrigin = m_combinedText ? FloatPoint(boxOrigin.x() + m_boxRect.width() / 2, boxOrigin.y() + m_font.fontMetrics().ascent()) : m_textOrigin;
+ if (m_combinedText)
+ m_context.concatCTM(rotation(m_boxRect, Clockwise));
</ins><span class="cx">
</span><ins>+ // FIXME: Truncate right-to-left text correctly.
+ paintTextWithShadows(m_context, m_combinedText ? m_combinedText->originalFont() : m_font, emphasisMarkTextRun, m_emphasisMark, m_emphasisMarkOffset, startOffset, endOffset, m_length, emphasisMarkTextOrigin, m_boxRect, shadow, paintStyle.strokeWidth > 0, m_textBoxIsHorizontal);
+
+ if (m_combinedText)
+ m_context.concatCTM(rotation(m_boxRect, Counterclockwise));
+}
+
+void TextPainter::paintTextWithStyle(int startOffset, int endOffset, const TextPaintStyle& paintStyle, const ShadowData* shadow)
+{
+ GraphicsContextStateSaver stateSaver(m_context, paintStyle.strokeWidth > 0);
+ updateGraphicsContext(m_context, paintStyle);
+ // FIXME: Truncate right-to-left text correctly.
+ paintTextWithShadows(m_context, m_font, m_textRun, nullAtom, 0, startOffset, endOffset, m_length, m_textOrigin, m_boxRect, shadow, paintStyle.strokeWidth > 0, m_textBoxIsHorizontal);
+ paintEmphasisMarksIfNeeded(startOffset, endOffset, paintStyle, shadow);
+}
+
+void TextPainter::paintText()
+{
</ins><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>- GraphicsContextStateSaver stateSaver(m_context, m_textPaintStyle.strokeWidth > 0);
-
- updateGraphicsContext(m_context, m_textPaintStyle);
- if (!m_paintSelectedTextSeparately || m_endPositionInTextRun <= m_startPositionInTextRun) {
- // FIXME: Truncate right-to-left text correctly.
- paintTextWithShadows(m_context, m_font, m_textRun, nullAtom, 0, 0, m_length, m_length, m_textOrigin, m_boxRect, m_textShadow, m_textPaintStyle.strokeWidth > 0, m_textBoxIsHorizontal);
- } else
- paintTextWithShadows(m_context, m_font, m_textRun, nullAtom, 0, m_endPositionInTextRun, m_startPositionInTextRun, m_length, m_textOrigin, m_boxRect, m_textShadow, m_textPaintStyle.strokeWidth > 0, m_textBoxIsHorizontal);
-
- if (!m_emphasisMark.isEmpty()) {
- updateGraphicsContext(m_context, m_textPaintStyle, UseEmphasisMarkColor);
-
- static NeverDestroyed<TextRun> objectReplacementCharacterTextRun(StringView(&objectReplacementCharacter, 1));
- TextRun& emphasisMarkTextRun = m_combinedText ? objectReplacementCharacterTextRun.get() : m_textRun;
- FloatPoint emphasisMarkTextOrigin = m_combinedText ? FloatPoint(boxOrigin.x() + m_boxRect.width() / 2, boxOrigin.y() + m_font.fontMetrics().ascent()) : m_textOrigin;
- if (m_combinedText)
- m_context.concatCTM(rotation(m_boxRect, Clockwise));
-
- if (!m_paintSelectedTextSeparately || m_endPositionInTextRun <= m_startPositionInTextRun) {
- // FIXME: Truncate right-to-left text correctly.
- paintTextWithShadows(m_context, m_combinedText ? m_combinedText->originalFont() : m_font, emphasisMarkTextRun, m_emphasisMark, m_emphasisMarkOffset, 0, m_length, m_length, emphasisMarkTextOrigin, m_boxRect, m_textShadow, m_textPaintStyle.strokeWidth > 0, m_textBoxIsHorizontal);
- } else
- paintTextWithShadows(m_context, m_combinedText ? m_combinedText->originalFont() : m_font, emphasisMarkTextRun, m_emphasisMark, m_emphasisMarkOffset, m_endPositionInTextRun, m_startPositionInTextRun, m_length, emphasisMarkTextOrigin, m_boxRect, m_textShadow, m_textPaintStyle.strokeWidth > 0, m_textBoxIsHorizontal);
-
- if (m_combinedText)
- m_context.concatCTM(rotation(m_boxRect, Counterclockwise));
- }
</del><ins>+ bool fullLengthPaint = !m_paintSelectedTextSeparately || m_endPositionInTextRun <= m_startPositionInTextRun;
+ int startOffset = fullLengthPaint ? 0 : m_endPositionInTextRun;
+ int endOffset = fullLengthPaint ? m_length : m_startPositionInTextRun;
+ paintTextWithStyle(startOffset, endOffset, m_textPaintStyle, m_textShadow);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_startPositionInTextRun < m_endPositionInTextRun) {
- // paint only the text that is selected
- GraphicsContextStateSaver stateSaver(m_context, m_selectionPaintStyle.strokeWidth > 0);
-
- updateGraphicsContext(m_context, m_selectionPaintStyle);
- paintTextWithShadows(m_context, m_font, m_textRun, nullAtom, 0, m_startPositionInTextRun, m_endPositionInTextRun, m_length, m_textOrigin, m_boxRect, m_selectionShadow, m_selectionPaintStyle.strokeWidth > 0, m_textBoxIsHorizontal);
- if (!m_emphasisMark.isEmpty()) {
- updateGraphicsContext(m_context, m_selectionPaintStyle, UseEmphasisMarkColor);
-
- DEPRECATED_DEFINE_STATIC_LOCAL(TextRun, objectReplacementCharacterTextRun, (StringView(&objectReplacementCharacter, 1)));
- TextRun& emphasisMarkTextRun = m_combinedText ? objectReplacementCharacterTextRun : m_textRun;
- FloatPoint emphasisMarkTextOrigin = m_combinedText ? FloatPoint(boxOrigin.x() + m_boxRect.width() / 2, boxOrigin.y() + m_font.fontMetrics().ascent()) : m_textOrigin;
- if (m_combinedText)
- m_context.concatCTM(rotation(m_boxRect, Clockwise));
-
- paintTextWithShadows(m_context, m_combinedText ? m_combinedText->originalFont() : m_font, emphasisMarkTextRun, m_emphasisMark, m_emphasisMarkOffset, m_startPositionInTextRun, m_endPositionInTextRun, m_length, emphasisMarkTextOrigin, m_boxRect, m_selectionShadow, m_selectionPaintStyle.strokeWidth > 0, m_textBoxIsHorizontal);
-
- if (m_combinedText)
- m_context.concatCTM(rotation(m_boxRect, Counterclockwise));
- }
- }
</del><ins>+ // paint only the text that is selected
+ if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_startPositionInTextRun < m_endPositionInTextRun)
+ paintTextWithStyle(m_startPositionInTextRun, m_endPositionInTextRun, 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 (193655 => 193656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.h 2015-12-07 22:52:07 UTC (rev 193655)
+++ trunk/Source/WebCore/rendering/TextPainter.h 2015-12-07 23:01:13 UTC (rev 193656)
</span><span class="lines">@@ -54,6 +54,10 @@
</span><span class="cx"> DashArray dashesForIntersectionsWithRect(const FloatRect& lineExtents);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void paintTextWithStyle(int startOffset, int endOffset, const TextPaintStyle&, const ShadowData*);
+ void paintEmphasisMarksIfNeeded(int startOffset, int endOffset, const TextPaintStyle&, const ShadowData*);
+
+private:
</ins><span class="cx"> GraphicsContext& m_context;
</span><span class="cx"> TextPaintStyle& m_textPaintStyle;
</span><span class="cx"> TextPaintStyle& m_selectionPaintStyle;
</span></span></pre>
</div>
</div>
</body>
</html>