Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
This commit is contained in:
@@ -245,7 +245,7 @@ void
|
||||
nsNPAPIPlugin::PluginCrashed(const nsAString& pluginDumpID,
|
||||
const nsAString& browserDumpID)
|
||||
{
|
||||
nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst();
|
||||
RefPtr<nsPluginHost> host = nsPluginHost::GetInst();
|
||||
host->PluginCrashed(this, pluginDumpID, browserDumpID);
|
||||
}
|
||||
|
||||
@@ -288,7 +288,7 @@ nsNPAPIPlugin::CreatePlugin(nsPluginTag *aPluginTag, nsNPAPIPlugin** aResult)
|
||||
|
||||
CheckClassInitialized();
|
||||
|
||||
nsRefPtr<nsNPAPIPlugin> plugin = new nsNPAPIPlugin();
|
||||
RefPtr<nsNPAPIPlugin> plugin = new nsNPAPIPlugin();
|
||||
|
||||
PluginLibrary* pluginLib = GetNewPluginLibrary(aPluginTag);
|
||||
if (!pluginLib) {
|
||||
@@ -421,7 +421,7 @@ MakeNewNPAPIStreamInternal(NPP npp, const char *relativeURL, const char *target,
|
||||
return NPERR_GENERIC_ERROR;
|
||||
}
|
||||
|
||||
nsRefPtr<nsNPAPIPluginStreamListener> listener;
|
||||
RefPtr<nsNPAPIPluginStreamListener> listener;
|
||||
// Set aCallNotify here to false. If pluginHost->GetURL or PostURL fail,
|
||||
// the listener's destructor will do the notification while we are about to
|
||||
// return a failure code.
|
||||
@@ -512,7 +512,7 @@ GetDocumentFromNPP(NPP npp)
|
||||
|
||||
PluginDestructionGuard guard(inst);
|
||||
|
||||
nsRefPtr<nsPluginInstanceOwner> owner = inst->GetOwner();
|
||||
RefPtr<nsPluginInstanceOwner> owner = inst->GetOwner();
|
||||
NS_ENSURE_TRUE(owner, nullptr);
|
||||
|
||||
nsCOMPtr<nsIDocument> doc;
|
||||
@@ -746,7 +746,7 @@ _geturl(NPP npp, const char* relativeURL, const char* target)
|
||||
|
||||
|
||||
const char *name = nullptr;
|
||||
nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst();
|
||||
RefPtr<nsPluginHost> host = nsPluginHost::GetInst();
|
||||
host->GetPluginName(inst, &name);
|
||||
|
||||
if (name && strstr(name, "Adobe") && strstr(name, "Acrobat")) {
|
||||
@@ -1457,7 +1457,7 @@ _getproperty(NPP npp, NPObject* npobj, NPIdentifier property,
|
||||
nsNPAPIPlugin* plugin = inst->GetPlugin();
|
||||
if (!plugin)
|
||||
return false;
|
||||
nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst();
|
||||
RefPtr<nsPluginHost> host = nsPluginHost::GetInst();
|
||||
nsPluginTag* pluginTag = host->TagForPlugin(plugin);
|
||||
if (!pluginTag->mIsJavaPlugin)
|
||||
return true;
|
||||
@@ -1806,7 +1806,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
|
||||
|
||||
nsNPAPIPluginInstance *inst = (nsNPAPIPluginInstance *) npp->ndata;
|
||||
|
||||
nsRefPtr<nsPluginInstanceOwner> owner = inst->GetOwner();
|
||||
RefPtr<nsPluginInstanceOwner> owner = inst->GetOwner();
|
||||
NS_ENSURE_TRUE(owner, NPERR_NO_ERROR);
|
||||
|
||||
if (NS_SUCCEEDED(owner->GetNetscapeWindow(result))) {
|
||||
@@ -2472,7 +2472,7 @@ _pluginthreadasynccall(NPP instance, PluginThreadCallback func, void *userData)
|
||||
} else {
|
||||
NPN_PLUGIN_LOG(PLUGIN_LOG_NOISY,("NPN_pluginthreadasynccall called from a non main thread\n"));
|
||||
}
|
||||
nsRefPtr<nsPluginThreadRunnable> evt =
|
||||
RefPtr<nsPluginThreadRunnable> evt =
|
||||
new nsPluginThreadRunnable(instance, func, userData);
|
||||
|
||||
if (evt && evt->IsValid()) {
|
||||
|
||||
Reference in New Issue
Block a user