<!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>[244554] trunk/Source/WebCore</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/244554">244554</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2019-04-23 12:13:48 -0700 (Tue, 23 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Speed up RenderTheme::systemColor on Speedometer2.
https://bugs.webkit.org/show_bug.cgi?id=197203
rdar://problem/50056756

Reviewed by Tim Horton.

* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::systemColor const): Remove some unused code. And fetch the cache after an early return.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::systemColor const): Avoid some allocations in LocalDefaultSystemAppearance
when a CSS color is in the system color cache.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244553 => 244554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-23 18:15:39 UTC (rev 244553)
+++ trunk/Source/WebCore/ChangeLog      2019-04-23 19:13:48 UTC (rev 244554)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-04-23  Timothy Hatcher  <timothy@apple.com>
+
+        Speed up RenderTheme::systemColor on Speedometer2.
+        https://bugs.webkit.org/show_bug.cgi?id=197203
+        rdar://problem/50056756
+
+        Reviewed by Tim Horton.
+
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::systemColor const): Remove some unused code. And fetch the cache after an early return.
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::systemColor const): Avoid some allocations in LocalDefaultSystemAppearance
+        when a CSS color is in the system color cache.
+
</ins><span class="cx"> 2019-04-23  Ryosuke Niwa  <rniwa@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         [iOS] element.focus() sometimes fails to reveal the focused element when it becomes editable dynamically
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (244553 => 244554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2019-04-23 18:15:39 UTC (rev 244553)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm    2019-04-23 19:13:48 UTC (rev 244554)
</span><span class="lines">@@ -1418,15 +1418,8 @@
</span><span class="cx"> 
</span><span class="cx"> Color RenderThemeIOS::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::Options> options) const
</span><span class="cx"> {
</span><del>-    const bool useSystemAppearance = options.contains(StyleColor::Options::UseSystemAppearance);
</del><span class="cx">     const bool forVisitedLink = options.contains(StyleColor::Options::ForVisitedLink);
</span><span class="cx"> 
</span><del>-    auto& cache = colorCache(options);
-
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/RenderThemeIOSSystemColorAdditions.mm>)
-#include <WebKitAdditions/RenderThemeIOSSystemColorAdditions.mm>
-#endif
-
</del><span class="cx">     // The system color cache below can't handle visited links. The only color value
</span><span class="cx">     // that cares about visited links is CSSValueWebkitLink, so handle it here by
</span><span class="cx">     // calling through to RenderTheme's base implementation.
</span><span class="lines">@@ -1433,10 +1426,14 @@
</span><span class="cx">     if (forVisitedLink && cssValueID == CSSValueWebkitLink)
</span><span class="cx">         return RenderTheme::systemColor(cssValueID, options);
</span><span class="cx"> 
</span><del>-    ASSERT_UNUSED(useSystemAppearance, !useSystemAppearance);
</del><span class="cx">     ASSERT(!forVisitedLink);
</span><span class="cx"> 
</span><ins>+    auto& cache = colorCache(options);
</ins><span class="cx">     return cache.systemStyleColors.ensure(cssValueID, [this, cssValueID, options] () -> Color {
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/RenderThemeIOSSystemColorAdditions.mm>)
+#include <WebKitAdditions/RenderThemeIOSSystemColorAdditions.mm>
+#endif
+
</ins><span class="cx">         auto cssColorToSelector = [cssValueID] () -> SEL {
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/RenderThemeIOSColorToSelectorAdditions.mm>)
</span><span class="cx"> #include <WebKitAdditions/RenderThemeIOSColorToSelectorAdditions.mm>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (244553 => 244554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2019-04-23 18:15:39 UTC (rev 244553)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm    2019-04-23 19:13:48 UTC (rev 244554)
</span><span class="lines">@@ -604,14 +604,13 @@
</span><span class="cx">     const bool useDarkAppearance = options.contains(StyleColor::Options::UseDarkAppearance);
</span><span class="cx">     const bool forVisitedLink = options.contains(StyleColor::Options::ForVisitedLink);
</span><span class="cx"> 
</span><del>-    LocalDefaultSystemAppearance localAppearance(useDarkAppearance);
-
</del><span class="cx">     auto& cache = colorCache(options);
</span><span class="cx"> 
</span><span class="cx">     if (useSystemAppearance) {
</span><span class="cx">         // Special handling for links and other system colors when the system appearance is desired.
</span><del>-        auto systemAppearanceColor = [] (Color& color, SEL selector) -> Color {
</del><ins>+        auto systemAppearanceColor = [useDarkAppearance] (Color& color, SEL selector) -> Color {
</ins><span class="cx">             if (!color.isValid()) {
</span><ins>+                LocalDefaultSystemAppearance localAppearance(useDarkAppearance);
</ins><span class="cx">                 auto systemColor = wtfObjCMsgSend<NSColor *>([NSColor class], selector);
</span><span class="cx">                 color = semanticColorFromNSColor(systemColor);
</span><span class="cx">             }
</span><span class="lines">@@ -662,7 +661,9 @@
</span><span class="cx"> 
</span><span class="cx">     ASSERT(!forVisitedLink);
</span><span class="cx"> 
</span><del>-    return cache.systemStyleColors.ensure(cssValueID, [this, cssValueID, options, &localAppearance] () -> Color {
</del><ins>+    return cache.systemStyleColors.ensure(cssValueID, [this, cssValueID, options, useDarkAppearance] () -> Color {
+        LocalDefaultSystemAppearance localAppearance(useDarkAppearance);
+
</ins><span class="cx">         auto selectCocoaColor = [cssValueID] () -> SEL {
</span><span class="cx">             switch (cssValueID) {
</span><span class="cx">             case CSSValueActivecaption:
</span></span></pre>
</div>
</div>

</body>
</html>