Diff
Modified: trunk/Source/WebCore/ChangeLog (175685 => 175686)
--- 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)
@@ -1,3 +1,17 @@
+2014-11-04 Ada Chan <adac...@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:
+
2014-11-05 Simon Fraser <simon.fra...@apple.com>
Fix crash introduced in r175656
Modified: trunk/Source/WebCore/WebCore.exp.in (175685 => 175686)
--- 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)
@@ -1323,12 +1323,15 @@
__ZN7WebCore8Document13createElementERKNS_13QualifiedNameEb
__ZN7WebCore8Document13svgExtensionsEv
__ZN7WebCore8Document14createTextNodeERKN3WTF6StringE
+__ZN7WebCore8Document16addAudioProducerEPNS_13AudioProducerE
__ZN7WebCore8Document16isPageBoxVisibleEi
__ZN7WebCore8Document16shortcutIconURLsEv
__ZN7WebCore8Document17setFocusedElementEN3WTF10PassRefPtrINS_7ElementEEENS_14FocusDirectionE
__ZN7WebCore8Document19accessSVGExtensionsEv
+__ZN7WebCore8Document19removeAudioProducerEPNS_13AudioProducerE
__ZN7WebCore8Document19updateStyleIfNeededEv
__ZN7WebCore8Document20styleResolverChangedENS_23StyleResolverUpdateFlagE
+__ZN7WebCore8Document20updateIsPlayingAudioEv
__ZN7WebCore8Document22createDocumentFragmentEv
__ZN7WebCore8Document23didAddWheelEventHandlerEv
__ZN7WebCore8Document24addMediaCanStartListenerEPNS_21MediaCanStartListenerE
Modified: trunk/Source/WebCore/plugins/npapi.h (175685 => 175686)
--- 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)
@@ -379,6 +379,9 @@
, NPPVpluginCoreAnimationLayer = 1003
#endif
+ /* Used for figuring out whether a plug-in is playing audio. */
+ , NPPVpluginIsPlayingAudio = 4000
+
} NPPVariable;
/*
Modified: trunk/Source/WebKit2/ChangeLog (175685 => 175686)
--- 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)
@@ -1,3 +1,44 @@
+2014-11-04 Ada Chan <adac...@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.
+
2014-11-05 Dan Bernstein <m...@apple.com>
Tried to fix the GTK build.
Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (175685 => 175686)
--- 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)
@@ -310,6 +310,11 @@
return true;
}
+void PluginControllerProxy::setPluginIsPlayingAudio(bool pluginIsPlayingAudio)
+{
+ m_connection->connection()->send(Messages::PluginProxy::SetPluginIsPlayingAudio(pluginIsPlayingAudio), m_pluginInstanceID);
+}
+
void PluginControllerProxy::setStatusbarText(const String& statusbarText)
{
m_connection->connection()->send(Messages::PluginProxy::SetStatusbarText(statusbarText), m_pluginInstanceID);
Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h (175685 => 175686)
--- 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)
@@ -92,6 +92,7 @@
virtual NPObject* windowScriptNPObject() override;
virtual NPObject* pluginElementNPObject() override;
virtual bool evaluate(NPObject*, const String& scriptString, NPVariant* result, bool allowPopups) override;
+ virtual void setPluginIsPlayingAudio(bool) override;
virtual void setStatusbarText(const String&) override;
virtual bool isAcceleratedCompositingEnabled() override;
virtual void pluginProcessCrashed() override;
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (175685 => 175686)
--- 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)
@@ -575,6 +575,12 @@
return NPERR_NO_ERROR;
}
+ case NPPVpluginIsPlayingAudio: {
+ RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
+ plugin->setIsPlayingAudio(value);
+ return NPERR_NO_ERROR;
+ }
+
default:
notImplemented();
return NPERR_GENERIC_ERROR;
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (175685 => 175686)
--- 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)
@@ -399,6 +399,11 @@
return controller()->getAuthenticationInfo(protectionSpace, username, password);
}
+void NetscapePlugin::setIsPlayingAudio(bool isPlayingAudio)
+{
+ controller()->setPluginIsPlayingAudio(isPlayingAudio);
+}
+
NPError NetscapePlugin::NPP_New(NPMIMEType pluginType, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* savedData)
{
return m_pluginModule->pluginFuncs().newp(pluginType, &m_npp, mode, argc, argn, argv, savedData);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (175685 => 175686)
--- 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)
@@ -129,6 +129,8 @@
void setCookiesForURL(const String& urlString, const String& cookieString);
bool getAuthenticationInfo(const WebCore::ProtectionSpace&, String& username, String& password);
+ void setIsPlayingAudio(bool);
+
// Member functions for calling into the plug-in.
NPError NPP_New(NPMIMEType pluginType, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData*);
NPError NPP_Destroy(NPSavedData**);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h (175685 => 175686)
--- 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)
@@ -155,6 +155,9 @@
// Called when the a plug-in instance fails to initialized, either synchronously or asynchronously.
virtual void didFailToInitializePlugin() = 0;
+ // Called by the Netscape plug-in when it starts or stops playing audio.
+ virtual void setPluginIsPlayingAudio(bool) = 0;
+
// Helper class for delaying destruction of a plug-in.
class PluginDestructionProtector {
public:
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (175685 => 175686)
--- 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)
@@ -654,6 +654,11 @@
releaseNPVariantValue(&npObjectAsVariant);
}
+void PluginProxy::setPluginIsPlayingAudio(bool pluginIsPlayingAudio)
+{
+ controller()->setPluginIsPlayingAudio(pluginIsPlayingAudio);
+}
+
void PluginProxy::cancelStreamLoad(uint64_t streamID)
{
controller()->cancelStreamLoad(streamID);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (175685 => 175686)
--- 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)
@@ -163,6 +163,7 @@
void getAuthenticationInfo(const WebCore::ProtectionSpace&, bool& returnValue, String& username, String& password);
void getPluginElementNPObject(uint64_t& pluginElementNPObjectID);
void evaluate(const NPVariantData& npObjectAsVariantData, const String& scriptString, bool allowPopups, bool& returnValue, NPVariantData& resultData);
+ void setPluginIsPlayingAudio(bool);
void cancelStreamLoad(uint64_t streamID);
void cancelManualStreamLoad();
void setStatusbarText(const String& statusbarText);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in (175685 => 175686)
--- 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)
@@ -83,6 +83,9 @@
# Tells the WebProcess that the plug-in failed to initialize.
DidFailToCreatePlugin() -> ()
+
+ # Tells the WebProcess that the plug-in has started or stopped playing audio.
+ SetPluginIsPlayingAudio(bool pluginIsPlayingAudio)
}
#endif
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (175685 => 175686)
--- 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)
@@ -297,6 +297,7 @@
, m_countSnapshotRetries(0)
, m_didReceiveUserInteraction(false)
, m_pageScaleFactor(1)
+ , m_pluginIsPlayingAudio(false)
{
m_webPage->addPluginView(this);
}
@@ -311,6 +312,8 @@
if (m_isWaitingUntilMediaCanStart)
m_pluginElement->document().removeMediaCanStartListener(this);
+ m_pluginElement->document().removeAudioProducer(this);
+
destroyPluginAndReset();
// Null out the plug-in element explicitly so we'll crash earlier if we try to use
@@ -589,6 +592,8 @@
}
}
+ m_pluginElement->document().addAudioProducer(this);
+
#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
HTMLPlugInImageElement& plugInImageElement = downcast<HTMLPlugInImageElement>(*m_pluginElement);
m_didPlugInStartOffScreen = !m_webPage->plugInIntersectsSearchRect(plugInImageElement);
@@ -1324,6 +1329,11 @@
initializePlugin();
}
+void PluginView::pageMutedStateDidChange()
+{
+ // FIXME: To be implemented (https://bugs.webkit.org/show_bug.cgi?id=138105).
+}
+
bool PluginView::isPluginVisible()
{
return isVisible();
@@ -1433,6 +1443,15 @@
UserGestureIndicator gestureIndicator(allowPopups ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
return m_npRuntimeObjectMap.evaluate(npObject, scriptString, result);
}
+
+void PluginView::setPluginIsPlayingAudio(bool pluginIsPlayingAudio)
+{
+ if (m_pluginIsPlayingAudio == pluginIsPlayingAudio)
+ return;
+
+ m_pluginIsPlayingAudio = pluginIsPlayingAudio;
+ m_pluginElement->document().updateIsPlayingAudio();
+}
#endif
void PluginView::setStatusbarText(const String& statusbarText)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (175685 => 175686)
--- 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)
@@ -31,6 +31,7 @@
#include "Plugin.h"
#include "PluginController.h"
#include "WebFrame.h"
+#include <WebCore/AudioProducer.h>
#include <WebCore/FindOptions.h>
#include <WebCore/Image.h>
#include <WebCore/MediaCanStartListener.h>
@@ -56,7 +57,7 @@
class WebEvent;
-class PluginView : public WebCore::PluginViewBase, public PluginController, private WebCore::MediaCanStartListener, private WebFrame::LoadListener {
+class PluginView : public WebCore::PluginViewBase, public PluginController, private WebCore::MediaCanStartListener, private WebFrame::LoadListener, private WebCore::AudioProducer {
public:
static PassRefPtr<PluginView> create(PassRefPtr<WebCore::HTMLPlugInElement>, PassRefPtr<Plugin>, const Plugin::Parameters&);
@@ -179,6 +180,10 @@
// WebCore::MediaCanStartListener
virtual void mediaCanStart() override;
+ // WebCore::AudioProducer
+ virtual bool isPlayingAudio() override { return m_pluginIsPlayingAudio; }
+ virtual void pageMutedStateDidChange() override;
+
// PluginController
virtual bool isPluginVisible() override;
virtual void invalidate(const WebCore::IntRect&) override;
@@ -190,6 +195,7 @@
virtual NPObject* windowScriptNPObject() override;
virtual NPObject* pluginElementNPObject() override;
virtual bool evaluate(NPObject*, const String& scriptString, NPVariant* result, bool allowPopups) override;
+ virtual void setPluginIsPlayingAudio(bool) override;
#endif
virtual void setStatusbarText(const String&) override;
virtual bool isAcceleratedCompositingEnabled() override;
@@ -278,6 +284,8 @@
bool m_didReceiveUserInteraction;
double m_pageScaleFactor;
+
+ bool m_pluginIsPlayingAudio;
};
} // namespace WebKit
