<!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>[175101] branches/safari-600.3-branch/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/175101">175101</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-10-23 02:17:39 -0700 (Thu, 23 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172629">r172629</a>. rdar://problem/18428706</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxycpp">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxyh">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessPluginProcesscpp">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessPluginProcessh">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginProcess.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessWebProcessConnectioncpp">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/WebProcessConnection.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessWebProcessConnectionh">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/WebProcessConnection.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessmacPluginControllerProxyMacmm">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175100 => 175101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 09:02:00 UTC (rev 175100)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 09:17:39 UTC (rev 175101)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-10-23 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r172629.
+
+ 2014-08-15 Gavin Barraclough <barraclough@apple.com>
+
+ Simplify visibility activity accounting for plugins
+ https://bugs.webkit.org/show_bug.cgi?id=135981
+
+ Reviewed by Dan Bernstein.
+
+ Just take one per connection, rather than implementing a counting mechanism.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::PluginControllerProxy):
+ * PluginProcess/PluginControllerProxy.h:
+ - added m_visiblityActivity.
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::PluginProcess):
+ (WebKit::PluginProcess::pluginsForWebProcessDidBecomeVisible): Deleted.
+ (WebKit::PluginProcess::pluginsForWebProcessDidBecomeHidden): Deleted.
+ * PluginProcess/PluginProcess.h:
+ - removed pluginsForWebProcessDidBecomeVisible/Hidden.
+ * PluginProcess/WebProcessConnection.cpp:
+ (WebKit::WebProcessConnection::removePluginControllerProxy):
+ (WebKit::WebProcessConnection::pluginDidBecomeVisible): Deleted.
+ (WebKit::WebProcessConnection::pluginDidBecomeHidden): Deleted.
+ * PluginProcess/WebProcessConnection.h:
+ - removed pluginDidBecomeVisible/Hidden.
+ * PluginProcess/mac/PluginControllerProxyMac.mm:
+ (WebKit::PluginControllerProxy::windowVisibilityChanged):
+ - windowVisibilityChanged uses m_visiblityActivity, rather than calling to PluginControllerProxy.
+
</ins><span class="cx"> 2014-10-21 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r174708
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (175100 => 175101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-10-23 09:02:00 UTC (rev 175100)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-10-23 09:17:39 UTC (rev 175101)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> , m_contentsScaleFactor(creationParameters.contentsScaleFactor)
</span><span class="cx"> , m_windowNPObject(0)
</span><span class="cx"> , m_pluginElementNPObject(0)
</span><ins>+ , m_visiblityActivity("Plugin is visible.")
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h (175100 => 175101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-10-23 09:02:00 UTC (rev 175100)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-10-23 09:17:39 UTC (rev 175101)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WebProcessConnectionMessages.h"
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><ins>+#include <WebCore/UserActivity.h>
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="lines">@@ -220,6 +221,9 @@
</span><span class="cx">
</span><span class="cx"> // The plug-in element NPObject.
</span><span class="cx"> NPObject* m_pluginElementNPObject;
</span><ins>+
+ // Hold an activity when the plugin is visible to prevent throttling.
+ UserActivity m_visiblityActivity;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp (175100 => 175101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp 2014-10-23 09:02:00 UTC (rev 175100)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginProcess.cpp 2014-10-23 09:17:39 UTC (rev 175101)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> , m_compositingRenderServerPort(MACH_PORT_NULL)
</span><span class="cx"> #endif
</span><span class="cx"> , m_connectionActivity("PluginProcess connection activity.")
</span><del>- , m_visiblePluginsActivity("Visible plugins from PluginProcess activity.")
</del><span class="cx"> {
</span><span class="cx"> NetscapePlugin::setSetExceptionFunction(WebProcessConnection::setGlobalException);
</span><span class="cx"> m_audioHardwareListener = AudioHardwareListener::create(*this);
</span><span class="lines">@@ -246,16 +245,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void PluginProcess::pluginsForWebProcessDidBecomeVisible()
-{
- m_visiblePluginsActivity.increment();
-}
-
-void PluginProcess::pluginsForWebProcessDidBecomeHidden()
-{
- m_visiblePluginsActivity.decrement();
-}
-
</del><span class="cx"> void PluginProcess::audioHardwareDidBecomeActive()
</span><span class="cx"> {
</span><span class="cx"> for (auto& connection : m_webProcessConnections)
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessPluginProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginProcess.h (175100 => 175101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginProcess.h 2014-10-23 09:02:00 UTC (rev 175100)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginProcess.h 2014-10-23 09:17:39 UTC (rev 175101)
</span><span class="lines">@@ -68,9 +68,6 @@
</span><span class="cx">
</span><span class="cx"> CountedUserActivity& connectionActivity() { return m_connectionActivity; }
</span><span class="cx">
</span><del>- void pluginsForWebProcessDidBecomeHidden();
- void pluginsForWebProcessDidBecomeVisible();
-
</del><span class="cx"> private:
</span><span class="cx"> PluginProcess();
</span><span class="cx"> ~PluginProcess();
</span><span class="lines">@@ -133,8 +130,7 @@
</span><span class="cx">
</span><span class="cx"> static void lowMemoryHandler(bool critical);
</span><span class="cx"> CountedUserActivity m_connectionActivity;
</span><del>- CountedUserActivity m_visiblePluginsActivity;
-
</del><ins>+
</ins><span class="cx"> RefPtr<WebCore::AudioHardwareListener> m_audioHardwareListener;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessWebProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/WebProcessConnection.cpp (175100 => 175101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2014-10-23 09:02:00 UTC (rev 175100)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2014-10-23 09:17:39 UTC (rev 175101)
</span><span class="lines">@@ -93,8 +93,6 @@
</span><span class="cx"> ASSERT(pluginControllerUniquePtr.get() == pluginController);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- pluginDidBecomeHidden(pluginInstanceID);
-
</del><span class="cx"> // Invalidate all objects related to this plug-in.
</span><span class="cx"> if (plugin)
</span><span class="cx"> m_npRemoteObjectMap->pluginDestroyed(plugin);
</span><span class="lines">@@ -325,28 +323,6 @@
</span><span class="cx"> m_connection->sendSync(Messages::PluginProxy::DidCreatePlugin(wantsWheelEvents, remoteLayerClientID), Messages::PluginProxy::DidCreatePlugin::Reply(), creationParameters.pluginInstanceID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessConnection::pluginDidBecomeVisible(unsigned pluginInstanceID)
-{
- bool oldState = m_visiblePluginInstanceIDs.isEmpty();
-
- m_visiblePluginInstanceIDs.add(pluginInstanceID);
-
- ASSERT(m_visiblePluginInstanceIDs.size() <= m_pluginControllers.size());
-
- if (oldState != m_visiblePluginInstanceIDs.isEmpty())
- PluginProcess::shared().pluginsForWebProcessDidBecomeVisible();
-}
-
-void WebProcessConnection::pluginDidBecomeHidden(unsigned pluginInstanceID)
-{
- bool oldState = m_visiblePluginInstanceIDs.isEmpty();
-
- m_visiblePluginInstanceIDs.remove(pluginInstanceID);
-
- if (oldState != m_visiblePluginInstanceIDs.isEmpty())
- PluginProcess::shared().pluginsForWebProcessDidBecomeHidden();
-}
-
</del><span class="cx"> void WebProcessConnection::audioHardwareDidBecomeActive()
</span><span class="cx"> {
</span><span class="cx"> m_connection->send(Messages::PluginProcessConnection::AudioHardwareDidBecomeActive(), 0);
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessWebProcessConnectionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/WebProcessConnection.h (175100 => 175101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/WebProcessConnection.h 2014-10-23 09:02:00 UTC (rev 175100)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/WebProcessConnection.h 2014-10-23 09:17:39 UTC (rev 175101)
</span><span class="lines">@@ -54,9 +54,6 @@
</span><span class="cx">
</span><span class="cx"> static void setGlobalException(const String&);
</span><span class="cx">
</span><del>- void pluginDidBecomeVisible(unsigned pluginInstanceID);
- void pluginDidBecomeHidden(unsigned pluginInstanceID);
-
</del><span class="cx"> void audioHardwareDidBecomeActive();
</span><span class="cx"> void audioHardwareDidBecomeInactive();
</span><span class="cx">
</span><span class="lines">@@ -87,7 +84,6 @@
</span><span class="cx"> HashMap<uint64_t, std::unique_ptr<PluginControllerProxy>> m_pluginControllers;
</span><span class="cx"> RefPtr<NPRemoteObjectMap> m_npRemoteObjectMap;
</span><span class="cx"> HashSet<uint64_t> m_asynchronousInstanceIDsToIgnore;
</span><del>- HashSet<uint64_t> m_visiblePluginInstanceIDs;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessmacPluginControllerProxyMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm (175100 => 175101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2014-10-23 09:02:00 UTC (rev 175100)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2014-10-23 09:17:39 UTC (rev 175101)
</span><span class="lines">@@ -108,9 +108,9 @@
</span><span class="cx"> {
</span><span class="cx"> m_plugin->windowVisibilityChanged(isVisible);
</span><span class="cx"> if (isVisible)
</span><del>- m_connection->pluginDidBecomeVisible(m_pluginInstanceID);
</del><ins>+ m_visiblityActivity.start();
</ins><span class="cx"> else
</span><del>- m_connection->pluginDidBecomeHidden(m_pluginInstanceID);
</del><ins>+ m_visiblityActivity.stop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginControllerProxy::sendComplexTextInput(const String& textInput)
</span></span></pre>
</div>
</div>
</body>
</html>