corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to inbound

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2016-11-16 14:53:15 +01:00
parent c5e421ee3c b2c0433310
commit b2903208c2
678 changed files with 22863 additions and 35496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@@ -466,9 +466,9 @@ class nsPluginThreadRunnable : public Runnable,
public:
nsPluginThreadRunnable(NPP instance, PluginThreadCallback func,
void *userData);
virtual ~nsPluginThreadRunnable();
~nsPluginThreadRunnable() override;
NS_IMETHOD Run();
NS_IMETHOD Run() override;
bool IsForInstance(NPP instance)
{
@@ -812,7 +812,7 @@ _newstream(NPP npp, NPMIMEType type, const char* target, NPStream* *result)
nsCOMPtr<nsIOutputStream> stream;
if (NS_SUCCEEDED(inst->NewStreamFromPlugin((const char*) type, target,
getter_AddRefs(stream)))) {
nsNPAPIStreamWrapper* wrapper = new nsNPAPIStreamWrapper(stream, nullptr);
auto* wrapper = new nsNPAPIStreamWrapper(stream, nullptr);
if (wrapper) {
(*result) = &wrapper->mNPStream;
err = NPERR_NO_ERROR;