Bug 1433715 - Make fallback folder icon content-accessible. r=Gijs, a=RyanVM
authorJan Henning <jh+bugzilla@buttercookie.de>
Sun, 28 Jan 2018 23:01:42 +0100
changeset 452206 711b8a407ffd287573fa14d5ca27631d47b8c413
parent 452205 3d51ba1a7c3fdffd5f44540038f11def9832fc96
child 452207 e60b08577c8971ce72538499a751ce04291881dd
push id8652
push userryanvm@gmail.com
push dateMon, 05 Feb 2018 20:36:30 +0000
treeherdermozilla-beta@d4c3d0d6a6f9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, RyanVM
bugs1433715, 863246
milestone59.0
Bug 1433715 - Make fallback folder icon content-accessible. r=Gijs, a=RyanVM 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
browser/installer/package-manifest.in
layout/generic/moz.build
mobile/android/installer/package-manifest.in
netwerk/streamconv/converters/nsIndexedToHTML.cpp
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -685,17 +685,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"