<!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>[235922] 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/235922">235922</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2018-09-11 16:41:49 -0700 (Tue, 11 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Follow up to:
Expose -apple-system-container-border color to internal web views.
https://bugs.webkit.org/show_bug.cgi?id=189178.

Patch by James Savage <james.savage@apple.com> on 2018-09-11
Reviewed by Timothy Hatcher.

Source/WebCore:

* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::systemColor const): Add a separate #if block for
Mojave. When I used CSSValueAppleSystemFindHighlightBackground as a template
for this change, I had to write out the condition in the first change, but
mistakenly thought I could reuse the block here. Turns out the versions were
different, and I could not.

LayoutTests:

* platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt:
Reset test expectations to go along with fix.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmachighsierrafastcssapplesystemcontrolcolorsexpectedtxt">trunk/LayoutTests/platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (235921 => 235922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2018-09-11 23:23:38 UTC (rev 235921)
+++ trunk/LayoutTests/ChangeLog 2018-09-11 23:41:49 UTC (rev 235922)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2018-09-11  James Savage  <james.savage@apple.com>
+
+        Follow up to:
+        Expose -apple-system-container-border color to internal web views.
+        https://bugs.webkit.org/show_bug.cgi?id=189178.
+
+        Reviewed by Timothy Hatcher.
+
+        * platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt:
+        Reset test expectations to go along with fix.
+
</ins><span class="cx"> 2018-09-07  Dean Jackson  <dino@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add and expose Internal features from WebKit
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmachighsierrafastcssapplesystemcontrolcolorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt (235921 => 235922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt      2018-09-11 23:23:38 UTC (rev 235921)
+++ trunk/LayoutTests/platform/mac-highsierra/fast/css/apple-system-control-colors-expected.txt 2018-09-11 23:41:49 UTC (rev 235922)
</span><span class="lines">@@ -19,5 +19,5 @@
</span><span class="cx"> -apple-system-quaternary-label : rgba(0, 0, 0, 0.0980392)
</span><span class="cx"> -apple-system-grid : rgb(204, 204, 204)
</span><span class="cx"> -apple-system-separator : rgb(204, 204, 204)
</span><del>--apple-system-container-border : rgba(0, 0, 0, 0)
</del><ins>+-apple-system-container-border : rgb(197, 197, 197)
</ins><span class="cx"> current-color with inherited -apple-system-label : rgba(0, 0, 0, 0.85098)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (235921 => 235922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-09-11 23:23:38 UTC (rev 235921)
+++ trunk/Source/WebCore/ChangeLog      2018-09-11 23:41:49 UTC (rev 235922)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2018-09-11  James Savage  <james.savage@apple.com>
+
+        Follow up to:
+        Expose -apple-system-container-border color to internal web views.
+        https://bugs.webkit.org/show_bug.cgi?id=189178.
+
+        Reviewed by Timothy Hatcher.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::systemColor const): Add a separate #if block for
+        Mojave. When I used CSSValueAppleSystemFindHighlightBackground as a template
+        for this change, I had to write out the condition in the first change, but
+        mistakenly thought I could reuse the block here. Turns out the versions were
+        different, and I could not.
+
</ins><span class="cx"> 2018-09-11  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Remove MediaDevices NoInterfaceObject
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (235921 => 235922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2018-09-11 23:23:38 UTC (rev 235921)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm    2018-09-11 23:41:49 UTC (rev 235922)
</span><span class="lines">@@ -867,7 +867,9 @@
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
</span><span class="cx">         case CSSValueAppleSystemFindHighlightBackground:
</span><span class="cx">             return platformActiveTextSearchHighlightColor(options);
</span><ins>+#endif
</ins><span class="cx"> 
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101400
</ins><span class="cx">         case CSSValueAppleSystemContainerBorder:
</span><span class="cx">             return 0xFFC5C5C5;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>