<!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>[183696] trunk</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/183696">183696</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-05-01 16:25:41 -0700 (Fri, 01 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[OS X] Text dilation parameters are not restored after being set
https://bugs.webkit.org/show_bug.cgi?id=144507
<rdar://problem/19446938>
Patch by Myles C. Maxfield <mmaxfield@apple.com> on 2015-05-01
Reviewed by Simon Fraser and Ned Holbrook.
Source/WebCore:
Create a RAII class who is in charge of saving, applying, and restoring dilation parameters. Use this class
around our text drawing routines.
Note that this migrates our use of CTFontSetRenderingParameters() to CTFontSetRenderingStyle().
Test: fast/text/dilation-save-restore.html
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::RenderingStyleSaver::RenderingStyleSaver):
(WebCore::RenderingStyleSaver::~RenderingStyleSaver):
(WebCore::showGlyphsWithAdvances):
* platform/spi/cg/CoreGraphicsSPI.h:
* platform/spi/cocoa/CoreTextSPI.h:
LayoutTests:
See below.
* fast/text/dilation-save-restore-expected.html: Added. Never sets dilation parameters, draws two strings.
* fast/text/dilation-save-restore.html: Added. Draws one string without dilation, sets the dilation, then draws a
second string. If saving and restoring doesn't work correctly, these two lines will appear different.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicgCoreGraphicsSPIh">trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaCoreTextSPIh">trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextdilationsaverestoreexpectedhtml">trunk/LayoutTests/fast/text/dilation-save-restore-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextdilationsaverestorehtml">trunk/LayoutTests/fast/text/dilation-save-restore.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183695 => 183696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-01 22:53:09 UTC (rev 183695)
+++ trunk/LayoutTests/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-05-01 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [OS X] Text dilation parameters are not restored after being set
+ https://bugs.webkit.org/show_bug.cgi?id=144507
+ <rdar://problem/19446938>
+
+ Reviewed by Simon Fraser and Ned Holbrook.
+
+ See below.
+
+ * fast/text/dilation-save-restore-expected.html: Added. Never sets dilation parameters, draws two strings.
+ * fast/text/dilation-save-restore.html: Added. Draws one string without dilation, sets the dilation, then draws a
+ second string. If saving and restoring doesn't work correctly, these two lines will appear different.
+
</ins><span class="cx"> 2015-05-01 Jordan Harband <ljharb@gmail.com>
</span><span class="cx">
</span><span class="cx"> String#startsWith/endsWith/includes don't handle Infinity position/endPosition args correctly
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextdilationsaverestoreexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/dilation-save-restore-expected.html (0 => 183696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/dilation-save-restore-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/dilation-save-restore-expected.html 2015-05-01 23:25:41 UTC (rev 183696)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that we save and restore state properly when issuing dilation rendering parameters.
+<div>Hello, World!</div>
+<br>
+<div>Hello, World!</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextdilationsaverestorehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/dilation-save-restore.html (0 => 183696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/dilation-save-restore.html (rev 0)
+++ trunk/LayoutTests/fast/text/dilation-save-restore.html 2015-05-01 23:25:41 UTC (rev 183696)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that we save and restore state properly when issuing dilation rendering parameters.
+<div>Hello, World!</div>
+<div style="margin-top: -100px; color: white;">Hello, World!</div>
+<div style="margin-top: 100px;">Hello, World!</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183695 => 183696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-01 22:53:09 UTC (rev 183695)
+++ trunk/Source/WebCore/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-05-01 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [OS X] Text dilation parameters are not restored after being set
+ https://bugs.webkit.org/show_bug.cgi?id=144507
+ <rdar://problem/19446938>
+
+ Reviewed by Simon Fraser and Ned Holbrook.
+
+ Create a RAII class who is in charge of saving, applying, and restoring dilation parameters. Use this class
+ around our text drawing routines.
+
+ Note that this migrates our use of CTFontSetRenderingParameters() to CTFontSetRenderingStyle().
+
+ Test: fast/text/dilation-save-restore.html
+
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::RenderingStyleSaver::RenderingStyleSaver):
+ (WebCore::RenderingStyleSaver::~RenderingStyleSaver):
+ (WebCore::showGlyphsWithAdvances):
+ * platform/spi/cg/CoreGraphicsSPI.h:
+ * platform/spi/cocoa/CoreTextSPI.h:
+
</ins><span class="cx"> 2015-05-01 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r183687.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (183695 => 183696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-05-01 22:53:09 UTC (rev 183695)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-05-01 23:25:41 UTC (rev 183696)
</span><span class="lines">@@ -131,6 +131,56 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class RenderingStyleSaver {
+public:
+#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
+
+ RenderingStyleSaver(CTFontRef, CGContextRef) { }
+
+#elif !defined(CORETEXT_HAS_CTFontSetRenderingStyle) || CORETEXT_HAS_CTFontSetRenderingStyle != 1
+
+ // This is very slow, but it's just a holdover until everyone migrates to CTFontSetRenderingStyle()
+ // FIXME: Delete this implementation when everyone has migrated off
+ RenderingStyleSaver(CTFontRef font, CGContextRef context)
+ : m_context(context)
+ {
+ CGContextSaveGState(context);
+ CTFontSetRenderingParameters(font, context);
+ }
+
+ ~RenderingStyleSaver()
+ {
+ CGContextRestoreGState(m_context);
+ }
+
+private:
+ CGContextRef m_context;
+
+#else
+
+ RenderingStyleSaver(CTFontRef font, CGContextRef context)
+ : m_context(context)
+ {
+ m_changed = CTFontSetRenderingStyle(font, context, &m_originalStyle, &m_originalDilation);
+ }
+
+ ~RenderingStyleSaver()
+ {
+ if (!m_changed)
+ return;
+ CGContextSetFontRenderingStyle(m_context, m_originalStyle);
+ CGContextSetFontDilation(m_context, m_originalDilation);
+ }
+
+private:
+ bool m_changed;
+ CGContextRef m_context;
+ CGFontRenderingStyle m_originalStyle;
+ CGSize m_originalDilation;
+
+#endif
+};
+
</ins><span class="cx"> static void showGlyphsWithAdvances(const FloatPoint& point, const Font* font, CGContextRef context, const CGGlyph* glyphs, const CGSize* advances, size_t count)
</span><span class="cx"> {
</span><span class="cx"> if (!count)
</span><span class="lines">@@ -162,18 +212,14 @@
</span><span class="cx"> position.y += advances[i].height;
</span><span class="cx"> }
</span><span class="cx"> if (!platformData.isColorBitmapFont()) {
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
- CTFontSetRenderingParameters(platformData.ctFont(), context);
-#endif
</del><ins>+ RenderingStyleSaver saver(platformData.ctFont(), context);
</ins><span class="cx"> CGContextShowGlyphsAtPositions(context, glyphs, positions.data(), count);
</span><span class="cx"> } else
</span><span class="cx"> CTFontDrawGlyphs(platformData.ctFont(), glyphs, positions.data(), count, context);
</span><span class="cx"> CGContextSetTextMatrix(context, savedMatrix);
</span><span class="cx"> } else {
</span><span class="cx"> if (!platformData.isColorBitmapFont()) {
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
- CTFontSetRenderingParameters(platformData.ctFont(), context);
-#endif
</del><ins>+ RenderingStyleSaver saver(platformData.ctFont(), context);
</ins><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span class="cx"> CGContextShowGlyphsWithAdvances(context, glyphs, advances, count);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicgCoreGraphicsSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h (183695 => 183696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2015-05-01 22:53:09 UTC (rev 183695)
+++ trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2015-05-01 23:25:41 UTC (rev 183696)
</span><span class="lines">@@ -144,6 +144,7 @@
</span><span class="cx"> void CGContextSetShouldAntialiasFonts(CGContextRef, bool shouldAntialiasFonts);
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><span class="cx"> void CGContextSetFontDilation(CGContextRef, CGSize);
</span><ins>+void CGContextSetFontRenderingStyle(CGContextRef, CGFontRenderingStyle);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CFStringRef CGFontCopyFamilyName(CGFontRef);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaCoreTextSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (183695 => 183696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2015-05-01 22:53:09 UTC (rev 183695)
+++ trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2015-05-01 23:25:41 UTC (rev 183696)
</span><span class="lines">@@ -66,8 +66,12 @@
</span><span class="cx"> CTTypesetterRef CTTypesetterCreateWithUniCharProviderAndOptions(CTUniCharProviderCallback provide, CTUniCharDisposeCallback dispose, void* refCon, CFDictionaryRef options);
</span><span class="cx"> bool CTFontGetVerticalGlyphsForCharacters(CTFontRef, const UniChar characters[], CGGlyph glyphs[], CFIndex count);
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
</span><ins>+#if defined(CORETEXT_HAS_CTFontSetRenderingStyle) && CORETEXT_HAS_CTFontSetRenderingStyle == 1
+bool CTFontSetRenderingStyle(CTFontRef, CGContextRef, CGFontRenderingStyle* originalStyle, CGSize* originalDilation);
+#else
</ins><span class="cx"> void CTFontSetRenderingParameters(CTFontRef, CGContextRef);
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> CTFontDescriptorRef CTFontDescriptorCreateForUIType(CTFontUIFontType, CGFloat size, CFStringRef language);
</span><span class="cx"> CTFontDescriptorRef CTFontDescriptorCreateWithTextStyle(CFStringRef style, CFStringRef size, CFStringRef language);
</span></span></pre>
</div>
</div>
</body>
</html>