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

Bug 784739 - Switch from NULL to nullptr in dom/plugins/ipc/; r=ehsan

Browse Source
This commit is contained in:
Birunthan Mohanathas
2013-10-23 16:34:46 -04:00
parent 1e93f27a06
commit 08cf444a2b
26 changed files with 196 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dom/plugins/ipc/PluginModuleParent.cpp
View File

@@ -122,8 +122,8 @@ PluginModuleParent::PluginModuleParent(const char* aFilePath)
, mShutdown(false)
, mClearSiteDataSupported(false)
, mGetSitesWithDataSupported(false)
, mNPNIface(NULL)
, mPlugin(NULL)
, mNPNIface(nullptr)
, mPlugin(nullptr)
, mTaskFactory(MOZ_THIS_IN_INITIALIZER_LIST())
#ifdef XP_WIN
, mPluginCpuUsageOnHang()
@@ -754,7 +754,7 @@ PluginModuleParent::AllocPPluginIdentifierParent(const nsCString& aString,
{
if (aTemporary) {
NS_ERROR("Plugins don't create temporary identifiers.");
return NULL; // should abort the plugin
return nullptr; // should abort the plugin
}
NPIdentifier npident = aString.IsVoid() ?
@@ -786,7 +786,7 @@ PluginModuleParent::AllocPPluginInstanceParent(const nsCString& aMimeType,
NPError* rv)
{
NS_ERROR("Not reachable!");
return NULL;
return nullptr;
}
bool
@@ -804,9 +804,9 @@ PluginModuleParent::SetPluginFuncs(NPPluginFuncs* aFuncs)
aFuncs->javaClass = nullptr;
// Gecko should always call these functions through a PluginLibrary object.
aFuncs->newp = NULL;
aFuncs->clearsitedata = NULL;
aFuncs->getsiteswithdata = NULL;
aFuncs->newp = nullptr;
aFuncs->clearsitedata = nullptr;
aFuncs->getsiteswithdata = nullptr;
aFuncs->destroy = NPP_Destroy;
aFuncs->setwindow = NPP_SetWindow;
@@ -820,9 +820,9 @@ PluginModuleParent::SetPluginFuncs(NPPluginFuncs* aFuncs)
aFuncs->urlnotify = NPP_URLNotify;
aFuncs->getvalue = NPP_GetValue;
aFuncs->setvalue = NPP_SetValue;
aFuncs->gotfocus = NULL;
aFuncs->lostfocus = NULL;
aFuncs->urlredirectnotify = NULL;
aFuncs->gotfocus = nullptr;
aFuncs->lostfocus = nullptr;
aFuncs->urlredirectnotify = nullptr;
// Provide 'NPP_URLRedirectNotify', 'NPP_ClearSiteData', and
// 'NPP_GetSitesWithData' functionality if it is supported by the plugin.
@@ -1062,9 +1062,9 @@ PluginModuleParent::InstCast(NPP instance)
static_cast<PluginInstanceParent*>(instance->pdata);
// If the plugin crashed and the PluginInstanceParent was deleted,
// instance->pdata will be NULL.
// instance->pdata will be nullptr.
if (!ip)
return NULL;
return nullptr;
if (instance != ip->mNPP) {
NS_RUNTIMEABORT("Corrupted plugin data.");
@@ -1078,7 +1078,7 @@ PluginModuleParent::StreamCast(NPP instance,
{
PluginInstanceParent* ip = InstCast(instance);
if (!ip)
return NULL;
return nullptr;
BrowserStreamParent* sp =
static_cast<BrowserStreamParent*>(static_cast<AStream*>(s->pdata));
@@ -1279,7 +1279,7 @@ PluginModuleParent::NP_GetEntryPoints(NPPluginFuncs* pFuncs, NPError* error)
// We need to have the child process update its function table
// here by actually calling NP_GetEntryPoints since the parent's
// function table can reflect NULL entries in the child's table.
// function table can reflect nullptr entries in the child's table.
if (!CallNP_GetEntryPoints(error)) {
return NS_ERROR_FAILURE;
}
@@ -1456,7 +1456,7 @@ PluginModuleParent::AnswerProcessSomeEvents()
int i = 0;
for (; i < kMaxChancesToProcessEvents; ++i)
if (!g_main_context_iteration(NULL, FALSE))
if (!g_main_context_iteration(nullptr, FALSE))
break;
PLUGIN_LOG_DEBUG(("... quitting mini nested loop; processed %i tasks", i));
@@ -1616,7 +1616,7 @@ PluginModuleParent::RecvNPN_SetException(PPluginScriptableObjectParent* aActor,
{
PLUGIN_LOG_DEBUG(("%s", FULLFUNCTION));
NPObject* aNPObj = NULL;
NPObject* aNPObj = nullptr;
if (aActor) {
aNPObj = static_cast<PluginScriptableObjectParent*>(aActor)->GetObject(true);
if (!aNPObj) {