Bug 1360332 - Part 0: remove unused function parameter; r?dragana
MozReview-Commit-ID: EGshnNhrVdl
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -2022,52 +2022,47 @@ HttpChannelParent::StartDiversion()
return;
}
}
class HTTPFailDiversionEvent : public Runnable
{
public:
HTTPFailDiversionEvent(HttpChannelParent *aChannelParent,
- nsresult aErrorCode,
- bool aSkipResume)
+ nsresult aErrorCode)
: mChannelParent(aChannelParent)
, mErrorCode(aErrorCode)
- , mSkipResume(aSkipResume)
{
MOZ_RELEASE_ASSERT(aChannelParent);
MOZ_RELEASE_ASSERT(NS_FAILED(aErrorCode));
}
NS_IMETHOD Run() override
{
- mChannelParent->NotifyDiversionFailed(mErrorCode, mSkipResume);
+ mChannelParent->NotifyDiversionFailed(mErrorCode);
return NS_OK;
}
private:
RefPtr<HttpChannelParent> mChannelParent;
nsresult mErrorCode;
- bool mSkipResume;
};
void
-HttpChannelParent::FailDiversion(nsresult aErrorCode,
- bool aSkipResume)
+HttpChannelParent::FailDiversion(nsresult aErrorCode)
{
MOZ_RELEASE_ASSERT(NS_FAILED(aErrorCode));
MOZ_RELEASE_ASSERT(mDivertingFromChild);
MOZ_RELEASE_ASSERT(mParentListener);
MOZ_RELEASE_ASSERT(mChannel);
NS_DispatchToCurrentThread(
- new HTTPFailDiversionEvent(this, aErrorCode, aSkipResume));
+ new HTTPFailDiversionEvent(this, aErrorCode));
}
void
-HttpChannelParent::NotifyDiversionFailed(nsresult aErrorCode,
- bool aSkipResume)
+HttpChannelParent::NotifyDiversionFailed(nsresult aErrorCode)
{
LOG(("HttpChannelParent::NotifyDiversionFailed [this=%p aErrorCode=%" PRIx32 "]\n",
this, static_cast<uint32_t>(aErrorCode)));
MOZ_RELEASE_ASSERT(NS_FAILED(aErrorCode));
MOZ_RELEASE_ASSERT(mDivertingFromChild);
MOZ_RELEASE_ASSERT(mParentListener);
MOZ_RELEASE_ASSERT(mChannel);
--- a/netwerk/protocol/http/HttpChannelParent.h
+++ b/netwerk/protocol/http/HttpChannelParent.h
@@ -86,17 +86,17 @@ public:
// Calls OnStartRequest for "DivertTo" listener, then notifies child channel
// that it should divert OnDataAvailable and OnStopRequest calls to this
// parent channel.
void StartDiversion();
// Handles calling OnStart/Stop if there are errors during diversion.
// Called asynchronously from FailDiversion.
- void NotifyDiversionFailed(nsresult aErrorCode, bool aSkipResume = true);
+ void NotifyDiversionFailed(nsresult aErrorCode);
// Forwarded to nsHttpChannel::SetApplyConversion.
void SetApplyConversion(bool aApplyConversion) {
if (mChannel) {
mChannel->SetApplyConversion(aApplyConversion);
}
}
@@ -201,17 +201,17 @@ protected:
virtual mozilla::ipc::IPCResult RecvRemoveCorsPreflightCacheEntry(const URIParams& uri,
const mozilla::ipc::PrincipalInfo& requestingPrincipal) override;
virtual void ActorDestroy(ActorDestroyReason why) override;
// Supporting function for ADivertableParentChannel.
MOZ_MUST_USE nsresult ResumeForDiversion();
// Asynchronously calls NotifyDiversionFailed.
- void FailDiversion(nsresult aErrorCode, bool aSkipResume = true);
+ void FailDiversion(nsresult aErrorCode);
friend class HttpChannelParentListener;
RefPtr<mozilla::dom::TabParent> mTabParent;
MOZ_MUST_USE nsresult
ReportSecurityMessage(const nsAString& aMessageTag,
const nsAString& aMessageCategory) override;