From 6b0d82462644abebb938ae5618a248a036209b1b Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 2 Feb 2016 17:36:31 +0200 Subject: [PATCH] Bug 1235261 - Part 6: Rename AutoInfallibleTArray to AutoTArray. r=froydnj --- dom/bluetooth/common/BluetoothService.cpp | 6 +++--- dom/ipc/TabParent.cpp | 12 ++++++------ dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp | 2 +- dom/plugins/ipc/PluginScriptableObjectChild.cpp | 2 +- dom/plugins/ipc/PluginScriptableObjectParent.cpp | 2 +- dom/xslt/xslt/txExecutionState.h | 2 +- gfx/layers/client/ClientLayerManager.cpp | 4 ++-- gfx/layers/ipc/ImageBridgeChild.cpp | 6 +++--- gfx/layers/ipc/ShadowLayers.cpp | 2 +- hal/WindowIdentifier.h | 2 +- hal/sandbox/SandboxHal.cpp | 2 +- js/xpconnect/src/xpcprivate.h | 2 +- layout/generic/nsFontInflationData.cpp | 2 +- layout/style/nsAnimationManager.cpp | 4 ++-- layout/style/nsCSSParser.cpp | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dom/bluetooth/common/BluetoothService.cpp b/dom/bluetooth/common/BluetoothService.cpp index aea7e8bc88e..7f4f39736aa 100644 --- a/dom/bluetooth/common/BluetoothService.cpp +++ b/dom/bluetooth/common/BluetoothService.cpp @@ -102,7 +102,7 @@ GetAllBluetoothActors(InfallibleTArray& aActors) contentIndex++) { MOZ_ASSERT(contentActors[contentIndex]); - AutoInfallibleTArray bluetoothActors; + AutoTArray bluetoothActors; contentActors[contentIndex]->ManagedPBluetoothParent(bluetoothActors); for (uint32_t bluetoothIndex = 0; @@ -487,7 +487,7 @@ BluetoothService::SetEnabled(bool aEnabled) { MOZ_ASSERT(NS_IsMainThread()); - AutoInfallibleTArray childActors; + AutoTArray childActors; GetAllBluetoothActors(childActors); for (uint32_t index = 0; index < childActors.Length(); index++) { @@ -571,7 +571,7 @@ BluetoothService::HandleShutdown() Cleanup(); - AutoInfallibleTArray childActors; + AutoTArray childActors; GetAllBluetoothActors(childActors); if (!childActors.IsEmpty()) { diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index 6ea222e7c73..3b0928980d4 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -1497,9 +1497,9 @@ bool TabParent::RecvRequestNativeKeyBindings(const WidgetKeyboardEvent& aEvent, MaybeNativeKeyBinding* aBindings) { - AutoInfallibleTArray singleLine; - AutoInfallibleTArray multiLine; - AutoInfallibleTArray richText; + AutoTArray singleLine; + AutoTArray multiLine; + AutoTArray richText; *aBindings = mozilla::void_t(); @@ -1711,9 +1711,9 @@ bool TabParent::SendRealKeyEvent(WidgetKeyboardEvent& event) if (event.mMessage == eKeyPress) { nsCOMPtr widget = GetWidget(); - AutoInfallibleTArray singleLine; - AutoInfallibleTArray multiLine; - AutoInfallibleTArray richText; + AutoTArray singleLine; + AutoTArray multiLine; + AutoTArray richText; widget->ExecuteNativeKeyBinding(nsIWidget::NativeKeyBindingsForSingleLineEditor, event, DoCommandCallback, &singleLine); diff --git a/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp b/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp index 0b423b9b3d9..59c76d15826 100644 --- a/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp +++ b/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp @@ -44,7 +44,7 @@ GetAllSpeechSynthActors(InfallibleTArray& ++contentIndex) { MOZ_ASSERT(contentActors[contentIndex]); - AutoInfallibleTArray speechsynthActors; + AutoTArray speechsynthActors; contentActors[contentIndex]->ManagedPSpeechSynthesisParent(speechsynthActors); for (uint32_t speechsynthIndex = 0; diff --git a/dom/plugins/ipc/PluginScriptableObjectChild.cpp b/dom/plugins/ipc/PluginScriptableObjectChild.cpp index e4c5f9d10b6..66bb3746eaa 100644 --- a/dom/plugins/ipc/PluginScriptableObjectChild.cpp +++ b/dom/plugins/ipc/PluginScriptableObjectChild.cpp @@ -436,7 +436,7 @@ PluginScriptableObjectChild::ScriptableEnumerate(NPObject* aObject, NS_ASSERTION(actor, "This shouldn't ever be null!"); NS_ASSERTION(actor->Type() == Proxy, "Bad type!"); - AutoInfallibleTArray identifiers; + AutoTArray identifiers; bool success; actor->CallEnumerate(&identifiers, &success); diff --git a/dom/plugins/ipc/PluginScriptableObjectParent.cpp b/dom/plugins/ipc/PluginScriptableObjectParent.cpp index f0aceab2971..9f042cfc264 100644 --- a/dom/plugins/ipc/PluginScriptableObjectParent.cpp +++ b/dom/plugins/ipc/PluginScriptableObjectParent.cpp @@ -485,7 +485,7 @@ PluginScriptableObjectParent::ScriptableEnumerate(NPObject* aObject, return false; } - AutoInfallibleTArray identifiers; + AutoTArray identifiers; bool success; if (!actor->CallEnumerate(&identifiers, &success)) { NS_WARNING("Failed to send message!"); diff --git a/dom/xslt/xslt/txExecutionState.h b/dom/xslt/xslt/txExecutionState.h index f57a516ddaa..9352f93aca7 100644 --- a/dom/xslt/xslt/txExecutionState.h +++ b/dom/xslt/xslt/txExecutionState.h @@ -150,7 +150,7 @@ private: RefPtr mGlobalVarPlaceholderValue; int32_t mRecursionDepth; - AutoInfallibleTArray mTemplateRules; + AutoTArray mTemplateRules; txIEvalContext* mEvalContext; txIEvalContext* mInitialEvalContext; diff --git a/gfx/layers/client/ClientLayerManager.cpp b/gfx/layers/client/ClientLayerManager.cpp index 66797a935eb..cb65eff5ae9 100644 --- a/gfx/layers/client/ClientLayerManager.cpp +++ b/gfx/layers/client/ClientLayerManager.cpp @@ -26,7 +26,7 @@ #include "ClientReadbackLayer.h" // for ClientReadbackLayer #include "nsAString.h" #include "nsIWidgetListener.h" -#include "nsTArray.h" // for AutoInfallibleTArray +#include "nsTArray.h" // for AutoTArray #include "nsXULAppAPI.h" // for XRE_GetProcessType, etc #include "TiledLayerBuffer.h" #include "mozilla/dom/WindowBinding.h" // for Overfill Callback @@ -603,7 +603,7 @@ ClientLayerManager::ForwardTransaction(bool aScheduleComposite) // forward this transaction's changeset to our LayerManagerComposite bool sent; - AutoInfallibleTArray replies; + AutoTArray replies; if (mForwarder->EndTransaction(&replies, mRegionToClear, mLatestTransactionId, aScheduleComposite, mPaintSequenceNumber, mIsRepeatTransaction, transactionStart, &sent)) { diff --git a/gfx/layers/ipc/ImageBridgeChild.cpp b/gfx/layers/ipc/ImageBridgeChild.cpp index b8f983067ad..edd9edd16ce 100644 --- a/gfx/layers/ipc/ImageBridgeChild.cpp +++ b/gfx/layers/ipc/ImageBridgeChild.cpp @@ -36,7 +36,7 @@ #include "nsAutoPtr.h" // for nsRefPtr #include "nsISupportsImpl.h" // for ImageContainer::AddRef, etc #include "nsTArray.h" // for AutoTArray, nsTArray, etc -#include "nsTArrayForwardDeclare.h" // for AutoInfallibleTArray +#include "nsTArrayForwardDeclare.h" // for AutoTArray #include "nsThreadUtils.h" // for NS_IsMainThread #include "nsXULAppAPI.h" // for XRE_GetIOMessageLoop #include "mozilla/StaticPtr.h" // for StaticRefPtr @@ -654,7 +654,7 @@ ImageBridgeChild::EndTransaction() return; } - AutoInfallibleTArray cset; + AutoTArray cset; cset.SetCapacity(mTxn->mOperations.size()); if (!mTxn->mOperations.empty()) { cset.AppendElements(&mTxn->mOperations.front(), mTxn->mOperations.size()); @@ -664,7 +664,7 @@ ImageBridgeChild::EndTransaction() ShadowLayerForwarder::PlatformSyncBeforeUpdate(); } - AutoInfallibleTArray replies; + AutoTArray replies; if (mTxn->mSwapRequired) { if (!SendUpdate(cset, mTxn->mDestroyedActors, &replies)) { diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp index 08bb1f7720c..343dddb3709 100644 --- a/gfx/layers/ipc/ShadowLayers.cpp +++ b/gfx/layers/ipc/ShadowLayers.cpp @@ -668,7 +668,7 @@ ShadowLayerForwarder::EndTransaction(InfallibleTArray* aReplies, mTxn->AddEdit(OpSetLayerAttributes(nullptr, Shadow(shadow), attrs)); } - AutoInfallibleTArray cset; + AutoTArray cset; size_t nCsets = mTxn->mCset.size() + mTxn->mPaints.size(); MOZ_ASSERT(nCsets > 0 || mTxn->RotationChanged(), "should have bailed by now"); diff --git a/hal/WindowIdentifier.h b/hal/WindowIdentifier.h index 7fbab27a677..01cdef58e6e 100644 --- a/hal/WindowIdentifier.h +++ b/hal/WindowIdentifier.h @@ -100,7 +100,7 @@ private: */ uint64_t GetWindowID() const; - AutoInfallibleTArray mID; + AutoTArray mID; nsCOMPtr mWindow; bool mIsEmpty; }; diff --git a/hal/sandbox/SandboxHal.cpp b/hal/sandbox/SandboxHal.cpp index e585a922725..daea88f5492 100644 --- a/hal/sandbox/SandboxHal.cpp +++ b/hal/sandbox/SandboxHal.cpp @@ -50,7 +50,7 @@ Vibrate(const nsTArray& pattern, const WindowIdentifier &id) { HAL_LOG("Vibrate: Sending to parent process."); - AutoInfallibleTArray p(pattern); + AutoTArray p(pattern); WindowIdentifier newID(id); newID.AppendProcessID(); diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h index 9924943b47b..00646467b0b 100644 --- a/js/xpconnect/src/xpcprivate.h +++ b/js/xpconnect/src/xpcprivate.h @@ -2885,7 +2885,7 @@ private: JSContext* Pop(); bool Push(JSContext* cx); - AutoInfallibleTArray mStack; + AutoTArray mStack; XPCJSRuntime* mRuntime; JSContext* mSafeJSContext; }; diff --git a/layout/generic/nsFontInflationData.cpp b/layout/generic/nsFontInflationData.cpp index e7af2372300..bd2ec5651f5 100644 --- a/layout/generic/nsFontInflationData.cpp +++ b/layout/generic/nsFontInflationData.cpp @@ -132,7 +132,7 @@ ComputeDescendantISize(const nsHTMLReflowState& aAncestorReflowState, return aAncestorReflowState.ComputedISize(); } - AutoInfallibleTArray frames; + AutoTArray frames; for (nsIFrame *f = aDescendantFrame; f != ancestorFrame; f = f->GetParent()->FirstInFlow()) { frames.AppendElement(f); diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp index be30a4b1ba9..566faf46f5c 100644 --- a/layout/style/nsAnimationManager.cpp +++ b/layout/style/nsAnimationManager.cpp @@ -629,7 +629,7 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext, // the replacement on a per-property basis rather than a per-rule // basis, just like everything else in CSS. - AutoInfallibleTArray sortedKeyframes; + AutoTArray sortedKeyframes; for (uint32_t ruleIdx = 0, ruleEnd = rule->StyleRuleCount(); ruleIdx != ruleEnd; ++ruleIdx) { @@ -690,7 +690,7 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext, // means we need every keyframe with the property in it, except // for those keyframes where a later keyframe with the *same key* // also has the property. - AutoInfallibleTArray keyframesWithProperty; + AutoTArray keyframesWithProperty; float lastKey = 100.0f; // an invalid key for (uint32_t kfIdx = 0, kfEnd = sortedKeyframes.Length(); kfIdx != kfEnd; ++kfIdx) { diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp index fc4e6dbed1e..40d03ec2b07 100644 --- a/layout/style/nsCSSParser.cpp +++ b/layout/style/nsCSSParser.cpp @@ -15162,7 +15162,7 @@ CSSParserImpl::ParseFunction(nsCSSKeyword aFunction, * functions. The number 16 is coming from the number of arguments that * matrix3d() accepts. */ - AutoInfallibleTArray foundValues; + AutoTArray foundValues; if (!ParseFunctionInternals(aAllowedTypes, aAllowedTypesAll, aMinElems, aMaxElems, foundValues)) { return false;