Bug 1305075 - Stop shipping filepicker.css and filepicker.xul on Mac and Windows, r=Gijs.
authorFlorian Quèze <florian@queze.net>
Mon, 26 Sep 2016 18:34:06 +0200
changeset 315268 4b5a9f8b52d493e4b867b666433fe2aae254c100
parent 315232 c55bcb7c777ea09431b4d16903ed079ae5632648
child 315269 b0b736fe600a41879e4a72934d9404a231462dcc
child 315397 df40bb716fe8df35692ead1dfd6e4cf5301e8010
push id30746
push usercbook@mozilla.com
push dateTue, 27 Sep 2016 09:20:25 +0000
treeherdermozilla-central@b0b736fe600a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1305075
milestone52.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 1305075 - Stop shipping filepicker.css and filepicker.xul on Mac and Windows, r=Gijs.
testing/firefox-ui/tests/puppeteer/test_l10n.py
toolkit/components/filepicker/moz.build
toolkit/components/moz.build
toolkit/locales/jar.mn
toolkit/locales/moz.build
toolkit/themes/osx/global/filepicker.css
toolkit/themes/osx/global/jar.mn
toolkit/themes/windows/global/filepicker.css
toolkit/themes/windows/global/filepicker/Filepicker.png
toolkit/themes/windows/global/jar.mn
--- a/testing/firefox-ui/tests/puppeteer/test_l10n.py
+++ b/testing/firefox-ui/tests/puppeteer/test_l10n.py
@@ -14,27 +14,27 @@ class TestL10n(FirefoxTestCase):
     def setUp(self):
         FirefoxTestCase.setUp(self)
         self.l10n = L10n(lambda: self.marionette)
 
     def tearDown(self):
         FirefoxTestCase.tearDown(self)
 
     def test_dtd_entity_chrome(self):
