Bug 1280336 - b2g-installer broke indexedDB; r=asuth

This commit is contained in:
Jan Varga 2016-06-16 15:26:22 +01:00
Родитель 33be75d853
Коммит 3b7511210c
1 изменённых файлов: 7 добавлений и 6 удалений

Просмотреть файл

@ -1360,7 +1360,7 @@ class MOZ_STACK_CLASS OriginParser final
enum SchemaType { enum SchemaType {
eNone, eNone,
eFile, eFile,
eMozSafeAbout eAbout
}; };
enum State { enum State {
@ -6628,7 +6628,7 @@ OriginParser::Parse(nsACString& aSpec, PrincipalOriginAttributes* aAttrs)
return true; return true;
} }
if (mSchemaType == eMozSafeAbout) { if (mSchemaType == eAbout) {
spec.Append(':'); spec.Append(':');
} else { } else {
spec.AppendLiteral("://"); spec.AppendLiteral("://");
@ -6652,19 +6652,20 @@ OriginParser::HandleSchema(const nsDependentCSubstring& aToken)
MOZ_ASSERT(!aToken.IsEmpty()); MOZ_ASSERT(!aToken.IsEmpty());
MOZ_ASSERT(mState == eExpectingAppIdOrSchema || mState == eExpectingSchema); MOZ_ASSERT(mState == eExpectingAppIdOrSchema || mState == eExpectingSchema);
bool isMozSafeAbout = false; bool isAbout = false;
bool isFile = false; bool isFile = false;
if (aToken.EqualsLiteral("http") || if (aToken.EqualsLiteral("http") ||
aToken.EqualsLiteral("https") || aToken.EqualsLiteral("https") ||
(isMozSafeAbout = aToken.EqualsLiteral("moz-safe-about")) || (isAbout = aToken.EqualsLiteral("about") ||
aToken.EqualsLiteral("moz-safe-about")) ||
aToken.EqualsLiteral("indexeddb") || aToken.EqualsLiteral("indexeddb") ||
(isFile = aToken.EqualsLiteral("file")) || (isFile = aToken.EqualsLiteral("file")) ||
aToken.EqualsLiteral("app") || aToken.EqualsLiteral("app") ||
aToken.EqualsLiteral("resource")) { aToken.EqualsLiteral("resource")) {
mSchema = aToken; mSchema = aToken;
if (isMozSafeAbout) { if (isAbout) {
mSchemaType = eMozSafeAbout; mSchemaType = eAbout;
mState = eExpectingHost; mState = eExpectingHost;
} else { } else {
if (isFile) { if (isFile) {