<!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>[194578] 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/194578">194578</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2016-01-04 23:46:14 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[PerformanceTiming] Don't expose the restrictedKeyMap() HashMap
https://bugs.webkit.org/show_bug.cgi?id=147366
Reviewed by Sam Weinig.
Instead of the callers looking up in the HashMap that's returned by restrictedKeyMap(),
keep the HashMap local in the static restrictedMarkFunction(). This function accepts
a String reference and performs the lookup, returning the pointer to a PerformanceTiming
method that corresponds to the passed-in mark or returns nullptr otherwise.
The HashMap is now wrapped in a NeverDestroyed object and is populated when the first
mark function is looked for.
* page/PerformanceUserTiming.cpp:
(WebCore::UserTiming::mark):
(WebCore::UserTiming::findExistingMarkStartTime):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceUserTimingcpp">trunk/Source/WebCore/page/PerformanceUserTiming.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194577 => 194578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-05 07:41:39 UTC (rev 194577)
+++ trunk/Source/WebCore/ChangeLog 2016-01-05 07:46:14 UTC (rev 194578)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-01-04 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [PerformanceTiming] Don't expose the restrictedKeyMap() HashMap
+ https://bugs.webkit.org/show_bug.cgi?id=147366
+
+ Reviewed by Sam Weinig.
+
+ Instead of the callers looking up in the HashMap that's returned by restrictedKeyMap(),
+ keep the HashMap local in the static restrictedMarkFunction(). This function accepts
+ a String reference and performs the lookup, returning the pointer to a PerformanceTiming
+ method that corresponds to the passed-in mark or returns nullptr otherwise.
+
+ The HashMap is now wrapped in a NeverDestroyed object and is populated when the first
+ mark function is looked for.
+
+ * page/PerformanceUserTiming.cpp:
+ (WebCore::UserTiming::mark):
+ (WebCore::UserTiming::findExistingMarkStartTime):
+
+2016-01-04 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [TextureMapper] Move ClipStack into its own file
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152661
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceUserTimingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceUserTiming.cpp (194577 => 194578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceUserTiming.cpp 2016-01-05 07:41:39 UTC (rev 194577)
+++ trunk/Source/WebCore/page/PerformanceUserTiming.cpp 2016-01-05 07:46:14 UTC (rev 194578)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "Performance.h"
</span><span class="cx"> #include "PerformanceMark.h"
</span><span class="cx"> #include "PerformanceMeasure.h"
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/dtoa/utils.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -38,34 +39,40 @@
</span><span class="cx">
</span><span class="cx"> namespace {
</span><span class="cx">
</span><del>-typedef HashMap<String, NavigationTimingFunction> RestrictedKeyMap;
-static RestrictedKeyMap restrictedKeyMap()
</del><ins>+static NavigationTimingFunction restrictedMarkFunction(const String& markName)
</ins><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(RestrictedKeyMap, map, ());
- if (map.isEmpty()) {
- map.add("navigationStart", &PerformanceTiming::navigationStart);
- map.add("unloadEventStart", &PerformanceTiming::unloadEventStart);
- map.add("unloadEventEnd", &PerformanceTiming::unloadEventEnd);
- map.add("redirectStart", &PerformanceTiming::redirectStart);
- map.add("redirectEnd", &PerformanceTiming::redirectEnd);
- map.add("fetchStart", &PerformanceTiming::fetchStart);
- map.add("domainLookupStart", &PerformanceTiming::domainLookupStart);
- map.add("domainLookupEnd", &PerformanceTiming::domainLookupEnd);
- map.add("connectStart", &PerformanceTiming::connectStart);
- map.add("connectEnd", &PerformanceTiming::connectEnd);
- map.add("secureConnectionStart", &PerformanceTiming::secureConnectionStart);
- map.add("requestStart", &PerformanceTiming::requestStart);
- map.add("responseStart", &PerformanceTiming::responseStart);
- map.add("responseEnd", &PerformanceTiming::responseEnd);
- map.add("domLoading", &PerformanceTiming::domLoading);
- map.add("domInteractive", &PerformanceTiming::domInteractive);
- map.add("domContentLoadedEventStart", &PerformanceTiming::domContentLoadedEventStart);
- map.add("domContentLoadedEventEnd", &PerformanceTiming::domContentLoadedEventEnd);
- map.add("domComplete", &PerformanceTiming::domComplete);
- map.add("loadEventStart", &PerformanceTiming::loadEventStart);
- map.add("loadEventEnd", &PerformanceTiming::loadEventEnd);
</del><ins>+ using MapPair = std::pair<ASCIILiteral, NavigationTimingFunction>;
+ static const std::array<MapPair, 21> pairs = { {
+ MapPair{ ASCIILiteral("navigationStart"), &PerformanceTiming::navigationStart },
+ MapPair{ ASCIILiteral("unloadEventStart"), &PerformanceTiming::unloadEventStart },
+ MapPair{ ASCIILiteral("unloadEventEnd"), &PerformanceTiming::unloadEventEnd },
+ MapPair{ ASCIILiteral("redirectStart"), &PerformanceTiming::redirectStart },
+ MapPair{ ASCIILiteral("redirectEnd"), &PerformanceTiming::redirectEnd },
+ MapPair{ ASCIILiteral("fetchStart"), &PerformanceTiming::fetchStart },
+ MapPair{ ASCIILiteral("domainLookupStart"), &PerformanceTiming::domainLookupStart },
+ MapPair{ ASCIILiteral("domainLookupEnd"), &PerformanceTiming::domainLookupEnd },
+ MapPair{ ASCIILiteral("connectStart"), &PerformanceTiming::connectStart },
+ MapPair{ ASCIILiteral("connectEnd"), &PerformanceTiming::connectEnd },
+ MapPair{ ASCIILiteral("secureConnectionStart"), &PerformanceTiming::secureConnectionStart },
+ MapPair{ ASCIILiteral("requestStart"), &PerformanceTiming::requestStart },
+ MapPair{ ASCIILiteral("responseStart"), &PerformanceTiming::responseStart },
+ MapPair{ ASCIILiteral("responseEnd"), &PerformanceTiming::responseEnd },
+ MapPair{ ASCIILiteral("domLoading"), &PerformanceTiming::domLoading },
+ MapPair{ ASCIILiteral("domInteractive"), &PerformanceTiming::domInteractive },
+ MapPair{ ASCIILiteral("domContentLoadedEventStart"), &PerformanceTiming::domContentLoadedEventStart },
+ MapPair{ ASCIILiteral("domContentLoadedEventEnd"), &PerformanceTiming::domContentLoadedEventEnd },
+ MapPair{ ASCIILiteral("domComplete"), &PerformanceTiming::domComplete },
+ MapPair{ ASCIILiteral("loadEventStart"), &PerformanceTiming::loadEventStart },
+ MapPair{ ASCIILiteral("loadEventEnd"), &PerformanceTiming::loadEventEnd },
+ } };
+
+ static NeverDestroyed<HashMap<String, NavigationTimingFunction>> map;
+ if (map.get().isEmpty()) {
+ for (auto& pair : pairs)
+ map.get().add(pair.first, pair.second);
</ins><span class="cx"> }
</span><del>- return map;
</del><ins>+
+ return map.get().get(markName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace anonymous
</span><span class="lines">@@ -98,7 +105,7 @@
</span><span class="cx"> void UserTiming::mark(const String& markName, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> ec = 0;
</span><del>- if (restrictedKeyMap().contains(markName)) {
</del><ins>+ if (restrictedMarkFunction(markName)) {
</ins><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -119,8 +126,8 @@
</span><span class="cx"> if (m_marksMap.contains(markName))
</span><span class="cx"> return m_marksMap.get(markName).last()->startTime();
</span><span class="cx">
</span><del>- if (restrictedKeyMap().contains(markName)) {
- double value = static_cast<double>((m_performance->timing()->*(restrictedKeyMap().get(markName)))());
</del><ins>+ if (auto function = restrictedMarkFunction(markName)) {
+ double value = static_cast<double>((m_performance->timing()->*(function))());
</ins><span class="cx"> if (!value) {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><span class="cx"> return 0.0;
</span></span></pre>
</div>
</div>
</body>
</html>