Bug 1433715 - Make fallback folder icon content-accessible. r?bz
The skin used on Firefox for Android doesn't style directory listing, hence we
fall back to using the default icon from gre/res/html. As of
bug 863246, this
location is no longer accessible from content as a resource://, hence the file
needs moving into the special content-accessible directory.
MozReview-Commit-ID: obtefafqul
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -689,17 +689,16 @@
@RESPATH@/res/table-remove-row-hover.gif
@RESPATH@/res/table-remove-row.gif
@RESPATH@/res/grabber.gif
#ifdef XP_MACOSX
@RESPATH@/res/cursors/*
#endif
@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/*
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -207,17 +207,17 @@ LOCAL_INCLUDES += [
'/docshell/base',
'/dom/base',
'/dom/html',
'/dom/xul',
]
JAR_MANIFESTS += ['jar.mn']
-RESOURCE_FILES.html = [
+CONTENT_ACCESSIBLE_FILES.html = [
'folder.png',
]
MOCHITEST_MANIFESTS += ['test/mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -464,17 +464,16 @@
@BINPATH@/res/table-remove-column-active.gif
@BINPATH@/res/table-remove-column-hover.gif
@BINPATH@/res/table-remove-column.gif
@BINPATH@/res/table-remove-row-active.gif
@BINPATH@/res/table-remove-row-hover.gif
@BINPATH@/res/table-remove-row.gif
@BINPATH@/res/grabber.gif
@BINPATH@/res/dtd/*
-@BINPATH@/res/html/*
@BINPATH@/res/language.properties
#ifndef MOZ_ANDROID_EXCLUDE_FONTS
@BINPATH@/res/fonts/*
#else
@BINPATH@/res/fonts/*.properties
#endif
--- a/netwerk/streamconv/converters/nsIndexedToHTML.cpp
+++ b/netwerk/streamconv/converters/nsIndexedToHTML.cpp
@@ -346,17 +346,17 @@ nsIndexedToHTML::DoOnStartRequest(nsIReq
".file > img {\n"
" margin-inline-end: 4px;\n"
" margin-inline-start: -20px;\n"
" max-width: 16px;\n"
" max-height: 16px;\n"
" vertical-align: middle;\n"
"}\n"
".dir::before {\n"
- " content: url(resource://gre/res/html/folder.png);\n"
+ " content: url(resource://content-accessible/html/folder.png);\n"
"}\n"
"</style>\n"
"<link rel=\"stylesheet\" media=\"screen, projection\" type=\"text/css\""
" href=\"chrome://global/skin/dirListing/dirListing.css\">\n"
"<script type=\"application/javascript\">\n"
"'use strict';\n"
"var gTable, gOrderBy, gTBody, gRows, gUI_showHidden;\n"
"document.addEventListener(\"DOMContentLoaded\", function() {\n"