From f6ee20b0fdc261fc3f5be0c50273a10f0da66a18 Mon Sep 17 00:00:00 2001 From: Nika Layzell Date: Wed, 28 Sep 2022 19:25:12 +0000 Subject: [PATCH] Bug 1783240 - Part 1: Remove unnecessary `Log` methods from ParamTraits impls, r=ipc-reviewers,necko-reviewers,media-playback-reviewers,mccr8,alwu These aren't used anywhere, so can be removed, simplifying some things. Differential Revision: https://phabricator.services.mozilla.com/D153802 --- chrome/RegistryMessageUtils.h | 18 ----- dom/indexedDB/SerializationHelpers.h | 8 --- dom/localstorage/SerializationHelpers.h | 7 -- dom/media/gmp/GMPMessageUtils.h | 16 ----- gfx/ipc/GfxMessageUtils.h | 6 -- ipc/chromium/src/chrome/common/ipc_message.h | 3 - .../src/chrome/common/ipc_message_utils.h | 57 --------------- ipc/glue/ByteBufUtils.h | 4 -- ipc/glue/IPCMessageUtils.h | 9 --- ipc/glue/IPCMessageUtilsSpecializations.h | 70 ------------------- ipc/glue/ProtocolMessageUtils.h | 8 --- ipc/glue/SerializedStructuredCloneBuffer.h | 4 -- ipc/glue/ShmemMessageUtils.h | 4 -- netwerk/ipc/NeckoMessageUtils.h | 12 ---- 14 files changed, 226 deletions(-) diff --git a/chrome/RegistryMessageUtils.h b/chrome/RegistryMessageUtils.h index c022a8071425..aa26001d482a 100644 --- a/chrome/RegistryMessageUtils.h +++ b/chrome/RegistryMessageUtils.h @@ -102,13 +102,6 @@ struct ParamTraits { } return false; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(StringPrintf(L"[%s, %s, %s, %s, %u]", aParam.package.get(), - aParam.contentBaseURI.spec.get(), - aParam.localeBaseURI.spec.get(), - aParam.skinBaseURI.spec.get(), aParam.flags)); - } }; template <> @@ -137,12 +130,6 @@ struct ParamTraits { } return false; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(StringPrintf(L"[%s://%s, %s, %u]", aParam.scheme.get(), - aParam.path.get(), - aParam.resolvedURI.spec.get())); - } }; template <> @@ -165,11 +152,6 @@ struct ParamTraits { } return false; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(StringPrintf(L"[%s, %s, %u]", aParam.originalURI.spec.get(), - aParam.overrideURI.spec.get())); - } }; } // namespace IPC diff --git a/dom/indexedDB/SerializationHelpers.h b/dom/indexedDB/SerializationHelpers.h index 241c85d9a662..7bc05720d485 100644 --- a/dom/indexedDB/SerializationHelpers.h +++ b/dom/indexedDB/SerializationHelpers.h @@ -35,10 +35,6 @@ struct ParamTraits { static bool Read(MessageReader* aReader, paramType* aResult) { return ReadParam(aReader, &aResult->mBuffer); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - LogParam(aParam.mBuffer, aLog); - } }; template <> @@ -61,10 +57,6 @@ struct ParamTraits { return ReadParam(aReader, &aResult->mType) && ReadParam(aReader, &aResult->mStrings); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - LogParam(aParam.mStrings, aLog); - } }; template <> diff --git a/dom/localstorage/SerializationHelpers.h b/dom/localstorage/SerializationHelpers.h index 54d6f2a035e6..f9b499671cf8 100644 --- a/dom/localstorage/SerializationHelpers.h +++ b/dom/localstorage/SerializationHelpers.h @@ -55,13 +55,6 @@ struct ParamTraits { ReadParam(aReader, &aResult->mConversionType) && ReadParam(aReader, &aResult->mCompressionType); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - LogParam(aParam.mBuffer, aLog); - LogParam(aParam.mUTF16Length, aLog); - LogParam(static_cast(aParam.mConversionType), aLog); - LogParam(static_cast(aParam.mCompressionType), aLog); - } }; } // namespace IPC diff --git a/dom/media/gmp/GMPMessageUtils.h b/dom/media/gmp/GMPMessageUtils.h index bc69e85c819d..33a18f7ad82d 100644 --- a/dom/media/gmp/GMPMessageUtils.h +++ b/dom/media/gmp/GMPMessageUtils.h @@ -87,13 +87,6 @@ struct ParamTraits { } return false; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(StringPrintf(L"[%u, %u, %u, %u, %u, %u, %u]", aParam.mWidth, - aParam.mHeight, aParam.mNumberOfTemporalLayers, - aParam.mMaxBitrate, aParam.mTargetBitrate, - aParam.mMinBitrate, aParam.mQPMax)); - } }; template <> @@ -174,15 +167,6 @@ struct ParamTraits { return true; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - const char* codecName = nullptr; - if (aParam.mCodecType == kGMPVideoCodecVP8) { - codecName = "VP8"; - } - aLog->append(StringPrintf(L"[%s, %u, %u]", codecName, aParam.mWidth, - aParam.mHeight)); - } }; } // namespace IPC diff --git a/gfx/ipc/GfxMessageUtils.h b/gfx/ipc/GfxMessageUtils.h index 46d29ac85be2..f24740508257 100644 --- a/gfx/ipc/GfxMessageUtils.h +++ b/gfx/ipc/GfxMessageUtils.h @@ -69,12 +69,6 @@ struct ParamTraits { return false; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(StringPrintf(L"[[%g %g] [%g %g] [%g %g]]", aParam._11, - aParam._12, aParam._21, aParam._22, aParam._31, - aParam._32)); - } }; template <> diff --git a/ipc/chromium/src/chrome/common/ipc_message.h b/ipc/chromium/src/chrome/common/ipc_message.h index 68781f978e08..86bf103e57c5 100644 --- a/ipc/chromium/src/chrome/common/ipc_message.h +++ b/ipc/chromium/src/chrome/common/ipc_message.h @@ -282,9 +282,6 @@ class Message : public mojo::core::ports::UserMessage, public Pickle { header()->event_footer_size = size; } - // Used for async messages with no parameters. - static void Log(const Message* msg, std::wstring* l) {} - static int HeaderSize() { return sizeof(Header); } // Figure out how big the message starting at range_start is. Returns 0 if diff --git a/ipc/chromium/src/chrome/common/ipc_message_utils.h b/ipc/chromium/src/chrome/common/ipc_message_utils.h index b258919780df..d8a20b62c181 100644 --- a/ipc/chromium/src/chrome/common/ipc_message_utils.h +++ b/ipc/chromium/src/chrome/common/ipc_message_utils.h @@ -298,11 +298,6 @@ static inline bool WARN_UNUSED_RESULT ReadParam(MessageReader* reader, P* p) { return ParamTraits

