<!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>[175686] trunk/Source</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/175686">175686</a></dd>
<dt>Author</dt> <dd>adachan@apple.com</dd>
<dt>Date</dt> <dd>2014-11-05 23:21:54 -0800 (Wed, 05 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Figure out whether a plug-in is playing audio.
https://bugs.webkit.org/show_bug.cgi?id=137219
Reviewed by Anders Carlsson.
Source/WebCore:
Add NPPVpluginIsPlayingAudio. Export some WebCore methods that will be used in WebKit2.
No new tests, but manually tested with an example plugin.
* WebCore.exp.in:
* plugins/npapi.h:
Source/WebKit2:
Handle the setting of the NPPVpluginIsPlayingAudio variable.
* PluginProcess/PluginControllerProxy.cpp:
(WebKit::PluginControllerProxy::setPluginIsPlayingAudio):
Send a SetPluginIsPlayingAudio message to the WebProcess.
* PluginProcess/PluginControllerProxy.h:
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::NPN_SetValue):
Handle NPPVpluginIsPlayingAudio. Call NetscapePlugin::setIsPlayingAudio().
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::setIsPlayingAudio):
Call PluginControllerProxy::setPluginIsPlayingAudio().
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
* WebProcess/Plugins/PluginController.h:
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::setPluginIsPlayingAudio):
Call PluginView::setPluginIsPlayingAudio().
* WebProcess/Plugins/PluginProxy.h:
* WebProcess/Plugins/PluginProxy.messages.in:
Add the SetPluginIsPlayingAudio message.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::PluginView):
Initialize m_pluginIsPlayingAudio.
(WebKit::PluginView::~PluginView):
Remove itself from the Document's list of AudioProducers.
(WebKit::PluginView::initializePlugin):
Add itself to the Document's list of AudioProducers.
(WebKit::PluginView::pageMutedStateDidChange):
Add a FIXME.
(WebKit::PluginView::setPluginIsPlayingAudio):
If m_pluginIsPlayingAudio has changed, tell the Document to update its audio playing state.
* WebProcess/Plugins/PluginView.h:
Now inherits AudioProducer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepluginsnpapih">trunk/Source/WebCore/plugins/npapi.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxycpp">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxyh">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginControllerh">trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxycpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxyh">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxymessagesin">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebCore/ChangeLog 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-11-04 Ada Chan <adachan@apple.com>
+
+ Figure out whether a plug-in is playing audio.
+ https://bugs.webkit.org/show_bug.cgi?id=137219
+
+ Reviewed by Anders Carlsson.
+
+ Add NPPVpluginIsPlayingAudio. Export some WebCore methods that will be used in WebKit2.
+
+ No new tests, but manually tested with an example plugin.
+
+ * WebCore.exp.in:
+ * plugins/npapi.h:
+
</ins><span class="cx"> 2014-11-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix crash introduced in r175656
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -1323,12 +1323,15 @@
</span><span class="cx"> __ZN7WebCore8Document13createElementERKNS_13QualifiedNameEb
</span><span class="cx"> __ZN7WebCore8Document13svgExtensionsEv
</span><span class="cx"> __ZN7WebCore8Document14createTextNodeERKN3WTF6StringE
</span><ins>+__ZN7WebCore8Document16addAudioProducerEPNS_13AudioProducerE
</ins><span class="cx"> __ZN7WebCore8Document16isPageBoxVisibleEi
</span><span class="cx"> __ZN7WebCore8Document16shortcutIconURLsEv
</span><span class="cx"> __ZN7WebCore8Document17setFocusedElementEN3WTF10PassRefPtrINS_7ElementEEENS_14FocusDirectionE
</span><span class="cx"> __ZN7WebCore8Document19accessSVGExtensionsEv
</span><ins>+__ZN7WebCore8Document19removeAudioProducerEPNS_13AudioProducerE
</ins><span class="cx"> __ZN7WebCore8Document19updateStyleIfNeededEv
</span><span class="cx"> __ZN7WebCore8Document20styleResolverChangedENS_23StyleResolverUpdateFlagE
</span><ins>+__ZN7WebCore8Document20updateIsPlayingAudioEv
</ins><span class="cx"> __ZN7WebCore8Document22createDocumentFragmentEv
</span><span class="cx"> __ZN7WebCore8Document23didAddWheelEventHandlerEv
</span><span class="cx"> __ZN7WebCore8Document24addMediaCanStartListenerEPNS_21MediaCanStartListenerE
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsnpapih"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/npapi.h (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/npapi.h 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebCore/plugins/npapi.h 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -379,6 +379,9 @@
</span><span class="cx"> , NPPVpluginCoreAnimationLayer = 1003
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ /* Used for figuring out whether a plug-in is playing audio. */
+ , NPPVpluginIsPlayingAudio = 4000
+
</ins><span class="cx"> } NPPVariable;
</span><span class="cx">
</span><span class="cx"> /*
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-11-04 Ada Chan <adachan@apple.com>
+
+ Figure out whether a plug-in is playing audio.
+ https://bugs.webkit.org/show_bug.cgi?id=137219
+
+ Reviewed by Anders Carlsson.
+
+ Handle the setting of the NPPVpluginIsPlayingAudio variable.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::setPluginIsPlayingAudio):
+ Send a SetPluginIsPlayingAudio message to the WebProcess.
+ * PluginProcess/PluginControllerProxy.h:
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::NPN_SetValue):
+ Handle NPPVpluginIsPlayingAudio. Call NetscapePlugin::setIsPlayingAudio().
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::setIsPlayingAudio):
+ Call PluginControllerProxy::setPluginIsPlayingAudio().
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/PluginController.h:
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::setPluginIsPlayingAudio):
+ Call PluginView::setPluginIsPlayingAudio().
+ * WebProcess/Plugins/PluginProxy.h:
+ * WebProcess/Plugins/PluginProxy.messages.in:
+ Add the SetPluginIsPlayingAudio message.
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::PluginView):
+ Initialize m_pluginIsPlayingAudio.
+ (WebKit::PluginView::~PluginView):
+ Remove itself from the Document's list of AudioProducers.
+ (WebKit::PluginView::initializePlugin):
+ Add itself to the Document's list of AudioProducers.
+ (WebKit::PluginView::pageMutedStateDidChange):
+ Add a FIXME.
+ (WebKit::PluginView::setPluginIsPlayingAudio):
+ If m_pluginIsPlayingAudio has changed, tell the Document to update its audio playing state.
+ * WebProcess/Plugins/PluginView.h:
+ Now inherits AudioProducer.
+
</ins><span class="cx"> 2014-11-05 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Tried to fix the GTK build.
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -310,6 +310,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginControllerProxy::setPluginIsPlayingAudio(bool pluginIsPlayingAudio)
+{
+ m_connection->connection()->send(Messages::PluginProxy::SetPluginIsPlayingAudio(pluginIsPlayingAudio), m_pluginInstanceID);
+}
+
</ins><span class="cx"> void PluginControllerProxy::setStatusbarText(const String& statusbarText)
</span><span class="cx"> {
</span><span class="cx"> m_connection->connection()->send(Messages::PluginProxy::SetStatusbarText(statusbarText), m_pluginInstanceID);
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx"> virtual NPObject* windowScriptNPObject() override;
</span><span class="cx"> virtual NPObject* pluginElementNPObject() override;
</span><span class="cx"> virtual bool evaluate(NPObject*, const String& scriptString, NPVariant* result, bool allowPopups) override;
</span><ins>+ virtual void setPluginIsPlayingAudio(bool) override;
</ins><span class="cx"> virtual void setStatusbarText(const String&) override;
</span><span class="cx"> virtual bool isAcceleratedCompositingEnabled() override;
</span><span class="cx"> virtual void pluginProcessCrashed() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -575,6 +575,12 @@
</span><span class="cx"> return NPERR_NO_ERROR;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case NPPVpluginIsPlayingAudio: {
+ RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
+ plugin->setIsPlayingAudio(value);
+ return NPERR_NO_ERROR;
+ }
+
</ins><span class="cx"> default:
</span><span class="cx"> notImplemented();
</span><span class="cx"> return NPERR_GENERIC_ERROR;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -399,6 +399,11 @@
</span><span class="cx"> return controller()->getAuthenticationInfo(protectionSpace, username, password);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetscapePlugin::setIsPlayingAudio(bool isPlayingAudio)
+{
+ controller()->setPluginIsPlayingAudio(isPlayingAudio);
+}
+
</ins><span class="cx"> NPError NetscapePlugin::NPP_New(NPMIMEType pluginType, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* savedData)
</span><span class="cx"> {
</span><span class="cx"> return m_pluginModule->pluginFuncs().newp(pluginType, &m_npp, mode, argc, argn, argv, savedData);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -129,6 +129,8 @@
</span><span class="cx"> void setCookiesForURL(const String& urlString, const String& cookieString);
</span><span class="cx"> bool getAuthenticationInfo(const WebCore::ProtectionSpace&, String& username, String& password);
</span><span class="cx">
</span><ins>+ void setIsPlayingAudio(bool);
+
</ins><span class="cx"> // Member functions for calling into the plug-in.
</span><span class="cx"> NPError NPP_New(NPMIMEType pluginType, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData*);
</span><span class="cx"> NPError NPP_Destroy(NPSavedData**);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -155,6 +155,9 @@
</span><span class="cx"> // Called when the a plug-in instance fails to initialized, either synchronously or asynchronously.
</span><span class="cx"> virtual void didFailToInitializePlugin() = 0;
</span><span class="cx">
</span><ins>+ // Called by the Netscape plug-in when it starts or stops playing audio.
+ virtual void setPluginIsPlayingAudio(bool) = 0;
+
</ins><span class="cx"> // Helper class for delaying destruction of a plug-in.
</span><span class="cx"> class PluginDestructionProtector {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -654,6 +654,11 @@
</span><span class="cx"> releaseNPVariantValue(&npObjectAsVariant);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginProxy::setPluginIsPlayingAudio(bool pluginIsPlayingAudio)
+{
+ controller()->setPluginIsPlayingAudio(pluginIsPlayingAudio);
+}
+
</ins><span class="cx"> void PluginProxy::cancelStreamLoad(uint64_t streamID)
</span><span class="cx"> {
</span><span class="cx"> controller()->cancelStreamLoad(streamID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -163,6 +163,7 @@
</span><span class="cx"> void getAuthenticationInfo(const WebCore::ProtectionSpace&, bool& returnValue, String& username, String& password);
</span><span class="cx"> void getPluginElementNPObject(uint64_t& pluginElementNPObjectID);
</span><span class="cx"> void evaluate(const NPVariantData& npObjectAsVariantData, const String& scriptString, bool allowPopups, bool& returnValue, NPVariantData& resultData);
</span><ins>+ void setPluginIsPlayingAudio(bool);
</ins><span class="cx"> void cancelStreamLoad(uint64_t streamID);
</span><span class="cx"> void cancelManualStreamLoad();
</span><span class="cx"> void setStatusbarText(const String& statusbarText);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -83,6 +83,9 @@
</span><span class="cx">
</span><span class="cx"> # Tells the WebProcess that the plug-in failed to initialize.
</span><span class="cx"> DidFailToCreatePlugin() -> ()
</span><ins>+
+ # Tells the WebProcess that the plug-in has started or stopped playing audio.
+ SetPluginIsPlayingAudio(bool pluginIsPlayingAudio)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -297,6 +297,7 @@
</span><span class="cx"> , m_countSnapshotRetries(0)
</span><span class="cx"> , m_didReceiveUserInteraction(false)
</span><span class="cx"> , m_pageScaleFactor(1)
</span><ins>+ , m_pluginIsPlayingAudio(false)
</ins><span class="cx"> {
</span><span class="cx"> m_webPage->addPluginView(this);
</span><span class="cx"> }
</span><span class="lines">@@ -311,6 +312,8 @@
</span><span class="cx"> if (m_isWaitingUntilMediaCanStart)
</span><span class="cx"> m_pluginElement->document().removeMediaCanStartListener(this);
</span><span class="cx">
</span><ins>+ m_pluginElement->document().removeAudioProducer(this);
+
</ins><span class="cx"> destroyPluginAndReset();
</span><span class="cx">
</span><span class="cx"> // Null out the plug-in element explicitly so we'll crash earlier if we try to use
</span><span class="lines">@@ -589,6 +592,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ m_pluginElement->document().addAudioProducer(this);
+
</ins><span class="cx"> #if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
</span><span class="cx"> HTMLPlugInImageElement& plugInImageElement = downcast<HTMLPlugInImageElement>(*m_pluginElement);
</span><span class="cx"> m_didPlugInStartOffScreen = !m_webPage->plugInIntersectsSearchRect(plugInImageElement);
</span><span class="lines">@@ -1324,6 +1329,11 @@
</span><span class="cx"> initializePlugin();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginView::pageMutedStateDidChange()
+{
+ // FIXME: To be implemented (https://bugs.webkit.org/show_bug.cgi?id=138105).
+}
+
</ins><span class="cx"> bool PluginView::isPluginVisible()
</span><span class="cx"> {
</span><span class="cx"> return isVisible();
</span><span class="lines">@@ -1433,6 +1443,15 @@
</span><span class="cx"> UserGestureIndicator gestureIndicator(allowPopups ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
</span><span class="cx"> return m_npRuntimeObjectMap.evaluate(npObject, scriptString, result);
</span><span class="cx"> }
</span><ins>+
+void PluginView::setPluginIsPlayingAudio(bool pluginIsPlayingAudio)
+{
+ if (m_pluginIsPlayingAudio == pluginIsPlayingAudio)
+ return;
+
+ m_pluginIsPlayingAudio = pluginIsPlayingAudio;
+ m_pluginElement->document().updateIsPlayingAudio();
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void PluginView::setStatusbarText(const String& statusbarText)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (175685 => 175686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-11-06 06:56:40 UTC (rev 175685)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-11-06 07:21:54 UTC (rev 175686)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "Plugin.h"
</span><span class="cx"> #include "PluginController.h"
</span><span class="cx"> #include "WebFrame.h"
</span><ins>+#include <WebCore/AudioProducer.h>
</ins><span class="cx"> #include <WebCore/FindOptions.h>
</span><span class="cx"> #include <WebCore/Image.h>
</span><span class="cx"> #include <WebCore/MediaCanStartListener.h>
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> class WebEvent;
</span><span class="cx">
</span><del>-class PluginView : public WebCore::PluginViewBase, public PluginController, private WebCore::MediaCanStartListener, private WebFrame::LoadListener {
</del><ins>+class PluginView : public WebCore::PluginViewBase, public PluginController, private WebCore::MediaCanStartListener, private WebFrame::LoadListener, private WebCore::AudioProducer {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<PluginView> create(PassRefPtr<WebCore::HTMLPlugInElement>, PassRefPtr<Plugin>, const Plugin::Parameters&);
</span><span class="cx">
</span><span class="lines">@@ -179,6 +180,10 @@
</span><span class="cx"> // WebCore::MediaCanStartListener
</span><span class="cx"> virtual void mediaCanStart() override;
</span><span class="cx">
</span><ins>+ // WebCore::AudioProducer
+ virtual bool isPlayingAudio() override { return m_pluginIsPlayingAudio; }
+ virtual void pageMutedStateDidChange() override;
+
</ins><span class="cx"> // PluginController
</span><span class="cx"> virtual bool isPluginVisible() override;
</span><span class="cx"> virtual void invalidate(const WebCore::IntRect&) override;
</span><span class="lines">@@ -190,6 +195,7 @@
</span><span class="cx"> virtual NPObject* windowScriptNPObject() override;
</span><span class="cx"> virtual NPObject* pluginElementNPObject() override;
</span><span class="cx"> virtual bool evaluate(NPObject*, const String& scriptString, NPVariant* result, bool allowPopups) override;
</span><ins>+ virtual void setPluginIsPlayingAudio(bool) override;
</ins><span class="cx"> #endif
</span><span class="cx"> virtual void setStatusbarText(const String&) override;
</span><span class="cx"> virtual bool isAcceleratedCompositingEnabled() override;
</span><span class="lines">@@ -278,6 +284,8 @@
</span><span class="cx"> bool m_didReceiveUserInteraction;
</span><span class="cx">
</span><span class="cx"> double m_pageScaleFactor;
</span><ins>+
+ bool m_pluginIsPlayingAudio;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>