-        dtds = ['chrome://global/locale/filepicker.dtd',
+        dtds = ['chrome://global/locale/about.dtd',
                 'chrome://browser/locale/baseMenuOverlay.dtd']
 
         value = self.l10n.get_entity(dtds, 'helpSafeMode.label')
         elm = self.marionette.find_element(By.ID, 'helpSafeMode')
         self.assertEqual(value, elm.get_attribute('label'))
 
         self.assertRaises(MarionetteException, self.l10n.get_entity, dtds, 'notExistent')
 
     def test_dtd_entity_content(self):
-        dtds = ['chrome://global/locale/filepicker.dtd',
+        dtds = ['chrome://global/locale/about.dtd',
                 'chrome://global/locale/aboutSupport.dtd']
 
         value = self.l10n.get_entity(dtds, 'aboutSupport.pageTitle')
 
         self.marionette.set_context(self.marionette.CONTEXT_CONTENT)
         self.marionette.navigate('about:support')
 
         elm = self.marionette.find_element(By.TAG_NAME, 'title')
--- a/toolkit/components/filepicker/moz.build
+++ b/toolkit/components/filepicker/moz.build
@@ -1,27 +1,25 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-if CONFIG['MOZ_XUL'] and \
-    CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'cocoa', 'windows'):
-        XPIDL_MODULE = 'filepicker'
-        XPIDL_SOURCES += [
-            'nsIFileView.idl',
-        ]
-        SOURCES += [
-            'nsFileView.cpp',
-        ]
-        EXTRA_COMPONENTS += [
-            'nsFilePicker.js',
-        ]
-        EXTRA_PP_COMPONENTS += [
-            'nsFilePicker.manifest',
-        ]
-        XPCSHELL_TESTS_MANIFESTS += [
-            'test/unit/xpcshell.ini',
-        ]
-        FINAL_LIBRARY = 'xul'
+XPIDL_MODULE = 'filepicker'
+XPIDL_SOURCES += [
+    'nsIFileView.idl',
+]
+SOURCES += [
+    'nsFileView.cpp',
+]
+EXTRA_COMPONENTS += [
+    'nsFilePicker.js',
+]
+EXTRA_PP_COMPONENTS += [
+    'nsFilePicker.manifest',
+]
+XPCSHELL_TESTS_MANIFESTS += [
+    'test/unit/xpcshell.ini',
+]
+FINAL_LIBRARY = 'xul'
 
 JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -21,17 +21,16 @@ DIRS += [
     'contentprefs',
     'contextualidentity',
     'cookie',
     'crashmonitor',
     'diskspacewatcher',
     'downloads',
     'extensions',
     'exthelper',
-    'filepicker',
     'filewatcher',
     'finalizationwitness',
     'formautofill',
     'find',
     'gfx',
     'jsdownloads',
     'lz4',
     'mediasniffer',
@@ -83,16 +82,19 @@ if CONFIG['BUILD_CTYPES']:
     DIRS += ['ctypes']
 
 if CONFIG['MOZ_FEEDS']:
     DIRS += ['feeds']
 
 if CONFIG['MOZ_XUL']:
     DIRS += ['autocomplete', 'satchel']
 
+if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+    DIRS += ['filepicker']
+
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
     DIRS += ['search']
 
 DIRS += ['captivedetect']
 
 if CONFIG['OS_TARGET'] != 'Android':
     DIRS += ['terminator']
 
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -41,17 +41,19 @@
   locale/@AB_CD@/global/dateFormat.properties           (%chrome/global/dateFormat.properties)
   locale/@AB_CD@/global/dialogOverlay.dtd               (%chrome/global/dialogOverlay.dtd)
 #ifndef MOZ_FENNEC
   locale/@AB_CD@/global/editMenuOverlay.dtd             (%chrome/global/editMenuOverlay.dtd)
 #endif
   locale/@AB_CD@/global/extensions.properties           (%chrome/global/extensions.properties)
   locale/@AB_CD@/global/fallbackMenubar.properties      (%chrome/global/fallbackMenubar.properties)
   locale/@AB_CD@/global/filefield.properties            (%chrome/global/filefield.properties)
+#ifdef MOZ_GTK
   locale/@AB_CD@/global/filepicker.dtd                  (%chrome/global/filepicker.dtd)
+#endif
   locale/@AB_CD@/global/filepicker.properties           (%chrome/global/filepicker.properties)
 #ifndef MOZ_FENNEC
   locale/@AB_CD@/global/findbar.dtd                     (%chrome/global/findbar.dtd)
   locale/@AB_CD@/global/findbar.properties              (%chrome/global/findbar.properties)
   locale/@AB_CD@/global/finddialog.dtd                  (%chrome/global/finddialog.dtd)
   locale/@AB_CD@/global/finddialog.properties           (%chrome/global/finddialog.properties)
 #endif
   locale/@AB_CD@/global/globalKeys.dtd                  (%chrome/global/globalKeys.dtd)
--- a/toolkit/locales/moz.build
+++ b/toolkit/locales/moz.build
@@ -2,9 +2,12 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
   DEFINES['MOZ_FENNEC'] = True
 
+if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+  DEFINES['MOZ_GTK'] = True
+
 JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/toolkit/themes/osx/global/filepicker.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@import url("chrome://global/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ::::: column widths ::::: */
-
-#FilenameColumn,
-#ContentLengthColumn,
-#LastModifiedDateColumn {
-  width: 100px;
-}
-
-/* ::::: file/directory items ::::: */
-
-treechildren::-moz-tree-image(treecolAutoCompleteValue, directory),
-treechildren::-moz-tree-image(FilenameColumn, directory) {
-  margin-right: 2px;
-  list-style-image: url("chrome://global/skin/filepicker/dir-closed.gif");
-}
-
-treechildren::-moz-tree-image(treecolAutoCompleteValue, file),
-treechildren::-moz-tree-image(FilenameColumn, file) {
-  list-style-image: url("chrome://global/skin/filepicker/blank.gif");
-}
-
-/* ::::: button items ::::: */
-
-.up-button {
-  list-style-image: url("chrome://global/skin/filepicker/folder-up.gif");
-  max-width: 36px;
-}
-
-.home-button {
-  list-style-image: url("chrome://global/skin/filepicker/folder-home.gif");
-  max-width: 36px;
-}
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -12,17 +12,16 @@ toolkit.jar:
   skin/classic/global/button.css
   skin/classic/global/checkbox.css
   skin/classic/global/colorpicker.css
   skin/classic/global/commonDialog.css
   skin/classic/global/customizeToolbar.css
   skin/classic/global/dialog.css
   skin/classic/global/dropmarker.css
   skin/classic/global/filefield.css
-  skin/classic/global/filepicker.css
   skin/classic/global/filters.svg
 * skin/classic/global/findBar.css
 * skin/classic/global/global.css
   skin/classic/global/groupbox.css
   skin/classic/global/linkTree.css
   skin/classic/global/listbox.css
   skin/classic/global/menu.css
   skin/classic/global/menulist.css
deleted file mode 100644
--- a/toolkit/themes/windows/global/filepicker.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* ===== filepicker.css =================================================
-  == Styles used by the File Picker dialog.
-  ======================================================================= */
-
-@import url("chrome://global/skin/");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ::::: column widths ::::: */
-
-#FilenameColumn,
-#ContentLengthColumn,
-#LastModifiedDateColumn {
-  width: 100px;
-}
-
-/* ::::: file/directory items ::::: */
-
-treechildren::-moz-tree-image(treecolAutoCompleteValue, directory),
-treechildren::-moz-tree-image(FilenameColumn, directory) {
-  list-style-image: url("chrome://global/skin/icons/folder-item.png");
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-treechildren::-moz-tree-image(treecolAutoCompleteValue, file),
-treechildren::-moz-tree-image(FilenameColumn, file) {
-  list-style-image: url("chrome://global/skin/icons/folder-item.png");
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-
-/* ::::: button items ::::: */
-
-/* up-button */
-
-.up-button {
-  list-style-image: url("chrome://global/skin/Filepicker.png");
-  -moz-image-region: rect(0px 24px 24px 0px);
-  max-width: 36px;
-}
-
-.up-button:hover {
-  list-style-image: url("chrome://global/skin/Filepicker.png");
-  -moz-image-region: rect(24px 24px 48px 0px);
-  max-width: 36px;
-}
-
-/* home-button */
-
-.home-button {
-  list-style-image: url("chrome://global/skin/Filepicker.png");
-  -moz-image-region: rect(0px 48px 24px 24px);
-  max-width: 36px;
-}
-
-.home-button:hover {
-  list-style-image: url("chrome://global/skin/Filepicker.png");
-  -moz-image-region: rect(24px 48px 48px 24px);
-  max-width: 36px;
-}
-
-/* new-dir-button */
-
-.new-dir-button {
-  list-style-image: url("chrome://global/skin/Filepicker.png");
-  -moz-image-region: rect(0px 72px 24px 48px);
-  max-width: 36px;
-}
-
-.new-dir-button:hover {
-  list-style-image: url("chrome://global/skin/Filepicker.png");
-  -moz-image-region: rect(24px 72px 48px 48px);
-  max-width: 36px;
-}
deleted file mode 100644
index 7b9508515161f160e018e444249c74080703b4a1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -15,18 +15,16 @@ toolkit.jar:
   skin/classic/global/menulist.css
 * skin/classic/global/popup.css
   skin/classic/global/radio.css
   skin/classic/global/tabbox.css
   skin/classic/global/textbox.css
 #endif
   skin/classic/global/colorpicker.css
   skin/classic/global/commonDialog.css
-  skin/classic/global/filepicker.css
-  skin/classic/global/Filepicker.png                       (filepicker/Filepicker.png)
   skin/classic/global/findBar.css
 * skin/classic/global/global.css
   skin/classic/global/listbox.css
   skin/classic/global/netError.css
   skin/classic/global/numberbox.css
 * skin/classic/global/notification.css
   skin/classic/global/preferences.css
   skin/classic/global/printPageSetup.css