Bug 1531658 Fix up absolute icon paths r=kmag
authorAndrew Swan <aswan@mozilla.com>
Fri, 01 Mar 2019 22:44:00 +0000
changeset 519927 e4a6fcff18b3681aea9d9288af3a30db83f8df71
parent 519926 3ebabb9accebd7c078d2cbbf194ca3d04b9045b6
child 519928 efec51b1aaf2bab63edb2eced66637eb1e030a17
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskmag
bugs1531658
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1531658 Fix up absolute icon paths r=kmag Differential Revision: https://phabricator.services.mozilla.com/D21792
toolkit/mozapps/extensions/internal/XPIDatabase.jsm
--- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
@@ -750,17 +750,18 @@ AddonWrapper = class {
     if (addon._repositoryAddon) {
       for (let size in addon._repositoryAddon.icons) {
         icons[size] = addon._repositoryAddon.icons[size];
       }
     }
 
     if (addon.icons) {
       for (let size in addon.icons) {
-        icons[size] = this.getResourceURI(addon.icons[size]).spec;
+        let path = addon.icons[size].replace(/^\//, "");
+        icons[size] = this.getResourceURI(path).spec;
       }
     }
 
     let canUseIconURLs = this.isActive;
     if (canUseIconURLs && addon.iconURL) {
       icons[32] = addon.iconURL;
       icons[48] = addon.iconURL;
     }