<!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>[197382] 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/197382">197382</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-02-29 19:42:41 -0800 (Mon, 29 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the experimental feature of antialiased font dilation
https://bugs.webkit.org/show_bug.cgi?id=154843
Reviewed by Zalan Bujtas.
Source/WebCore:
Remove the "antialiased font dilation" code path, and related prefs.
* page/Settings.cpp:
(WebCore::Settings::Settings): Deleted.
(WebCore::Settings::setAntialiasedFontDilationEnabled): Deleted.
* page/Settings.h:
(WebCore::Settings::antialiasedFontDilationEnabled): Deleted.
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::setAntialiasedFontDilationEnabled): Deleted.
(WebCore::FontCascade::antialiasedFontDilationEnabled): Deleted.
* platform/graphics/FontCascade.h:
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContextStateChange::changesFromState): Deleted.
(WebCore::GraphicsContextStateChange::accumulate): Deleted.
(WebCore::GraphicsContextStateChange::apply): Deleted.
(WebCore::GraphicsContextStateChange::dump): Deleted.
(WebCore::GraphicsContext::setAntialiasedFontDilationEnabled): Deleted.
* platform/graphics/GraphicsContext.h:
(WebCore::GraphicsContextState::GraphicsContextState): Deleted.
(WebCore::GraphicsContext::antialiasedFontDilationEnabled): Deleted.
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
(PlatformCALayer::drawLayerContents): Deleted.
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::dilationSizeForTextColor): Deleted.
(WebCore::FontCascade::drawGlyphs): Deleted.
* platform/graphics/displaylists/DisplayList.cpp:
(WebCore::DisplayList::DisplayList::shouldDumpForFlags): Deleted.
Source/WebKit/mac:
Remove the "antialiased font dilation" code path, and related prefs.
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]): Deleted.
(-[WebPreferences setAntialiasedFontDilationEnabled:]): Deleted.
(-[WebPreferences antialiasedFontDilationEnabled]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]): Deleted.
Source/WebKit2:
Remove the "antialiased font dilation" code path, and related prefs.
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetAntialiasedFontDilationEnabled):
(WKPreferencesGetAntialiasedFontDilationEnabled):
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _antialiasedFontDilationEnabled]): Deleted.
(-[WKPreferences _setAntialiasedFontDilationEnabled:]): Deleted.
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Deleted.
Tools:
Remove the "antialiased font dilation" code path, and related prefs.
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues): Deleted.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetPreferencesToConsistentValues): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</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="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListcpp">trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/ChangeLog 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-02-29 Simon Fraser <simon.fraser@apple.com>
+
+ Remove the experimental feature of antialiased font dilation
+ https://bugs.webkit.org/show_bug.cgi?id=154843
+
+ Reviewed by Zalan Bujtas.
+
+ Remove the "antialiased font dilation" code path, and related prefs.
+
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings): Deleted.
+ (WebCore::Settings::setAntialiasedFontDilationEnabled): Deleted.
+ * page/Settings.h:
+ (WebCore::Settings::antialiasedFontDilationEnabled): Deleted.
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::setAntialiasedFontDilationEnabled): Deleted.
+ (WebCore::FontCascade::antialiasedFontDilationEnabled): Deleted.
+ * platform/graphics/FontCascade.h:
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContextStateChange::changesFromState): Deleted.
+ (WebCore::GraphicsContextStateChange::accumulate): Deleted.
+ (WebCore::GraphicsContextStateChange::apply): Deleted.
+ (WebCore::GraphicsContextStateChange::dump): Deleted.
+ (WebCore::GraphicsContext::setAntialiasedFontDilationEnabled): Deleted.
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::GraphicsContextState::GraphicsContextState): Deleted.
+ (WebCore::GraphicsContext::antialiasedFontDilationEnabled): Deleted.
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+ (PlatformCALayer::drawLayerContents): Deleted.
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::dilationSizeForTextColor): Deleted.
+ (WebCore::FontCascade::drawGlyphs): Deleted.
+ * platform/graphics/displaylists/DisplayList.cpp:
+ (WebCore::DisplayList::DisplayList::shouldDumpForFlags): Deleted.
+
</ins><span class="cx"> 2016-02-29 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor CoreVideo API access into their own classes so code can be re-used.
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -199,7 +199,6 @@
</span><span class="cx"> , m_needsAdobeFrameReloadingQuirk(false)
</span><span class="cx"> , m_usesPageCache(false)
</span><span class="cx"> , m_fontRenderingMode(0)
</span><del>- , m_antialiasedFontDilationEnabled(false)
</del><span class="cx"> , m_showTiledScrollingIndicator(false)
</span><span class="cx"> , m_backgroundShouldExtendBeyondPage(false)
</span><span class="cx"> , m_dnsPrefetchingEnabled(false)
</span><span class="lines">@@ -360,12 +359,6 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void Settings::setAntialiasedFontDilationEnabled(bool enabled)
-{
- // FIXME: It's wrong for a setting to toggle a global, but this code is temporary.
- FontCascade::setAntialiasedFontDilationEnabled(enabled);
-}
-
</del><span class="cx"> void Settings::setMediaTypeOverride(const String& mediaTypeOverride)
</span><span class="cx"> {
</span><span class="cx"> if (m_mediaTypeOverride == mediaTypeOverride)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/page/Settings.h 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -113,9 +113,6 @@
</span><span class="cx"> const IntSize& textAutosizingWindowSizeOverride() const { return m_textAutosizingWindowSizeOverride; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setAntialiasedFontDilationEnabled(bool);
- bool antialiasedFontDilationEnabled() const { return m_antialiasedFontDilationEnabled; }
-
</del><span class="cx"> // Only set by Layout Tests.
</span><span class="cx"> WEBCORE_EXPORT void setMediaTypeOverride(const String&);
</span><span class="cx"> const String& mediaTypeOverride() const { return m_mediaTypeOverride; }
</span><span class="lines">@@ -322,7 +319,6 @@
</span><span class="cx"> bool m_needsAdobeFrameReloadingQuirk : 1;
</span><span class="cx"> bool m_usesPageCache : 1;
</span><span class="cx"> unsigned m_fontRenderingMode : 1;
</span><del>- bool m_antialiasedFontDilationEnabled : 1;
</del><span class="cx"> bool m_showTiledScrollingIndicator : 1;
</span><span class="cx"> bool m_backgroundShouldExtendBeyondPage : 1;
</span><span class="cx"> bool m_dnsPrefetchingEnabled : 1;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -567,18 +567,6 @@
</span><span class="cx"> return shouldUseFontSmoothing;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool antialiasedFontDilationIsEnabled = false;
-
-void FontCascade::setAntialiasedFontDilationEnabled(bool enabled)
-{
- antialiasedFontDilationIsEnabled = enabled;
-}
-
-bool FontCascade::antialiasedFontDilationEnabled()
-{
- return antialiasedFontDilationIsEnabled;
-}
-
</del><span class="cx"> void FontCascade::setCodePath(CodePath p)
</span><span class="cx"> {
</span><span class="cx"> s_codePath = p;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -204,9 +204,6 @@
</span><span class="cx"> static bool leadingExpansionOpportunity(const StringView&, TextDirection);
</span><span class="cx"> static bool trailingExpansionOpportunity(const StringView&, TextDirection);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static void setAntialiasedFontDilationEnabled(bool);
- WEBCORE_EXPORT static bool antialiasedFontDilationEnabled();
-
</del><span class="cx"> WEBCORE_EXPORT static void setShouldUseSmoothing(bool);
</span><span class="cx"> WEBCORE_EXPORT static bool shouldUseSmoothing();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -110,7 +110,6 @@
</span><span class="cx">
</span><span class="cx"> CHECK_FOR_CHANGED_PROPERTY(ShouldAntialiasChange, shouldAntialias);
</span><span class="cx"> CHECK_FOR_CHANGED_PROPERTY(ShouldSmoothFontsChange, shouldSmoothFonts);
</span><del>- CHECK_FOR_CHANGED_PROPERTY(AntialiasedFontDilationEnabledChange, antialiasedFontDilationEnabled);
</del><span class="cx"> CHECK_FOR_CHANGED_PROPERTY(ShouldSubpixelQuantizeFontsChange, shouldSubpixelQuantizeFonts);
</span><span class="cx"> CHECK_FOR_CHANGED_PROPERTY(ShadowsIgnoreTransformsChange, shadowsIgnoreTransforms);
</span><span class="cx"> CHECK_FOR_CHANGED_PROPERTY(DrawLuminanceMaskChange, drawLuminanceMask);
</span><span class="lines">@@ -173,9 +172,6 @@
</span><span class="cx"> if (flags & GraphicsContextState::ShouldSmoothFontsChange)
</span><span class="cx"> m_state.shouldSmoothFonts = state.shouldSmoothFonts;
</span><span class="cx">
</span><del>- if (flags & GraphicsContextState::AntialiasedFontDilationEnabledChange)
- m_state.antialiasedFontDilationEnabled = state.antialiasedFontDilationEnabled;
-
</del><span class="cx"> if (flags & GraphicsContextState::ShouldSubpixelQuantizeFontsChange)
</span><span class="cx"> m_state.shouldSubpixelQuantizeFonts = state.shouldSubpixelQuantizeFonts;
</span><span class="cx">
</span><span class="lines">@@ -244,9 +240,6 @@
</span><span class="cx"> if (m_changeFlags & GraphicsContextState::ShouldSmoothFontsChange)
</span><span class="cx"> context.setShouldSmoothFonts(m_state.shouldSmoothFonts);
</span><span class="cx">
</span><del>- if (m_changeFlags & GraphicsContextState::AntialiasedFontDilationEnabledChange)
- context.setAntialiasedFontDilationEnabled(m_state.antialiasedFontDilationEnabled);
-
</del><span class="cx"> if (m_changeFlags & GraphicsContextState::ShouldSubpixelQuantizeFontsChange)
</span><span class="cx"> context.setShouldSubpixelQuantizeFonts(m_state.shouldSubpixelQuantizeFonts);
</span><span class="cx">
</span><span class="lines">@@ -317,9 +310,6 @@
</span><span class="cx"> if (m_changeFlags & GraphicsContextState::ShouldSmoothFontsChange)
</span><span class="cx"> ts.dumpProperty("should-smooth-fonts", m_state.shouldSmoothFonts);
</span><span class="cx">
</span><del>- if (m_changeFlags & GraphicsContextState::AntialiasedFontDilationEnabledChange)
- ts.dumpProperty("antialiased-font-dilation-enabled", m_state.antialiasedFontDilationEnabled);
-
</del><span class="cx"> if (m_changeFlags & GraphicsContextState::ShouldSubpixelQuantizeFontsChange)
</span><span class="cx"> ts.dumpProperty("should-subpixel-quantize-fonts", m_state.shouldSubpixelQuantizeFonts);
</span><span class="cx">
</span><span class="lines">@@ -586,13 +576,6 @@
</span><span class="cx"> setPlatformImageInterpolationQuality(imageInterpolationQuality);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::setAntialiasedFontDilationEnabled(bool antialiasedFontDilationEnabled)
-{
- m_state.antialiasedFontDilationEnabled = antialiasedFontDilationEnabled;
- if (isRecording())
- m_displayListRecorder->updateState(m_state, GraphicsContextState::AntialiasedFontDilationEnabledChange);
-}
-
</del><span class="cx"> void GraphicsContext::setStrokePattern(Ref<Pattern>&& pattern)
</span><span class="cx"> {
</span><span class="cx"> m_state.strokeGradient = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -110,7 +110,6 @@
</span><span class="cx"> GraphicsContextState()
</span><span class="cx"> : shouldAntialias(true)
</span><span class="cx"> , shouldSmoothFonts(true)
</span><del>- , antialiasedFontDilationEnabled(true)
</del><span class="cx"> , shouldSubpixelQuantizeFonts(true)
</span><span class="cx"> , shadowsIgnoreTransforms(false)
</span><span class="cx"> #if USE(CG)
</span><span class="lines">@@ -142,10 +141,9 @@
</span><span class="cx"> TextDrawingModeChange = 1 << 16,
</span><span class="cx"> ShouldAntialiasChange = 1 << 17,
</span><span class="cx"> ShouldSmoothFontsChange = 1 << 18,
</span><del>- AntialiasedFontDilationEnabledChange = 1 << 19,
- ShouldSubpixelQuantizeFontsChange = 1 << 20,
- DrawLuminanceMaskChange = 1 << 21,
- ImageInterpolationQualityChange = 1 << 22,
</del><ins>+ ShouldSubpixelQuantizeFontsChange = 1 << 19,
+ DrawLuminanceMaskChange = 1 << 20,
+ ImageInterpolationQualityChange = 1 << 21,
</ins><span class="cx"> };
</span><span class="cx"> typedef uint32_t StateChangeFlags;
</span><span class="cx">
</span><span class="lines">@@ -176,7 +174,6 @@
</span><span class="cx">
</span><span class="cx"> bool shouldAntialias : 1;
</span><span class="cx"> bool shouldSmoothFonts : 1;
</span><del>- bool antialiasedFontDilationEnabled : 1;
</del><span class="cx"> bool shouldSubpixelQuantizeFonts : 1;
</span><span class="cx"> bool shadowsIgnoreTransforms : 1;
</span><span class="cx"> #if USE(CG)
</span><span class="lines">@@ -294,9 +291,6 @@
</span><span class="cx"> WEBCORE_EXPORT void setShouldAntialias(bool);
</span><span class="cx"> bool shouldAntialias() const { return m_state.shouldAntialias; }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setAntialiasedFontDilationEnabled(bool);
- bool antialiasedFontDilationEnabled() const { return m_state.antialiasedFontDilationEnabled; }
-
</del><span class="cx"> WEBCORE_EXPORT void setShouldSmoothFonts(bool);
</span><span class="cx"> bool shouldSmoothFonts() const { return m_state.shouldSmoothFonts; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -1059,7 +1059,6 @@
</span><span class="cx"> if (!layerContents->platformCALayerContentsOpaque()) {
</span><span class="cx"> // Turn off font smoothing to improve the appearance of text rendered onto a transparent background.
</span><span class="cx"> graphicsContext.setShouldSmoothFonts(false);
</span><del>- graphicsContext.setAntialiasedFontDilationEnabled(true);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -220,26 +220,6 @@
</span><span class="cx"> CGContextSetShouldSubpixelQuantizeFonts(cgContext, doSubpixelQuantization);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
-static CGSize dilationSizeForTextColor(const Color& color)
-{
- double hue;
- double saturation;
- double lightness;
- color.getHSL(hue, saturation, lightness);
-
- // These values were derived empirically, and are only experimental.
- if (lightness < 0.3333) // Dark
- return CGSizeMake(0.007, 0.019);
-
- if (lightness < 0.6667) // Medium
- return CGSizeMake(0.032, 0.032);
-
- // Light
- return CGSizeMake(0.0475, 0.039);
-}
-#endif
-
</del><span class="cx"> void FontCascade::drawGlyphs(GraphicsContext& context, const Font& font, const GlyphBuffer& glyphBuffer, int from, int numGlyphs, const FloatPoint& anchorPoint, FontSmoothingMode smoothingMode)
</span><span class="cx"> {
</span><span class="cx"> const FontPlatformData& platformData = font.platformData();
</span><span class="lines">@@ -250,34 +230,29 @@
</span><span class="cx">
</span><span class="cx"> bool shouldSmoothFonts;
</span><span class="cx"> bool changeFontSmoothing;
</span><del>- bool matchAntialiasedAndSmoothedFonts = context.antialiasedFontDilationEnabled();
</del><span class="cx">
</span><span class="cx"> switch (smoothingMode) {
</span><span class="cx"> case Antialiased: {
</span><span class="cx"> context.setShouldAntialias(true);
</span><span class="cx"> shouldSmoothFonts = false;
</span><span class="cx"> changeFontSmoothing = true;
</span><del>- matchAntialiasedAndSmoothedFonts = false; // CSS has opted into strictly antialiased fonts.
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case SubpixelAntialiased: {
</span><span class="cx"> context.setShouldAntialias(true);
</span><span class="cx"> shouldSmoothFonts = true;
</span><span class="cx"> changeFontSmoothing = true;
</span><del>- matchAntialiasedAndSmoothedFonts = true;
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case NoSmoothing: {
</span><span class="cx"> context.setShouldAntialias(false);
</span><span class="cx"> shouldSmoothFonts = false;
</span><span class="cx"> changeFontSmoothing = true;
</span><del>- matchAntialiasedAndSmoothedFonts = false;
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case AutoSmoothing: {
</span><span class="cx"> shouldSmoothFonts = true;
</span><span class="cx"> changeFontSmoothing = false;
</span><del>- matchAntialiasedAndSmoothedFonts = true;
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -285,7 +260,6 @@
</span><span class="cx"> if (!shouldUseSmoothing()) {
</span><span class="cx"> shouldSmoothFonts = false;
</span><span class="cx"> changeFontSmoothing = true;
</span><del>- matchAntialiasedAndSmoothedFonts = true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -294,18 +268,7 @@
</span><span class="cx"> originalShouldUseFontSmoothing = CGContextGetShouldSmoothFonts(cgContext);
</span><span class="cx"> CGContextSetShouldSmoothFonts(cgContext, shouldSmoothFonts);
</span><span class="cx"> }
</span><del>-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
- CGFontAntialiasingStyle oldAntialiasingStyle;
- bool resetAntialiasingStyle = false;
- if (antialiasedFontDilationEnabled() && !CGContextGetShouldSmoothFonts(cgContext) && matchAntialiasedAndSmoothedFonts) {
- resetAntialiasingStyle = true;
- oldAntialiasingStyle = CGContextGetFontAntialiasingStyle(cgContext);
- CGContextSetFontAntialiasingStyle(cgContext, kCGFontAntialiasingStyleUnfilteredCustomDilation);
- CGContextSetFontDilation(cgContext, dilationSizeForTextColor(context.fillColor()));
- }
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> CGContextSetFont(cgContext, platformData.cgFont());
</span><span class="cx">
</span><span class="lines">@@ -371,11 +334,6 @@
</span><span class="cx"> context.setShadow(shadowOffset, shadowBlur, shadowColor);
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
- if (resetAntialiasingStyle)
- CGContextSetFontAntialiasingStyle(cgContext, oldAntialiasingStyle);
-#endif
-
</del><span class="cx"> if (changeFontSmoothing)
</span><span class="cx"> CGContextSetShouldSmoothFonts(cgContext, originalShouldUseFontSmoothing);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsdisplaylistsDisplayListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebCore/platform/graphics/displaylists/DisplayList.cpp 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -68,9 +68,6 @@
</span><span class="cx"> if (stateItem.state().m_changeFlags == GraphicsContextState::ShouldSubpixelQuantizeFontsChange)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (stateItem.state().m_changeFlags == GraphicsContextState::AntialiasedFontDilationEnabledChange)
- return false;
-
</del><span class="cx"> if (stateItem.state().m_changeFlags == GraphicsContextState::ShouldSubpixelQuantizeFontsChange)
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-02-29 Simon Fraser <simon.fraser@apple.com>
+
+ Remove the experimental feature of antialiased font dilation
+ https://bugs.webkit.org/show_bug.cgi?id=154843
+
+ Reviewed by Zalan Bujtas.
+
+ Remove the "antialiased font dilation" code path, and related prefs.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Deleted.
+ (-[WebPreferences setAntialiasedFontDilationEnabled:]): Deleted.
+ (-[WebPreferences antialiasedFontDilationEnabled]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Deleted.
+
</ins><span class="cx"> 2016-02-26 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix for when WK_OVERRIDE_FRAMEWORKS_DIR contains spaces.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -178,7 +178,6 @@
</span><span class="cx"> #define WebKitWantsBalancedSetDefersLoadingBehaviorKey @"WebKitWantsBalancedSetDefersLoadingBehavior"
</span><span class="cx"> #define WebKitDebugFullPageZoomPreferenceKey @"WebKitDebugFullPageZoomPreferenceKey"
</span><span class="cx"> #define WebKitMinimumZoomFontSizePreferenceKey @"WebKitMinimumZoomFontSizePreferenceKey"
</span><del>-#define WebKitAntialiasedFontDilationEnabledKey @"AntialiasedFontDilationEnabled"
</del><span class="cx"> #define WebKitHTTPEquivEnabledPreferenceKey @"WebKitHTTPEquivEnabled"
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -418,7 +418,6 @@
</span><span class="cx"> @"0", WebKitMinimumFontSizePreferenceKey,
</span><span class="cx"> @"9", WebKitMinimumLogicalFontSizePreferenceKey,
</span><span class="cx"> @"16", WebKitDefaultFontSizePreferenceKey,
</span><del>- @(NO), WebKitAntialiasedFontDilationEnabledKey,
</del><span class="cx"> @"13", WebKitDefaultFixedFontSizePreferenceKey,
</span><span class="cx"> @"ISO-8859-1", WebKitDefaultTextEncodingNamePreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitUsesEncodingDetectorPreferenceKey,
</span><span class="lines">@@ -2590,16 +2589,6 @@
</span><span class="cx"> [self _setStringValue:directory forKey:WebKitMediaKeysStorageDirectoryKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setAntialiasedFontDilationEnabled:(BOOL)enabled
-{
- [self _setBoolValue:enabled forKey:WebKitAntialiasedFontDilationEnabledKey];
-}
-
-- (BOOL)antialiasedFontDilationEnabled
-{
- return [self _boolValueForKey:WebKitAntialiasedFontDilationEnabledKey];
-}
-
</del><span class="cx"> - (void)setMetaRefreshEnabled:(BOOL)enabled
</span><span class="cx"> {
</span><span class="cx"> [self setHTTPEquivEnabled:enabled];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -458,9 +458,6 @@
</span><span class="cx"> - (void)setMediaKeysStorageDirectory:(NSString *)directory;
</span><span class="cx"> - (NSString *)mediaKeysStorageDirectory;
</span><span class="cx">
</span><del>-- (void)setAntialiasedFontDilationEnabled:(BOOL)flag;
-- (BOOL)antialiasedFontDilationEnabled;
-
</del><span class="cx"> - (void)setMetaRefreshEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)metaRefreshEnabled;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -2257,7 +2257,6 @@
</span><span class="cx"> settings.setUsesEncodingDetector([preferences usesEncodingDetector]);
</span><span class="cx"> settings.setFantasyFontFamily([preferences fantasyFontFamily]);
</span><span class="cx"> settings.setFixedFontFamily([preferences fixedFontFamily]);
</span><del>- settings.setAntialiasedFontDilationEnabled([preferences antialiasedFontDilationEnabled]);
</del><span class="cx"> settings.setForceFTPDirectoryListings([preferences _forceFTPDirectoryListings]);
</span><span class="cx"> settings.setFTPDirectoryTemplatePath([preferences _ftpDirectoryTemplatePath]);
</span><span class="cx"> settings.setLocalStorageDatabasePath([preferences _localStorageDatabasePath]);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-02-29 Simon Fraser <simon.fraser@apple.com>
+
+ Remove the experimental feature of antialiased font dilation
+ https://bugs.webkit.org/show_bug.cgi?id=154843
+
+ Reviewed by Zalan Bujtas.
+
+ Remove the "antialiased font dilation" code path, and related prefs.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetAntialiasedFontDilationEnabled):
+ (WKPreferencesGetAntialiasedFontDilationEnabled):
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _antialiasedFontDilationEnabled]): Deleted.
+ (-[WKPreferences _setAntialiasedFontDilationEnabled:]): Deleted.
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Deleted.
+
</ins><span class="cx"> 2016-02-29 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: WebKit 2 IPC layer easily confused about multiple web processes being connected.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -222,7 +222,6 @@
</span><span class="cx"> macro(ServiceControlsEnabled, serviceControlsEnabled, Bool, bool, false) \
</span><span class="cx"> macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, false) \
</span><span class="cx"> macro(NewBlockInsideInlineModelEnabled, newBlockInsideInlineModelEnabled, Bool, bool, false) \
</span><del>- macro(AntialiasedFontDilationEnabled, antialiasedFontDilationEnabled, Bool, bool, false) \
</del><span class="cx"> macro(HTTPEquivEnabled, httpEquivEnabled, Bool, bool, true) \
</span><span class="cx"> macro(MockCaptureDevicesEnabled, mockCaptureDevicesEnabled, Bool, bool, false) \
</span><span class="cx"> FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -1387,14 +1387,14 @@
</span><span class="cx"> return toImpl(preferencesRef)->minimumZoomFontSize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPreferencesSetAntialiasedFontDilationEnabled(WKPreferencesRef preferencesRef, bool enabled)
</del><ins>+void WKPreferencesSetAntialiasedFontDilationEnabled(WKPreferencesRef, bool)
</ins><span class="cx"> {
</span><del>- toImpl(preferencesRef)->setAntialiasedFontDilationEnabled(enabled);
</del><ins>+ // Feature removed.
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool WKPreferencesGetAntialiasedFontDilationEnabled(WKPreferencesRef preferencesRef)
</del><ins>+bool WKPreferencesGetAntialiasedFontDilationEnabled(WKPreferencesRef)
</ins><span class="cx"> {
</span><del>- return toImpl(preferencesRef)->antialiasedFontDilationEnabled();
</del><ins>+ return false; // Feature removed.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPreferencesSetVisibleDebugOverlayRegions(WKPreferencesRef preferencesRef, WKDebugOverlayRegions visibleRegions)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetScreenFontSubstitutionEnabled(WKPreferencesRef preferences, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetScreenFontSubstitutionEnabled(WKPreferencesRef preferences);
</span><span class="cx">
</span><del>-// Defaults to false.
</del><ins>+// Not implemented, should be deleted once Safari no longer uses this function.
</ins><span class="cx"> WK_EXPORT void WKPreferencesSetAntialiasedFontDilationEnabled(WKPreferencesRef preferences, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetAntialiasedFontDilationEnabled(WKPreferencesRef preferences);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -389,16 +389,6 @@
</span><span class="cx"> _preferences->setDiagnosticLoggingEnabled(diagnosticLoggingEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_antialiasedFontDilationEnabled
-{
- return _preferences->antialiasedFontDilationEnabled();
-}
-
-- (void)_setAntialiasedFontDilationEnabled:(BOOL)antialiasedFontDilationEnabled
-{
- _preferences->setAntialiasedFontDilationEnabled(antialiasedFontDilationEnabled);
-}
-
</del><span class="cx"> - (NSUInteger)_defaultFontSize
</span><span class="cx"> {
</span><span class="cx"> return _preferences->defaultFontSize();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -76,8 +76,6 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setDiagnosticLoggingEnabled:) BOOL _diagnosticLoggingEnabled WK_AVAILABLE(10_11, 9_0);
</span><span class="cx">
</span><del>-@property (nonatomic, setter=_setAntialiasedFontDilationEnabled:) BOOL _antialiasedFontDilationEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-
</del><span class="cx"> @property (nonatomic, setter=_setDefaultFontSize:) NSUInteger _defaultFontSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx"> @property (nonatomic, setter=_setDefaultFixedPitchFontSize:) NSUInteger _defaultFixedPitchFontSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx"> @property (nonatomic, copy, setter=_setFixedPitchFontFamily:) NSString *_fixedPitchFontFamily WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -2987,7 +2987,6 @@
</span><span class="cx"> settings.setSimpleLineLayoutDebugBordersEnabled(store.getBoolValueForKey(WebPreferencesKey::simpleLineLayoutDebugBordersEnabledKey()));
</span><span class="cx">
</span><span class="cx"> settings.setNewBlockInsideInlineModelEnabled(store.getBoolValueForKey(WebPreferencesKey::newBlockInsideInlineModelEnabledKey()));
</span><del>- settings.setAntialiasedFontDilationEnabled(store.getBoolValueForKey(WebPreferencesKey::antialiasedFontDilationEnabledKey()));
</del><span class="cx">
</span><span class="cx"> settings.setSubpixelCSSOMElementMetricsEnabled(store.getBoolValueForKey(WebPreferencesKey::subpixelCSSOMElementMetricsEnabledKey()));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Tools/ChangeLog 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-29 Simon Fraser <simon.fraser@apple.com>
+
+ Remove the experimental feature of antialiased font dilation
+ https://bugs.webkit.org/show_bug.cgi?id=154843
+
+ Reviewed by Zalan Bujtas.
+
+ Remove the "antialiased font dilation" code path, and related prefs.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues): Deleted.
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues): Deleted.
+
</ins><span class="cx"> 2016-02-29 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix timing flakiness in test I added in http://trac.webkit.org/changeset/197372
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -899,7 +899,6 @@
</span><span class="cx"> [preferences setPictographFontFamily:@"Apple Color Emoji"];
</span><span class="cx"> [preferences setDefaultFontSize:16];
</span><span class="cx"> [preferences setDefaultFixedFontSize:13];
</span><del>- [preferences setAntialiasedFontDilationEnabled:NO];
</del><span class="cx"> [preferences setMinimumFontSize:0];
</span><span class="cx"> [preferences setDefaultTextEncodingName:@"ISO-8859-1"];
</span><span class="cx"> [preferences setJavaEnabled:NO];
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (197381 => 197382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-03-01 03:18:59 UTC (rev 197381)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-03-01 03:42:41 UTC (rev 197382)
</span><span class="lines">@@ -630,7 +630,6 @@
</span><span class="cx"> WKPreferencesSetPageVisibilityBasedProcessSuppressionEnabled(preferences, false);
</span><span class="cx"> WKPreferencesSetOfflineWebApplicationCacheEnabled(preferences, true);
</span><span class="cx"> WKPreferencesSetFontSmoothingLevel(preferences, kWKFontSmoothingLevelNoSubpixelAntiAliasing);
</span><del>- WKPreferencesSetAntialiasedFontDilationEnabled(preferences, false);
</del><span class="cx"> WKPreferencesSetXSSAuditorEnabled(preferences, false);
</span><span class="cx"> WKPreferencesSetWebAudioEnabled(preferences, true);
</span><span class="cx"> WKPreferencesSetMediaStreamEnabled(preferences, true);
</span></span></pre>
</div>
</div>
</body>
</html>