::Read(reader, p); } -template -static inline void LogParam(const P& p, std::wstring* l) { - ParamTraits

::Log(p, l); -} - // Temporary fallback class to allow types to declare serialization using the // IPDLParamTraits type class. Will be removed once all remaining // IPDLParamTraits implementations are gone. (bug 1754009) @@ -341,9 +336,6 @@ struct ParamTraitsFundamental { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadBool(r); } - static void Log(const param_type& p, std::wstring* l) { - l->append(p ? L"true" : L"false"); - } }; template <> @@ -355,9 +347,6 @@ struct ParamTraitsFundamental { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadInt(r); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%d", p)); - } }; template <> @@ -369,9 +358,6 @@ struct ParamTraitsFundamental { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadLong(r); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%l", p)); - } }; template <> @@ -383,9 +369,6 @@ struct ParamTraitsFundamental { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadULong(r); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%ul", p)); - } }; template <> @@ -397,9 +380,6 @@ struct ParamTraitsFundamental { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadBytesInto(r, sizeof(*r)); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%ll", p)); - } }; template <> @@ -411,9 +391,6 @@ struct ParamTraitsFundamental { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadBytesInto(r, sizeof(*r)); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%ull", p)); - } }; template <> @@ -425,9 +402,6 @@ struct ParamTraitsFundamental { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadDouble(r); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"e", p)); - } }; // Fixed-size types. @@ -444,9 +418,6 @@ struct ParamTraitsFixed { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadInt16(r); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%hd", p)); - } }; template <> @@ -458,9 +429,6 @@ struct ParamTraitsFixed { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadUInt16(r); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%hu", p)); - } }; template <> @@ -472,9 +440,6 @@ struct ParamTraitsFixed { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadUInt32(r); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%u", p)); - } }; template <> @@ -486,9 +451,6 @@ struct ParamTraitsFixed { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadInt64(r); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%" PRId64L, p)); - } }; template <> @@ -500,9 +462,6 @@ struct ParamTraitsFixed { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadInt64(reinterpret_cast(r)); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%" PRIu64L, p)); - } }; // std::* types. @@ -519,9 +478,6 @@ struct ParamTraitsStd { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadString(r); } - static void Log(const param_type& p, std::wstring* l) { - l->append(UTF8ToWide(p)); - } }; template <> @@ -533,7 +489,6 @@ struct ParamTraitsStd { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadWString(r); } - static void Log(const param_type& p, std::wstring* l) { l->append(p); } }; template @@ -558,9 +513,6 @@ struct ParamTraitsStd> { } return true; } - static void Log(const param_type& p, std::wstring* l) { - l->append(L""); - } }; // Windows-specific types. @@ -579,9 +531,6 @@ struct ParamTraitsWindows { static bool Read(MessageReader* reader, HANDLE* r) { return reader->ReadIntPtr(reinterpret_cast(r)); } - static void Log(const HANDLE& p, std::wstring* l) { - l->append(StringPrintf(L"0x%X", p)); - } }; template <> @@ -594,9 +543,6 @@ struct ParamTraitsWindows { static bool Read(MessageReader* reader, HWND* r) { return reader->ReadIntPtr(reinterpret_cast(r)); } - static void Log(const HWND& p, std::wstring* l) { - l->append(StringPrintf(L"0x%X", p)); - } }; #endif // defined(OS_WIN) @@ -707,9 +653,6 @@ struct ParamTraitsMozilla { static bool Read(MessageReader* reader, param_type* r) { return reader->ReadUInt32(reinterpret_cast(r)); } - static void Log(const param_type& p, std::wstring* l) { - l->append(StringPrintf(L"%u", static_cast(p))); - } }; // See comments for the IPDLParamTraits specializations for RefPtr and diff --git a/ipc/glue/ByteBufUtils.h b/ipc/glue/ByteBufUtils.h index 813068dc907e..59a16513708f 100644 --- a/ipc/glue/ByteBufUtils.h +++ b/ipc/glue/ByteBufUtils.h @@ -52,10 +52,6 @@ struct ParamTraits { } return aReader->ReadBytesInto(aResult->mData, length); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(L"(byte buf)"); - } }; } // namespace IPC diff --git a/ipc/glue/IPCMessageUtils.h b/ipc/glue/IPCMessageUtils.h index b78c36f737fb..9a97f507cbe7 100644 --- a/ipc/glue/IPCMessageUtils.h +++ b/ipc/glue/IPCMessageUtils.h @@ -105,11 +105,6 @@ struct ParamTraits { static bool Read(MessageReader* aReader, paramType* aResult) { return aReader->ReadBytesInto(aResult, sizeof(*aResult)); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - // Use 0xff to avoid sign extension. - aLog->append(StringPrintf(L"0x%02x", aParam & 0xff)); - } }; template <> @@ -123,10 +118,6 @@ struct ParamTraits { static bool Read(MessageReader* aReader, paramType* aResult) { return aReader->ReadBytesInto(aResult, sizeof(*aResult)); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(StringPrintf(L"0x%02x", aParam)); - } }; #if !defined(OS_POSIX) diff --git a/ipc/glue/IPCMessageUtilsSpecializations.h b/ipc/glue/IPCMessageUtilsSpecializations.h index 2844542265e4..b39a79cc7845 100644 --- a/ipc/glue/IPCMessageUtilsSpecializations.h +++ b/ipc/glue/IPCMessageUtilsSpecializations.h @@ -111,13 +111,6 @@ struct ParamTraits { return aReader->ReadBytesInto(aResult->BeginWriting(), length); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - if (aParam.IsVoid()) - aLog->append(L"(NULL)"); - else - aLog->append(UTF8ToWide(aParam.BeginReading())); - } }; template <> @@ -162,21 +155,6 @@ struct ParamTraits { return aReader->ReadBytesInto(aResult->BeginWriting(), byteLength.value()); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - if (aParam.IsVoid()) - aLog->append(L"(NULL)"); - else { -#ifdef WCHAR_T_IS_UTF16 - aLog->append(reinterpret_cast(aParam.BeginReading())); -#else - uint32_t length = aParam.Length(); - for (uint32_t index = 0; index < length; index++) { - aLog->push_back(std::wstring::value_type(aParam[index])); - } -#endif - } - } }; template <> @@ -332,15 +310,6 @@ struct ParamTraits> { } } - static void Log(const paramType& aParam, std::wstring* aLog) { - for (uint32_t index = 0; index < aParam.Length(); index++) { - if (index) { - aLog->append(L" "); - } - LogParam(aParam[index], aLog); - } - } - private: // Length has already been written. Const overload. static void WriteValues(MessageWriter* aWriter, const paramType& aParam) { @@ -381,10 +350,6 @@ struct ParamTraits> { *aResult = std::move(temp); return true; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - LogParam(static_cast&>(aParam), aLog); - } }; template @@ -468,15 +433,6 @@ struct ParamTraits> { return true; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - for (uint32_t index = 0, len = aParam.length(); index < len; ++index) { - if (index) { - aLog->append(L" "); - } - LogParam(aParam[index], aLog); - } - } }; template @@ -542,15 +498,6 @@ struct ParamTraits> { return true; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - for (uint32_t index = 0, len = aParam.size(); index < len; ++index) { - if (index) { - aLog->append(L" "); - } - LogParam(aParam[index], aLog); - } - } }; template @@ -595,10 +542,6 @@ struct ParamTraits { static bool Read(MessageReader* aReader, paramType* aResult) { return aReader->ReadBytesInto(aResult, sizeof(*aResult)); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(StringPrintf(L"%g", aParam)); - } }; template <> @@ -630,15 +573,6 @@ struct ParamTraits { return true; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(L"{"); - aLog->append( - StringPrintf(L"%8.8X-%4.4X-%4.4X-", aParam.m0, aParam.m1, aParam.m2)); - for (unsigned int i = 0; i < mozilla::ArrayLength(aParam.m3); i++) - aLog->append(StringPrintf(L"%2.2X", aParam.m3[i])); - aLog->append(L"}"); - } }; template <> @@ -701,10 +635,6 @@ struct ParamTraits { static bool Read(MessageReader* aReader, paramType* aResult) { return aResult->ReadIPCParams(aReader); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - LogParam(aParam.DataLength(), aLog); - } }; template diff --git a/ipc/glue/ProtocolMessageUtils.h b/ipc/glue/ProtocolMessageUtils.h index 33a2c0c4f640..48485596ea34 100644 --- a/ipc/glue/ProtocolMessageUtils.h +++ b/ipc/glue/ProtocolMessageUtils.h @@ -61,10 +61,6 @@ struct ParamTraits { } return false; } - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(StringPrintf(L"(%d)", aParam.mId)); - } }; template <> @@ -74,10 +70,6 @@ struct ParamTraits { static void Write(MessageWriter* aWriter, paramType&& aParam); static bool Read(MessageReader* aReader, paramType* aResult); - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(StringPrintf(L"Endpoint")); - } }; template diff --git a/ipc/glue/SerializedStructuredCloneBuffer.h b/ipc/glue/SerializedStructuredCloneBuffer.h index 222561a5b068..839d7ee266f4 100644 --- a/ipc/glue/SerializedStructuredCloneBuffer.h +++ b/ipc/glue/SerializedStructuredCloneBuffer.h @@ -117,10 +117,6 @@ struct ParamTraits { static bool Read(MessageReader* aReader, paramType* aResult) { return ReadParam(aReader, &aResult->data); } - - static void Log(const paramType& aParam, std::wstring* aLog) { - LogParam(aParam.data.Size(), aLog); - } }; } // namespace IPC diff --git a/ipc/glue/ShmemMessageUtils.h b/ipc/glue/ShmemMessageUtils.h index c8740eacb4bf..c0f8c40215aa 100644 --- a/ipc/glue/ShmemMessageUtils.h +++ b/ipc/glue/ShmemMessageUtils.h @@ -22,10 +22,6 @@ struct IPDLParamTraits { paramType&& aParam); static bool Read(IPC::MessageReader* aReader, IProtocol* aActor, paramType* aResult); - - static void Log(const paramType& aParam, std::wstring* aLog) { - aLog->append(L"(shmem segment)"); - } }; } // namespace ipc diff --git a/netwerk/ipc/NeckoMessageUtils.h b/netwerk/ipc/NeckoMessageUtils.h index dd29d03a4dcc..cc8e87118783 100644 --- a/netwerk/ipc/NeckoMessageUtils.h +++ b/netwerk/ipc/NeckoMessageUtils.h @@ -62,18 +62,6 @@ struct ParamTraits { ReadParam(aReader, &aResult->expireType) && ReadParam(aReader, &aResult->expireTime); } - - static void Log(const Permission& p, std::wstring* l) { - l->append(L"("); - LogParam(p.origin, l); - l->append(L", "); - LogParam(p.capability, l); - l->append(L", "); - LogParam(p.expireTime, l); - l->append(L", "); - LogParam(p.expireType, l); - l->append(L")"); - } }; template <>