Merge inbound to mozilla-central. a=merge
authorGurzau Raul <rgurzau@mozilla.com>
Sun, 19 Aug 2018 12:41:39 +0300
changeset 487391 2d1d32212c1e
parent 487388 eef8c5edb73c (current diff)
parent 487390 f4f56776a112 (diff)
child 487393 c6e7b65bf8b0
child 487401 9f9bb31175a8
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone63.0a1
first release with
nightly linux32
2d1d32212c1e / 63.0a1 / 20180819100312 / files
nightly linux64
2d1d32212c1e / 63.0a1 / 20180819100312 / files
nightly mac
2d1d32212c1e / 63.0a1 / 20180819100312 / files
nightly win32
2d1d32212c1e / 63.0a1 / 20180819100312 / files
nightly win64
2d1d32212c1e / 63.0a1 / 20180819100312 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
--- a/browser/themes/osx/places/organizer.css
+++ b/browser/themes/osx/places/organizer.css
@@ -1,65 +1,58 @@
 /* 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/. */
 
 /* Places Organizer Sidebars */
 
-#placesList > treechildren::-moz-tree-row {
-  padding-bottom: 1px;
+#placesList {
+  -moz-appearance: -moz-mac-source-list;
+  width: 160px;
+}
+
+@media (-moz-mac-yosemite-theme: 0) {
+  #placesList {
+    box-shadow: inset -2px 0 0 hsla(0,0%,100%,.2);
+  }
 }
 
 #placesList > treechildren::-moz-tree-cell-text {
   margin-inline-end: 6px;
 }
 
 #placesList > treechildren::-moz-tree-row(selected) {
   -moz-appearance: -moz-mac-source-list-selection;
   -moz-font-smoothing-background-color: -moz-mac-source-list-selection;
 }
 
 #placesList > treechildren::-moz-tree-row(selected,focus) {
   -moz-appearance: -moz-mac-active-source-list-selection;
   -moz-font-smoothing-background-color: -moz-mac-active-source-list-selection;
 }
 
-#placesList > treechildren::-moz-tree-row(History),
-#placesList > treechildren::-moz-tree-row(history)  {
-  background-color: blue;
-}
-
 #placesList > treechildren::-moz-tree-cell(separator) {
   cursor: default;
 }
 
 #placesList > treechildren::-moz-tree-separator {
   border-top: 1px solid #505d6d;
   margin: 0 10px;
 }
 
-#placesList > treechildren::-moz-tree-twisty(selected),
-#placesList > treechildren::-moz-tree-cell-text(selected) {
-  color: #fff;
-  fill-opacity: 1;
-  font-weight: bold;
-}
-
-@media (-moz-mac-yosemite-theme) {
+/* Match selected item styling for -moz-appearance values on OSX 10.9 */
+@media (-moz-mac-yosemite-theme: 0) {
+  #placesList > treechildren::-moz-tree-image(selected),
   #placesList > treechildren::-moz-tree-twisty(selected),
   #placesList > treechildren::-moz-tree-cell-text(selected) {
-    color: -moz-dialogtext;
-    fill-opacity: 0.6;
-    font-weight: 500;
+    color: #fff;
   }
 
-  #placesList > treechildren::-moz-tree-twisty(selected, focus),
-  #placesList > treechildren::-moz-tree-cell-text(selected, focus) {
-    color: #fff;
-    fill-opacity: 1;
+  #placesList > treechildren::-moz-tree-cell-text(selected) {
+    font-weight: bold;
   }
 }
 
 #placesToolbar {
   padding: 0 4px 3px;
 }
 
 #placesView {
@@ -164,59 +157,26 @@
 }
 
 /* Root View */
 #placesView {
   border-top: 1px solid ThreeDDarkShadow;
   -moz-user-focus: ignore;
 }
 
-/* Place List, Place Content */
-#placesList {
-  -moz-appearance: -moz-mac-source-list;
-  box-shadow: inset -2px 0 0 hsla(0,0%,100%,.2);
-  width: 160px;
-}
-
-@media (-moz-mac-yosemite-theme) {
-  #placesList {
-    box-shadow: none;
-  }
-}
-
 /* Info box */
 #detailsDeck {
   border-top: 1px solid #919191;
   background-color: #f0f0f0;
   padding: 10px;
 }
 
 #placeContent {
   -moz-appearance: none;
