<!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>[194966] 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/194966">194966</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-01-13 10:19:45 -0800 (Wed, 13 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get text drawing working with display lists.
https://bugs.webkit.org/show_bug.cgi?id=152957
Reviewed by Simon Fraser.
This patch enables text drawing for display lists.
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::drawGlyphBuffer):
* platform/graphics/FontCascade.h:
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::drawGlyphs):
(WebCore::GraphicsContext::drawText): Deleted.
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::FontCascade::drawGlyphs):
* platform/graphics/displaylists/DisplayListItems.cpp:
(WebCore::DisplayList::DrawGlyphs::apply):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoFontCairocpp">trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListItemscpp">trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCGWincpp">trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194965 => 194966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-13 17:08:35 UTC (rev 194965)
+++ trunk/Source/WebCore/ChangeLog 2016-01-13 18:19:45 UTC (rev 194966)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-01-13 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Get text drawing working with display lists.
+ https://bugs.webkit.org/show_bug.cgi?id=152957
+
+ Reviewed by Simon Fraser.
+
+ This patch enables text drawing for display lists.
+
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::drawGlyphBuffer):
+ * platform/graphics/FontCascade.h:
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::drawGlyphs):
+ (WebCore::GraphicsContext::drawText): Deleted.
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::FontCascade::drawGlyphs):
+ * platform/graphics/displaylists/DisplayListItems.cpp:
+ (WebCore::DisplayList::DrawGlyphs::apply):
+
+2016-01-13 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Simple line layout: Add support for word-break property.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153054
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (194965 => 194966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-01-13 17:08:35 UTC (rev 194965)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-01-13 18:19:45 UTC (rev 194966)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "FontCache.h"
</span><span class="cx"> #include "GlyphBuffer.h"
</span><ins>+#include "GraphicsContext.h"
</ins><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "SurrogatePairAwareTextIterator.h"
</span><span class="cx"> #include "TextRun.h"
</span><span class="lines">@@ -1342,7 +1343,7 @@
</span><span class="cx"> renderingContext->drawSVGGlyphs(context, *fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
</span><span class="cx"> else
</span><span class="cx"> #endif
</span><del>- drawGlyphs(context, *fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
</del><ins>+ context.drawGlyphs(*this, *fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
</ins><span class="cx">
</span><span class="cx"> lastFrom = nextGlyph;
</span><span class="cx"> fontData = nextFontData;
</span><span class="lines">@@ -1361,7 +1362,7 @@
</span><span class="cx"> else
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- drawGlyphs(context, *fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
</del><ins>+ context.drawGlyphs(*this, *fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
</ins><span class="cx"> point.setX(nextX);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (194965 => 194966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2016-01-13 17:08:35 UTC (rev 194965)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2016-01-13 18:19:45 UTC (rev 194966)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> enum CustomFontNotReadyAction { DoNotPaintIfFontNotReady, UseFallbackIfFontNotReady };
</span><span class="cx"> WEBCORE_EXPORT float drawText(GraphicsContext&, const TextRun&, const FloatPoint&, int from = 0, int to = -1, CustomFontNotReadyAction = DoNotPaintIfFontNotReady) const;
</span><del>- void drawGlyphs(GraphicsContext&, const Font&, const GlyphBuffer&, int from, int numGlyphs, const FloatPoint&) const;
</del><ins>+ static void drawGlyphs(GraphicsContext&, const Font&, const GlyphBuffer&, int from, int numGlyphs, const FloatPoint&, FontSmoothingMode);
</ins><span class="cx"> void drawEmphasisMarks(GraphicsContext&, const TextRun&, const AtomicString& mark, const FloatPoint&, int from = 0, int to = -1) const;
</span><span class="cx">
</span><span class="cx"> DashArray dashesForIntersectionsWithRect(const TextRun&, const FloatPoint& textOrigin, const FloatRect& lineExtents) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (194965 => 194966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2016-01-13 17:08:35 UTC (rev 194965)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2016-01-13 18:19:45 UTC (rev 194966)
</span><span class="lines">@@ -682,11 +682,7 @@
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (isRecording()) {
- // FIXME: Text drawing with display lists TBD.
- return 0;
- }
-
</del><ins>+ // Display list recording for text content is done at glyphs level. See GraphicsContext::drawGlyphs.
</ins><span class="cx"> return font.drawText(*this, run, point, from, to);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -700,7 +696,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- fontCascade.drawGlyphs(*this, font, buffer, from, numGlyphs, point);
</del><ins>+ fontCascade.drawGlyphs(*this, font, buffer, from, numGlyphs, point, fontCascade.fontDescription().fontSmoothing());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::drawEmphasisMarks(const FontCascade& font, const TextRun& run, const AtomicString& mark, const FloatPoint& point, int from, int to)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoFontCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp (194965 => 194966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp 2016-01-13 17:08:35 UTC (rev 194965)
+++ trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp 2016-01-13 18:19:45 UTC (rev 194966)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FontCascade::drawGlyphs(GraphicsContext& context, const Font& font, const GlyphBuffer& glyphBuffer,
</span><del>- int from, int numGlyphs, const FloatPoint& point) const
</del><ins>+ int from, int numGlyphs, const FloatPoint& point, FontSmoothingMode)
</ins><span class="cx"> {
</span><span class="cx"> if (!font.platformData().size())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (194965 => 194966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-01-13 17:08:35 UTC (rev 194965)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-01-13 18:19:45 UTC (rev 194966)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void FontCascade::drawGlyphs(GraphicsContext& context, const Font& font, const GlyphBuffer& glyphBuffer, int from, int numGlyphs, const FloatPoint& anchorPoint) const
</del><ins>+void FontCascade::drawGlyphs(GraphicsContext& context, const Font& font, const GlyphBuffer& glyphBuffer, int from, int numGlyphs, const FloatPoint& anchorPoint, FontSmoothingMode smoothingMode)
</ins><span class="cx"> {
</span><span class="cx"> const FontPlatformData& platformData = font.platformData();
</span><span class="cx"> if (!platformData.size())
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> bool changeFontSmoothing;
</span><span class="cx"> bool matchAntialiasedAndSmoothedFonts = context.antialiasedFontDilationEnabled();
</span><span class="cx">
</span><del>- switch (fontDescription().fontSmoothing()) {
</del><ins>+ switch (smoothingMode) {
</ins><span class="cx"> case Antialiased: {
</span><span class="cx"> context.setShouldAntialias(true);
</span><span class="cx"> shouldSmoothFonts = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListItemscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp (194965 => 194966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp 2016-01-13 17:08:35 UTC (rev 194965)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayListItems.cpp 2016-01-13 18:19:45 UTC (rev 194966)
</span><span class="lines">@@ -397,10 +397,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DrawGlyphs::apply(GraphicsContext&) const
</del><ins>+void DrawGlyphs::apply(GraphicsContext& context) const
</ins><span class="cx"> {
</span><del>- // FIXME: implement.
- UNUSED_PARAM(m_smoothingMode);
</del><ins>+ FontCascade::drawGlyphs(context, m_font, generateGlyphBuffer(), 0, m_glyphs.size(), anchorPoint(), m_smoothingMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawGlyphs::computeBounds()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCGWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp (194965 => 194966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2016-01-13 17:08:35 UTC (rev 194965)
+++ trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2016-01-13 18:19:45 UTC (rev 194966)
</span><span class="lines">@@ -128,12 +128,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FontCascade::drawGlyphs(GraphicsContext& graphicsContext, const Font& font, const GlyphBuffer& glyphBuffer,
</span><del>- int from, int numGlyphs, const FloatPoint& point) const
</del><ins>+ int from, int numGlyphs, const FloatPoint& point, FontSmoothingMode smoothingMode)
</ins><span class="cx"> {
</span><span class="cx"> CGContextRef cgContext = graphicsContext.platformContext();
</span><span class="cx"> bool shouldUseFontSmoothing = WebCoreShouldUseFontSmoothing();
</span><span class="cx">
</span><del>- switch(fontDescription().fontSmoothing()) {
</del><ins>+ switch (smoothingMode) {
</ins><span class="cx"> case Antialiased: {
</span><span class="cx"> graphicsContext.setShouldAntialias(true);
</span><span class="cx"> shouldUseFontSmoothing = false;
</span></span></pre>
</div>
</div>
</body>
</html>