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

Backed out changeset 9e0475a23d21 (bug 1158561) for assertions in test_clear_site_data.html CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher
2015-07-01 16:25:26 -07:00
parent 6c264bd80d
commit 1e193b542b
16 changed files with 173 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dom/plugins/base/PluginPRLibrary.cpp
View File

@@ -204,7 +204,7 @@ PluginPRLibrary::NPP_New(NPMIMEType pluginType, NPP instance,
nsresult
PluginPRLibrary::NPP_ClearSiteData(const char* site, uint64_t flags,
uint64_t maxAge, nsCOMPtr<nsIClearSiteDataCallback> callback)
uint64_t maxAge)
{
if (!mNPP_ClearSiteData) {
return NS_ERROR_NOT_AVAILABLE;
@@ -213,44 +213,39 @@ PluginPRLibrary::NPP_ClearSiteData(const char* site, uint64_t flags,
MAIN_THREAD_JNI_REF_GUARD;
NPError result = mNPP_ClearSiteData(site, flags, maxAge);
nsresult rv;
switch (result) {
case NPERR_NO_ERROR:
rv = NS_OK;
break;
return NS_OK;
case NPERR_TIME_RANGE_NOT_SUPPORTED:
rv = NS_ERROR_PLUGIN_TIME_RANGE_NOT_SUPPORTED;
break;
return NS_ERROR_PLUGIN_TIME_RANGE_NOT_SUPPORTED;
case NPERR_MALFORMED_SITE:
rv = NS_ERROR_INVALID_ARG;
break;
return NS_ERROR_INVALID_ARG;
default:
rv = NS_ERROR_FAILURE;
return NS_ERROR_FAILURE;
}
callback->Callback(rv);
return NS_OK;
}
nsresult
PluginPRLibrary::NPP_GetSitesWithData(nsCOMPtr<nsIGetSitesWithDataCallback> callback)
PluginPRLibrary::NPP_GetSitesWithData(InfallibleTArray<nsCString>& result)
{
if (!mNPP_GetSitesWithData) {
return NS_ERROR_NOT_AVAILABLE;
}
result.Clear();
MAIN_THREAD_JNI_REF_GUARD;
char** sites = mNPP_GetSitesWithData();
if (!sites) {
return NS_OK;
}
InfallibleTArray<nsCString> result;
char** iterator = sites;
while (*iterator) {
result.AppendElement(*iterator);
free(*iterator);
++iterator;
}
callback->SitesWithData(result);
free(sites);
return NS_OK;