-  border: 0px;
-}
-
-#placeContent > treechildren::-moz-tree-row {
-  border-top: none !important;
-  padding-top: 1px;
-}
-
-#placeContent > treechildren::-moz-tree-row(odd) {
-  background-color: #edf3fe;
-}
-
-#placeContent > treechildren::-moz-tree-row(selected),
-#placeContent > treechildren::-moz-tree-row(odd, selected) {
-  background-color: -moz-mac-secondaryhighlight;
-}
-
-#placeContent > treechildren::-moz-tree-row(selected, focus), 
-#placeContent > treechildren::-moz-tree-row(odd, selected, focus) {
-  background-color: Highlight;
-  color: HighlightText !important;
+  border: none;
 }
 
 #placeContent > treechildren::-moz-tree-cell,
 #placeContent > treechildren::-moz-tree-column {
   border-right: 1px solid #d7dad7;
 }
 
 #placeContent > treechildren::-moz-tree-cell(separator) {
--- a/browser/themes/osx/places/places.css
+++ b/browser/themes/osx/places/places.css
@@ -1,82 +1,66 @@
 /* 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/. */
 
 /* Sidebars */
 
 %include ../../shared/places/places.inc.css
 
-.sidebar-placesTree,
-.sidebar-placesTreechildren::-moz-tree-row {
-  padding-bottom: 1px;
+.sidebar-placesTree {
   margin: 0;
-  height: 24px;
   /* Default font size is 11px on mac, so this is 12px */
   font-size: 1.0909rem;
+  -moz-appearance: -moz-mac-source-list;
+  -moz-font-smoothing-background-color: -moz-mac-source-list;
 }
 
 :root[uidensity=touch] .sidebar-placesTreechildren::-moz-tree-row {
   min-height: 32px;
 }
 
-.sidebar-placesTree {
-  -moz-appearance: -moz-mac-source-list;
-  -moz-font-smoothing-background-color: -moz-mac-source-list;
-}
-
 .sidebar-placesTreechildren::-moz-tree-separator {
   border-top: 1px solid #505d6d;
   margin: 0 10px;
 }
 
-.sidebar-placesTreechildren::-moz-tree-row {
-  background-color: transparent;
-}
-
 .sidebar-placesTreechildren::-moz-tree-row(selected) {
   -moz-appearance: -moz-mac-source-list-selection;
   -moz-font-smoothing-background-color: -moz-mac-source-list-selection;
 }
 
 .sidebar-placesTreechildren::-moz-tree-row(selected,focus) {
   -moz-appearance: -moz-mac-active-source-list-selection;
   -moz-font-smoothing-background-color: -moz-mac-active-source-list-selection;
 }
 
 .sidebar-placesTreechildren::-moz-tree-cell-text {
   margin-inline-end: 6px;
 }
 
-.sidebar-placesTreechildren::-moz-tree-twisty(selected),
-.sidebar-placesTreechildren::-moz-tree-cell-text(selected) {
-  color: #fff;
-  font-weight: bold;
+/* Match selected item styling for -moz-appearance values on OSX 10.9 */
+@media (-moz-mac-yosemite-theme: 0) {
+  .sidebar-placesTreechildren::-moz-tree-image(selected),
+  .sidebar-placesTreechildren::-moz-tree-twisty(selected),
+  .sidebar-placesTreechildren::-moz-tree-cell-text(selected) {
+    color: #fff;
+  }
+
+  .sidebar-placesTreechildren::-moz-tree-cell-text(selected) {
+    font-weight: bold;
+  }
 }
 
 #sidebar-search-container {
   /* Native searchbar styling already adds 4px margin on Mac, so
    * adding 4px padding results in 8px of total whitespace. */
   padding: 4px;
 }
 
-@media (-moz-mac-yosemite-theme) {
-  .sidebar-placesTreechildren::-moz-tree-twisty(selected),
-  .sidebar-placesTreechildren::-moz-tree-cell-text(selected) {
-    color: -moz-dialogtext;
-    font-weight: 500;
-  }
-
-  .sidebar-placesTreechildren::-moz-tree-twisty(selected, focus),
-  .sidebar-placesTreechildren::-moz-tree-cell-text(selected, focus) {
-    color: #fff;
-  }
-}
-
 #viewButton {
   margin: 4px 0;
   margin-inline-end: 4px;
   /* Default font size is 11px on mac, so this is 12px */
   font-size: 1.0909rem;
 }
 
 #viewButton:focus {
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1005,18 +1005,20 @@ pref("accessibility.typeaheadfind.manual
 pref("accessibility.typeaheadfind.autostart", true);
 // casesensitive: controls the find bar's case-sensitivity
 //     0 - "never"  (case-insensitive)
 //     1 - "always" (case-sensitive)
 // other - "auto"   (case-sensitive for mixed-case input, insensitive otherwise)
 pref("accessibility.typeaheadfind.casesensitive", 0);
 pref("accessibility.typeaheadfind.linksonly", true);
 pref("accessibility.typeaheadfind.startlinksonly", false);
+// timeout: controls the delay in milliseconds after which the quick-find dialog will close
+//          if no further keystrokes are pressed
+//              set to a zero or negative value to keep dialog open until it's manually closed
 pref("accessibility.typeaheadfind.timeout", 4000);
-pref("accessibility.typeaheadfind.enabletimeout", true);
 pref("accessibility.typeaheadfind.soundURL", "beep");
 pref("accessibility.typeaheadfind.enablesound", true);
 #ifdef XP_MACOSX
 pref("accessibility.typeaheadfind.prefillwithselection", false);
 #else
 pref("accessibility.typeaheadfind.prefillwithselection", true);
 #endif
 pref("accessibility.typeaheadfind.matchesCountLimit", 1000);
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -328,16 +328,19 @@
 
           switch (aPrefName) {
             case "accessibility.typeaheadfind":
               this._self._findAsYouType = prefsvc.getBoolPref(aPrefName);
               break;
             case "accessibility.typeaheadfind.manual":
               this._self._manualFAYT = prefsvc.getBoolPref(aPrefName);
               break;
+            case "accessibility.typeaheadfind.timeout":
+              this._self.quickFindTimeoutLength = prefsvc.getIntPref(aPrefName);
+              break;
             case "accessibility.typeaheadfind.linksonly":
               this._self._typeAheadLinksOnly = prefsvc.getBoolPref(aPrefName);
               break;
             case "accessibility.typeaheadfind.casesensitive":
               this._self._setCaseSensitivity(prefsvc.getIntPref(aPrefName));
               break;
             case "findbar.entireword":
               this._self._entireWord = prefsvc.getBoolPref(aPrefName);
@@ -363,17 +366,17 @@
         this._foundMatches = this.getElement("found-matches");
         this._findStatusIcon = this.getElement("find-status-icon");
         this._findStatusDesc = this.getElement("find-status");
 
         this._foundURL = null;
 
         let prefsvc = this._prefsvc;
 
-        this._quickFindTimeoutLength =
+        this.quickFindTimeoutLength =
           prefsvc.getIntPref("accessibility.typeaheadfind.timeout");
         this._flashFindBar =
           prefsvc.getIntPref("accessibility.typeaheadfind.flashBar");
         this._useModalHighlight = prefsvc.getBoolPref("findbar.modalHighlight");
 
         prefsvc.addObserver("accessibility.typeaheadfind",
                             this._observer);
         prefsvc.addObserver("accessibility.typeaheadfind.manual",
@@ -473,21 +476,25 @@
           // Don't close the find toolbar while IME is composing OR when the
           // findbar is already hidden.
           if (this._isIMEComposing || this.hidden) {
             this._quickFindTimeout = null;
             this._updateBrowserWithState();
             return;
           }
 
-          this._quickFindTimeout = setTimeout(() => {
-             if (this._findMode != this.FIND_NORMAL)
-               this.close();
-             this._quickFindTimeout = null;
-           }, this._quickFindTimeoutLength);
+          if (this.quickFindTimeoutLength < 1) {
+            this._quickFindTimeout = null;
+          } else {
+            this._quickFindTimeout = setTimeout(() => {
+              if (this._findMode != this.FIND_NORMAL)
+                  this.close();
+               this._quickFindTimeout = null;
+            }, this.quickFindTimeoutLength);
+          }
           this._updateBrowserWithState();
         ]]></body>
       </method>
 
       <field name="_pluralForm">null</field>
       <property name="pluralForm">
         <getter><![CDATA[
           if (!this._pluralForm) {