<!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>[193688] 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/193688">193688</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 20:34:27 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make paintTextWithShadows a member function (TextPainter).
https://bugs.webkit.org/show_bug.cgi?id=151979
Reviewed by Simon Fraser.
This patch also simplifies paintTextWithShadows and
rearranges some of the functions' arguments.
No change in functionality.
* rendering/TextPainter.cpp:
(WebCore::TextPainter::drawTextOrEmphasisMarks):
(WebCore::TextPainter::paintTextWithShadows):
(WebCore::TextPainter::paintEmphasisMarksIfNeeded):
(WebCore::TextPainter::paintTextWithStyle):
(WebCore::TextPainter::paintText):
(WebCore::drawTextOrEmphasisMarks): Deleted.
(WebCore::paintTextWithShadows): 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 (193687 => 193688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-08 04:05:24 UTC (rev 193687)
+++ trunk/Source/WebCore/ChangeLog 2015-12-08 04:34:27 UTC (rev 193688)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-12-07 Zalan Bujtas <zalan@apple.com>
+
+ Make paintTextWithShadows a member function (TextPainter).
+ https://bugs.webkit.org/show_bug.cgi?id=151979
+
+ Reviewed by Simon Fraser.
+
+ This patch also simplifies paintTextWithShadows and
+ rearranges some of the functions' arguments.
+
+ No change in functionality.
+
+ * rendering/TextPainter.cpp:
+ (WebCore::TextPainter::drawTextOrEmphasisMarks):
+ (WebCore::TextPainter::paintTextWithShadows):
+ (WebCore::TextPainter::paintEmphasisMarksIfNeeded):
+ (WebCore::TextPainter::paintTextWithStyle):
+ (WebCore::TextPainter::paintText):
+ (WebCore::drawTextOrEmphasisMarks): Deleted.
+ (WebCore::paintTextWithShadows): Deleted.
+ * rendering/TextPainter.h:
+
</ins><span class="cx"> 2015-12-07 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: storage/indexeddb/factory-deletedatabase.html fails.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (193687 => 193688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.cpp 2015-12-08 04:05:24 UTC (rev 193687)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp 2015-12-08 04:34:27 UTC (rev 193688)
</span><span class="lines">@@ -56,15 +56,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void drawTextOrEmphasisMarks(GraphicsContext& context, const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark,
- int emphasisMarkOffset, const FloatPoint& point, const int from, const int to)
-{
- if (emphasisMark.isEmpty())
- context.drawText(font, textRun, point, from, to);
- else
- context.drawEmphasisMarks(font, textRun, emphasisMark, point + IntSize(0, emphasisMarkOffset), from, to);
-}
-
</del><span class="cx"> ShadowApplier::ShadowApplier(GraphicsContext& context, const ShadowData* shadow, const FloatRect& textRect, bool lastShadowIterationShouldDrawText, bool opaque, FontOrientation orientation)
</span><span class="cx"> : m_context(context)
</span><span class="cx"> , m_shadow(shadow)
</span><span class="lines">@@ -113,41 +104,53 @@
</span><span class="cx"> m_context.clearShadow();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void paintTextWithShadows(GraphicsContext& context, const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark,
- int emphasisMarkOffset, int startOffset, int endOffset, int truncationPoint, const FloatPoint& textOrigin, const FloatRect& boxRect,
- const ShadowData* shadow, bool stroked, bool horizontal)
</del><ins>+void TextPainter::drawTextOrEmphasisMarks(const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark,
+ int emphasisMarkOffset, const FloatPoint& textOrigin, int startOffset, int endOffset)
</ins><span class="cx"> {
</span><del>- Color fillColor = context.fillColor();
</del><ins>+ 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);
+}
+
+void TextPainter::paintTextWithShadows(const ShadowData* shadow, const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark,
+ int emphasisMarkOffset, int startOffset, int endOffset, const FloatPoint& textOrigin, bool stroked)
+{
+ if (!shadow) {
+ drawTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin, startOffset, endOffset);
+ return;
+ }
+
+ Color fillColor = m_context.fillColor();
</ins><span class="cx"> bool opaque = !fillColor.hasAlpha();
</span><span class="cx"> bool lastShadowIterationShouldDrawText = !stroked && opaque;
</span><span class="cx"> if (!opaque)
</span><del>- context.setFillColor(Color::black);
</del><ins>+ m_context.setFillColor(Color::black);
+ while (shadow) {
+ ShadowApplier shadowApplier(m_context, shadow, m_boxRect, lastShadowIterationShouldDrawText, opaque, m_textBoxIsHorizontal ? Horizontal : Vertical);
+ if (!shadowApplier.nothingToDraw())
+ drawTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin + shadowApplier.extraOffset(), startOffset, endOffset);
+ shadow = shadow->next();
+ }
</ins><span class="cx">
</span><del>- do {
- ShadowApplier shadowApplier(context, shadow, boxRect, lastShadowIterationShouldDrawText, opaque, horizontal ? Horizontal : Vertical);
- if (shadowApplier.nothingToDraw()) {
- shadow = shadow->next();
- continue;
- }
-
- IntSize extraOffset = roundedIntSize(shadowApplier.extraOffset());
- if (!shadow && !opaque)
- context.setFillColor(fillColor);
-
- if (startOffset <= endOffset)
- drawTextOrEmphasisMarks(context, font, textRun, emphasisMark, emphasisMarkOffset, textOrigin + extraOffset, startOffset, endOffset);
- else {
- if (endOffset > 0)
- drawTextOrEmphasisMarks(context, font, textRun, emphasisMark, emphasisMarkOffset, textOrigin + extraOffset, 0, endOffset);
- if (startOffset < truncationPoint)
- drawTextOrEmphasisMarks(context, font, textRun, emphasisMark, emphasisMarkOffset, textOrigin + extraOffset, startOffset, truncationPoint);
- }
-
- if (!shadow)
- break;
-
- shadow = shadow->next();
- } while (shadow || !lastShadowIterationShouldDrawText);
</del><ins>+ if (!lastShadowIterationShouldDrawText) {
+ if (!opaque)
+ m_context.setFillColor(fillColor);
+ drawTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin, startOffset, endOffset);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextPainter::paintEmphasisMarksIfNeeded(int startOffset, int endOffset, const TextPaintStyle& paintStyle, const ShadowData* shadow)
</span><span class="lines">@@ -164,18 +167,18 @@
</span><span class="cx"> m_context.concatCTM(rotation(m_boxRect, Clockwise));
</span><span class="cx">
</span><span class="cx"> // FIXME: Truncate right-to-left text correctly.
</span><del>- 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);
</del><ins>+ paintTextWithShadows(shadow, m_combinedText ? m_combinedText->originalFont() : m_font, emphasisMarkTextRun, m_emphasisMark, m_emphasisMarkOffset, startOffset, endOffset, emphasisMarkTextOrigin, paintStyle.strokeWidth > 0);
</ins><span class="cx">
</span><span class="cx"> if (m_combinedText)
</span><span class="cx"> m_context.concatCTM(rotation(m_boxRect, Counterclockwise));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TextPainter::paintTextWithStyle(int startOffset, int endOffset, const TextPaintStyle& paintStyle, const ShadowData* shadow)
</del><ins>+void TextPainter::paintTextWithStyle(const TextPaintStyle& paintStyle, int startOffset, int endOffset, const ShadowData* shadow)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(m_context, paintStyle.strokeWidth > 0);
</span><span class="cx"> updateGraphicsContext(m_context, paintStyle);
</span><span class="cx"> // FIXME: Truncate right-to-left text correctly.
</span><del>- paintTextWithShadows(m_context, m_font, m_textRun, nullAtom, 0, startOffset, endOffset, m_length, m_textOrigin, m_boxRect, shadow, paintStyle.strokeWidth > 0, m_textBoxIsHorizontal);
</del><ins>+ paintTextWithShadows(shadow, m_font, m_textRun, nullAtom, 0, startOffset, endOffset, m_textOrigin, paintStyle.strokeWidth > 0);
</ins><span class="cx"> paintEmphasisMarksIfNeeded(startOffset, endOffset, paintStyle, shadow);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -187,12 +190,12 @@
</span><span class="cx"> bool fullLengthPaint = !m_paintSelectedTextSeparately || m_endPositionInTextRun <= m_startPositionInTextRun;
</span><span class="cx"> int startOffset = fullLengthPaint ? 0 : m_endPositionInTextRun;
</span><span class="cx"> int endOffset = fullLengthPaint ? m_length : m_startPositionInTextRun;
</span><del>- paintTextWithStyle(startOffset, endOffset, m_textPaintStyle, m_textShadow);
</del><ins>+ paintTextWithStyle(m_textPaintStyle, startOffset, endOffset, m_textShadow);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // paint only the text that is selected
</span><span class="cx"> if ((m_paintSelectedTextOnly || m_paintSelectedTextSeparately) && m_startPositionInTextRun < m_endPositionInTextRun)
</span><del>- paintTextWithStyle(m_startPositionInTextRun, m_endPositionInTextRun, m_selectionPaintStyle, m_selectionShadow);
</del><ins>+ paintTextWithStyle(m_selectionPaintStyle, m_startPositionInTextRun, m_endPositionInTextRun, 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 (193687 => 193688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.h 2015-12-08 04:05:24 UTC (rev 193687)
+++ trunk/Source/WebCore/rendering/TextPainter.h 2015-12-08 04:34:27 UTC (rev 193688)
</span><span class="lines">@@ -54,7 +54,11 @@
</span><span class="cx"> DashArray dashesForIntersectionsWithRect(const FloatRect& lineExtents);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void paintTextWithStyle(int startOffset, int endOffset, const TextPaintStyle&, const ShadowData*);
</del><ins>+ void drawTextOrEmphasisMarks(const FontCascade&, const TextRun&, const AtomicString& emphasisMark, int emphasisMarkOffset,
+ const FloatPoint& textOrigin, int startOffset, int endOffset);
+ void paintTextWithShadows(const ShadowData*, const FontCascade&, const TextRun&, const AtomicString& emphasisMark, int emphasisMarkOffset,
+ int startOffset, int endOffset, const FloatPoint& textOrigin, bool stroked);
+ void paintTextWithStyle(const TextPaintStyle&, int startOffset, int endOffset, const ShadowData*);
</ins><span class="cx"> void paintEmphasisMarksIfNeeded(int startOffset, int endOffset, const TextPaintStyle&, const ShadowData*);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>