<!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>[209937] trunk/Source/WebKit2</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/209937">209937</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-12-16 14:05:54 -0800 (Fri, 16 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Small refactor: Use HashCountedSet rather than HashMap<..., int> to store client counts in WebPlaybackSessionManager{,Proxy}.
https://bugs.webkit.org/show_bug.cgi?id=165807
Reviewed by Eric Carlson.
* UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h:
* UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm:
(WebKit::WebPlaybackSessionManagerProxy::addClientForContext):
(WebKit::WebPlaybackSessionManagerProxy::removeClientForContext):
* WebProcess/cocoa/WebPlaybackSessionManager.h:
* WebProcess/cocoa/WebPlaybackSessionManager.mm:
(WebKit::WebPlaybackSessionManager::addClientForContext):
(WebKit::WebPlaybackSessionManager::removeClientForContext):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxyh">trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxymm">trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebPlaybackSessionManagerh">trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebPlaybackSessionManagermm">trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209936 => 209937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-16 21:52:38 UTC (rev 209936)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-16 22:05:54 UTC (rev 209937)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-16 Jer Noble <jer.noble@apple.com>
+
+ Small refactor: Use HashCountedSet rather than HashMap<..., int> to store client counts in WebPlaybackSessionManager{,Proxy}.
+ https://bugs.webkit.org/show_bug.cgi?id=165807
+
+ Reviewed by Eric Carlson.
+
+ * UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h:
+ * UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm:
+ (WebKit::WebPlaybackSessionManagerProxy::addClientForContext):
+ (WebKit::WebPlaybackSessionManagerProxy::removeClientForContext):
+ * WebProcess/cocoa/WebPlaybackSessionManager.h:
+ * WebProcess/cocoa/WebPlaybackSessionManager.mm:
+ (WebKit::WebPlaybackSessionManager::addClientForContext):
+ (WebKit::WebPlaybackSessionManager::removeClientForContext):
+
</ins><span class="cx"> 2016-12-16 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Visual viewports: carets and selection UI are incorrectly positioned when editing fixed elements
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h (209936 => 209937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h 2016-12-16 21:52:38 UTC (rev 209936)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h 2016-12-16 22:05:54 UTC (rev 209937)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <WebCore/PlatformView.h>
</span><span class="cx"> #include <WebCore/TimeRanges.h>
</span><span class="cx"> #include <WebCore/WebPlaybackSessionModel.h>
</span><ins>+#include <wtf/HashCountedSet.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -203,7 +204,7 @@
</span><span class="cx"> WebPageProxy* m_page;
</span><span class="cx"> HashMap<uint64_t, ModelInterfaceTuple> m_contextMap;
</span><span class="cx"> uint64_t m_controlsManagerContextId { 0 };
</span><del>- HashMap<uint64_t, int> m_clientCounts;
</del><ins>+ HashCountedSet<uint64_t> m_clientCounts;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPlaybackSessionManagerProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm (209936 => 209937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm 2016-12-16 21:52:38 UTC (rev 209936)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm 2016-12-16 22:05:54 UTC (rev 209937)
</span><span class="lines">@@ -281,31 +281,16 @@
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::addClientForContext(uint64_t contextId)
</span><span class="cx"> {
</span><del>- auto addResult = m_clientCounts.add(contextId, 1);
- if (!addResult.isNewEntry)
- addResult.iterator->value++;
</del><ins>+ m_clientCounts.add(contextId);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManagerProxy::removeClientForContext(uint64_t contextId)
</span><span class="cx"> {
</span><del>- ASSERT(m_clientCounts.contains(contextId));
-
- int clientCount = m_clientCounts.get(contextId);
- ASSERT(clientCount > 0);
- clientCount--;
-
- if (clientCount <= 0) {
- m_clientCounts.remove(contextId);
-
- RefPtr<WebPlaybackSessionModelContext> model;
- RefPtr<PlatformWebPlaybackSessionInterface> interface;
- std::tie(model, interface) = ensureModelAndInterface(contextId);
- interface->invalidate();
- m_contextMap.remove(contextId);
</del><ins>+ if (!m_clientCounts.remove(contextId))
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><del>- m_clientCounts.set(contextId, clientCount);
</del><ins>+ ensureInterface(contextId).invalidate();
+ m_contextMap.remove(contextId);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Messages from WebPlaybackSessionManager
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebPlaybackSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h (209936 => 209937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h 2016-12-16 21:52:38 UTC (rev 209936)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h 2016-12-16 22:05:54 UTC (rev 209937)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include <WebCore/PlatformCALayer.h>
</span><span class="cx"> #include <WebCore/WebPlaybackSessionInterface.h>
</span><span class="cx"> #include <WebCore/WebPlaybackSessionModelMediaElement.h>
</span><ins>+#include <wtf/HashCountedSet.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -151,7 +152,7 @@
</span><span class="cx"> HashMap<WebCore::HTMLMediaElement*, uint64_t> m_mediaElements;
</span><span class="cx"> HashMap<uint64_t, ModelInterfaceTuple> m_contextMap;
</span><span class="cx"> uint64_t m_controlsManagerContextId { 0 };
</span><del>- HashMap<uint64_t, int> m_clientCounts;
</del><ins>+ HashCountedSet<uint64_t> m_clientCounts;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebPlaybackSessionManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm (209936 => 209937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm 2016-12-16 21:52:38 UTC (rev 209936)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm 2016-12-16 22:05:54 UTC (rev 209937)
</span><span class="lines">@@ -213,26 +213,14 @@
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManager::addClientForContext(uint64_t contextId)
</span><span class="cx"> {
</span><del>- auto addResult = m_clientCounts.add(contextId, 1);
- if (!addResult.isNewEntry)
- addResult.iterator->value++;
</del><ins>+ m_clientCounts.add(contextId);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManager::removeClientForContext(uint64_t contextId)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_clientCounts.contains(contextId));
</span><del>-
- int clientCount = m_clientCounts.get(contextId);
- ASSERT(clientCount > 0);
- clientCount--;
-
- if (clientCount <= 0) {
- m_clientCounts.remove(contextId);
</del><ins>+ if (m_clientCounts.remove(contextId))
</ins><span class="cx"> removeContext(contextId);
</span><del>- return;
- }
-
- m_clientCounts.set(contextId, clientCount);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionManager::setUpPlaybackControlsManager(WebCore::HTMLMediaElement& mediaElement)
</span></span></pre>
</div>
</div>
</body>
</html>