diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /extensions | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/permissions/nsContentBlocker.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/extensions/permissions/nsContentBlocker.cpp b/extensions/permissions/nsContentBlocker.cpp index cc2162b70..391785dc3 100644 --- a/extensions/permissions/nsContentBlocker.cpp +++ b/extensions/permissions/nsContentBlocker.cpp @@ -23,6 +23,7 @@ #define BEHAVIOR_NOFOREIGN 3 // From nsIContentPolicy +// and nsIContentPolicyBase.idl: Their order must be retained! static const char *kTypeString[] = { "other", "script", @@ -59,6 +60,13 @@ static const char *kTypeString[] = { "", // TYPE_INTERNAL_XMLHTTPREQUEST "", // TYPE_INTERNAL_EVENTSOURCE "", // TYPE_INTERNAL_SERVICE_WORKER + "", // TYPE_INTERNAL_SCRIPT_PRELOAD + "", // TYPE_INTERNAL_IMAGE + "", // TYPE_INTERNAL_IMAGE_PRELOAD + "", // TYPE_INTERNAL_STYLESHEET + "", // TYPE_INTERNAL_STYLESHEET_PRELOAD + "", // TYPE_INTERNAL_IMAGE_FAVICON + "saveas_download", }; #define NUMBER_OF_TYPES MOZ_ARRAY_LENGTH(kTypeString) |