Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1289211 - Rename InfallibleTArray to nsTArray in dom/plugins/ r=jmathies

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D36948

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Barret Rennie 2019-07-10 03:27:43 +00:00
parent c5fb688d6a
commit 6d98deeeab
14 changed files with 75 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dom/plugins/base/nsPluginHost.cpp
View File

@ -1105,7 +1105,7 @@ nsPluginHost::GetPluginTags(nsTArray<RefPtr<nsIPluginTag>>& aResults) {
}
nsPluginTag* nsPluginHost::FindPreferredPlugin(
const InfallibleTArray<nsPluginTag*>& matches) {
const nsTArray<nsPluginTag*>& matches) {
// We prefer the plugin with the highest version number.
/// XXX(johns): This seems to assume the only time multiple plugins will have
/// the same MIME type is if they're multiple versions of the same
@ -1179,7 +1179,7 @@ nsPluginTag* nsPluginHost::FindNativePluginForType(const nsACString& aMimeType,
LoadPlugins();
InfallibleTArray<nsPluginTag*> matchingPlugins;
nsTArray<nsPluginTag*> matchingPlugins;
nsPluginTag* plugin = mPlugins;
while (plugin) {
@ -1202,7 +1202,7 @@ nsPluginTag* nsPluginHost::FindNativePluginForExtension(
LoadPlugins();
InfallibleTArray<nsPluginTag*> matchingPlugins;
nsTArray<nsPluginTag*> matchingPlugins;
nsCString matchingMime; // Don't mutate aMimeType unless returning a match
nsPluginTag* plugin = mPlugins;
@ -1380,9 +1380,10 @@ nsresult nsPluginHost::NormalizeHostname(nsCString& host) {
// any of them have a base domain in common with 'domain'; if so, append them
// to the 'result' array. If 'firstMatchOnly' is true, return after finding the
// first match.
nsresult nsPluginHost::EnumerateSiteData(
const nsACString& domain, const InfallibleTArray<nsCString>& sites,
InfallibleTArray<nsCString>& result, bool firstMatchOnly) {
nsresult nsPluginHost::EnumerateSiteData(const nsACString& domain,
const nsTArray<nsCString>& sites,
nsTArray<nsCString>& result,
bool firstMatchOnly) {
NS_ASSERTION(!domain.IsVoid(), "null domain string");
nsresult rv;
@ -1605,7 +1606,7 @@ class ClearDataFromSitesClosure : public nsIClearSiteDataCallback,
// Callback from NPP_GetSitesWithData, kick the iteration off to clear the
// data
NS_IMETHOD SitesWithData(InfallibleTArray<nsCString>& sites) override {
NS_IMETHOD SitesWithData(nsTArray<nsCString>& sites) override {
// Enumerate the sites and build a list of matches.
nsresult rv = host->EnumerateSiteData(domain, sites, matches, false);
Callback(rv);
@ -1614,7 +1615,7 @@ class ClearDataFromSitesClosure : public nsIClearSiteDataCallback,
nsCString domain;
nsCOMPtr<nsIClearSiteDataCallback> callback;
InfallibleTArray<nsCString> matches;
nsTArray<nsCString> matches;
nsIPluginTag* tag;
uint64_t flags;
int64_t maxAge;
@ -1701,13 +1702,13 @@ class GetSitesClosure : public nsIGetSitesWithDataCallback {
keepWaiting(true),
retVal(NS_ERROR_NOT_INITIALIZED) {}
NS_IMETHOD SitesWithData(InfallibleTArray<nsCString>& sites) override {
NS_IMETHOD SitesWithData(nsTArray<nsCString>& sites) override {
retVal = HandleGetSites(sites);
keepWaiting = false;
return NS_OK;
}
nsresult HandleGetSites(InfallibleTArray<nsCString>& sites) {
nsresult HandleGetSites(nsTArray<nsCString>& sites) {
// If there's no data, we're done.
if (sites.IsEmpty()) {
result = false;
@ -1722,7 +1723,7 @@ class GetSitesClosure : public nsIGetSitesWithDataCallback {
}
// Enumerate the sites and determine if there's a match.
InfallibleTArray<nsCString> matches;
nsTArray<nsCString> matches;
nsresult rv = host->EnumerateSiteData(domain, sites, matches, true);
NS_ENSURE_SUCCESS(rv, rv);

8
dom/plugins/base/nsPluginHost.h
View File

@ -234,9 +234,8 @@ class nsPluginHost final : public nsIPluginHost,
void CreateWidget(nsPluginInstanceOwner* aOwner);
nsresult EnumerateSiteData(const nsACString& domain,
const InfallibleTArray<nsCString>& sites,
InfallibleTArray<nsCString>& result,
bool firstMatchOnly);
const nsTArray<nsCString>& sites,
nsTArray<nsCString>& result, bool firstMatchOnly);
nsresult SendPluginsToContent();
nsresult SetPluginsInContent(
@ -257,8 +256,7 @@ class nsPluginHost final : public nsIPluginHost,
nsPluginInstanceOwner* aOwner);
// FIXME-jsplugins comment here about when things may be fake
nsPluginTag* FindPreferredPlugin(
const InfallibleTArray<nsPluginTag*>& matches);
nsPluginTag* FindPreferredPlugin(const nsTArray<nsPluginTag*>& matches);
// Find a plugin for the given type. If aIncludeFake is true a fake plugin
// will be preferred if one exists; otherwise a fake plugin will never be

12
dom/plugins/ipc/PluginInstanceChild.cpp
View File

@ -120,10 +120,10 @@ static RefPtr<DrawTarget> CreateDrawTargetForSurface(gfxASurface* aSurface) {
bool PluginInstanceChild::sIsIMEComposing = false;
PluginInstanceChild::PluginInstanceChild(
const NPPluginFuncs* aPluginIface, const nsCString& aMimeType,
const InfallibleTArray<nsCString>& aNames,
const InfallibleTArray<nsCString>& aValues)
PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface,
const nsCString& aMimeType,
const nsTArray<nsCString>& aNames,
const nsTArray<nsCString>& aValues)
: mPluginIface(aPluginIface),
mMimeType(aMimeType),
mNames(aNames),
@ -2501,7 +2501,7 @@ void PluginInstanceChild::NPN_URLRedirectResponse(void* notifyData,
return;
}
InfallibleTArray<PStreamNotifyChild*> notifyStreams;
nsTArray<PStreamNotifyChild*> notifyStreams;
ManagedPStreamNotifyChild(notifyStreams);
uint32_t notifyStreamCount = notifyStreams.Length();
for (uint32_t i = 0; i < notifyStreamCount; i++) {
@ -3959,7 +3959,7 @@ void PluginInstanceChild::Destroy() {
SetProp(mPluginWindowHWND, kPluginIgnoreSubclassProperty, (HANDLE)1);
#endif
InfallibleTArray<PBrowserStreamChild*> streams;
nsTArray<PBrowserStreamChild*> streams;
ManagedPBrowserStreamChild(streams);
// First make sure none of these streams become deleted

8
dom/plugins/ipc/PluginInstanceChild.h
View File

@ -166,8 +166,8 @@ class PluginInstanceChild : public PPluginInstanceChild {
public:
PluginInstanceChild(const NPPluginFuncs* aPluginIface,
const nsCString& aMimeType,
const InfallibleTArray<nsCString>& aNames,
const InfallibleTArray<nsCString>& aValues);
const nsTArray<nsCString>& aNames,
const nsTArray<nsCString>& aValues);
virtual ~PluginInstanceChild();
@ -320,8 +320,8 @@ class PluginInstanceChild : public PPluginInstanceChild {
#endif // #if defined(OS_WIN)
const NPPluginFuncs* mPluginIface;
nsCString mMimeType;
InfallibleTArray<nsCString> mNames;
InfallibleTArray<nsCString> mValues;
nsTArray<nsCString> mNames;
nsTArray<nsCString> mValues;
NPP_t mData;
NPWindow mWindow;
#if defined(XP_DARWIN) || defined(XP_WIN)

2
dom/plugins/ipc/PluginLibrary.h
View File

@ -40,7 +40,7 @@ class nsIClearSiteDataCallback;
}
class nsIGetSitesWithDataCallback : public nsISupports {
public:
NS_IMETHOD SitesWithData(InfallibleTArray<nsCString>& result) = 0;
NS_IMETHOD SitesWithData(nsTArray<nsCString>& result) = 0;
NS_DECLARE_STATIC_IID_ACCESSOR(nsIGetSitesWithDataCallback_CID)
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsIGetSitesWithDataCallback,

9
dom/plugins/ipc/PluginModuleChild.cpp
View File

@ -660,7 +660,7 @@ mozilla::ipc::IPCResult PluginModuleChild::RecvNPP_ClearSiteData(
mozilla::ipc::IPCResult PluginModuleChild::RecvNPP_GetSitesWithData(
const uint64_t& aCallbackId) {
char** result = mFunctions.getsiteswithdata();
InfallibleTArray<nsCString> array;
nsTArray<nsCString> array;
if (!result) {
SendReturnSitesWithData(array, aCallbackId);
return IPC_OK();
@ -1582,8 +1582,8 @@ NPError PluginModuleChild::DoNP_Initialize(const PluginSettings& aSettings) {
}
PPluginInstanceChild* PluginModuleChild::AllocPPluginInstanceChild(
const nsCString& aMimeType, const InfallibleTArray<nsCString>& aNames,
const InfallibleTArray<nsCString>& aValues) {
const nsCString& aMimeType, const nsTArray<nsCString>& aNames,
const nsTArray<nsCString>& aValues) {
PLUGIN_LOG_DEBUG_METHOD;
AssertPluginThread();
@ -1623,8 +1623,7 @@ mozilla::ipc::IPCResult PluginModuleChild::AnswerModuleSupportsAsyncRender(
mozilla::ipc::IPCResult PluginModuleChild::RecvPPluginInstanceConstructor(
PPluginInstanceChild* aActor, const nsCString& aMimeType,
InfallibleTArray<nsCString>&& aNames,
InfallibleTArray<nsCString>&& aValues) {
nsTArray<nsCString>&& aNames, nsTArray<nsCString>&& aValues) {
PLUGIN_LOG_DEBUG_METHOD;
AssertPluginThread();

7
dom/plugins/ipc/PluginModuleChild.h
View File

@ -70,15 +70,14 @@ class PluginModuleChild : public PPluginModuleChild {
Endpoint<PFunctionBrokerChild>&& endpoint);
PPluginInstanceChild* AllocPPluginInstanceChild(
const nsCString& aMimeType, const InfallibleTArray<nsCString>& aNames,
const InfallibleTArray<nsCString>& aValues);
const nsCString& aMimeType, const nsTArray<nsCString>& aNames,
const nsTArray<nsCString>& aValues);
bool DeallocPPluginInstanceChild(PPluginInstanceChild* aActor);
mozilla::ipc::IPCResult RecvPPluginInstanceConstructor(
PPluginInstanceChild* aActor, const nsCString& aMimeType,
InfallibleTArray<nsCString>&& aNames,
InfallibleTArray<nsCString>&& aValues) override;
nsTArray<nsCString>&& aNames, nsTArray<nsCString>&& aValues) override;
mozilla::ipc::IPCResult AnswerNP_Shutdown(NPError* rv);
mozilla::ipc::IPCResult AnswerOptionalFunctionsSupported(

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

@ -795,10 +795,9 @@ struct CpuUsageSamples {
uint64_t cpuTimes[2];
};
bool GetProcessCpuUsage(
const InfallibleTArray<base::ProcessHandle>& processHandles,
InfallibleTArray<float>& cpuUsage) {
InfallibleTArray<CpuUsageSamples> samples(processHandles.Length());
bool GetProcessCpuUsage(const nsTArray<base::ProcessHandle>& processHandles,
nsTArray<float>& cpuUsage) {
nsTArray<CpuUsageSamples> samples(processHandles.Length());
FILETIME creationTime, exitTime, kernelTime, userTime, currentTime;
BOOL res;
@ -1113,7 +1112,7 @@ void PluginModuleChromeParent::TerminateChildProcess(
#ifdef XP_WIN
// collect cpu usage for plugin processes
InfallibleTArray<base::ProcessHandle> processHandles;
nsTArray<base::ProcessHandle> processHandles;
if (childOpened) {
processHandles.AppendElement(geckoChildProcess);
@ -1428,8 +1427,8 @@ void PluginModuleParent::NotifyPluginCrashed() {
}
PPluginInstanceParent* PluginModuleParent::AllocPPluginInstanceParent(
const nsCString& aMimeType, const InfallibleTArray<nsCString>& aNames,
const InfallibleTArray<nsCString>& aValues) {
const nsCString& aMimeType, const nsTArray<nsCString>& aNames,
const nsTArray<nsCString>& aValues) {
NS_ERROR("Not reachable!");
return nullptr;
}
@ -2003,8 +2002,8 @@ nsresult PluginModuleParent::NPP_New(NPMIMEType pluginType, NPP instance,
}
// create the instance on the other side
InfallibleTArray<nsCString> names;
InfallibleTArray<nsCString> values;
nsTArray<nsCString> names;
nsTArray<nsCString> values;
for (int i = 0; i < argc; ++i) {
names.AppendElement(NullableString(argn[i]));
@ -2023,8 +2022,8 @@ class nsCaseInsensitiveUTF8StringArrayComparator {
};
#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK)
static void ForceWindowless(InfallibleTArray<nsCString>& names,
InfallibleTArray<nsCString>& values) {
static void ForceWindowless(nsTArray<nsCString>& names,
nsTArray<nsCString>& values) {
nsCaseInsensitiveUTF8StringArrayComparator comparator;
NS_NAMED_LITERAL_CSTRING(wmodeAttributeName, "wmode");
NS_NAMED_LITERAL_CSTRING(opaqueAttributeValue, "opaque");
@ -2040,8 +2039,8 @@ static void ForceWindowless(InfallibleTArray<nsCString>& names,
}
#endif // windows or linux
#if defined(XP_WIN)
static void ForceDirect(InfallibleTArray<nsCString>& names,
InfallibleTArray<nsCString>& values) {
static void ForceDirect(nsTArray<nsCString>& names,
nsTArray<nsCString>& values) {
nsCaseInsensitiveUTF8StringArrayComparator comparator;
NS_NAMED_LITERAL_CSTRING(wmodeAttributeName, "wmode");
NS_NAMED_LITERAL_CSTRING(directAttributeValue, "direct");
@ -2058,8 +2057,8 @@ static void ForceDirect(InfallibleTArray<nsCString>& names,
#endif // windows
nsresult PluginModuleParent::NPP_NewInternal(
NPMIMEType pluginType, NPP instance, InfallibleTArray<nsCString>& names,
InfallibleTArray<nsCString>& values, NPSavedData* saved, NPError* error) {
NPMIMEType pluginType, NPP instance, nsTArray<nsCString>& names,
nsTArray<nsCString>& values, NPSavedData* saved, NPError* error) {
MOZ_ASSERT(names.Length() == values.Length());
if (mPluginName.IsEmpty()) {
GetPluginDetails();

12
dom/plugins/ipc/PluginModuleParent.h
View File

@ -83,8 +83,8 @@ class PluginModuleParent : public PPluginModuleParent,
typedef mozilla::PluginLibrary PluginLibrary;
PPluginInstanceParent* AllocPPluginInstanceParent(
const nsCString& aMimeType, const InfallibleTArray<nsCString>& aNames,
const InfallibleTArray<nsCString>& aValues);
const nsCString& aMimeType, const nsTArray<nsCString>& aNames,
const nsTArray<nsCString>& aValues);
bool DeallocPPluginInstanceParent(PPluginInstanceParent* aActor);
@ -165,9 +165,9 @@ class PluginModuleParent : public PPluginModuleParent,
void SetPluginFuncs(NPPluginFuncs* aFuncs);
nsresult NPP_NewInternal(NPMIMEType pluginType, NPP instance,
InfallibleTArray<nsCString>& names,
InfallibleTArray<nsCString>& values,
NPSavedData* saved, NPError* error);
nsTArray<nsCString>& names,
nsTArray<nsCString>& values, NPSavedData* saved,
NPError* error);
// NPP-like API that Gecko calls are trampolined into. These
// messages then get forwarded along to the plugin instance,
@ -477,7 +477,7 @@ class PluginModuleChromeParent : public PluginModuleParent,
};
Atomic<uint32_t> mHangAnnotationFlags;
#ifdef XP_WIN
InfallibleTArray<float> mPluginCpuUsageOnHang;
nsTArray<float> mPluginCpuUsageOnHang;
PluginHangUIParent* mHangUIParent;
bool mHangUIEnabled;
bool mIsTimerReset;

10
dom/plugins/ipc/PluginScriptableObjectChild.cpp
View File

@ -691,8 +691,8 @@ mozilla::ipc::IPCResult PluginScriptableObjectChild::AnswerHasMethod(
}
mozilla::ipc::IPCResult PluginScriptableObjectChild::AnswerInvoke(
const PluginIdentifier& aId, InfallibleTArray<Variant>&& aArgs,
Variant* aResult, bool* aSuccess) {
const PluginIdentifier& aId, nsTArray<Variant>&& aArgs, Variant* aResult,
bool* aSuccess) {
AssertPluginThread();
PluginInstanceChild::AutoStackHelper guard(mInstance);
@ -760,7 +760,7 @@ mozilla::ipc::IPCResult PluginScriptableObjectChild::AnswerInvoke(
}
mozilla::ipc::IPCResult PluginScriptableObjectChild::AnswerInvokeDefault(
InfallibleTArray<Variant>&& aArgs, Variant* aResult, bool* aSuccess) {
nsTArray<Variant>&& aArgs, Variant* aResult, bool* aSuccess) {
AssertPluginThread();
PluginInstanceChild::AutoStackHelper guard(mInstance);
@ -963,7 +963,7 @@ mozilla::ipc::IPCResult PluginScriptableObjectChild::AnswerRemoveProperty(
}
mozilla::ipc::IPCResult PluginScriptableObjectChild::AnswerEnumerate(
InfallibleTArray<PluginIdentifier>* aProperties, bool* aSuccess) {
nsTArray<PluginIdentifier>* aProperties, bool* aSuccess) {
AssertPluginThread();
PluginInstanceChild::AutoStackHelper guard(mInstance);
@ -1000,7 +1000,7 @@ mozilla::ipc::IPCResult PluginScriptableObjectChild::AnswerEnumerate(
}
mozilla::ipc::IPCResult PluginScriptableObjectChild::AnswerConstruct(
InfallibleTArray<Variant>&& aArgs, Variant* aResult, bool* aSuccess) {
nsTArray<Variant>&& aArgs, Variant* aResult, bool* aSuccess) {
AssertPluginThread();
PluginInstanceChild::AutoStackHelper guard(mInstance);

8
dom/plugins/ipc/PluginScriptableObjectChild.h
View File

@ -50,10 +50,10 @@ class PluginScriptableObjectChild : public PPluginScriptableObjectChild {
bool* aHasMethod);
mozilla::ipc::IPCResult AnswerInvoke(const PluginIdentifier& aId,
InfallibleTArray<Variant>&& aArgs,
nsTArray<Variant>&& aArgs,
Variant* aResult, bool* aSuccess);
mozilla::ipc::IPCResult AnswerInvokeDefault(InfallibleTArray<Variant>&& aArgs,
mozilla::ipc::IPCResult AnswerInvokeDefault(nsTArray<Variant>&& aArgs,
Variant* aResult, bool* aSuccess);
mozilla::ipc::IPCResult AnswerHasProperty(const PluginIdentifier& aId,
@ -73,9 +73,9 @@ class PluginScriptableObjectChild : public PPluginScriptableObjectChild {
bool* aSuccess);
mozilla::ipc::IPCResult AnswerEnumerate(
InfallibleTArray<PluginIdentifier>* aProperties, bool* aSuccess);
nsTArray<PluginIdentifier>* aProperties, bool* aSuccess);
mozilla::ipc::IPCResult AnswerConstruct(InfallibleTArray<Variant>&& aArgs,
mozilla::ipc::IPCResult AnswerConstruct(nsTArray<Variant>&& aArgs,
Variant* aResult, bool* aSuccess);
mozilla::ipc::IPCResult RecvProtect();

10
dom/plugins/ipc/PluginScriptableObjectParent.cpp
View File

@ -728,8 +728,8 @@ mozilla::ipc::IPCResult PluginScriptableObjectParent::AnswerHasMethod(
}
mozilla::ipc::IPCResult PluginScriptableObjectParent::AnswerInvoke(
const PluginIdentifier& aId, InfallibleTArray<Variant>&& aArgs,
Variant* aResult, bool* aSuccess) {
const PluginIdentifier& aId, nsTArray<Variant>&& aArgs, Variant* aResult,
bool* aSuccess) {
if (!mObject) {
NS_WARNING("Calling AnswerInvoke with an invalidated object!");
*aResult = void_t();
@ -816,7 +816,7 @@ mozilla::ipc::IPCResult PluginScriptableObjectParent::AnswerInvoke(
}
mozilla::ipc::IPCResult PluginScriptableObjectParent::AnswerInvokeDefault(
InfallibleTArray<Variant>&& aArgs, Variant* aResult, bool* aSuccess) {
nsTArray<Variant>&& aArgs, Variant* aResult, bool* aSuccess) {
if (!mObject) {
NS_WARNING("Calling AnswerInvoke with an invalidated object!");
*aResult = void_t();
@ -1065,7 +1065,7 @@ mozilla::ipc::IPCResult PluginScriptableObjectParent::AnswerRemoveProperty(
}
mozilla::ipc::IPCResult PluginScriptableObjectParent::AnswerEnumerate(
InfallibleTArray<PluginIdentifier>* aProperties, bool* aSuccess) {
nsTArray<PluginIdentifier>* aProperties, bool* aSuccess) {
if (!mObject) {
NS_WARNING("Calling AnswerEnumerate with an invalidated object!");
*aSuccess = false;
@ -1112,7 +1112,7 @@ mozilla::ipc::IPCResult PluginScriptableObjectParent::AnswerEnumerate(
}
mozilla::ipc::IPCResult PluginScriptableObjectParent::AnswerConstruct(
InfallibleTArray<Variant>&& aArgs, Variant* aResult, bool* aSuccess) {
nsTArray<Variant>&& aArgs, Variant* aResult, bool* aSuccess) {
if (!mObject) {
NS_WARNING("Calling AnswerConstruct with an invalidated object!");
*aResult = void_t();

8
dom/plugins/ipc/PluginScriptableObjectParent.h
View File

@ -47,10 +47,10 @@ class PluginScriptableObjectParent : public PPluginScriptableObjectParent {
bool* aHasMethod);
mozilla::ipc::IPCResult AnswerInvoke(const PluginIdentifier& aId,
InfallibleTArray<Variant>&& aArgs,
nsTArray<Variant>&& aArgs,
Variant* aResult, bool* aSuccess);
mozilla::ipc::IPCResult AnswerInvokeDefault(InfallibleTArray<Variant>&& aArgs,
mozilla::ipc::IPCResult AnswerInvokeDefault(nsTArray<Variant>&& aArgs,
Variant* aResult, bool* aSuccess);
mozilla::ipc::IPCResult AnswerHasProperty(const PluginIdentifier& aId,
@ -68,9 +68,9 @@ class PluginScriptableObjectParent : public PPluginScriptableObjectParent {
bool* aSuccess);
mozilla::ipc::IPCResult AnswerEnumerate(
InfallibleTArray<PluginIdentifier>* aProperties, bool* aSuccess);
nsTArray<PluginIdentifier>* aProperties, bool* aSuccess);
mozilla::ipc::IPCResult AnswerConstruct(InfallibleTArray<Variant>&& aArgs,
mozilla::ipc::IPCResult AnswerConstruct(nsTArray<Variant>&& aArgs,
Variant* aResult, bool* aSuccess);
mozilla::ipc::IPCResult AnswerNPN_Evaluate(const nsCString& aScript,

10
dom/plugins/ipc/PluginScriptableObjectUtils.h
View File

@ -180,21 +180,19 @@ class ProtectedVariantArray {
}
~ProtectedVariantArray() {
InfallibleTArray<Variant>& vars = EnsureAndGetShadowArray();
nsTArray<Variant>& vars = EnsureAndGetShadowArray();
uint32_t count = vars.Length();
for (uint32_t index = 0; index < count; index++) {
ReleaseRemoteVariant(vars[index]);
}
}
operator const InfallibleTArray<Variant>&() {
return EnsureAndGetShadowArray();
}
operator const nsTArray<Variant>&() { return EnsureAndGetShadowArray(); }
bool IsOk() { return mOk; }
private:
InfallibleTArray<Variant>& EnsureAndGetShadowArray() {
nsTArray<Variant>& EnsureAndGetShadowArray() {
if (!mUsingShadowArray) {
mShadowArray.SwapElements(mArray);
mUsingShadowArray = true;
@ -205,7 +203,7 @@ class ProtectedVariantArray {
// We convert the variants fallibly, but pass them to Call*()
// methods as an infallible array
nsTArray<Variant> mArray;
InfallibleTArray<Variant> mShadowArray;
nsTArray<Variant> mShadowArray;
bool mOk;
bool mUsingShadowArray;
};