Merge fx-team to m-c

browser/base/content/test/general/browser.ini

@@ -117,7 +117,6 @@ run-if = crashreporter
 [browser_aboutHealthReport.js]
 skip-if = os == "linux" # Bug 924307
 [browser_aboutHome.js]
-skip-if = os == "linux" # Bug 945667
 [browser_aboutSyncProgress.js]
 [browser_addKeywordSearch.js]
 [browser_alltabslistener.js]

browser/base/content/test/general/browser_aboutHome.js

@@ -89,11 +89,15 @@ let gTests = [
   }
 },
 
+// Disabled on Linux for intermittent issues with FHR, see Bug 945667.
 {
   desc: "Check that performing a search fires a search event and records to " +
         "Firefox Health Report.",
   setup: function () { },
   run: function () {
+    // Skip this test on Linux.
+    if (navigator.platform.indexOf("Linux") == 0) { return; }
+
     try {
       let cm = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
       cm.getCategoryEntry("healthreport-js-provider-default", "SearchesProvider");

browser/components/customizableui/test/browser.ini

@@ -12,6 +12,9 @@ support-files =
 [browser_880164_customization_context_menus.js]
 [browser_880382_drag_wide_widgets_in_panel.js]
 [browser_885052_customize_mode_observers_disabed.js]
+# Bug 951403 - Disabled on OSX for frequent failures
+skip-if = os == "mac"
+
 [browser_885530_showInPrivateBrowsing.js]
 [browser_886323_buildArea_removable_nodes.js]
 [browser_887438_currentset_shim.js]

browser/components/search/test/Makefile.in

@@ -5,14 +5,8 @@
 ifdef ENABLE_TESTS
 pp_mochitest_browser_files := \
   browser_google.js \
-  $(NULL)
-
-# This test depends on browser_aboutHome.js, which was disabled (bug 945667)
-ifndef MOZ_WIDGET_GTK
-pp_mochitest_browser_files += \
   browser_google_behavior.js \
   $(NULL)
-endif
   
 pp_mochitest_browser_files_PATH := $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 pp_mochitest_browser_files_FLAGS := -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)

browser/themes/osx/browser.css

@@ -467,6 +467,10 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
     -moz-image-region: rect(18px, 630px, 36px, 612px);
   }
 
+  #bookmarks-menu-button[cui-areatype="toolbar"][open] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+    -moz-image-region: rect(36px, 630px, 54px, 612px);
+  }
+
   #history-panelmenu@toolbarButtonPressed@ {
     -moz-image-region: rect(18px, 180px, 36px, 162px);
   }
@@ -475,7 +479,6 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
     -moz-image-region: rect(36px, 180px, 54px, 162px);
   }
 
-  #downloads-indicator@toolbarButtonPressed@,
   #downloads-button@toolbarButtonPressed@ {
     -moz-image-region: rect(18px, 198px, 36px, 180px);
   }
@@ -671,6 +674,10 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
     -moz-image-region: rect(36px, 1260px, 72px, 1224px);
   }
 
+  #bookmarks-menu-button[cui-areatype="toolbar"][open] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+    -moz-image-region: rect(72px, 1260px, 108px, 1224px);
+  }
+
   #history-panelmenu[cui-areatype="toolbar"] {
     -moz-image-region: rect(0, 360px, 36px, 324px);
   }
@@ -683,12 +690,10 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
     -moz-image-region: rect(72px, 360px, 108px, 324px);
   }
 
-  #downloads-indicator[cui-areatype="toolbar"],
   #downloads-button[cui-areatype="toolbar"] {
     -moz-image-region: rect(0, 396px, 36px, 360px);
   }
 
-  #downloads-indicator[cui-areatype="toolbar"]:hover:active:not([disabled="true"]),
   #downloads-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
     -moz-image-region: rect(36px, 396px, 72px, 360px);
   }
@@ -941,7 +946,6 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
   }
 
   #downloads-button[cui-areatype="menu-panel"],
-  #downloads-indicator[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #downloads-button {
     -moz-image-region: rect(0px, 512px, 64px, 448px);
   }
@@ -1916,6 +1920,11 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 }
 
 #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+  width: 18px;
+  height: 18px;
+}
+
+#bookmarks-menu-button[cui-areatype="toolbar"].bookmark-item > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   width: 16px;
   height: 16px;
 }

