<!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>[269603] 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/269603">269603</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2020-11-09 14:28:13 -0800 (Mon, 09 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Show legacy line layout visual coverage instead of "simple line" layout.
https://bugs.webkit.org/show_bug.cgi?id=218695

Reviewed by Antti Koivisto.

Source/WebCore:

Paint legacy line layout content with the debug shadow instead of the modern one (and use red instead of blue).

* layout/integration/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::paint):
(WebCore::LayoutIntegration::LineLayout::debugTextShadow): Deleted.
* layout/integration/LayoutIntegrationLineLayout.h:
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintMarkedTextForeground):
(WebCore::InlineTextBox::debugTextShadow):
* rendering/InlineTextBox.h:

Source/WebKit:

* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetLegacyLineLayoutVisualCoverageEnabled):
(WKPreferencesGetLegacyLineLayoutVisualCoverageEnabled):
(WKPreferencesSetSimpleLineLayoutDebugBordersEnabled): Deleted.
(WKPreferencesGetSimpleLineLayoutDebugBordersEnabled): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _legacyLineLayoutVisualCoverageEnabled]):
(-[WKPreferences _setLegacyLineLayoutVisualCoverageEnabled:]):
(-[WKPreferences _simpleLineLayoutDebugBordersEnabled]): Deleted.
(-[WKPreferences _setSimpleLineLayoutDebugBordersEnabled:]): Deleted.
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:

Source/WebKitLegacy/mac:

* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(-[WebPreferences legacyLineLayoutVisualCoverageEnabled]):
(-[WebPreferences setLegacyLineLayoutVisualCoverageEnabled:]):
(-[WebPreferences simpleLineLayoutDebugBordersEnabled]): Deleted.
(-[WebPreferences setSimpleLineLayoutDebugBordersEnabled:]): Deleted.
* WebView/WebPreferencesPrivate.h:

Source/WTF:

* Scripts/Preferences/WebPreferencesDebug.yaml:

Tools:

* MiniBrowser/mac/SettingsController.h:
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController toggleLegacyLineLayoutVisualCoverageEnabled:]):
(-[SettingsController legacyLineLayoutVisualCoverageEnabled]):
(-[SettingsController toggleSimpleLineLayoutDebugBordersEnabled:]): Deleted.
(-[SettingsController simpleLineLayoutDebugBordersEnabled]): Deleted.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController didChangeSettings]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController didChangeSettings]):

LayoutTests:

