Port bug 863246 to TB/IB/SM: Move resources that need to be exposed to web content to locations that are marked as contentaccessible. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Tue, 29 Aug 2017 08:14:38 +0200
changeset 29638 f86f48fda7bdc4b1b28af381e82f9ba58b024205
parent 29637 af8cdc1ef919b0adc5e1a2c7bccf2649878a9088
child 29639 9f258e1db839a7a52227e0ec637110d5165eac73
push id378
push userclokep@gmail.com
push dateMon, 13 Nov 2017 18:45:35 +0000
reviewersjorgk
bugs863246
Port bug 863246 to TB/IB/SM: Move resources that need to be exposed to web content to locations that are marked as contentaccessible. r=jorgk
im/installer/package-manifest.in
mail/installer/package-manifest.in
suite/installer/package-manifest.in
--- a/im/installer/package-manifest.in
+++ b/im/installer/package-manifest.in
@@ -653,19 +653,16 @@
 @RESPATH@/components/places.xpt
 @RESPATH@/components/plugin.xpt
 @RESPATH@/components/prefetch.xpt
 
 ; editor resource files
 @RESPATH@/res/EditorOverride.css
 @RESPATH@/res/contenteditable.css
 @RESPATH@/res/designmode.css
-@RESPATH@/res/ImageDocument.css
-@RESPATH@/res/TopLevelImageDocument.css
-@RESPATH@/res/TopLevelVideoDocument.css
 @RESPATH@/res/table-add-column-after-active.gif
 @RESPATH@/res/table-add-column-after-hover.gif
 @RESPATH@/res/table-add-column-after.gif
 @RESPATH@/res/table-add-column-before-active.gif
 @RESPATH@/res/table-add-column-before-hover.gif
 @RESPATH@/res/table-add-column-before.gif
 @RESPATH@/res/table-add-row-after-active.gif
 @RESPATH@/res/table-add-row-after-hover.gif
@@ -686,16 +683,19 @@
 @RESPATH@/res/fonts/*
 @RESPATH@/res/dtd/*
 @RESPATH@/res/html/*
 @RESPATH@/res/language.properties
 #ifdef XP_MACOSX
 @RESPATH@/res/MainMenu.nib/
 #endif
 
+; Content-accessible resources.
+@RESPATH@/contentaccessible/*
+
 ; svg
 @RESPATH@/res/svg.css
 @RESPATH@/components/dom_svg.xpt
 
 ; [Updater]
 #ifdef MOZ_UPDATER
 #ifdef XP_MACOSX
 @BINPATH@/updater.app/
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -726,19 +726,16 @@
 @BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@
 #endif
 #endif # MOZ_ANGLE_RENDERER
 
 ; editor resource files
 @RESPATH@/res/EditorOverride.css
 @RESPATH@/res/contenteditable.css
 @RESPATH@/res/designmode.css
-@RESPATH@/res/ImageDocument.css
-@RESPATH@/res/TopLevelImageDocument.css
-@RESPATH@/res/TopLevelVideoDocument.css
 @RESPATH@/res/table-add-column-after-active.gif
 @RESPATH@/res/table-add-column-after-hover.gif
 @RESPATH@/res/table-add-column-after.gif
 @RESPATH@/res/table-add-column-before-active.gif
 @RESPATH@/res/table-add-column-before-hover.gif
 @RESPATH@/res/table-add-column-before.gif
 @RESPATH@/res/table-add-row-after-active.gif
 @RESPATH@/res/table-add-row-after-hover.gif
@@ -759,16 +756,19 @@
 @RESPATH@/res/fonts/*
 @RESPATH@/res/dtd/*
 @RESPATH@/res/html/*
 @RESPATH@/res/language.properties
 #ifdef XP_MACOSX
 @RESPATH@/res/MainMenu.nib/
 #endif
 
+; Content-accessible resources.
+@RESPATH@/contentaccessible/*
+
 ; svg
 @RESPATH@/res/svg.css
 @RESPATH@/components/dom_svg.xpt
 @RESPATH@/components/dom_smil.xpt
 
 ; [Extensions]
 @RESPATH@/components/extensions-toolkit.manifest
 @RESPATH@/components/extension-process-script.js
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -673,29 +673,29 @@
 @RESPATH@/res/table-add-row-before-hover.gif
 @RESPATH@/res/table-add-row-before.gif
 @RESPATH@/res/table-remove-column-active.gif
 @RESPATH@/res/table-remove-column-hover.gif
 @RESPATH@/res/table-remove-column.gif
 @RESPATH@/res/table-remove-row-active.gif
 @RESPATH@/res/table-remove-row-hover.gif
 @RESPATH@/res/table-remove-row.gif
-@RESPATH@/res/ImageDocument.css
-@RESPATH@/res/TopLevelImageDocument.css
-@RESPATH@/res/TopLevelVideoDocument.css
 #ifdef XP_MACOSX
 @RESPATH@/res/cursors/*
 #endif
 @RESPATH@/res/fonts/*
 @RESPATH@/res/dtd/*
 @RESPATH@/res/html/*
 #ifdef XP_MACOSX
 @RESPATH@/res/MainMenu.nib/
 #endif
 
+; Content-accessible resources.
+@RESPATH@/contentaccessible/*
+
 ; [Personal Security Manager]
 ;
 ; NSS libraries are signed in the staging directory,
 ; meaning their .chk files are created there directly.
 ;
 #ifndef MOZ_SYSTEM_NSS
 #if defined(XP_LINUX) && !defined(ANDROID)
 @BINPATH@/@DLL_PREFIX@freeblpriv3@DLL_SUFFIX@