зеркало из https://github.com/mozilla/gecko-dev.git
Fixing bustage in a different way! Courtesy: Heikki
This commit is contained in:
Родитель
4e4680c4c1
Коммит
df21499ff9
|
@ -542,10 +542,8 @@ nsWebScriptsAccess::CheckAccess(AccessInfoEntry* aEntry,
|
|||
NS_REINTERPRET_CAST(AccessInfo*, aEntry->mInfoArray.ElementAt(index));
|
||||
NS_ASSERTION(access_info, "Entry is missing attribute information");
|
||||
|
||||
const nsAString& type =
|
||||
access_info->mType ?
|
||||
nsDependentString(access_info->mType) : nsDependentString(kAny.get());
|
||||
if (type.Equals(kAny) || type.Equals(aRequestType)) {
|
||||
if (!access_info->mType || kAny.Equals(access_info->mType) ||
|
||||
aRequestType.Equals(access_info->mType)) {
|
||||
if (!access_info->mFrom) {
|
||||
// If "from" is not specified, then all scripts will be allowed
|
||||
*aAccessGranted = PR_TRUE;
|
||||
|
|
|
@ -542,10 +542,8 @@ nsWebScriptsAccess::CheckAccess(AccessInfoEntry* aEntry,
|
|||
NS_REINTERPRET_CAST(AccessInfo*, aEntry->mInfoArray.ElementAt(index));
|
||||
NS_ASSERTION(access_info, "Entry is missing attribute information");
|
||||
|
||||
const nsAString& type =
|
||||
access_info->mType ?
|
||||
nsDependentString(access_info->mType) : nsDependentString(kAny.get());
|
||||
if (type.Equals(kAny) || type.Equals(aRequestType)) {
|
||||
if (!access_info->mType || kAny.Equals(access_info->mType) ||
|
||||
aRequestType.Equals(access_info->mType)) {
|
||||
if (!access_info->mFrom) {
|
||||
// If "from" is not specified, then all scripts will be allowed
|
||||
*aAccessGranted = PR_TRUE;
|
||||
|
|
Загрузка…
Ссылка в новой задаче