* fast/inline/simple-line-layout-16bit-content-expected-mismatch.html: Removed.
* fast/inline/simple-line-layout-16bit-content.html:
* fast/text/simple-line-layout-do-not-support-unicode-range-expected.html:
* fast/text/simple-line-layout-do-not-support-unicode-range.html:
* fast/text/simple-line-layout-line-box-contain-glyphs-expected.html:
* fast/text/simple-line-layout-line-box-contain-glyphs.html:
* fast/text/simple-line-layout-no-surrogate-pairs-expected.html:
* fast/text/simple-line-layout-no-surrogate-pairs.html:
* fast/text/simple-line-layout-simple-text-but-complex-font-path-expected.html:
* fast/text/simple-line-layout-simple-text-but-complex-font-path.html:
* fast/text/simple-line-layout-with-text-underline-position-expected.html:
* fast/text/simple-line-layout-with-text-underline-position.html:
* fast/text/simple-lines-float-expected.html:
* fast/text/simple-lines-float.html:
* fast/text/simple-lines-hover-expected.html:
* fast/text/simple-lines-hover.html:
* fast/text/simple-lines-multiple-renderers-expected.html:
* fast/text/simple-lines-multiple-renderers.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastinlinesimplelinelayout16bitcontenthtml">trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutdonotsupportunicoderangeexpectedhtml">trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutdonotsupportunicoderangehtml">trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutlineboxcontainglyphsexpectedhtml">trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutlineboxcontainglyphshtml">trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutnosurrogatepairsexpectedhtml">trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutnosurrogatepairshtml">trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutsimpletextbutcomplexfontpathexpectedhtml">trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutsimpletextbutcomplexfontpathhtml">trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutwithtextunderlinepositionexpectedhtml">trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutwithtextunderlinepositionhtml">trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinesfloatexpectedhtml">trunk/LayoutTests/fast/text/simple-lines-float-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinesfloathtml">trunk/LayoutTests/fast/text/simple-lines-float.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelineshoverexpectedhtml">trunk/LayoutTests/fast/text/simple-lines-hover-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelineshoverhtml">trunk/LayoutTests/fast/text/simple-lines-hover.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinesmultiplerenderersexpectedhtml">trunk/LayoutTests/fast/text/simple-lines-multiple-renderers-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinesmultiplerenderershtml">trunk/LayoutTests/fast/text/simple-lines-multiple-renderers.html</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFScriptsPreferencesWebPreferencesDebugyaml">trunk/Source/WTF/Scripts/Preferences/WebPreferencesDebug.yaml</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayouth">trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxh">trunk/Source/WebCore/rendering/InlineTextBox.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICWKPreferencescpp">trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICWKPreferencesRefPrivateh">trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKPreferencesmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKPreferencesPrivateh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacChangeLog">trunk/Source/WebKitLegacy/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebPreferencesmm">trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebPreferencesPrivateh">trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastinlinesimplelinelayout16bitcontentexpectedhtml">trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content-expected.html</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastinlinesimplelinelayout16bitcontentexpectedmismatchhtml">trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content-expected-mismatch.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/ChangeLog 2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2020-11-09  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        Show legacy line layout visual coverage instead of "simple line" layout.
+        https://bugs.webkit.org/show_bug.cgi?id=218695
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline/simple-line-layout-16bit-content-expected-mismatch.html: Removed.
+        * fast/inline/simple-line-layout-16bit-content.html:
+        * fast/text/simple-line-layout-do-not-support-unicode-range-expected.html:
+        * fast/text/simple-line-layout-do-not-support-unicode-range.html:
+        * fast/text/simple-line-layout-line-box-contain-glyphs-expected.html:
+        * fast/text/simple-line-layout-line-box-contain-glyphs.html:
+        * fast/text/simple-line-layout-no-surrogate-pairs-expected.html:
+        * fast/text/simple-line-layout-no-surrogate-pairs.html:
+        * fast/text/simple-line-layout-simple-text-but-complex-font-path-expected.html:
+        * fast/text/simple-line-layout-simple-text-but-complex-font-path.html:
+        * fast/text/simple-line-layout-with-text-underline-position-expected.html:
+        * fast/text/simple-line-layout-with-text-underline-position.html:
+        * fast/text/simple-lines-float-expected.html:
+        * fast/text/simple-lines-float.html:
+        * fast/text/simple-lines-hover-expected.html:
+        * fast/text/simple-lines-hover.html:
+        * fast/text/simple-lines-multiple-renderers-expected.html:
+        * fast/text/simple-lines-multiple-renderers.html:
+
+2020-11-09  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC][Integration] Enable inline image support
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=217874
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastinlinesimplelinelayout16bitcontentexpectedmismatchhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content-expected-mismatch.html ( => )</h4>
<pre class="diff"><span>
<span class="info">Copied: trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content-expected.html (from rev 269602, trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content.html)
===================================================================
</span><del>--- trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content-expected.html                                (rev 0)
</del><ins>+++ trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content-expected.html 2020-11-09 22:28:13 UTC (rev 269603)
</ins><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<title>This tests that we use simple line layout to layout/render 16bit content.</title>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+<style>
+  div {
+    color: transparent;
+  }
+</style>
+<script>
+  if (window.internals) {
+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(false);
+    internals.settings.setSimpleLineLayoutEnabled(false);
+  }
+</script>
+</head>
+<body>
+  <div>uüúoöóőaáeé</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastinlinesimplelinelayout16bitcontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content.html      2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/inline/simple-line-layout-16bit-content.html 2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><span class="cx">   if (window.internals)
</span><del>-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutdonotsupportunicoderangeexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range-expected.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range-expected.html        2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range-expected.html   2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -11,12 +11,12 @@
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><span class="cx"> if (window.internals) {
</span><del>-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx">     internals.settings.setSimpleLineLayoutEnabled(false);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<p style="font-family: Monaco;">THIS SHOULD NOT HAVE GREEN simple line layout borders.</p>
</del><ins>+<p style="font-family: Monaco;">THIS SHOULD HAVE legacy line layout coverage indicator.</p>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutdonotsupportunicoderangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range.html 2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-line-layout-do-not-support-unicode-range.html    2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -11,12 +11,12 @@
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><span class="cx"> if (window.internals) {
</span><del>-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx">     internals.settings.setSimpleLineLayoutEnabled(true);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<p style="font-family: Monaco;">THIS SHOULD NOT HAVE GREEN simple line layout borders.</p>
</del><ins>+<p style="font-family: Monaco;">THIS SHOULD HAVE legacy line layout coverage indicator.</p>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutlineboxcontainglyphsexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs-expected.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs-expected.html     2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs-expected.html        2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -9,8 +9,10 @@
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><del>-  if (window.internals)
-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(false);
</del><ins>+  if (window.internals) {
+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
+    internals.settings.setSimpleLineLayoutEnabled(false);
+ }
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutlineboxcontainglyphshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs.html      2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-line-layout-line-box-contain-glyphs.html 2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -9,8 +9,10 @@
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><del>-  if (window.internals)
-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+  if (window.internals) {
+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
+    internals.settings.setSimpleLineLayoutEnabled(true);
+ }
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutnosurrogatepairsexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html  2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html     2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1,7 +1,24 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><ins>+<meta charset="utf-8">
</ins><span class="cx"> <title>This tests that we don't use simple line layout for surrogate pairs.</title>
</span><ins>+<style>
+div {
+    color: white;
+    font-family: Arial;
+}
+</style>
+<script>
+if (window.internals) {
+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
+    internals.settings.setSimpleLineLayoutEnabled(false);
+}
+</script>
</ins><span class="cx"> </head>
</span><del>-<body></body>
</del><ins>+<body>
+<div>&#xd800;</div>
+<div>&#x1D306;</div>
+<div>&#xdb7f;</div>
+</body>
</ins><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutnosurrogatepairshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html   2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html      2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -11,8 +11,8 @@
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><span class="cx"> if (window.internals) {
</span><del>-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><span class="cx">     internals.settings.setSimpleLineLayoutEnabled(true);
</span><ins>+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutsimpletextbutcomplexfontpathexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path-expected.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path-expected.html   2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path-expected.html      2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -2,6 +2,33 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <title>This tests that we don't try to use simple line layout for simple text but complex font path related properties.</title>
</span><ins>+<style>
+div {
+    color: white;
+}
+.common-ligatures-disabled {
+    font-variant-ligatures: no-common-ligatures;
+}
+
+.common-ligatures-enabled {
+    font-variant-ligatures: common-ligatures;
+}
+</style>
+<script>
+if (window.internals) {
+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
+    internals.settings.setSimpleLineLayoutEnabled(false);
+}
+</script>
</ins><span class="cx"> </head>
</span><del>-<body></body>
</del><ins>+<body>
+    <div>
+        <div class="common-ligatures-disabled">file</div>
+        <div class="common-ligatures-enabled">file</div>
+    </div>
+    <div style="text-rendering: optimizelegibility">
+        <div class="common-ligatures-disabled">file</div>
+        <div class="common-ligatures-enabled">file</div>
+    </div>
+</body>
</ins><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutsimpletextbutcomplexfontpathhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path.html    2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-line-layout-simple-text-but-complex-font-path.html       2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><span class="cx"> if (window.internals) {
</span><del>-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx">     internals.settings.setSimpleLineLayoutEnabled(true);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutwithtextunderlinepositionexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html        2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html   2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -2,6 +2,27 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <title>This tests that simple line layout is disabled for text-underline-position: under</title>
</span><ins>+<style>
+div {
+    color: white;
+}
+
+.first {
+    overflow: hidden;
+}
+.second, .first {
+       text-underline-position: under;
+}
+</style>
+<script>
+if (window.internals) {
+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
+    internals.settings.setSimpleLineLayoutEnabled(false);
+}
+</script>
</ins><span class="cx"> </head>
</span><del>-<body></body>
</del><ins>+<body>
+<div class=first>Pass if after selecting these 2 lines</div>
+<div class=second>this line is still visible</div>
+</body>
</ins><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutwithtextunderlinepositionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html 2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html    2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span><span class="cx"> if (window.internals) {
</span><del>-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx">     internals.settings.setSimpleLineLayoutEnabled(true);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinesfloatexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-lines-float-expected.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-lines-float-expected.html     2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-lines-float-expected.html        2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <!DOCTYPE html> <!-- webkit-test-runner [ LayoutFormattingContextIntegrationEnabled=false ] -->
</span><span class="cx"> <script>
</span><span class="cx"> if (window.internals)
</span><del>-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx"> </script>
</span><span class="cx"> <div style="position:relative">
</span><span class="cx"> <div style="position:absolute; border:1px solid blue; width:50px; height:200px"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinesfloathtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-lines-float.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-lines-float.html      2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-lines-float.html 2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <!DOCTYPE html> <!-- webkit-test-runner [ LayoutFormattingContextIntegrationEnabled=false ] -->
</span><span class="cx"> <script>
</span><span class="cx"> if (window.internals)
</span><del>-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx"> </script>
</span><span class="cx"> <div style="float:left; border:1px solid blue; width:50px; height:200px"></div>
</span><span class="cx"> <div>Quo usque tandem abutere, Catilina, patientia nostra?  quam diu etiam
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelineshoverexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-lines-hover-expected.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-lines-hover-expected.html     2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-lines-hover-expected.html        2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -2,4 +2,4 @@
</span><span class="cx"> if (window.internals)
</span><span class="cx">     internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</span><span class="cx"> </script>
</span><del>-<div id="target">This text should have border around it indicating it is in simple line layout mode</div>
</del><ins>+<div>This text should not have legacy line layout visual indicator.</div>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelineshoverhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-lines-hover.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-lines-hover.html      2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-lines-hover.html 2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test() {
</span><span class="cx">     if (window.internals)
</span><del>-        internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+        internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx">     var target = document.getElementById("target");
</span><span class="cx">     eventSender.mouseMoveTo(target.offsetLeft + 5, target.offsetTop + 5);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> <body onload="test()">
</span><del>-<div id="target">This text should have border around it indicating it is in simple line layout mode</div>
</del><ins>+<div id="target">This text should not have legacy line layout visual indicator.</div>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinesmultiplerenderersexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-lines-multiple-renderers-expected.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-lines-multiple-renderers-expected.html        2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-lines-multiple-renderers-expected.html   2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <title>This tests that simple line layout is applied on multiple sibling text renderers.</title>
</span><span class="cx"> <script>
</span><span class="cx">   if (window.internals)
</span><del>-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinesmultiplerenderershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/simple-lines-multiple-renderers.html (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-lines-multiple-renderers.html 2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/LayoutTests/fast/text/simple-lines-multiple-renderers.html    2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <title>This tests that simple line layout is applied on multiple sibling text renderers.</title>
</span><span class="cx"> <script>
</span><span class="cx">   if (window.internals)
</span><del>-    internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
</del><ins>+    internals.settings.setLegacyLineLayoutVisualCoverageEnabled(true);
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WTF/ChangeLog  2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2020-11-09  Zalan Bujtas  <zalan@apple.com>
+
+        Show legacy line layout visual coverage instead of "simple line" layout.
+        https://bugs.webkit.org/show_bug.cgi?id=218695
+
+        Reviewed by Antti Koivisto.
+
+        * Scripts/Preferences/WebPreferencesDebug.yaml:
+
</ins><span class="cx"> 2020-11-09  Per Arne Vollan  <pvollan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [macOS] Set preference for overridden languages in the WebContent process after entering the sandbox.
</span></span></pre></div>
<a id="trunkSourceWTFScriptsPreferencesWebPreferencesDebugyaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesDebug.yaml (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesDebug.yaml    2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesDebug.yaml       2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -105,6 +105,17 @@
</span><span class="cx">     WebKit:
</span><span class="cx">       default: false
</span><span class="cx"> 
</span><ins>+LegacyLineLayoutVisualCoverageEnabled:
+  type: bool
+  webcoreOnChange: setNeedsRecalcStyleInAllFrames
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+    WebCore:
+      default: false
+
</ins><span class="cx"> LogsPageMessagesToSystemConsoleEnabled:
</span><span class="cx">   type: bool
</span><span class="cx">   defaultValue:
</span><span class="lines">@@ -141,17 +152,6 @@
</span><span class="cx">     WebCore:
</span><span class="cx">       default: false
</span><span class="cx"> 
</span><del>-SimpleLineLayoutDebugBordersEnabled:
-  type: bool
-  webcoreOnChange: setNeedsRecalcStyleInAllFrames
-  defaultValue:
-    WebKitLegacy:
-      default: false
-    WebKit:
-      default: false
-    WebCore:
-      default: false
-
</del><span class="cx"> SubpixelAntialiasedLayerTextEnabled:
</span><span class="cx">   type: bool
</span><span class="cx">   webcoreOnChange: setNeedsRecalcStyleInAllFrames
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebCore/ChangeLog      2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2020-11-09  Zalan Bujtas  <zalan@apple.com>
+
+        Show legacy line layout visual coverage instead of "simple line" layout.
+        https://bugs.webkit.org/show_bug.cgi?id=218695
+
+        Reviewed by Antti Koivisto.
+
+        Paint legacy line layout content with the debug shadow instead of the modern one (and use red instead of blue).
+
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::paint):
+        (WebCore::LayoutIntegration::LineLayout::debugTextShadow): Deleted.
+        * layout/integration/LayoutIntegrationLineLayout.h:
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paintMarkedTextForeground):
+        (WebCore::InlineTextBox::debugTextShadow):
+        * rendering/InlineTextBox.h:
+
</ins><span class="cx"> 2020-11-09  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC Display] Implement background bleed avoidance, and border-radius clipping of backgrounds
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp  2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp     2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -403,8 +403,6 @@
</span><span class="cx">         TextPainter textPainter(paintInfo.context());
</span><span class="cx">         textPainter.setFont(style.fontCascade());
</span><span class="cx">         textPainter.setStyle(computeTextPaintStyle(flow().frame(), style, paintInfo));
</span><del>-        if (auto* debugShadow = debugTextShadow())
-            textPainter.setShadow(debugShadow);
</del><span class="cx"> 
</span><span class="cx">         textPainter.setGlyphDisplayListIfNeeded(run, paintInfo, style.fontCascade(), paintInfo.context(), textRun);
</span><span class="cx">         textPainter.paint(textRun, rect, textOrigin);
</span><span class="lines">@@ -466,15 +464,6 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-ShadowData* LineLayout::debugTextShadow()
-{
-    if (!flow().settings().simpleLineLayoutDebugBordersEnabled())
-        return nullptr;
-
-    static NeverDestroyed<ShadowData> debugTextShadow(IntPoint(0, 0), 10, 20, ShadowStyle::Normal, true, SRGBA<uint8_t> { 0, 0, 150, 150 });
-    return &debugTextShadow.get();
-}
-
</del><span class="cx"> void LineLayout::releaseCaches(RenderView& view)
</span><span class="cx"> {
</span><span class="cx">     if (!RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextIntegrationEnabled())
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayouth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h    2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h       2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -106,7 +106,6 @@
</span><span class="cx"> 
</span><span class="cx">     const Layout::ContainerBox& rootLayoutBox() const;
</span><span class="cx">     Layout::ContainerBox& rootLayoutBox();
</span><del>-    ShadowData* debugTextShadow();
</del><span class="cx">     void releaseInlineItemCache();
</span><span class="cx"> 
</span><span class="cx">     BoxTree m_boxTree;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp    2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1163,6 +1163,8 @@
</span><span class="cx">             textPainter.setShadowColorFilter(&lineStyle.appleColorFilter());
</span><span class="cx">     }
</span><span class="cx">     textPainter.setEmphasisMark(emphasisMark, emphasisMarkOffset, combinedText());
</span><ins>+    if (auto* debugShadow = debugTextShadow())
+        textPainter.setShadow(debugShadow);
</ins><span class="cx"> 
</span><span class="cx">     TextRun textRun = createTextRun();
</span><span class="cx">     textPainter.setGlyphDisplayListIfNeeded(*this, paintInfo, font, context, textRun);
</span><span class="lines">@@ -1429,6 +1431,15 @@
</span><span class="cx">     return lineStyle().hasTextCombine() && is<RenderCombineText>(renderer()) && downcast<RenderCombineText>(renderer()).isCombined() ? &downcast<RenderCombineText>(renderer()) : nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+ShadowData* InlineTextBox::debugTextShadow()
+{
+    if (!renderer().settings().legacyLineLayoutVisualCoverageEnabled())
+        return nullptr;
+
+    static NeverDestroyed<ShadowData> debugTextShadow(IntPoint(0, 0), 10, 20, ShadowStyle::Normal, true, SRGBA<uint8_t> { 150, 0, 0, 190 });
+    return &debugTextShadow.get();
+}
+
</ins><span class="cx"> ExpansionBehavior InlineTextBox::expansionBehavior() const
</span><span class="cx"> {
</span><span class="cx">     ExpansionBehavior leftBehavior;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.h   2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h      2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -199,6 +199,8 @@
</span><span class="cx">     const RenderCombineText* combinedText() const;
</span><span class="cx">     const FontCascade& lineFont() const;
</span><span class="cx"> 
</span><ins>+    ShadowData* debugTextShadow();
+
</ins><span class="cx">     String text(bool ignoreCombinedText = false, bool ignoreHyphen = false) const; // The effective text for the run.
</span><span class="cx">     TextRun createTextRun(bool ignoreCombinedText = false, bool ignoreHyphen = false) const;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebKit/ChangeLog       2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2020-11-09  Zalan Bujtas  <zalan@apple.com>
+
+        Show legacy line layout visual coverage instead of "simple line" layout.
+        https://bugs.webkit.org/show_bug.cgi?id=218695
+
+        Reviewed by Antti Koivisto.
+
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetLegacyLineLayoutVisualCoverageEnabled):
+        (WKPreferencesGetLegacyLineLayoutVisualCoverageEnabled):
+        (WKPreferencesSetSimpleLineLayoutDebugBordersEnabled): Deleted.
+        (WKPreferencesGetSimpleLineLayoutDebugBordersEnabled): Deleted.
+        * UIProcess/API/C/WKPreferencesRefPrivate.h:
+        * UIProcess/API/Cocoa/WKPreferences.mm:
+        (-[WKPreferences _legacyLineLayoutVisualCoverageEnabled]):
+        (-[WKPreferences _setLegacyLineLayoutVisualCoverageEnabled:]):
+        (-[WKPreferences _simpleLineLayoutDebugBordersEnabled]): Deleted.
+        (-[WKPreferences _setSimpleLineLayoutDebugBordersEnabled:]): Deleted.
+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+
</ins><span class="cx"> 2020-11-09  Per Arne Vollan  <pvollan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [macOS] System sounds should be played in the UI process
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp    2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp       2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1279,14 +1279,14 @@
</span><span class="cx">     return toImpl(preferencesRef)->simpleLineLayoutEnabled();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WKPreferencesSetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef preferencesRef, bool flag)
</del><ins>+void WKPreferencesSetLegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef preferencesRef, bool flag)
</ins><span class="cx"> {
</span><del>-    toImpl(preferencesRef)->setSimpleLineLayoutDebugBordersEnabled(flag);
</del><ins>+    toImpl(preferencesRef)->setLegacyLineLayoutVisualCoverageEnabled(flag);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool WKPreferencesGetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef preferencesRef)
</del><ins>+bool WKPreferencesGetLegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef preferencesRef)
</ins><span class="cx"> {
</span><del>-    return toImpl(preferencesRef)->simpleLineLayoutDebugBordersEnabled();
</del><ins>+    return toImpl(preferencesRef)->legacyLineLayoutVisualCoverageEnabled();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WKPreferencesSetContentChangeObserverEnabled(WKPreferencesRef preferencesRef, bool flag)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h    2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h       2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -317,8 +317,8 @@
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetSimpleLineLayoutEnabled(WKPreferencesRef);
</span><span class="cx"> 
</span><span class="cx"> // Defaults to false.
</span><del>-WK_EXPORT void WKPreferencesSetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef, bool);
-WK_EXPORT bool WKPreferencesGetSimpleLineLayoutDebugBordersEnabled(WKPreferencesRef);
</del><ins>+WK_EXPORT void WKPreferencesSetLegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef, bool);
+WK_EXPORT bool WKPreferencesGetLegacyLineLayoutVisualCoverageEnabled(WKPreferencesRef);
</ins><span class="cx"> 
</span><span class="cx"> WK_EXPORT void WKPreferencesSetContentChangeObserverEnabled(WKPreferencesRef, bool);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetContentChangeObserverEnabled(WKPreferencesRef);
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm    2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -305,14 +305,14 @@
</span><span class="cx">     _preferences->setSimpleLineLayoutEnabled(simpleLineLayoutEnabled);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (BOOL)_simpleLineLayoutDebugBordersEnabled
</del><ins>+- (BOOL)_legacyLineLayoutVisualCoverageEnabled
</ins><span class="cx"> {
</span><del>-    return _preferences->simpleLineLayoutDebugBordersEnabled();
</del><ins>+    return _preferences->legacyLineLayoutVisualCoverageEnabled();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_setSimpleLineLayoutDebugBordersEnabled:(BOOL)simpleLineLayoutDebugBordersEnabled
</del><ins>+- (void)_setLegacyLineLayoutVisualCoverageEnabled:(BOOL)legacyLineLayoutVisualCoverageEnabled
</ins><span class="cx"> {
</span><del>-    _preferences->setSimpleLineLayoutDebugBordersEnabled(simpleLineLayoutDebugBordersEnabled);
</del><ins>+    _preferences->setLegacyLineLayoutVisualCoverageEnabled(legacyLineLayoutVisualCoverageEnabled);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_contentChangeObserverEnabled
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h   2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h      2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> @property (nonatomic, setter=_setResourceUsageOverlayVisible:) BOOL _resourceUsageOverlayVisible WK_API_AVAILABLE(macos(10.12), ios(10.0));
</span><span class="cx"> @property (nonatomic, setter=_setVisibleDebugOverlayRegions:) _WKDebugOverlayRegions _visibleDebugOverlayRegions WK_API_AVAILABLE(macos(10.11), ios(9.0));
</span><span class="cx"> @property (nonatomic, setter=_setSimpleLineLayoutEnabled:) BOOL _simpleLineLayoutEnabled WK_API_AVAILABLE(macos(10.12), ios(10.0));
</span><del>-@property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_API_AVAILABLE(macos(10.11), ios(9.0));
</del><ins>+@property (nonatomic, setter=_setLegacyLineLayoutVisualCoverageEnabled:) BOOL _legacyLineLayoutVisualCoverageEnabled WK_API_AVAILABLE(macos(10.11), ios(9.0));
</ins><span class="cx"> @property (nonatomic, setter=_setContentChangeObserverEnabled:) BOOL _contentChangeObserverEnabled WK_API_AVAILABLE(macos(10.15), ios(13.0));
</span><span class="cx"> @property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macos(10.12), ios(10.0));
</span><span class="cx"> @property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_API_AVAILABLE(macos(10.12), ios(10.0));
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/ChangeLog  2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog     2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2020-11-09  Zalan Bujtas  <zalan@apple.com>
+
+        Show legacy line layout visual coverage instead of "simple line" layout.
+        https://bugs.webkit.org/show_bug.cgi?id=218695
+
+        Reviewed by Antti Koivisto.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (-[WebPreferences legacyLineLayoutVisualCoverageEnabled]):
+        (-[WebPreferences setLegacyLineLayoutVisualCoverageEnabled:]):
+        (-[WebPreferences simpleLineLayoutDebugBordersEnabled]): Deleted.
+        (-[WebPreferences setSimpleLineLayoutDebugBordersEnabled:]): Deleted.
+        * WebView/WebPreferencesPrivate.h:
+
</ins><span class="cx"> 2020-11-06  Peng Liu  <peng.liu6@apple.com>
</span><span class="cx"> 
</span><span class="cx">         PiP return to element full screen is not smooth on some websites
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h 2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h    2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> #define WebKitShowDebugBordersPreferenceKey @"WebKitShowDebugBorders"
</span><span class="cx"> #define WebKitSubpixelAntialiasedLayerTextEnabledPreferenceKey @"WebKitSubpixelAntialiasedLayerTextEnabled"
</span><span class="cx"> #define WebKitSimpleLineLayoutEnabledPreferenceKey @"WebKitSimpleLineLayoutEnabled"
</span><del>-#define WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey @"WebKitSimpleLineLayoutDebugBordersEnabled"
</del><ins>+#define WebKitLegacyLineLayoutVisualCoverageEnabledPreferenceKey @"WebKitLegacyLineLayoutVisualCoverageEnabled"
</ins><span class="cx"> #define WebKitContentChangeObserverEnabledPreferenceKey @"WebKitContentChangeObserverEnabled"
</span><span class="cx"> #define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter"
</span><span class="cx"> #define WebKitWebAudioEnabledPreferenceKey @"WebKitWebAudioEnabled"
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm  2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm     2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1809,14 +1809,14 @@
</span><span class="cx">     [self _setBoolValue:enabled forKey:WebKitSimpleLineLayoutEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (BOOL)simpleLineLayoutDebugBordersEnabled
</del><ins>+- (BOOL)legacyLineLayoutVisualCoverageEnabled
</ins><span class="cx"> {
</span><del>-    return [self _boolValueForKey:WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey];
</del><ins>+    return [self _boolValueForKey:WebKitLegacyLineLayoutVisualCoverageEnabledPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)setSimpleLineLayoutDebugBordersEnabled:(BOOL)enabled
</del><ins>+- (void)setLegacyLineLayoutVisualCoverageEnabled:(BOOL)enabled
</ins><span class="cx"> {
</span><del>-    [self _setBoolValue:enabled forKey:WebKitSimpleLineLayoutDebugBordersEnabledPreferenceKey];
</del><ins>+    [self _setBoolValue:enabled forKey:WebKitLegacyLineLayoutVisualCoverageEnabledPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)showRepaintCounter
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h    2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h       2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> @property (nonatomic) BOOL subpixelAntialiasedLayerTextEnabled;
</span><span class="cx"> @property (nonatomic) BOOL showDebugBorders;
</span><span class="cx"> @property (nonatomic) BOOL simpleLineLayoutEnabled;
</span><del>-@property (nonatomic) BOOL simpleLineLayoutDebugBordersEnabled;
</del><ins>+@property (nonatomic) BOOL legacyLineLayoutVisualCoverageEnabled;
</ins><span class="cx"> @property (nonatomic) BOOL showRepaintCounter;
</span><span class="cx"> @property (nonatomic) BOOL webAudioEnabled;
</span><span class="cx"> @property (nonatomic) BOOL webGLEnabled;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Tools/ChangeLog       2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2020-11-09  Zalan Bujtas  <zalan@apple.com>
+
+        Show legacy line layout visual coverage instead of "simple line" layout.
+        https://bugs.webkit.org/show_bug.cgi?id=218695
+
+        Reviewed by Antti Koivisto.
+
+        * MiniBrowser/mac/SettingsController.h:
+        * MiniBrowser/mac/SettingsController.m:
+        (-[SettingsController _populateMenu]):
+        (-[SettingsController validateMenuItem:]):
+        (-[SettingsController toggleLegacyLineLayoutVisualCoverageEnabled:]):
+        (-[SettingsController legacyLineLayoutVisualCoverageEnabled]):
+        (-[SettingsController toggleSimpleLineLayoutDebugBordersEnabled:]): Deleted.
+        (-[SettingsController simpleLineLayoutDebugBordersEnabled]): Deleted.
+        * MiniBrowser/mac/WK1BrowserWindowController.m:
+        (-[WK1BrowserWindowController didChangeSettings]):
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController didChangeSettings]):
+
</ins><span class="cx"> 2020-11-09  Diego Pino Garcia  <dpino@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [webkitpy] When platform is GTK or WPE, make lint-test-expectations lint GLIB too
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.h 2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h    2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> @property (nonatomic, readonly) BOOL usePaginatedMode;
</span><span class="cx"> @property (nonatomic, readonly) BOOL layerBordersVisible;
</span><span class="cx"> @property (nonatomic, readonly) BOOL simpleLineLayoutEnabled;
</span><del>-@property (nonatomic, readonly) BOOL simpleLineLayoutDebugBordersEnabled;
</del><ins>+@property (nonatomic, readonly) BOOL legacyLineLayoutVisualCoverageEnabled;
</ins><span class="cx"> @property (nonatomic, readonly) BOOL incrementalRenderingSuppressed;
</span><span class="cx"> @property (nonatomic, readonly) BOOL tiledScrollingIndicatorVisible;
</span><span class="cx"> @property (nonatomic, readonly, getter=isSpaceReservedForBanners) BOOL spaceReservedForBanners;
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m    2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> static NSString * const CreateEditorByDefaultPreferenceKey = @"CreateEditorByDefault";
</span><span class="cx"> static NSString * const LayerBordersVisiblePreferenceKey = @"LayerBordersVisible";
</span><span class="cx"> static NSString * const SimpleLineLayoutEnabledPreferenceKey = @"SimpleLineLayoutEnabled";
</span><del>-static NSString * const SimpleLineLayoutDebugBordersEnabledPreferenceKey = @"SimpleLineLayoutDebugBordersEnabled";
</del><ins>+static NSString * const LegacyLineLayoutVisualCoverageEnabledPreferenceKey = @"LegacyLineLayoutVisualCoverageEnabled";
</ins><span class="cx"> static NSString * const TiledScrollingIndicatorVisiblePreferenceKey = @"TiledScrollingIndicatorVisible";
</span><span class="cx"> static NSString * const ReserveSpaceForBannersPreferenceKey = @"ReserveSpaceForBanners";
</span><span class="cx"> static NSString * const WebViewFillsWindowKey = @"WebViewFillsWindow";
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx">     [self _addItemWithTitle:@"Use Paginated Mode" action:@selector(toggleUsePaginatedMode:) indented:NO];
</span><span class="cx">     [self _addItemWithTitle:@"Show Layer Borders" action:@selector(toggleShowLayerBorders:) indented:NO];
</span><span class="cx">     [self _addItemWithTitle:@"Disable Simple Line Layout" action:@selector(toggleSimpleLineLayoutEnabled:) indented:NO];
</span><del>-    [self _addItemWithTitle:@"Show Simple Line Layout Borders" action:@selector(toggleSimpleLineLayoutDebugBordersEnabled:) indented:NO];
</del><ins>+    [self _addItemWithTitle:@"Enable Legacy Line Layout Visual Coverage" action:@selector(toggleLegacyLineLayoutVisualCoverageEnabled:) indented:NO];
</ins><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><span class="lines">@@ -346,8 +346,8 @@
</span><span class="cx">         [menuItem setState:[self layerBordersVisible] ? NSControlStateValueOn : NSControlStateValueOff];
</span><span class="cx">     else if (action == @selector(toggleSimpleLineLayoutEnabled:))
</span><span class="cx">         [menuItem setState:[self simpleLineLayoutEnabled] ? NSControlStateValueOff : NSControlStateValueOn];
</span><del>-    else if (action == @selector(toggleSimpleLineLayoutDebugBordersEnabled:))
-        [menuItem setState:[self simpleLineLayoutDebugBordersEnabled] ? NSControlStateValueOn : NSControlStateValueOff];
</del><ins>+    else if (action == @selector(toggleLegacyLineLayoutVisualCoverageEnabled:))
+        [menuItem setState:[self legacyLineLayoutVisualCoverageEnabled] ? NSControlStateValueOn : NSControlStateValueOff];
</ins><span class="cx">     else if (action == @selector(toggleIncrementalRenderingSuppressed:))
</span><span class="cx">         [menuItem setState:[self incrementalRenderingSuppressed] ? NSControlStateValueOn : NSControlStateValueOff];
</span><span class="cx">     else if (action == @selector(toggleAcceleratedDrawingEnabled:))
</span><span class="lines">@@ -523,14 +523,14 @@
</span><span class="cx">     return [[NSUserDefaults standardUserDefaults] boolForKey:SimpleLineLayoutEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)toggleSimpleLineLayoutDebugBordersEnabled:(id)sender
</del><ins>+- (void)toggleLegacyLineLayoutVisualCoverageEnabled:(id)sender
</ins><span class="cx"> {
</span><del>-    [self _toggleBooleanDefault:SimpleLineLayoutDebugBordersEnabledPreferenceKey];
</del><ins>+    [self _toggleBooleanDefault:LegacyLineLayoutVisualCoverageEnabledPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (BOOL)simpleLineLayoutDebugBordersEnabled
</del><ins>+- (BOOL)legacyLineLayoutVisualCoverageEnabled
</ins><span class="cx"> {
</span><del>-    return [[NSUserDefaults standardUserDefaults] boolForKey:SimpleLineLayoutDebugBordersEnabledPreferenceKey];
</del><ins>+    return [[NSUserDefaults standardUserDefaults] boolForKey:LegacyLineLayoutVisualCoverageEnabledPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)toggleAcceleratedDrawingEnabled:(id)sender
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m    2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> 
</span><span class="cx">     [[WebPreferences standardPreferences] setShowDebugBorders:settings.layerBordersVisible];
</span><span class="cx">     [[WebPreferences standardPreferences] setSimpleLineLayoutEnabled:settings.simpleLineLayoutEnabled];
</span><del>-    [[WebPreferences standardPreferences] setSimpleLineLayoutDebugBordersEnabled:settings.simpleLineLayoutDebugBordersEnabled];
</del><ins>+    [[WebPreferences standardPreferences] setLegacyLineLayoutVisualCoverageEnabled:settings.legacyLineLayoutVisualCoverageEnabled];
</ins><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></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (269602 => 269603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2020-11-09 22:27:15 UTC (rev 269602)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m    2020-11-09 22:28:13 UTC (rev 269603)
</span><span class="lines">@@ -472,7 +472,7 @@
</span><span class="cx">     preferences._compositingBordersVisible = settings.layerBordersVisible;
</span><span class="cx">     preferences._compositingRepaintCountersVisible = settings.layerBordersVisible;
</span><span class="cx">     preferences._simpleLineLayoutEnabled = settings.simpleLineLayoutEnabled;
</span><del>-    preferences._simpleLineLayoutDebugBordersEnabled = settings.simpleLineLayoutDebugBordersEnabled;
</del><ins>+    preferences._legacyLineLayoutVisualCoverageEnabled = settings.legacyLineLayoutVisualCoverageEnabled;
</ins><span class="cx">     preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled;
</span><span class="cx">     preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
</span><span class="cx">     preferences._displayListDrawingEnabled = settings.displayListDrawingEnabled;
</span></span></pre>
</div>
</div>

</body>
</html>