<!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>[212776] 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/212776">212776</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-02-21 16:30:32 -0800 (Tue, 21 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support to PlatformCALayer/GraphicsLayerCA for subpixel-antialiased text, with a Setting and a MiniBrowser switch
https://bugs.webkit.org/show_bug.cgi?id=168620
<rdar://problem/30617772>
Reviewed by Tim Horton.
Source/WebCore:
Add a Setting for subpixel-antialiased layer text. Plumb this through GraphicsLayerCA and
PlatformCALayer, where it ultimately affects the layer contents format.
TileControllers are slightly special because we communicate with them via an Obj-C
WebTiledBackingLayer.
Test: compositing/contents-format/subpixel-antialiased-text-enabled.html
* page/Settings.in:
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::GraphicsLayer):
(WebCore::GraphicsLayer::dumpProperties):
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::supportsSubpixelAntialiasedText):
(WebCore::GraphicsLayer::setSupportsSubpixelAntialiasedText):
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setSupportsSubpixelAntialiasedText):
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::updateSupportsSubpixelAntialiasedText):
* platform/graphics/ca/GraphicsLayerCA.h:
* platform/graphics/ca/PlatformCALayer.cpp:
(WebCore::PlatformCALayer::drawRepaintIndicator):
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/ca/TileController.cpp:
(WebCore::TileController::setWantsDeepColorBackingStore):
(WebCore::TileController::setSupportsSubpixelAntialiasedText):
(WebCore::TileController::setTilesOpaque):
* platform/graphics/ca/TileController.h:
* platform/graphics/ca/TileGrid.cpp:
(WebCore::TileGrid::updateTileLayerProperties):
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.h:
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
(PlatformCALayerCocoa::supportsSubpixelAntialiasedText):
(PlatformCALayerCocoa::setSupportsSubpixelAntialiasedText):
(layerContentsFormat):
(PlatformCALayerCocoa::updateContentsFormat):
(PlatformCALayer::drawLayerContents):
* platform/graphics/ca/cocoa/WebTiledBackingLayer.h:
* platform/graphics/ca/cocoa/WebTiledBackingLayer.mm:
(-[WebTiledBackingLayer drawsAsynchronously]):
(-[WebTiledBackingLayer setSupportsSubpixelAntialiasedText:]):
(-[WebTiledBackingLayer supportsSubpixelAntialiasedText]):
* platform/spi/cocoa/QuartzCoreSPI.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::createGraphicsLayer):
Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences subpixelAntialiasedLayerTextEnabled]):
(-[WebPreferences setSubpixelAntialiasedLayerTextEnabled:]):
* WebView/WebPreferencesPrivate.h:
Source/WebKit2:
Add a Setting for subpixel-antialiased layer text. Plumb this through GraphicsLayerCA and
PlatformCALayer, where it ultimately affects the layer contents format.
This is not supported with UI-side compositing.
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetSubpixelAntialiasedLayerTextEnabled):
(WKPreferencesGetSubpixelAntialiasedLayerTextEnabled):
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _subpixelAntialiasedLayerTextEnabled]):
(-[WKPreferences _setSubpixelAntialiasedLayerTextEnabled:]):
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(WebKit::PlatformCALayerRemote::supportsSubpixelAntialiasedText):
(WebKit::PlatformCALayerRemote::setSupportsSubpixelAntialiasedText):
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:
* WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp:
(WebKit::PlatformCALayerRemoteTiledBacking::supportsSubpixelAntialiasedText):
(WebKit::PlatformCALayerRemoteTiledBacking::setSupportsSubpixelAntialiasedText):
* WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h:
Tools:
Add a setting that allows one to toggle subpixel-antialiased layer text on and off.
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues):
* MiniBrowser/mac/SettingsController.h:
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController toggleSubpixelAntialiasedLayerTextEnabled:]):
(-[SettingsController subpixelAntialiasedLayerTextEnabled]):
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController didChangeSettings]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController didChangeSettings]):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetPreferencesToConsistentValues):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllerh">trunk/Source/WebCore/platform/graphics/ca/TileController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileGridcpp">trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoah">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaWebTiledBackingLayerh">trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaWebTiledBackingLayermm">trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinh">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.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="#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="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteTiledBackingcpp">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteTiledBackingh">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h</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="#trunkToolsMiniBrowsermacSettingsControllerh">trunk/Tools/MiniBrowser/mac/SettingsController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerm">trunk/Tools/MiniBrowser/mac/SettingsController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/compositing/contents-format/</li>
<li><a href="#trunkLayoutTestscompositingcontentsformatsubpixelantialiasedtextenabledexpectedtxt">trunk/LayoutTests/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingcontentsformatsubpixelantialiasedtextenabledhtml">trunk/LayoutTests/compositing/contents-format/subpixel-antialiased-text-enabled.html</a></li>
<li>trunk/LayoutTests/platform/mac-wk1/compositing/contents-format/</li>
<li><a href="#trunkLayoutTestsplatformmacwk1compositingcontentsformatsubpixelantialiasedtextenabledexpectedtxt">trunk/LayoutTests/platform/mac-wk1/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestscompositingcontentsformatsubpixelantialiasedtextenabledexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt (0 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+Normal layer
+Tiled layer
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 5018.00 2018.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 5018.00 2018.00)
+ (contentsOpaque 1)
+ (supports subpixel antialiased text 1)
+ (tile cache coverage 0, 0 1024 x 1024)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 2)
+ (in window 1)
+ (children 2
+ (GraphicsLayer
+ (position 18.00 10.00)
+ (bounds 100.00 100.00)
+ (contentsOpaque 1)
+ (supports subpixel antialiased text 1)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 18.00 120.00)
+ (bounds 5000.00 100.00)
+ (usingTiledLayer 1)
+ (contentsOpaque 1)
+ (supports subpixel antialiased text 1)
+ (drawsContent 1)
+ (tile cache coverage 0, 0 1024 x 100)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 1)
+ (in window 1)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingcontentsformatsubpixelantialiasedtextenabledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/contents-format/subpixel-antialiased-text-enabled.html (0 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/contents-format/subpixel-antialiased-text-enabled.html (rev 0)
+++ trunk/LayoutTests/compositing/contents-format/subpixel-antialiased-text-enabled.html 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ height: 2000px;
+ }
+
+ .box {
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ margin: 10px;
+ }
+
+ .composited {
+ transform: translateZ(0);
+ }
+
+ .tiled {
+ width: 5000px;
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function doAfterReload()
+ {
+ if (window.internals)
+ document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_TILE_CACHES);
+
+ delete window.localStorage.stage;
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ function doOnFirstLoad()
+ {
+ window.localStorage.stage = 1;
+ if (window.internals)
+ internals.settings.setSubpixelAntialiasedLayerTextEnabled(true)
+
+ // Reload so that the setting affects page tiles.
+ location.reload();
+ }
+
+ function doTest()
+ {
+ if (window.localStorage.stage)
+ doAfterReload();
+ else
+ doOnFirstLoad();
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+
+<div class="composited box">
+ Normal layer
+</div>
+
+<div class="tiled composited box">
+ Tiled layer
+</div>
+
+<pre id="layers"></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1compositingcontentsformatsubpixelantialiasedtextenabledexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk1/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt (0 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk1/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Normal layer
+Tiled layer
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 5018.00 2018.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 5018.00 2018.00)
+ (contentsOpaque 1)
+ (supports subpixel antialiased text 1)
+ (children 2
+ (GraphicsLayer
+ (position 18.00 10.00)
+ (bounds 100.00 100.00)
+ (contentsOpaque 1)
+ (supports subpixel antialiased text 1)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 18.00 120.00)
+ (bounds 5000.00 100.00)
+ (usingTiledLayer 1)
+ (contentsOpaque 1)
+ (supports subpixel antialiased text 1)
+ (drawsContent 1)
+ (tile cache coverage 0, 0 1024 x 100)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 1)
+ (in window 1)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/ChangeLog 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2017-02-20 Simon Fraser <simon.fraser@apple.com>
+
+ Add support to PlatformCALayer/GraphicsLayerCA for subpixel-antialiased text, with a Setting and a MiniBrowser switch
+ https://bugs.webkit.org/show_bug.cgi?id=168620
+ <rdar://problem/30617772>
+
+ Reviewed by Tim Horton.
+
+ Add a Setting for subpixel-antialiased layer text. Plumb this through GraphicsLayerCA and
+ PlatformCALayer, where it ultimately affects the layer contents format.
+
+ TileControllers are slightly special because we communicate with them via an Obj-C
+ WebTiledBackingLayer.
+
+ Test: compositing/contents-format/subpixel-antialiased-text-enabled.html
+
+ * page/Settings.in:
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::GraphicsLayer):
+ (WebCore::GraphicsLayer::dumpProperties):
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::supportsSubpixelAntialiasedText):
+ (WebCore::GraphicsLayer::setSupportsSubpixelAntialiasedText):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setSupportsSubpixelAntialiasedText):
+ (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
+ (WebCore::GraphicsLayerCA::updateSupportsSubpixelAntialiasedText):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ * platform/graphics/ca/PlatformCALayer.cpp:
+ (WebCore::PlatformCALayer::drawRepaintIndicator):
+ * platform/graphics/ca/PlatformCALayer.h:
+ * platform/graphics/ca/TileController.cpp:
+ (WebCore::TileController::setWantsDeepColorBackingStore):
+ (WebCore::TileController::setSupportsSubpixelAntialiasedText):
+ (WebCore::TileController::setTilesOpaque):
+ * platform/graphics/ca/TileController.h:
+ * platform/graphics/ca/TileGrid.cpp:
+ (WebCore::TileGrid::updateTileLayerProperties):
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.h:
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+ (PlatformCALayerCocoa::supportsSubpixelAntialiasedText):
+ (PlatformCALayerCocoa::setSupportsSubpixelAntialiasedText):
+ (layerContentsFormat):
+ (PlatformCALayerCocoa::updateContentsFormat):
+ (PlatformCALayer::drawLayerContents):
+ * platform/graphics/ca/cocoa/WebTiledBackingLayer.h:
+ * platform/graphics/ca/cocoa/WebTiledBackingLayer.mm:
+ (-[WebTiledBackingLayer drawsAsynchronously]):
+ (-[WebTiledBackingLayer setSupportsSubpixelAntialiasedText:]):
+ (-[WebTiledBackingLayer supportsSubpixelAntialiasedText]):
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::createGraphicsLayer):
+
</ins><span class="cx"> 2017-02-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (203941): iAd Producer: Clicking buttons in Preview does not work
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/page/Settings.in 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -201,6 +201,7 @@
</span><span class="cx"> textAutosizingWindowSizeOverride type=IntSize, setNeedsStyleRecalcInAllFrames=1, conditional=TEXT_AUTOSIZING
</span><span class="cx"> minimumZoomFontSize type=float, initial=defaultMinimumZoomFontSize(), conditional=TEXT_AUTOSIZING
</span><span class="cx">
</span><ins>+subpixelAntialiasedLayerTextEnabled initial=false, setNeedsStyleRecalcInAllFrames=1
</ins><span class="cx"> simpleLineLayoutEnabled initial=true, setNeedsStyleRecalcInAllFrames=1
</span><span class="cx"> simpleLineLayoutDebugBordersEnabled initial=false, setNeedsStyleRecalcInAllFrames=1
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_type(type)
</span><span class="cx"> , m_contentsOpaque(false)
</span><ins>+ , m_supportsSubpixelAntialiasedText(false)
</ins><span class="cx"> , m_preserves3D(false)
</span><span class="cx"> , m_backfaceVisibility(true)
</span><span class="cx"> , m_masksToBounds(false)
</span><span class="lines">@@ -762,6 +763,11 @@
</span><span class="cx"> ts << "(contentsOpaque " << (m_contentsOpaque || needsIOSDumpRenderTreeMainFrameRenderViewLayerIsAlwaysOpaqueHack) << ")\n";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_supportsSubpixelAntialiasedText) {
+ writeIndent(ts, indent + 1);
+ ts << "(supports subpixel antialiased text " << m_supportsSubpixelAntialiasedText << ")\n";
+ }
+
</ins><span class="cx"> if (m_preserves3D) {
</span><span class="cx"> writeIndent(ts, indent + 1);
</span><span class="cx"> ts << "(preserves3D " << m_preserves3D << ")\n";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -374,6 +374,9 @@
</span><span class="cx"> bool contentsOpaque() const { return m_contentsOpaque; }
</span><span class="cx"> virtual void setContentsOpaque(bool b) { m_contentsOpaque = b; }
</span><span class="cx">
</span><ins>+ bool supportsSubpixelAntialiasedText() const { return m_supportsSubpixelAntialiasedText; }
+ virtual void setSupportsSubpixelAntialiasedText(bool b) { m_supportsSubpixelAntialiasedText = b; }
+
</ins><span class="cx"> bool backfaceVisibility() const { return m_backfaceVisibility; }
</span><span class="cx"> virtual void setBackfaceVisibility(bool b) { m_backfaceVisibility = b; }
</span><span class="cx">
</span><span class="lines">@@ -631,6 +634,7 @@
</span><span class="cx"> const Type m_type;
</span><span class="cx">
</span><span class="cx"> bool m_contentsOpaque : 1;
</span><ins>+ bool m_supportsSubpixelAntialiasedText : 1;
</ins><span class="cx"> bool m_preserves3D: 1;
</span><span class="cx"> bool m_backfaceVisibility : 1;
</span><span class="cx"> bool m_masksToBounds : 1;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -738,6 +738,15 @@
</span><span class="cx"> noteLayerPropertyChanged(ContentsOpaqueChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsLayerCA::setSupportsSubpixelAntialiasedText(bool supportsSubpixelAntialiasedText)
+{
+ if (m_supportsSubpixelAntialiasedText == supportsSubpixelAntialiasedText)
+ return;
+
+ GraphicsLayer::setSupportsSubpixelAntialiasedText(supportsSubpixelAntialiasedText);
+ noteLayerPropertyChanged(SupportsSubpixelAntialiasedTextChanged);
+}
+
</ins><span class="cx"> void GraphicsLayerCA::setBackfaceVisibility(bool visible)
</span><span class="cx"> {
</span><span class="cx"> if (m_backfaceVisibility == visible)
</span><span class="lines">@@ -1671,6 +1680,9 @@
</span><span class="cx"> if (m_uncommittedChanges & AcceleratesDrawingChanged)
</span><span class="cx"> updateAcceleratesDrawing();
</span><span class="cx">
</span><ins>+ if (m_uncommittedChanges & SupportsSubpixelAntialiasedTextChanged)
+ updateSupportsSubpixelAntialiasedText();
+
</ins><span class="cx"> if (m_uncommittedChanges & DebugIndicatorsChanged)
</span><span class="cx"> updateDebugBorder();
</span><span class="cx">
</span><span class="lines">@@ -2202,6 +2214,11 @@
</span><span class="cx"> m_layer->setAcceleratesDrawing(m_acceleratesDrawing);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsLayerCA::updateSupportsSubpixelAntialiasedText()
+{
+ m_layer->setSupportsSubpixelAntialiasedText(m_supportsSubpixelAntialiasedText);
+}
+
</ins><span class="cx"> static void setLayerDebugBorder(PlatformCALayer& layer, Color borderColor, float borderWidth)
</span><span class="cx"> {
</span><span class="cx"> layer.setBorderColor(borderColor);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -94,6 +94,8 @@
</span><span class="cx"> WEBCORE_EXPORT void setBackgroundColor(const Color&) override;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setContentsOpaque(bool) override;
</span><ins>+ WEBCORE_EXPORT void setSupportsSubpixelAntialiasedText(bool) override;
+
</ins><span class="cx"> WEBCORE_EXPORT void setBackfaceVisibility(bool) override;
</span><span class="cx">
</span><span class="cx"> // return true if we started an animation
</span><span class="lines">@@ -405,6 +407,7 @@
</span><span class="cx"> void updateAnimations();
</span><span class="cx"> void updateContentsNeedsDisplay();
</span><span class="cx"> void updateAcceleratesDrawing();
</span><ins>+ void updateSupportsSubpixelAntialiasedText();
</ins><span class="cx"> void updateDebugBorder();
</span><span class="cx"> void updateTiles();
</span><span class="cx"> void updateContentsScale(float pageScaleFactor);
</span><span class="lines">@@ -452,44 +455,45 @@
</span><span class="cx"> bool appendToUncommittedAnimations(const KeyframeValueList&, const FilterOperation*, const Animation*, const String& animationName, int animationIndex, double timeOffset);
</span><span class="cx">
</span><span class="cx"> enum LayerChange : uint64_t {
</span><del>- NoChange = 0,
- NameChanged = 1LLU << 1,
- ChildrenChanged = 1LLU << 2, // also used for content layer, and preserves-3d, and size if tiling changes?
- GeometryChanged = 1LLU << 3,
- TransformChanged = 1LLU << 4,
- ChildrenTransformChanged = 1LLU << 5,
- Preserves3DChanged = 1LLU << 6,
- MasksToBoundsChanged = 1LLU << 7,
- DrawsContentChanged = 1LLU << 8,
- BackgroundColorChanged = 1LLU << 9,
- ContentsOpaqueChanged = 1LLU << 10,
- BackfaceVisibilityChanged = 1LLU << 11,
- OpacityChanged = 1LLU << 12,
- AnimationChanged = 1LLU << 13,
- DirtyRectsChanged = 1LLU << 14,
- ContentsImageChanged = 1LLU << 15,
- ContentsPlatformLayerChanged = 1LLU << 16,
- ContentsColorLayerChanged = 1LLU << 17,
- ContentsRectsChanged = 1LLU << 18,
- MasksToBoundsRectChanged = 1LLU << 19,
- MaskLayerChanged = 1LLU << 20,
- ReplicatedLayerChanged = 1LLU << 21,
- ContentsNeedsDisplay = 1LLU << 22,
- AcceleratesDrawingChanged = 1LLU << 23,
- ContentsScaleChanged = 1LLU << 24,
- ContentsVisibilityChanged = 1LLU << 25,
- CoverageRectChanged = 1LLU << 26,
- FiltersChanged = 1LLU << 27,
- BackdropFiltersChanged = 1LLU << 28,
- BackdropFiltersRectChanged = 1LLU << 29,
- TilingAreaChanged = 1LLU << 30,
- TilesAdded = 1LLU << 31,
- DebugIndicatorsChanged = 1LLU << 32,
- CustomAppearanceChanged = 1LLU << 33,
- BlendModeChanged = 1LLU << 34,
- ShapeChanged = 1LLU << 35,
- WindRuleChanged = 1LLU << 36,
- UserInteractionEnabledChanged = 1LLU << 37,
</del><ins>+ NoChange = 0,
+ NameChanged = 1LLU << 1,
+ ChildrenChanged = 1LLU << 2, // also used for content layer, and preserves-3d, and size if tiling changes?
+ GeometryChanged = 1LLU << 3,
+ TransformChanged = 1LLU << 4,
+ ChildrenTransformChanged = 1LLU << 5,
+ Preserves3DChanged = 1LLU << 6,
+ MasksToBoundsChanged = 1LLU << 7,
+ DrawsContentChanged = 1LLU << 8,
+ BackgroundColorChanged = 1LLU << 9,
+ ContentsOpaqueChanged = 1LLU << 10,
+ BackfaceVisibilityChanged = 1LLU << 11,
+ OpacityChanged = 1LLU << 12,
+ AnimationChanged = 1LLU << 13,
+ DirtyRectsChanged = 1LLU << 14,
+ ContentsImageChanged = 1LLU << 15,
+ ContentsPlatformLayerChanged = 1LLU << 16,
+ ContentsColorLayerChanged = 1LLU << 17,
+ ContentsRectsChanged = 1LLU << 18,
+ MasksToBoundsRectChanged = 1LLU << 19,
+ MaskLayerChanged = 1LLU << 20,
+ ReplicatedLayerChanged = 1LLU << 21,
+ ContentsNeedsDisplay = 1LLU << 22,
+ AcceleratesDrawingChanged = 1LLU << 23,
+ SupportsSubpixelAntialiasedTextChanged = 1LLU << 24,
+ ContentsScaleChanged = 1LLU << 25,
+ ContentsVisibilityChanged = 1LLU << 26,
+ CoverageRectChanged = 1LLU << 27,
+ FiltersChanged = 1LLU << 28,
+ BackdropFiltersChanged = 1LLU << 29,
+ BackdropFiltersRectChanged = 1LLU << 30,
+ TilingAreaChanged = 1LLU << 31,
+ TilesAdded = 1LLU << 32,
+ DebugIndicatorsChanged = 1LLU << 33,
+ CustomAppearanceChanged = 1LLU << 34,
+ BlendModeChanged = 1LLU << 35,
+ ShapeChanged = 1LLU << 36,
+ WindRuleChanged = 1LLU << 37,
+ UserInteractionEnabledChanged = 1LLU << 38,
</ins><span class="cx"> };
</span><span class="cx"> typedef uint64_t LayerChangeFlags;
</span><span class="cx"> enum ScheduleFlushOrNot { ScheduleFlush, DontScheduleFlush };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -116,6 +116,12 @@
</span><span class="cx"> CGContextStrokeRect(context, indicatorBox);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!platformCALayer->isOpaque() && platformCALayer->supportsSubpixelAntialiasedText()) {
+ // Draw a gray shadow behind the repaint count.
+ CGContextSetRGBFillColor(context, 1, 1, 1, 0.4);
+ platformCALayer->drawTextAtPoint(context, indicatorBox.x() + 7, indicatorBox.y() + 24, CGSizeMake(1, -1), 22, text, strlen(text));
+ }
+
</ins><span class="cx"> if (platformCALayer->acceleratesDrawing())
</span><span class="cx"> CGContextSetRGBFillColor(context, 1, 0, 0, 1);
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -179,6 +179,9 @@
</span><span class="cx"> virtual bool wantsDeepColorBackingStore() const = 0;
</span><span class="cx"> virtual void setWantsDeepColorBackingStore(bool) = 0;
</span><span class="cx">
</span><ins>+ virtual bool supportsSubpixelAntialiasedText() const = 0;
+ virtual void setSupportsSubpixelAntialiasedText(bool) = 0;
+
</ins><span class="cx"> virtual CFTypeRef contents() const = 0;
</span><span class="cx"> virtual void setContents(CFTypeRef) = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -179,7 +179,15 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_wantsDeepColorBackingStore = wantsDeepColorBackingStore;
</span><ins>+ tileGrid().updateTileLayerProperties();
+}
</ins><span class="cx">
</span><ins>+void TileController::setSupportsSubpixelAntialiasedText(bool supportsSubpixelAntialiasedText)
+{
+ if (m_supportsSubpixelAntialiasedText == supportsSubpixelAntialiasedText)
+ return;
+
+ m_supportsSubpixelAntialiasedText = supportsSubpixelAntialiasedText;
</ins><span class="cx"> tileGrid().updateTileLayerProperties();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -187,8 +195,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (opaque == m_tilesAreOpaque)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> m_tilesAreOpaque = opaque;
</span><del>-
</del><span class="cx"> tileGrid().updateTileLayerProperties();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -74,6 +74,9 @@
</span><span class="cx"> bool wantsDeepColorBackingStore() const { return m_wantsDeepColorBackingStore; }
</span><span class="cx"> WEBCORE_EXPORT void setWantsDeepColorBackingStore(bool);
</span><span class="cx">
</span><ins>+ bool supportsSubpixelAntialiasedText() const { return m_supportsSubpixelAntialiasedText; }
+ WEBCORE_EXPORT void setSupportsSubpixelAntialiasedText(bool);
+
</ins><span class="cx"> WEBCORE_EXPORT void setTilesOpaque(bool);
</span><span class="cx"> bool tilesAreOpaque() const { return m_tilesAreOpaque; }
</span><span class="cx">
</span><span class="lines">@@ -221,6 +224,7 @@
</span><span class="cx"> bool m_scrollingPerformanceLoggingEnabled { false };
</span><span class="cx"> bool m_acceleratesDrawing { false };
</span><span class="cx"> bool m_wantsDeepColorBackingStore { false };
</span><ins>+ bool m_supportsSubpixelAntialiasedText { false };
</ins><span class="cx"> bool m_tilesAreOpaque { false };
</span><span class="cx"> bool m_hasTilesWithTemporaryScaleFactor { false }; // Used to make low-res tiles when zooming.
</span><span class="cx"> bool m_inLiveResize { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -199,6 +199,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool acceleratesDrawing = m_controller.acceleratesDrawing();
</span><span class="cx"> bool deepColor = m_controller.wantsDeepColorBackingStore();
</span><ins>+ bool subpixelAntialiasedText = m_controller.supportsSubpixelAntialiasedText();
</ins><span class="cx"> bool opaque = m_controller.tilesAreOpaque();
</span><span class="cx"> Color tileDebugBorderColor = m_controller.tileDebugBorderColor();
</span><span class="cx"> float tileDebugBorderWidth = m_controller.tileDebugBorderWidth();
</span><span class="lines">@@ -207,6 +208,7 @@
</span><span class="cx"> const TileInfo& tileInfo = it->value;
</span><span class="cx"> tileInfo.layer->setAcceleratesDrawing(acceleratesDrawing);
</span><span class="cx"> tileInfo.layer->setWantsDeepColorBackingStore(deepColor);
</span><ins>+ tileInfo.layer->setSupportsSubpixelAntialiasedText(subpixelAntialiasedText);
</ins><span class="cx"> tileInfo.layer->setOpaque(opaque);
</span><span class="cx"> tileInfo.layer->setBorderColor(tileDebugBorderColor);
</span><span class="cx"> tileInfo.layer->setBorderWidth(tileDebugBorderWidth);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -113,6 +113,9 @@
</span><span class="cx"> bool wantsDeepColorBackingStore() const override;
</span><span class="cx"> void setWantsDeepColorBackingStore(bool) override;
</span><span class="cx">
</span><ins>+ bool supportsSubpixelAntialiasedText() const override;
+ void setSupportsSubpixelAntialiasedText(bool) override;
+
</ins><span class="cx"> CFTypeRef contents() const override;
</span><span class="cx"> void setContents(CFTypeRef) override;
</span><span class="cx">
</span><span class="lines">@@ -191,6 +194,7 @@
</span><span class="cx"> GraphicsLayer::CustomAppearance m_customAppearance;
</span><span class="cx"> std::unique_ptr<FloatRoundedRect> m_shapeRoundedRect;
</span><span class="cx"> bool m_wantsDeepColorBackingStore { false };
</span><ins>+ bool m_supportsSubpixelAntialiasedText { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -705,6 +705,26 @@
</span><span class="cx"> updateContentsFormat();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PlatformCALayerCocoa::supportsSubpixelAntialiasedText() const
+{
+ return m_supportsSubpixelAntialiasedText;
+}
+
+void PlatformCALayerCocoa::setSupportsSubpixelAntialiasedText(bool supportsSubpixelAntialiasedText)
+{
+ if (supportsSubpixelAntialiasedText == m_supportsSubpixelAntialiasedText)
+ return;
+
+ m_supportsSubpixelAntialiasedText = supportsSubpixelAntialiasedText;
+
+ if (usesTiledBackingLayer()) {
+ [static_cast<WebTiledBackingLayer *>(m_layer.get()) setSupportsSubpixelAntialiasedText:m_supportsSubpixelAntialiasedText];
+ return;
+ }
+
+ updateContentsFormat();
+}
+
</ins><span class="cx"> CFTypeRef PlatformCALayerCocoa::contents() const
</span><span class="cx"> {
</span><span class="cx"> return [m_layer contents];
</span><span class="lines">@@ -975,7 +995,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
</span><del>-static NSString *layerContentsFormat(bool wantsDeepColor)
</del><ins>+static NSString *layerContentsFormat(bool wantsDeepColor, bool supportsSubpixelAntialiasedFonts)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
</span><span class="cx"> if (wantsDeepColor)
</span><span class="lines">@@ -983,6 +1003,14 @@
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(wantsDeepColor);
</span><span class="cx"> #endif
</span><ins>+
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+ if (supportsSubpixelAntialiasedFonts)
+ return kCAContentsFormatRGBA8ColorRGBA8LinearGlyphMask;
+#else
+ UNUSED_PARAM(supportsSubpixelAntialiasedFonts);
+#endif
+
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -992,7 +1020,7 @@
</span><span class="cx"> if (m_layerType == LayerTypeWebLayer || m_layerType == LayerTypeTiledBackingTileLayer) {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
</span><del>- if (NSString *formatString = layerContentsFormat(wantsDeepColorBackingStore()))
</del><ins>+ if (NSString *formatString = layerContentsFormat(wantsDeepColorBackingStore(), supportsSubpixelAntialiasedText()))
</ins><span class="cx"> [m_layer setContentsFormat:formatString];
</span><span class="cx"> #endif
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="lines">@@ -1107,7 +1135,7 @@
</span><span class="cx"> graphicsContext.setIsCALayerContext(true);
</span><span class="cx"> graphicsContext.setIsAcceleratedContext(platformCALayer->acceleratesDrawing());
</span><span class="cx">
</span><del>- if (!layerContents->platformCALayerContentsOpaque()) {
</del><ins>+ if (!layerContents->platformCALayerContentsOpaque() && !platformCALayer->supportsSubpixelAntialiasedText()) {
</ins><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><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaWebTiledBackingLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -46,6 +46,9 @@
</span><span class="cx"> - (void)setWantsDeepColorBackingStore:(BOOL)wantsDeepColor;
</span><span class="cx"> - (BOOL)wantsDeepColorBackingStore;
</span><span class="cx">
</span><ins>+- (void)setSupportsSubpixelAntialiasedText:(BOOL)supportsSubpixelAntialiasedText;
+- (BOOL)supportsSubpixelAntialiasedText;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WebTiledBackingLayer_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaWebTiledBackingLayermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.mm (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.mm 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/WebTiledBackingLayer.mm 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -108,6 +108,11 @@
</span><span class="cx"> _tileController->setAcceleratesDrawing(acceleratesDrawing);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)drawsAsynchronously
+{
+ return _tileController ? _tileController->acceleratesDrawing() : NO;
+}
+
</ins><span class="cx"> - (void)setWantsDeepColorBackingStore:(BOOL)wantsDeepColor
</span><span class="cx"> {
</span><span class="cx"> _tileController->setWantsDeepColorBackingStore(wantsDeepColor);
</span><span class="lines">@@ -118,11 +123,16 @@
</span><span class="cx"> return _tileController->wantsDeepColorBackingStore();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)drawsAsynchronously
</del><ins>+- (void)setSupportsSubpixelAntialiasedText:(BOOL)supportsSubpixelAntialiasedText
</ins><span class="cx"> {
</span><del>- return _tileController ? _tileController->acceleratesDrawing() : NO;
</del><ins>+ _tileController->setSupportsSubpixelAntialiasedText(supportsSubpixelAntialiasedText);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)supportsSubpixelAntialiasedText
+{
+ return _tileController->supportsSubpixelAntialiasedText();
+}
+
</ins><span class="cx"> - (void)setContentsScale:(CGFloat)contentsScale
</span><span class="cx"> {
</span><span class="cx"> _tileController->setContentsScale(contentsScale);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -528,6 +528,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PlatformCALayerWin::supportsSubpixelAntialiasedText() const
+{
+ return false
+}
+
+void PlatformCALayerWin::setSupportsSubpixelAntialiasedText(bool)
+{
+}
+
</ins><span class="cx"> CFTypeRef PlatformCALayerWin::contents() const
</span><span class="cx"> {
</span><span class="cx"> return CACFLayerGetContents(m_layer.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx"> bool wantsDeepColorBackingStore() const override;
</span><span class="cx"> void setWantsDeepColorBackingStore(bool) override;
</span><span class="cx">
</span><ins>+ bool supportsSubpixelAntialiasedText() const override;
+ void setSupportsSubpixelAntialiasedText(bool) override;
+
</ins><span class="cx"> CFTypeRef contents() const override;
</span><span class="cx"> void setContents(CFTypeRef) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -221,6 +221,10 @@
</span><span class="cx"> extern NSString * const kCAContentsFormatRGBA10XR;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+extern NSString * const kCAContentsFormatRGBA8ColorRGBA8LinearGlyphMask;
+#endif
+
</ins><span class="cx"> #if (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED < 100000) \
</span><span class="cx"> || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 30000) \
</span><span class="cx"> || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000) \
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -142,6 +142,7 @@
</span><span class="cx"> #if PLATFORM(COCOA) && USE(CA)
</span><span class="cx"> graphicsLayer->setAcceleratesDrawing(compositor().acceleratedDrawingEnabled());
</span><span class="cx"> graphicsLayer->setUsesDisplayListDrawing(compositor().displayListDrawingEnabled());
</span><ins>+ graphicsLayer->setSupportsSubpixelAntialiasedText(renderer().settings().subpixelAntialiasedLayerTextEnabled());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return graphicsLayer;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-20 Simon Fraser <simon.fraser@apple.com>
+
+ Add support to PlatformCALayer/GraphicsLayerCA for subpixel-antialiased text, with a Setting and a MiniBrowser switch
+ https://bugs.webkit.org/show_bug.cgi?id=168620
+ <rdar://problem/30617772>
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences subpixelAntialiasedLayerTextEnabled]):
+ (-[WebPreferences setSubpixelAntialiasedLayerTextEnabled:]):
+ * WebView/WebPreferencesPrivate.h:
+
</ins><span class="cx"> 2017-02-21 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> Export various NSString symbols from WebUIDelegatePrivate.h
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> #define WebKitCanvasUsesAcceleratedDrawingPreferenceKey @"WebKitCanvasUsesAcceleratedDrawing"
</span><span class="cx"> #define WebKitAcceleratedCompositingEnabledPreferenceKey @"WebKitAcceleratedCompositingEnabled"
</span><span class="cx"> #define WebKitShowDebugBordersPreferenceKey @"WebKitShowDebugBorders"
</span><ins>+#define WebKitSubpixelAntialiasedLayerTextEnabledPreferenceKey @"WebKitSubpixelAntialiasedLayerTextEnabled"
</ins><span class="cx"> #define WebKitSimpleLineLayoutEnabledPreferenceKey @"WebKitSimpleLineLayoutEnabled"
</span><span class="cx"> #define WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey @"WebKitSimpleLineLayoutDebugBordersEnabled"
</span><span class="cx"> #define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -491,6 +491,7 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitJavaScriptCanAccessClipboardPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitXSSAuditorEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitAcceleratedCompositingEnabledPreferenceKey,
</span><ins>+ [NSNumber numberWithBool:NO], WebKitSubpixelAntialiasedLayerTextEnabledPreferenceKey,
</ins><span class="cx"> [NSNumber numberWithBool:NO], WebKitDisplayListDrawingEnabledPreferenceKey,
</span><span class="cx"> #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitAcceleratedDrawingEnabledPreferenceKey,
</span><span class="lines">@@ -1961,6 +1962,16 @@
</span><span class="cx"> [self _setBoolValue:enabled forKey:WebKitShowDebugBordersPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)subpixelAntialiasedLayerTextEnabled
+{
+ return [self _boolValueForKey:WebKitSubpixelAntialiasedLayerTextEnabledPreferenceKey];
+}
+
+- (void)setSubpixelAntialiasedLayerTextEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitSubpixelAntialiasedLayerTextEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (BOOL)simpleLineLayoutEnabled
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitSimpleLineLayoutEnabledPreferenceKey];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -224,6 +224,9 @@
</span><span class="cx"> - (BOOL)acceleratedCompositingEnabled;
</span><span class="cx"> - (void)setAcceleratedCompositingEnabled:(BOOL)enabled;
</span><span class="cx">
</span><ins>+- (BOOL)subpixelAntialiasedLayerTextEnabled;
+- (void)setSubpixelAntialiasedLayerTextEnabled:(BOOL)enabled;
+
</ins><span class="cx"> - (BOOL)showDebugBorders;
</span><span class="cx"> - (void)setShowDebugBorders:(BOOL)show;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2017-02-20 Simon Fraser <simon.fraser@apple.com>
+
+ Add support to PlatformCALayer/GraphicsLayerCA for subpixel-antialiased text, with a Setting and a MiniBrowser switch
+ https://bugs.webkit.org/show_bug.cgi?id=168620
+ <rdar://problem/30617772>
+
+ Reviewed by Tim Horton.
+
+ Add a Setting for subpixel-antialiased layer text. Plumb this through GraphicsLayerCA and
+ PlatformCALayer, where it ultimately affects the layer contents format.
+
+ This is not supported with UI-side compositing.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetSubpixelAntialiasedLayerTextEnabled):
+ (WKPreferencesGetSubpixelAntialiasedLayerTextEnabled):
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _subpixelAntialiasedLayerTextEnabled]):
+ (-[WKPreferences _setSubpixelAntialiasedLayerTextEnabled:]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (WebKit::PlatformCALayerRemote::supportsSubpixelAntialiasedText):
+ (WebKit::PlatformCALayerRemote::setSupportsSubpixelAntialiasedText):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+ * WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp:
+ (WebKit::PlatformCALayerRemoteTiledBacking::supportsSubpixelAntialiasedText):
+ (WebKit::PlatformCALayerRemoteTiledBacking::setSupportsSubpixelAntialiasedText):
+ * WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h:
+
</ins><span class="cx"> 2017-02-21 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Resource Load Statistics: Only scan website data store once per session ID + reinstate removal counting
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -273,6 +273,7 @@
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DEBUG_BOOL_PREFERENCE(macro) \
</span><span class="cx"> macro(AcceleratedDrawingEnabled, acceleratedDrawingEnabled, Bool, bool, DEFAULT_ACCELERATED_DRAWING_ENABLED, "", "") \
</span><ins>+ macro(SubpixelAntialiasedLayerTextEnabled, subpixelAntialiasedLayerTextEnabled, Bool, bool, false, "", "") \
</ins><span class="cx"> macro(DisplayListDrawingEnabled, displayListDrawingEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(CompositingBordersVisible, compositingBordersVisible, Bool, bool, false, "", "") \
</span><span class="cx"> macro(CompositingRepaintCountersVisible, compositingRepaintCountersVisible, Bool, bool, false, "", "") \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -383,6 +383,16 @@
</span><span class="cx"> return toAPI(static_cast<FontSmoothingLevel>(toImpl(preferencesRef)->fontSmoothingLevel()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPreferencesSetSubpixelAntialiasedLayerTextEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setSubpixelAntialiasedLayerTextEnabled(flag);
+}
+
+bool WKPreferencesGetSubpixelAntialiasedLayerTextEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->subpixelAntialiasedLayerTextEnabled();
+}
+
</ins><span class="cx"> void WKPreferencesSetAcceleratedDrawingEnabled(WKPreferencesRef preferencesRef, bool flag)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setAcceleratedDrawingEnabled(flag);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -63,6 +63,10 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetFontSmoothingLevel(WKPreferencesRef, WKFontSmoothingLevel);
</span><span class="cx"> WK_EXPORT WKFontSmoothingLevel WKPreferencesGetFontSmoothingLevel(WKPreferencesRef);
</span><span class="cx">
</span><ins>+// Defaults to false.
+WK_EXPORT void WKPreferencesSetSubpixelAntialiasedLayerTextEnabled(WKPreferencesRef, bool);
+WK_EXPORT bool WKPreferencesGetSubpixelAntialiasedLayerTextEnabled(WKPreferencesRef);
+
</ins><span class="cx"> // Defaults to EditableLinkNeverLive.
</span><span class="cx"> WK_EXPORT void WKPreferencesSetEditableLinkBehavior(WKPreferencesRef preferencesRef, WKEditableLinkBehavior);
</span><span class="cx"> WK_EXPORT WKEditableLinkBehavior WKPreferencesGetEditableLinkBehavior(WKPreferencesRef preferencesRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -365,6 +365,16 @@
</span><span class="cx"> _preferences->setTextAutosizingEnabled(enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_subpixelAntialiasedLayerTextEnabled
+{
+ return _preferences->subpixelAntialiasedLayerTextEnabled();
+}
+
+- (void)_setSubpixelAntialiasedLayerTextEnabled:(BOOL)enabled
+{
+ _preferences->setSubpixelAntialiasedLayerTextEnabled(enabled);
+}
+
</ins><span class="cx"> - (BOOL)_developerExtrasEnabled
</span><span class="cx"> {
</span><span class="cx"> return _preferences->developerExtrasEnabled();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> @property (nonatomic, setter=_setLargeImageAsyncDecodingEnabled:) BOOL _largeImageAsyncDecodingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><span class="cx"> @property (nonatomic, setter=_setAnimatedImageAsyncDecodingEnabled:) BOOL _animatedImageAsyncDecodingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><span class="cx"> @property (nonatomic, setter=_setTextAutosizingEnabled:) BOOL _textAutosizingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><ins>+@property (nonatomic, setter=_setSubpixelAntialiasedLayerTextEnabled:) BOOL _subpixelAntialiasedLayerTextEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -3005,7 +3005,8 @@
</span><span class="cx"> settings.setShowTiledScrollingIndicator(store.getBoolValueForKey(WebPreferencesKey::tiledScrollingIndicatorVisibleKey()));
</span><span class="cx"> settings.setVisibleDebugOverlayRegions(store.getUInt32ValueForKey(WebPreferencesKey::visibleDebugOverlayRegionsKey()));
</span><span class="cx"> settings.setUseGiantTiles(store.getBoolValueForKey(WebPreferencesKey::useGiantTilesKey()));
</span><del>-
</del><ins>+ settings.setSubpixelAntialiasedLayerTextEnabled(store.getBoolValueForKey(WebPreferencesKey::subpixelAntialiasedLayerTextEnabledKey()));
+
</ins><span class="cx"> settings.setAggressiveTileRetentionEnabled(store.getBoolValueForKey(WebPreferencesKey::aggressiveTileRetentionEnabledKey()));
</span><span class="cx"> settings.setTemporaryTileCohortRetentionEnabled(store.getBoolValueForKey(WebPreferencesKey::temporaryTileCohortRetentionEnabledKey()));
</span><span class="cx"> #if ENABLE(CSS_ANIMATIONS_LEVEL_2)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -607,6 +607,15 @@
</span><span class="cx"> updateBackingStore();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PlatformCALayerRemote::supportsSubpixelAntialiasedText() const
+{
+ return false;
+}
+
+void PlatformCALayerRemote::setSupportsSubpixelAntialiasedText(bool)
+{
+}
+
</ins><span class="cx"> CFTypeRef PlatformCALayerRemote::contents() const
</span><span class="cx"> {
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -118,6 +118,9 @@
</span><span class="cx"> bool wantsDeepColorBackingStore() const override;
</span><span class="cx"> void setWantsDeepColorBackingStore(bool) override;
</span><span class="cx">
</span><ins>+ bool supportsSubpixelAntialiasedText() const override;
+ void setSupportsSubpixelAntialiasedText(bool) override;
+
</ins><span class="cx"> CFTypeRef contents() const override;
</span><span class="cx"> void setContents(CFTypeRef) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteTiledBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -97,6 +97,16 @@
</span><span class="cx"> m_tileController->setWantsDeepColorBackingStore(wantsDeepColorBackingStore);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PlatformCALayerRemoteTiledBacking::supportsSubpixelAntialiasedText() const
+{
+ return m_tileController->supportsSubpixelAntialiasedText();
+}
+
+void PlatformCALayerRemoteTiledBacking::setSupportsSubpixelAntialiasedText(bool supportsSubpixelAntialiasedText)
+{
+ m_tileController->setSupportsSubpixelAntialiasedText(supportsSubpixelAntialiasedText);
+}
+
</ins><span class="cx"> float PlatformCALayerRemoteTiledBacking::contentsScale() const
</span><span class="cx"> {
</span><span class="cx"> return m_tileController->contentsScale();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteTiledBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -56,7 +56,10 @@
</span><span class="cx">
</span><span class="cx"> bool wantsDeepColorBackingStore() const override;
</span><span class="cx"> void setWantsDeepColorBackingStore(bool) override;
</span><del>-
</del><ins>+
+ bool supportsSubpixelAntialiasedText() const override;
+ void setSupportsSubpixelAntialiasedText(bool) override;
+
</ins><span class="cx"> float contentsScale() const override;
</span><span class="cx"> void setContentsScale(float) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Tools/ChangeLog 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-02-20 Simon Fraser <simon.fraser@apple.com>
+
+ Add support to PlatformCALayer/GraphicsLayerCA for subpixel-antialiased text, with a Setting and a MiniBrowser switch
+ https://bugs.webkit.org/show_bug.cgi?id=168620
+ <rdar://problem/30617772>
+
+ Reviewed by Tim Horton.
+
+ Add a setting that allows one to toggle subpixel-antialiased layer text on and off.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues):
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+ (-[SettingsController toggleSubpixelAntialiasedLayerTextEnabled:]):
+ (-[SettingsController subpixelAntialiasedLayerTextEnabled]):
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController didChangeSettings]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController didChangeSettings]):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues):
+
</ins><span class="cx"> 2017-02-21 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Resource Load Statistics: Add alternate classification method
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -971,11 +971,13 @@
</span><span class="cx"> [preferences setUserStyleSheetEnabled:YES];
</span><span class="cx"> } else
</span><span class="cx"> [preferences setUserStyleSheetEnabled:NO];
</span><ins>+
</ins><span class="cx"> [preferences setMediaPlaybackAllowsInline:YES];
</span><span class="cx"> [preferences setVideoPlaybackRequiresUserGesture:NO];
</span><span class="cx"> [preferences setAudioPlaybackRequiresUserGesture:NO];
</span><span class="cx"> [preferences setMediaDataLoadsAutomatically:YES];
</span><span class="cx"> [preferences setInvisibleAutoplayNotPermitted:NO];
</span><ins>+ [preferences setSubpixelAntialiasedLayerTextEnabled:NO];
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Enable the tracker before creating the first WebView will
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> @property (nonatomic, readonly) BOOL subPixelCSSOMMetricsEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL acceleratedDrawingEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL displayListDrawingEnabled;
</span><ins>+@property (nonatomic, readonly) BOOL subpixelAntialiasedLayerTextEnabled;
</ins><span class="cx"> @property (nonatomic, readonly) BOOL resourceLoadStatisticsEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL visualViewportEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL largeImageAsyncDecodingEnabled;
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> static NSString * const IncrementalRenderingSuppressedPreferenceKey = @"IncrementalRenderingSuppressed";
</span><span class="cx"> static NSString * const AcceleratedDrawingEnabledPreferenceKey = @"AcceleratedDrawingEnabled";
</span><span class="cx"> static NSString * const DisplayListDrawingEnabledPreferenceKey = @"DisplayListDrawingEnabled";
</span><ins>+static NSString * const SubpixelAntialiasedLayerTextEnabledPreferenceKey = @"SubpixelAntialiasedLayerTextEnabled";
</ins><span class="cx"> static NSString * const ResourceLoadStatisticsEnabledPreferenceKey = @"ResourceLoadStatisticsEnabled";
</span><span class="cx">
</span><span class="cx"> static NSString * const NonFastScrollableRegionOverlayVisiblePreferenceKey = @"NonFastScrollableRegionOverlayVisible";
</span><span class="lines">@@ -134,6 +135,7 @@
</span><span class="cx"> [self _addItemWithTitle:@"Suppress Incremental Rendering in New Windows" action:@selector(toggleIncrementalRenderingSuppressed:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Enable Accelerated Drawing" action:@selector(toggleAcceleratedDrawingEnabled:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Enable Display List Drawing" action:@selector(toggleDisplayListDrawingEnabled:) indented:NO];
</span><ins>+ [self _addItemWithTitle:@"Enable Subpixel-antialiased Layer Text" action:@selector(toggleSubpixelAntialiasedLayerTextEnabled:) indented:NO];
</ins><span class="cx"> [self _addItemWithTitle:@"Enable Visual Viewport" action:@selector(toggleVisualViewportEnabled:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Enable Resource Load Statistics" action:@selector(toggleResourceLoadStatisticsEnabled:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Enable Large Image Async Decoding" action:@selector(toggleLargeImageAsyncDecodingEnabled:) indented:NO];
</span><span class="lines">@@ -218,6 +220,8 @@
</span><span class="cx"> [menuItem setState:[self acceleratedDrawingEnabled] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleDisplayListDrawingEnabled:))
</span><span class="cx"> [menuItem setState:[self displayListDrawingEnabled] ? NSOnState : NSOffState];
</span><ins>+ else if (action == @selector(toggleSubpixelAntialiasedLayerTextEnabled:))
+ [menuItem setState:[self subpixelAntialiasedLayerTextEnabled] ? NSOnState : NSOffState];
</ins><span class="cx"> else if (action == @selector(toggleResourceLoadStatisticsEnabled:))
</span><span class="cx"> [menuItem setState:[self resourceLoadStatisticsEnabled] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleLargeImageAsyncDecodingEnabled:))
</span><span class="lines">@@ -398,6 +402,16 @@
</span><span class="cx"> return [[NSUserDefaults standardUserDefaults] boolForKey:DisplayListDrawingEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)toggleSubpixelAntialiasedLayerTextEnabled:(id)sender
+{
+ [self _toggleBooleanDefault:SubpixelAntialiasedLayerTextEnabledPreferenceKey];
+}
+
+- (BOOL)subpixelAntialiasedLayerTextEnabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:SubpixelAntialiasedLayerTextEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (void)toggleReserveSpaceForBanners:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [self _toggleBooleanDefault:ReserveSpaceForBannersPreferenceKey];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -269,6 +269,7 @@
</span><span class="cx"> [[WebPreferences standardPreferences] setShowRepaintCounter:settings.layerBordersVisible];
</span><span class="cx"> [[WebPreferences standardPreferences] setSuppressesIncrementalRendering:settings.incrementalRenderingSuppressed];
</span><span class="cx"> [[WebPreferences standardPreferences] setAcceleratedDrawingEnabled:settings.acceleratedDrawingEnabled];
</span><ins>+ [[WebPreferences standardPreferences] setSubpixelAntialiasedLayerTextEnabled:settings.subpixelAntialiasedLayerTextEnabled];
</ins><span class="cx"> [[WebPreferences standardPreferences] setResourceLoadStatisticsEnabled:settings.resourceLoadStatisticsEnabled];
</span><span class="cx"> [[WebPreferences standardPreferences] setVisualViewportEnabled:settings.visualViewportEnabled];
</span><span class="cx"> [[WebPreferences standardPreferences] setLargeImageAsyncDecodingEnabled:settings.largeImageAsyncDecodingEnabled];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -375,6 +375,7 @@
</span><span class="cx"> preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled;
</span><span class="cx"> preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
</span><span class="cx"> preferences._displayListDrawingEnabled = settings.displayListDrawingEnabled;
</span><ins>+ preferences._subpixelAntialiasedLayerTextEnabled = settings.subpixelAntialiasedLayerTextEnabled;
</ins><span class="cx"> preferences._visualViewportEnabled = settings.visualViewportEnabled;
</span><span class="cx"> preferences._largeImageAsyncDecodingEnabled = settings.largeImageAsyncDecodingEnabled;
</span><span class="cx"> preferences._animatedImageAsyncDecodingEnabled = settings.animatedImageAsyncDecodingEnabled;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (212775 => 212776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2017-02-21 23:57:03 UTC (rev 212775)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2017-02-22 00:30:32 UTC (rev 212776)
</span><span class="lines">@@ -642,6 +642,7 @@
</span><span class="cx"> WKPreferencesSetPageVisibilityBasedProcessSuppressionEnabled(preferences, false);
</span><span class="cx"> WKPreferencesSetOfflineWebApplicationCacheEnabled(preferences, true);
</span><span class="cx"> WKPreferencesSetFontSmoothingLevel(preferences, kWKFontSmoothingLevelNoSubpixelAntiAliasing);
</span><ins>+ WKPreferencesSetSubpixelAntialiasedLayerTextEnabled(preferences, false);
</ins><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>