KotJohansson/UXP
1
0
Fork 0
mirror of https://github.com/roytam1/UXP.git synced 2026-05-26 14:54:25 +00:00
Code Issues Projects Releases Wiki Activity

nsIContentPolicy: Their order (in nsIContentPolicyBase.idl) must be retained in nsContentBlocker.cpp

Browse Source
This commit is contained in:
janekptacijarabaci
2018-06-18 00:49:45 +02:00
committed by Roy Tam
parent d180a351b0
commit 0fac4df87d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dom/base/nsContentPolicyUtils.h
+1 -1
View File
@@ -115,7 +115,6 @@ NS_CP_ContentTypeName(uint32_t contentType)
CASE_RETURN( TYPE_FETCH );
CASE_RETURN( TYPE_IMAGESET );
CASE_RETURN( TYPE_WEB_MANIFEST );
CASE_RETURN( TYPE_SAVEAS_DOWNLOAD );
CASE_RETURN( TYPE_INTERNAL_SCRIPT );
CASE_RETURN( TYPE_INTERNAL_WORKER );
CASE_RETURN( TYPE_INTERNAL_SHARED_WORKER );
@@ -135,6 +134,7 @@ NS_CP_ContentTypeName(uint32_t contentType)
CASE_RETURN( TYPE_INTERNAL_IMAGE_FAVICON );
CASE_RETURN( TYPE_INTERNAL_STYLESHEET );
CASE_RETURN( TYPE_INTERNAL_STYLESHEET_PRELOAD );
CASE_RETURN( TYPE_SAVEAS_DOWNLOAD );
default:
return "<Unknown Type>";
}
extensions/permissions/nsContentBlocker.cpp
+8 -1
View File
@@ -23,6 +23,7 @@
#define BEHAVIOR_NOFOREIGN 3
// From nsIContentPolicy
// and nsIContentPolicyBase.idl: Their order must be retained!
static const char *kTypeString[] = {
"other",
"script",
@@ -46,7 +47,6 @@ static const char *kTypeString[] = {
"fetch",
"image",
"manifest",
"saveas_download",
"", // TYPE_INTERNAL_SCRIPT
"", // TYPE_INTERNAL_WORKER
"", // TYPE_INTERNAL_SHARED_WORKER
@@ -60,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)