corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 1158561 - [e10s] Browser hang in PluginModuleParent::NPP_ClearSiteData() r=jimm,mak

Browse Source
This commit is contained in:
Brad Lassey
2015-06-30 18:08:19 -04:00
parent 78aac3bedd
commit ffff931b1a
16 changed files with 451 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dom/plugins/ipc/PluginModuleChild.cpp
View File

@@ -734,31 +734,34 @@ PluginModuleChild::AnswerOptionalFunctionsSupported(bool *aURLRedirectNotify,
}
bool
PluginModuleChild::AnswerNPP_ClearSiteData(const nsCString& aSite,
PluginModuleChild::RecvNPP_ClearSiteData(const nsCString& aSite,
const uint64_t& aFlags,
const uint64_t& aMaxAge,
NPError* aResult)
const uint64_t& aCallbackId)
{
*aResult =
NPError result =
mFunctions.clearsitedata(NullableStringGet(aSite), aFlags, aMaxAge);
SendReturnClearSiteData(result, aCallbackId);
return true;
}
bool
PluginModuleChild::AnswerNPP_GetSitesWithData(InfallibleTArray<nsCString>* aResult)
PluginModuleChild::RecvNPP_GetSitesWithData(const uint64_t& aCallbackId)
{
char** result = mFunctions.getsiteswithdata();
if (!result)
InfallibleTArray<nsCString> array;
if (!result) {
SendReturnSitesWithData(array, aCallbackId);
return true;
}
char** iterator = result;
while (*iterator) {
aResult->AppendElement(*iterator);
array.AppendElement(*iterator);
free(*iterator);
++iterator;
}
SendReturnSitesWithData(array, aCallbackId);
free(result);
return true;
}