Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1401107 - Use ContiguousEnumSerializer for ParamTraits in npapi; r=jimm

Browse Source
This commit is contained in:
Julian Hector 2017-12-04 10:12:50 -05:00
parent c3cfcede43
commit 4dfbc18a1c
2 changed files with 23 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/plugins/base/npapi.h
View File

@ -473,6 +473,7 @@ typedef enum {
, NPNVsupportsCompositingCoreAnimationPluginsBool = 74656 /* TRUE if the browser supports
CA model compositing */
#endif
, NPNVLast
} NPNVariable;
typedef enum {

113
dom/plugins/ipc/PluginMessageUtils.h
View File

@ -373,30 +373,11 @@ struct ParamTraits<NPRect>
};
template <>
struct ParamTraits<NPWindowType>
{
typedef NPWindowType paramType;
static void Write(Message* aMsg, const paramType& aParam)
{
aMsg->WriteInt16(int16_t(aParam));
}
static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
{
int16_t result;
if (aMsg->ReadInt16(aIter, &result)) {
*aResult = paramType(result);
return true;
}
return false;
}
static void Log(const paramType& aParam, std::wstring* aLog)
{
aLog->append(StringPrintf(L"%d", int16_t(aParam)));
}
};
struct ParamTraits<NPWindowType> :
public ContiguousEnumSerializerInclusive<NPWindowType,
NPWindowType::NPWindowTypeWindow,
NPWindowType::NPWindowTypeDrawable>
{};
template <>
struct ParamTraits<mozilla::plugins::NPRemoteWindow>
@ -670,76 +651,26 @@ struct ParamTraits<mozilla::plugins::IPCByteRange>
};
template <>
struct ParamTraits<NPNVariable>
{
typedef NPNVariable paramType;
struct ParamTraits<NPNVariable> :
public ContiguousEnumSerializer<NPNVariable,
NPNVariable::NPNVxDisplay,
NPNVariable::NPNVLast>
{};
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, int(aParam));
}
static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
{
int intval;
if (ReadParam(aMsg, aIter, &intval)) {
*aResult = paramType(intval);
return true;
}
return false;
}
};
// The only accepted value is NPNURLVariable::NPNURLVProxy
template<>
struct ParamTraits<NPNURLVariable> :
public ContiguousEnumSerializerInclusive<NPNURLVariable,
NPNURLVariable::NPNURLVProxy,
NPNURLVariable::NPNURLVProxy>
{};
template<>
struct ParamTraits<NPNURLVariable>
{
typedef NPNURLVariable paramType;
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, int(aParam));
}
static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
{
int intval;
if (ReadParam(aMsg, aIter, &intval) &&
intval == NPNURLVProxy) {
*aResult = paramType(intval);
return true;
}
return false;
}
};
template<>
struct ParamTraits<NPCoordinateSpace>
{
typedef NPCoordinateSpace paramType;
static void Write(Message* aMsg, const paramType& aParam)
{
WriteParam(aMsg, int32_t(aParam));
}
static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
{
int32_t intval;
if (ReadParam(aMsg, aIter, &intval)) {
switch (intval) {
case NPCoordinateSpacePlugin:
case NPCoordinateSpaceWindow:
case NPCoordinateSpaceFlippedWindow:
case NPCoordinateSpaceScreen:
case NPCoordinateSpaceFlippedScreen:
*aResult = paramType(intval);
return true;
}
}
return false;
}
};
struct ParamTraits<NPCoordinateSpace> :
public ContiguousEnumSerializerInclusive<NPCoordinateSpace,
NPCoordinateSpace::NPCoordinateSpacePlugin,
NPCoordinateSpace::NPCoordinateSpaceFlippedScreen>
{};
template <>
struct ParamTraits<mozilla::plugins::NPAudioDeviceChangeDetailsIPC>