From 95ab77e28a8978fc412ad6fd55c73b137bea0a5d Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Sun, 14 May 2017 21:12:08 +0200 Subject: [PATCH] Backed out changeset 7da161abdad5 (bug 1348362) --HG-- rename : toolkit/themes/linux/global/icons/Restore.gif => toolkit/themes/windows/global/icons/Restore.gif --- .../test/static/browser_all_files_referenced.js | 16 ++++++++++++++++ toolkit/themes/linux/global/jar.mn | 1 - toolkit/themes/mobile/global/icons/Error.png | Bin 0 -> 2148 bytes toolkit/themes/mobile/jar.mn | 2 ++ toolkit/themes/osx/global/icons/Error.png | Bin 0 -> 1439 bytes toolkit/themes/osx/global/jar.mn | 1 + toolkit/themes/shared/non-mac.jar.inc.mn | 16 ++++++++++++++++ .../{linux => windows}/global/icons/Restore.gif | Bin toolkit/themes/windows/global/jar.mn | 15 --------------- 9 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 toolkit/themes/mobile/global/icons/Error.png create mode 100644 toolkit/themes/osx/global/icons/Error.png rename toolkit/themes/{linux => windows}/global/icons/Restore.gif (100%) diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js index a3d76043ebd0..245fab6be270 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js @@ -158,15 +158,31 @@ var whitelist = new Set([ {file: "chrome://global/skin/arrow/panelarrow-vertical.svg", platforms: ["linux"]}, // Bug 1348362 + {file: "chrome://global/skin/icons/Error.png", platforms: ["linux", "macosx"]}, + {file: "chrome://global/skin/icons/Landscape.png", platforms: ["linux"]}, + {file: "chrome://global/skin/icons/Portrait.png", platforms: ["linux"]}, + {file: "chrome://global/skin/icons/Print-preview.png", platforms: ["linux"]}, + {file: "chrome://global/skin/icons/Question.png", platforms: ["linux"]}, + {file: "chrome://global/skin/icons/Restore.gif", platforms: ["win"]}, + {file: "chrome://global/skin/icons/Search-close.png", platforms: ["linux"]}, + {file: "chrome://global/skin/icons/Search-glass.png", platforms: ["linux"]}, + {file: "chrome://global/skin/icons/Warning.png", platforms: ["linux"]}, {file: "chrome://global/skin/icons/checkbox.png", platforms: ["macosx"]}, {file: "chrome://global/skin/icons/checkbox@2x.png", platforms: ["macosx"]}, + {file: "chrome://global/skin/icons/close-inverted.png", platforms: ["linux"]}, + {file: "chrome://global/skin/icons/close-inverted@2x.png", platforms: ["linux"]}, {file: "chrome://global/skin/icons/close.png", platforms: ["linux"]}, {file: "chrome://global/skin/icons/close@2x.png", platforms: ["linux"]}, + {file: "chrome://global/skin/icons/collapse.png", platforms: ["linux"]}, {file: "chrome://global/skin/icons/error-64.png", platforms: ["linux", "win"]}, {file: "chrome://global/skin/icons/error-large.png", platforms: ["macosx"]}, + {file: "chrome://global/skin/icons/expand.png", platforms: ["linux"]}, + {file: "chrome://global/skin/icons/folder-item.png", platforms: ["linux"]}, {file: "chrome://global/skin/icons/question-large.png", platforms: ["macosx"]}, {file: "chrome://global/skin/icons/warning-32.png", platforms: ["macosx"]}, {file: "chrome://global/skin/icons/warning-64.png", platforms: ["linux", "win"]}, + {file: "chrome://global/skin/icons/warning-large.png", platforms: ["linux"]}, + {file: "chrome://global/skin/icons/windowControls.png", platforms: ["linux"]}, // Bug 1348522 {file: "chrome://global/skin/media/clicktoplay-bgtexture.png"}, {file: "chrome://global/skin/media/videoClickToPlayButton.svg"}, diff --git a/toolkit/themes/linux/global/jar.mn b/toolkit/themes/linux/global/jar.mn index 5a64678dca98..6f1717e60825 100644 --- a/toolkit/themes/linux/global/jar.mn +++ b/toolkit/themes/linux/global/jar.mn @@ -44,7 +44,6 @@ toolkit.jar: skin/classic/global/icons/close.svg (icons/close.svg) skin/classic/global/icons/Minimize.gif (icons/Minimize.gif) skin/classic/global/icons/resizer.png (icons/resizer.png) - skin/classic/global/icons/Restore.gif (icons/Restore.gif) skin/classic/global/icons/sslWarning.png (icons/sslWarning.png) * skin/classic/global/in-content/common.css (in-content/common.css) diff --git a/toolkit/themes/mobile/global/icons/Error.png b/toolkit/themes/mobile/global/icons/Error.png new file mode 100644 index 0000000000000000000000000000000000000000..bd4064f49a32da610169a4e19e26a60e8a176250 GIT binary patch literal 2148 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 literal 0 HcmV?d00001 diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index 3f34376b941f..32251e227a72 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -107,6 +107,7 @@ toolkit.jar: skin/classic/global/icons/error-16.png (icons/error-16.png) skin/classic/global/icons/error-64.png (icons/error-64.png) skin/classic/global/icons/error-large.png (icons/error-large.png) + skin/classic/global/icons/Error.png (icons/Error.png) skin/classic/global/icons/question-16.png (icons/question-16.png) skin/classic/global/icons/question-32.png (icons/question-32.png) skin/classic/global/icons/question-64.png (icons/question-64.png) diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn index 9e149ffacff1..68e01d649a20 100644 --- a/toolkit/themes/shared/non-mac.jar.inc.mn +++ b/toolkit/themes/shared/non-mac.jar.inc.mn @@ -51,14 +51,30 @@ skin/classic/global/icons/autocomplete-search.svg (../../windows/global/icons/autocomplete-search.svg) skin/classic/global/icons/close.png (../../windows/global/icons/close.png) skin/classic/global/icons/close@2x.png (../../windows/global/icons/close@2x.png) + skin/classic/global/icons/close-inverted.png (../../windows/global/icons/close-inverted.png) + skin/classic/global/icons/close-inverted@2x.png (../../windows/global/icons/close-inverted@2x.png) + skin/classic/global/icons/collapse.png (../../windows/global/icons/collapse.png) skin/classic/global/icons/Error.png (../../windows/global/icons/Error.png) + skin/classic/global/icons/error-16.png (../../windows/global/icons/error-16.png) skin/classic/global/icons/error-64.png (../../windows/global/icons/error-64.png) + skin/classic/global/icons/expand.png (../../windows/global/icons/expand.png) + skin/classic/global/icons/folder-item.png (../../windows/global/icons/folder-item.png) + skin/classic/global/icons/Print-preview.png (../../windows/global/icons/Print-preview.png) + skin/classic/global/icons/Portrait.png (../../windows/global/icons/Portrait.png) + skin/classic/global/icons/Landscape.png (../../windows/global/icons/Landscape.png) + skin/classic/global/icons/Question.png (../../windows/global/icons/Question.png) skin/classic/global/icons/question-16.png (../../windows/global/icons/question-16.png) skin/classic/global/icons/question-64.png (../../windows/global/icons/question-64.png) skin/classic/global/icons/resizer-rtl.png (../../windows/global/icons/resizer-rtl.png) + skin/classic/global/icons/Restore.gif (../../windows/global/icons/Restore.gif) + skin/classic/global/icons/Search-close.png (../../windows/global/icons/Search-close.png) + skin/classic/global/icons/Search-glass.png (../../windows/global/icons/Search-glass.png) skin/classic/global/icons/tabprompts-bgtexture.png (../../windows/global/icons/tabprompts-bgtexture.png) + skin/classic/global/icons/Warning.png (../../windows/global/icons/Warning.png) + skin/classic/global/icons/warning-large.png (../../windows/global/icons/warning-large.png) skin/classic/global/icons/warning-16.png (../../windows/global/icons/warning-16.png) skin/classic/global/icons/warning-64.png (../../windows/global/icons/warning-64.png) + skin/classic/global/icons/windowControls.png (../../windows/global/icons/windowControls.png) skin/classic/global/radio/radio-check.gif (../../windows/global/radio/radio-check.gif) skin/classic/global/radio/radio-check-dis.gif (../../windows/global/radio/radio-check-dis.gif) skin/classic/global/splitter/grip-bottom.gif (../../windows/global/splitter/grip-bottom.gif) diff --git a/toolkit/themes/linux/global/icons/Restore.gif b/toolkit/themes/windows/global/icons/Restore.gif similarity index 100% rename from toolkit/themes/linux/global/icons/Restore.gif rename to toolkit/themes/windows/global/icons/Restore.gif diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn index 497730c4ab4f..bf638e2216db 100644 --- a/toolkit/themes/windows/global/jar.mn +++ b/toolkit/themes/windows/global/jar.mn @@ -39,26 +39,11 @@ toolkit.jar: skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png) skin/classic/global/icons/close-win7.png (icons/close-win7.png) skin/classic/global/icons/close-win7@2x.png (icons/close-win7@2x.png) - skin/classic/global/icons/close-inverted.png (icons/close-inverted.png) - skin/classic/global/icons/close-inverted@2x.png (icons/close-inverted@2x.png) skin/classic/global/icons/close-inverted-win7.png (icons/close-inverted-win7.png) skin/classic/global/icons/close-inverted-win7@2x.png (icons/close-inverted-win7@2x.png) - skin/classic/global/icons/collapse.png (icons/collapse.png) - skin/classic/global/icons/error-16.png (icons/error-16.png) - skin/classic/global/icons/expand.png (icons/expand.png) - skin/classic/global/icons/folder-item.png (icons/folder-item.png) skin/classic/global/icons/information-16.png (icons/information-16.png) - skin/classic/global/icons/Landscape.png (icons/Landscape.png) - skin/classic/global/icons/Portrait.png (icons/Portrait.png) - skin/classic/global/icons/Print-preview.png (icons/Print-preview.png) - skin/classic/global/icons/Search-close.png (icons/Search-close.png) - skin/classic/global/icons/Search-glass.png (icons/Search-glass.png) - skin/classic/global/icons/Question.png (icons/Question.png) skin/classic/global/icons/resizer.png (icons/resizer.png) skin/classic/global/icons/sslWarning.png (icons/sslWarning.png) - skin/classic/global/icons/Warning.png (icons/Warning.png) - skin/classic/global/icons/windowControls.png (icons/windowControls.png) - skin/classic/global/icons/warning-large.png (icons/warning-large.png) * skin/classic/global/in-content/common.css (in-content/common.css) * skin/classic/global/in-content/info-pages.css (in-content/info-pages.css) skin/classic/global/toolbar/spring.png (toolbar/spring.png)