forked from mirrors/gecko-dev
5dc21d568c
The inclusions were removed with the following very crude script and the
resulting breakage was fixed up by hand. The manual fixups did either
revert the changes done by the script, replace a generic header with a more
specific one or replace a header with a forward declaration.
find . -name "*.idl" | grep -v web-platform | grep -v third_party | while read path; do
interfaces=$(grep "^\(class\|interface\).*:.*" "$path" | cut -d' ' -f2)
if [ -n "$interfaces" ]; then
if [[ "$interfaces" == *$'\n'* ]]; then
regexp="\("
for i in $interfaces; do regexp="$regexp$i\|"; done
regexp="${regexp%%\\\|}\)"
else
regexp="$interfaces"
fi
interface=$(basename "$path")
rg -l "#include.*${interface%%.idl}.h" . | while read path2; do
hits=$(grep -v "#include.*${interface%%.idl}.h" "$path2" | grep -c "$regexp" )
if [ $hits -eq 0 ]; then
echo "Removing ${interface} from ${path2}"
grep -v "#include.*${interface%%.idl}.h" "$path2" > "$path2".tmp
mv -f "$path2".tmp "$path2"
fi
done
fi
done
Differential Revision: https://phabricator.services.mozilla.com/D55444
--HG--
extra : moz-landing-system : lando
148 lines
5.1 KiB
C++
148 lines
5.1 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef mozilla_net_NeckoMessageUtils_h
|
|
#define mozilla_net_NeckoMessageUtils_h
|
|
|
|
#include "mozilla/DebugOnly.h"
|
|
|
|
#include "ipc/IPCMessageUtils.h"
|
|
#include "nsExceptionHandler.h"
|
|
#include "nsIHttpChannel.h"
|
|
#include "nsPrintfCString.h"
|
|
#include "nsString.h"
|
|
#include "prio.h"
|
|
#include "mozilla/net/DNS.h"
|
|
|
|
namespace IPC {
|
|
|
|
// nsIPermissionManager utilities
|
|
|
|
struct Permission {
|
|
nsCString origin, type;
|
|
uint32_t capability, expireType;
|
|
int64_t expireTime;
|
|
|
|
Permission() : capability(0), expireType(0), expireTime(0) {}
|
|
|
|
Permission(const nsCString& aOrigin, const nsACString& aType,
|
|
const uint32_t aCapability, const uint32_t aExpireType,
|
|
const int64_t aExpireTime)
|
|
: origin(aOrigin),
|
|
type(aType),
|
|
capability(aCapability),
|
|
expireType(aExpireType),
|
|
expireTime(aExpireTime) {}
|
|
|
|
bool operator==(const Permission& aOther) const {
|
|
return aOther.origin == origin && aOther.type == type &&
|
|
aOther.capability == capability && aOther.expireType == expireType &&
|
|
aOther.expireTime == expireTime;
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct ParamTraits<Permission> {
|
|
static void Write(Message* aMsg, const Permission& aParam) {
|
|
WriteParam(aMsg, aParam.origin);
|
|
WriteParam(aMsg, aParam.type);
|
|
WriteParam(aMsg, aParam.capability);
|
|
WriteParam(aMsg, aParam.expireType);
|
|
WriteParam(aMsg, aParam.expireTime);
|
|
}
|
|
|
|
static bool Read(const Message* aMsg, PickleIterator* aIter,
|
|
Permission* aResult) {
|
|
return ReadParam(aMsg, aIter, &aResult->origin) &&
|
|
ReadParam(aMsg, aIter, &aResult->type) &&
|
|
ReadParam(aMsg, aIter, &aResult->capability) &&
|
|
ReadParam(aMsg, aIter, &aResult->expireType) &&
|
|
ReadParam(aMsg, aIter, &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 <>
|
|
struct ParamTraits<mozilla::net::NetAddr> {
|
|
static void Write(Message* aMsg, const mozilla::net::NetAddr& aParam) {
|
|
WriteParam(aMsg, aParam.raw.family);
|
|
if (aParam.raw.family == AF_UNSPEC) {
|
|
aMsg->WriteBytes(aParam.raw.data, sizeof(aParam.raw.data));
|
|
} else if (aParam.raw.family == AF_INET) {
|
|
WriteParam(aMsg, aParam.inet.port);
|
|
WriteParam(aMsg, aParam.inet.ip);
|
|
} else if (aParam.raw.family == AF_INET6) {
|
|
WriteParam(aMsg, aParam.inet6.port);
|
|
WriteParam(aMsg, aParam.inet6.flowinfo);
|
|
WriteParam(aMsg, aParam.inet6.ip.u64[0]);
|
|
WriteParam(aMsg, aParam.inet6.ip.u64[1]);
|
|
WriteParam(aMsg, aParam.inet6.scope_id);
|
|
#if defined(XP_UNIX)
|
|
} else if (aParam.raw.family == AF_LOCAL) {
|
|
// Train's already off the rails: let's get a stack trace at least...
|
|
MOZ_CRASH(
|
|
"Error: please post stack trace to "
|
|
"https://bugzilla.mozilla.org/show_bug.cgi?id=661158");
|
|
aMsg->WriteBytes(aParam.local.path, sizeof(aParam.local.path));
|
|
#endif
|
|
} else {
|
|
if (XRE_IsParentProcess()) {
|
|
nsPrintfCString msg("%d", aParam.raw.family);
|
|
CrashReporter::AnnotateCrashReport(
|
|
CrashReporter::Annotation::UnknownNetAddrSocketFamily, msg);
|
|
}
|
|
|
|
MOZ_CRASH("Unknown socket family");
|
|
}
|
|
}
|
|
|
|
static bool Read(const Message* aMsg, PickleIterator* aIter,
|
|
mozilla::net::NetAddr* aResult) {
|
|
if (!ReadParam(aMsg, aIter, &aResult->raw.family)) return false;
|
|
|
|
if (aResult->raw.family == AF_UNSPEC) {
|
|
return aMsg->ReadBytesInto(aIter, &aResult->raw.data,
|
|
sizeof(aResult->raw.data));
|
|
} else if (aResult->raw.family == AF_INET) {
|
|
return ReadParam(aMsg, aIter, &aResult->inet.port) &&
|
|
ReadParam(aMsg, aIter, &aResult->inet.ip);
|
|
} else if (aResult->raw.family == AF_INET6) {
|
|
return ReadParam(aMsg, aIter, &aResult->inet6.port) &&
|
|
ReadParam(aMsg, aIter, &aResult->inet6.flowinfo) &&
|
|
ReadParam(aMsg, aIter, &aResult->inet6.ip.u64[0]) &&
|
|
ReadParam(aMsg, aIter, &aResult->inet6.ip.u64[1]) &&
|
|
ReadParam(aMsg, aIter, &aResult->inet6.scope_id);
|
|
#if defined(XP_UNIX)
|
|
} else if (aResult->raw.family == AF_LOCAL) {
|
|
return aMsg->ReadBytesInto(aIter, &aResult->local.path,
|
|
sizeof(aResult->local.path));
|
|
#endif
|
|
}
|
|
|
|
/* We've been tricked by some socket family we don't know about! */
|
|
return false;
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct ParamTraits<nsIHttpChannel::FlashPluginState>
|
|
: public ContiguousEnumSerializerInclusive<
|
|
nsIHttpChannel::FlashPluginState, nsIHttpChannel::FlashPluginUnknown,
|
|
nsIHttpChannel::FlashPluginLastValue> {};
|
|
|
|
} // namespace IPC
|
|
|
|
#endif // mozilla_net_NeckoMessageUtils_h
|