From c869e31d5e121b37f843e9e3c1b9b34cda19cde1 Mon Sep 17 00:00:00 2001 From: Timothy Nikkel Date: Mon, 20 Mar 2023 23:46:50 +0000 Subject: [PATCH] Bug 1818724. Rename nsAVIFDecoder::Decode. r=Zaggy1024 Because it has the same name as the base class function Decoder::Decode but different arguments, which is confusing. Depends on D172998 Differential Revision: https://phabricator.services.mozilla.com/D173000 --- image/decoders/nsAVIFDecoder.cpp | 6 +++--- image/decoders/nsAVIFDecoder.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/image/decoders/nsAVIFDecoder.cpp b/image/decoders/nsAVIFDecoder.cpp index 1c42d76f1f72..8af71b04fe8a 100644 --- a/image/decoders/nsAVIFDecoder.cpp +++ b/image/decoders/nsAVIFDecoder.cpp @@ -1190,7 +1190,7 @@ LexerResult nsAVIFDecoder::DoDecode(SourceBufferIterator& aIterator, MOZ_LOG(sAVIFLog, LogLevel::Info, ("[this=%p] nsAVIFDecoder::DoDecode start", this)); - DecodeResult result = Decode(aIterator, aOnResume); + DecodeResult result = DoDecodeInternal(aIterator, aOnResume); RecordDecodeResultTelemetry(result); @@ -1378,10 +1378,10 @@ static void RecordFrameTelem(bool aAnimated, const Mp4parseAvifInfo& aInfo, } } -nsAVIFDecoder::DecodeResult nsAVIFDecoder::Decode( +nsAVIFDecoder::DecodeResult nsAVIFDecoder::DoDecodeInternal( SourceBufferIterator& aIterator, IResumable* aOnResume) { MOZ_LOG(sAVIFLog, LogLevel::Debug, - ("[this=%p] nsAVIFDecoder::DoDecode", this)); + ("[this=%p] nsAVIFDecoder::DoDecodeInternal", this)); // Since the SourceBufferIterator doesn't guarantee a contiguous buffer, // but the current mp4parse-rust implementation requires it, always buffer diff --git a/image/decoders/nsAVIFDecoder.h b/image/decoders/nsAVIFDecoder.h index 8ecb272cab67..59f64982029c 100644 --- a/image/decoders/nsAVIFDecoder.h +++ b/image/decoders/nsAVIFDecoder.h @@ -71,7 +71,8 @@ class nsAVIFDecoder final : public Decoder { Variant; Mp4parseStatus CreateParser(); DecodeResult CreateDecoder(); - DecodeResult Decode(SourceBufferIterator& aIterator, IResumable* aOnResume); + DecodeResult DoDecodeInternal(SourceBufferIterator& aIterator, + IResumable* aOnResume); static bool IsDecodeSuccess(const DecodeResult& aResult);