browser/themes/shared/menupanel.inc.css

@@ -25,7 +25,6 @@ toolbarpaletteitem[place="palette"] > #history-panelmenu {
 }
 
 #downloads-button[cui-areatype="menu-panel"],
-#downloads-indicator[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #downloads-button {
   -moz-image-region: rect(0px, 256px, 32px, 224px);
 }

mobile/android/base/BrowserApp.java

@@ -1631,9 +1631,9 @@ abstract public class BrowserApp extends GeckoApp
     @Override
     public void onLocaleReady(final String locale) {
         super.onLocaleReady(locale);
-        if (isHomePagerVisible()) {
-            // Blow it away and rebuild it with the right strings.
-            mHomePager.redisplay(getSupportLoaderManager(), getSupportFragmentManager());
+
+        if (mHomePager != null) {
+            mHomePager.invalidate(getSupportLoaderManager(), getSupportFragmentManager());
         }
 
         if (mMenu != null) {
@@ -2016,8 +2016,11 @@ abstract public class BrowserApp extends GeckoApp
 
     @Override
     public void openOptionsMenu() {
-        if (!hasTabsSideBar() && areTabsShown())
+        // Disable menu access in edge cases only accessible to hardware menu buttons.
+        if ((!hasTabsSideBar() && areTabsShown()) ||
+                mBrowserToolbar.isEditing()) {
             return;
+        }
 
         // Scroll custom menu to the top
         if (mMenuPanel != null)

mobile/android/base/TextSelection.java

@@ -124,6 +124,9 @@ class TextSelection extends Layer implements GeckoEventListener {
                         if (mActionModeTimerTask != null)
                             mActionModeTimerTask.cancel();
                         showActionMode(message.getJSONArray("actions"));
+
+                        if (handles.length() > 1)
+                            GeckoAppShell.performHapticFeedback(true);
                     } else if (event.equals("TextSelection:Update")) {
                         if (mActionModeTimerTask != null)
                             mActionModeTimerTask.cancel();

mobile/android/base/home/HomePager.java

@@ -47,6 +47,9 @@ public class HomePager extends ViewPager {
 
     private String mInitialPageId;
 
+    // Whether or not we need to restart the loader when we show the HomePager.
+    private boolean mRestartLoader;
+
     // This is mostly used by UI tests to easily fetch
     // specific list views at runtime.
     static final String LIST_TAG_HISTORY = "history";
@@ -154,7 +157,20 @@ public class HomePager extends ViewPager {
         super.addView(child, index, params);
     }
 
-    public void redisplay(LoaderManager lm, FragmentManager fm) {
+    /**
+     * Invalidates the current configuration, redisplaying the HomePager if necessary.
+     */
+    public void invalidate(LoaderManager lm, FragmentManager fm) {
+        // We need to restart the loader to load the new strings.
+        mRestartLoader = true;
+
+        // If the HomePager is currently visible, redisplay it with the new strings.
+        if (isVisible()) {
+            redisplay(lm, fm);
+        }
+    }
+
+    private void redisplay(LoaderManager lm, FragmentManager fm) {
         final HomeAdapter adapter = (HomeAdapter) getAdapter();
 
         // If mInitialPageId is non-null, this means the HomePager hasn't
@@ -193,8 +209,13 @@ public class HomePager extends ViewPager {
         // list of pages in place.
         mTabStrip.setVisibility(View.INVISIBLE);
 
-        // Load list of pages from configuration
+        // Load list of pages from configuration. Restart the loader if necessary.
+        if (mRestartLoader) {
+            lm.restartLoader(LOADER_ID_CONFIG, null, mConfigLoaderCallbacks);
+            mRestartLoader = false;
+        } else {
             lm.initLoader(LOADER_ID_CONFIG, null, mConfigLoaderCallbacks);
+        }
 
         if (shouldAnimate) {
             animator.addPropertyAnimationListener(new PropertyAnimator.PropertyAnimationListener() {

toolkit/content/tests/browser/browser.ini

@@ -5,7 +5,6 @@
 [browser_bug594509.js]
 [browser_default_image_filename.js]
 [browser_findbar.js]
-skip-if = os == "linux" # Bug 945667
 [browser_input_file_tooltips.js]
 [browser_keyevents_during_autoscrolling.js]
 [browser_save_resend_postdata.js]