mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-04 06:48:38 +09:00
Issue #2402 - importScripts should be governed by script-src in Web Workers. https://bugzilla.mozilla.org/show_bug.cgi?id=1322111 Add TYPE_INTERNAL_WORKER_IMPORT_SCRIPTS content policy. Update the Cache API schema to account for new nsIContentPolicy type.
This commit is contained in:
parent
f8a174e19f
commit
6979441734
8 changed files with 40 additions and 8 deletions
18
dom/cache/DBSchema.cpp
vendored
18
dom/cache/DBSchema.cpp
vendored
|
|
@ -34,7 +34,7 @@ namespace db {
|
|||
const int32_t kFirstShippedSchemaVersion = 15;
|
||||
namespace {
|
||||
// Update this whenever the DB schema is changed.
|
||||
const int32_t kLatestSchemaVersion = 24;
|
||||
const int32_t kLatestSchemaVersion = 25;
|
||||
// ---------
|
||||
// The following constants define the SQL schema. These are defined in the
|
||||
// same order the SQL should be executed in CreateOrMigrateSchema(). They are
|
||||
|
|
@ -287,7 +287,8 @@ static_assert(nsIContentPolicy::TYPE_INVALID == 0 &&
|
|||
nsIContentPolicy::TYPE_INTERNAL_STYLESHEET == 39 &&
|
||||
nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD == 40 &&
|
||||
nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON == 41 &&
|
||||
nsIContentPolicy::TYPE_SAVEAS_DOWNLOAD == 42,
|
||||
nsIContentPolicy::TYPE_SAVEAS_DOWNLOAD == 42 &&
|
||||
nsIContentPolicy::TYPE_INTERNAL_WORKER_IMPORT_SCRIPTS == 43,
|
||||
"nsContentPolicyType values are as expected");
|
||||
|
||||
namespace {
|
||||
|
|
@ -2478,6 +2479,7 @@ nsresult MigrateFrom20To21(mozIStorageConnection* aConn, bool& aRewriteSchema);
|
|||
nsresult MigrateFrom21To22(mozIStorageConnection* aConn, bool& aRewriteSchema);
|
||||
nsresult MigrateFrom22To23(mozIStorageConnection* aConn, bool& aRewriteSchema);
|
||||
nsresult MigrateFrom23To24(mozIStorageConnection* aConn, bool& aRewriteSchema);
|
||||
nsresult MigrateFrom24To25(mozIStorageConnection* aConn, bool& aRewriteSchema);
|
||||
// Configure migration functions to run for the given starting version.
|
||||
Migration sMigrationList[] = {
|
||||
Migration(15, MigrateFrom15To16),
|
||||
|
|
@ -2489,6 +2491,7 @@ Migration sMigrationList[] = {
|
|||
Migration(21, MigrateFrom21To22),
|
||||
Migration(22, MigrateFrom22To23),
|
||||
Migration(23, MigrateFrom23To24),
|
||||
Migration(24, MigrateFrom24To25),
|
||||
};
|
||||
uint32_t sMigrationListLength = sizeof(sMigrationList) / sizeof(Migration);
|
||||
nsresult
|
||||
|
|
@ -3013,6 +3016,17 @@ nsresult MigrateFrom23To24(mozIStorageConnection* aConn, bool& aRewriteSchema)
|
|||
return rv;
|
||||
}
|
||||
|
||||
nsresult MigrateFrom24To25(mozIStorageConnection* aConn, bool& aRewriteSchema)
|
||||
{
|
||||
MOZ_ASSERT(!NS_IsMainThread());
|
||||
MOZ_DIAGNOSTIC_ASSERT(aConn);
|
||||
|
||||
// The only change between 24 and 25 was a new nsIContentPolicy type.
|
||||
nsresult rv = aConn->SetSchemaVersion(25);
|
||||
if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
|
||||
return rv;
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
} // namespace db
|
||||
} // namespace cache
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue