Commit dad27b90 authored by Cosmin Sabou's avatar Cosmin Sabou
Browse files

Merge mozilla-central to mozilla-inbound. 

--HG--
rename : browser/base/content/test/urlbar/Panel.jsm => browser/components/urlbar/tests/browser/Panel.jsm
rename : browser/base/content/test/urlbar/authenticate.sjs => browser/components/urlbar/tests/browser/authenticate.sjs
rename : browser/base/content/test/urlbar/browser_URLBarSetURI.js => browser/components/urlbar/tests/browser/browser_URLBarSetURI.js
rename : browser/base/content/test/urlbar/browser_bug1025195_switchToTabHavingURI_aOpenParams.js => browser/components/urlbar/tests/browser/browser_bug1025195_switchToTabHavingURI_aOpenParams.js
rename : browser/base/content/test/urlbar/browser_bug562649.js => browser/components/urlbar/tests/browser/browser_bug562649.js
rename : browser/base/content/test/urlbar/browser_bug623155.js => browser/components/urlbar/tests/browser/browser_bug623155.js
rename : browser/base/content/test/urlbar/browser_bug783614.js => browser/components/urlbar/tests/browser/browser_bug783614.js
rename : browser/base/content/test/urlbar/browser_locationBarExternalLoad.js => browser/components/urlbar/tests/browser/browser_locationBarExternalLoad.js
rename : browser/base/content/test/urlbar/browser_moz_action_link.js => browser/components/urlbar/tests/browser/browser_moz_action_link.js
rename : browser/base/content/test/urlbar/browser_page_action_menu_add_search_engine.js => browser/components/urlbar/tests/browser/browser_page_action_menu_add_search_engine.js
rename : browser/base/content/test/urlbar/browser_page_action_menu_clipboard.js => browser/components/urlbar/tests/browser/browser_page_action_menu_clipboard.js
rename : browser/base/content/test/urlbar/browser_page_action_menu_share_mac.js => browser/components/urlbar/tests/browser/browser_page_action_menu_share_mac.js
rename : browser/base/content/test/urlbar/browser_page_action_menu_share_win.html => browser/components/urlbar/tests/browser/browser_page_action_menu_share_win.html
rename : browser/base/content/test/urlbar/browser_page_action_menu_share_win.js => browser/components/urlbar/tests/browser/browser_page_action_menu_share_win.js
rename : browser/base/content/test/urlbar/browser_populateAfterPushState.js => browser/components/urlbar/tests/browser/browser_populateAfterPushState.js
rename : browser/base/content/test/urlbar/browser_urlbarCopying.js => browser/components/urlbar/tests/browser/browser_urlbarCopying.js
rename : browser/base/content/test/urlbar/browser_urlbarEnter.js => browser/components/urlbar/tests/browser/browser_urlbarEnter.js
rename : browser/base/content/test/urlbar/browser_urlbarFocusedCmdK.js => browser/components/urlbar/tests/browser/browser_urlbarFocusedCmdK.js
rename : browser/base/content/test/urlbar/browser_urlbarHashChangeProxyState.js => browser/components/urlbar/tests/browser/browser_urlbarHashChangeProxyState.js
rename : browser/base/content/test/urlbar/browser_urlbarPlaceholder.js => browser/components/urlbar/tests/browser/browser_urlbarPlaceholder.js
rename : browser/base/content/test/urlbar/browser_urlbarRevert.js => browser/components/urlbar/tests/browser/browser_urlbarRevert.js
rename : browser/base/content/test/urlbar/browser_urlbarSearchSingleWordNotification.js => browser/components/urlbar/tests/browser/browser_urlbarSearchSingleWordNotification.js
rename : browser/base/content/test/urlbar/browser_urlbarUpdateForDomainCompletion.js => browser/components/urlbar/tests/browser/browser_urlbarUpdateForDomainCompletion.js
rename : browser/base/content/test/urlbar/browser_urlbar_blanking.js => browser/components/urlbar/tests/browser/browser_urlbar_blanking.js
rename : browser/base/content/test/urlbar/browser_urlbar_locationchange_urlbar_edit_dos.js => browser/components/urlbar/tests/browser/browser_urlbar_locationchange_urlbar_edit_dos.js
rename : browser/base/content/test/urlbar/browser_urlbar_remoteness_switch.js => browser/components/urlbar/tests/browser/browser_urlbar_remoteness_switch.js
rename : browser/base/content/test/urlbar/browser_urlbar_searchsettings.js => browser/components/urlbar/tests/browser/browser_urlbar_searchsettings.js
rename : browser/base/content/test/urlbar/browser_urlbar_whereToOpen.js => browser/components/urlbar/tests/browser/browser_urlbar_whereToOpen.js
rename : browser/base/content/test/urlbar/browser_wyciwyg_urlbarCopying.js => browser/components/urlbar/tests/browser/browser_wyciwyg_urlbarCopying.js
rename : browser/base/content/test/urlbar/dummy_page.html => browser/components/urlbar/tests/browser/dummy_page.html
rename : browser/base/content/test/urlbar/file_blank_but_not_blank.html => browser/components/urlbar/tests/browser/file_blank_but_not_blank.html
rename : browser/base/content/test/urlbar/file_bug562649.html => browser/components/urlbar/tests/browser/file_bug562649.html
rename : browser/base/content/test/urlbar/file_urlbar_edit_dos.html => browser/components/urlbar/tests/browser/file_urlbar_edit_dos.html
rename : browser/base/content/test/urlbar/head.js => browser/components/urlbar/tests/browser/head-common.js
rename : browser/base/content/test/urlbar/moz.png => browser/components/urlbar/tests/browser/moz.png
rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_0.xml => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_0.xml
rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_1.xml => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_1.xml
rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_2.xml => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_2.xml
rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_many.html => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_many.html
rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_one.html => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_one.html
rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_same_names.html => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_same_names.html
rename : browser/base/content/test/urlbar/print_postdata.sjs => browser/components/urlbar/tests/browser/print_postdata.sjs
rename : browser/base/content/test/urlbar/redirect_bug623155.sjs => browser/components/urlbar/tests/browser/redirect_bug623155.sjs
rename : browser/base/content/test/urlbar/searchSuggestionEngine.sjs => browser/components/urlbar/tests/browser/searchSuggestionEngine.sjs
rename : browser/base/content/test/urlbar/searchSuggestionEngine.xml => browser/components/urlbar/tests/browser/searchSuggestionEngine.xml
rename : browser/base/content/test/urlbar/searchSuggestionEngine2.xml => browser/components/urlbar/tests/browser/searchSuggestionEngine2.xml
rename : browser/base/content/test/urlbar/searchSuggestionEngineSlow.xml => browser/components/urlbar/tests/browser/searchSuggestionEngineSlow.xml
rename : browser/base/content/test/urlbar/slow-page.sjs => browser/components/urlbar/tests/browser/slow-page.sjs
rename : browser/base/content/test/urlbar/test_wyciwyg_copying.html => browser/components/urlbar/tests/browser/test_wyciwyg_copying.html
rename : browser/base/content/test/urlbar/urlbarAddonIframe.js => browser/components/urlbar/tests/browser/urlbarAddonIframe.js
rename : browser/base/content/test/urlbar/urlbarAddonIframeContentScript.js => browser/components/urlbar/tests/browser/urlbarAddonIframeContentScript.js
rename : browser/base/content/test/urlbar/.eslintrc.js => browser/components/urlbar/tests/legacy/.eslintrc.js
rename : browser/base/content/test/urlbar/browser_action_keyword.js => browser/components/urlbar/tests/legacy/browser_action_keyword.js
rename : browser/base/content/test/urlbar/browser_action_keyword_override.js => browser/components/urlbar/tests/legacy/browser_action_keyword_override.js
rename : browser/base/content/test/urlbar/browser_action_searchengine.js => browser/components/urlbar/tests/legacy/browser_action_searchengine.js
rename : browser/base/content/test/urlbar/browser_action_searchengine_alias.js => browser/components/urlbar/tests/legacy/browser_action_searchengine_alias.js
rename : browser/base/content/test/urlbar/browser_autocomplete_a11y_label.js => browser/components/urlbar/tests/legacy/browser_autocomplete_a11y_label.js
rename : browser/base/content/test/urlbar/browser_autocomplete_autoselect.js => browser/components/urlbar/tests/legacy/browser_autocomplete_autoselect.js
rename : browser/base/content/test/urlbar/browser_autocomplete_cursor.js => browser/components/urlbar/tests/legacy/browser_autocomplete_cursor.js
rename : browser/base/content/test/urlbar/browser_autocomplete_edit_completed.js => browser/components/urlbar/tests/legacy/browser_autocomplete_edit_completed.js
rename : browser/base/content/test/urlbar/browser_autocomplete_enter_race.js => browser/components/urlbar/tests/legacy/browser_autocomplete_enter_race.js
rename : browser/base/content/test/urlbar/browser_autocomplete_no_title.js => browser/components/urlbar/tests/legacy/browser_autocomplete_no_title.js
rename : browser/base/content/test/urlbar/browser_autocomplete_readline_navigation.js => browser/components/urlbar/tests/legacy/browser_autocomplete_readline_navigation.js
rename : browser/base/content/test/urlbar/browser_autocomplete_tag_star_visibility.js => browser/components/urlbar/tests/legacy/browser_autocomplete_tag_star_visibility.js
rename : browser/base/content/test/urlbar/browser_bug1003461-switchtab-override.js => browser/components/urlbar/tests/legacy/browser_bug1003461-switchtab-override.js
rename : browser/base/content/test/urlbar/browser_bug1024133-switchtab-override-keynav.js => browser/components/urlbar/tests/legacy/browser_bug1024133-switchtab-override-keynav.js
rename : browser/base/content/test/urlbar/browser_bug1070778.js => browser/components/urlbar/tests/legacy/browser_bug1070778.js
rename : browser/base/content/test/urlbar/browser_bug1104165-switchtab-decodeuri.js => browser/components/urlbar/tests/legacy/browser_bug1104165-switchtab-decodeuri.js
rename : browser/base/content/test/urlbar/browser_bug1225194-remotetab.js => browser/components/urlbar/tests/legacy/browser_bug1225194-remotetab.js
rename : browser/base/content/test/urlbar/browser_bug304198.js => browser/components/urlbar/tests/legacy/browser_bug304198.js
rename : browser/base/content/test/urlbar/browser_bug556061.js => browser/components/urlbar/tests/legacy/browser_bug556061.js
rename : browser/base/content/test/urlbar/browser_canonizeURL.js => browser/components/urlbar/tests/legacy/browser_canonizeURL.js
rename : browser/base/content/test/urlbar/browser_dragdropURL.js => browser/components/urlbar/tests/legacy/browser_dragdropURL.js
rename : browser/base/content/test/urlbar/browser_locationBarCommand.js => browser/components/urlbar/tests/legacy/browser_locationBarCommand.js
rename : browser/base/content/test/urlbar/browser_new_tab_urlbar_reset.js => browser/components/urlbar/tests/legacy/browser_new_tab_urlbar_reset.js
rename : browser/base/content/test/urlbar/browser_page_action_menu.js => browser/components/urlbar/tests/legacy/browser_page_action_menu.js
rename : browser/base/content/test/urlbar/browser_pasteAndGo.js => browser/components/urlbar/tests/legacy/browser_pasteAndGo.js
rename : browser/base/content/test/urlbar/browser_removeUnsafeProtocolsFromURLBarPaste.js => browser/components/urlbar/tests/legacy/browser_removeUnsafeProtocolsFromURLBarPaste.js
rename : browser/base/content/test/urlbar/browser_search_favicon.js => browser/components/urlbar/tests/legacy/browser_search_favicon.js
rename : browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js => browser/components/urlbar/tests/legacy/browser_tabMatchesInAwesomebar.js
rename : browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar_perwindowpb.js => browser/components/urlbar/tests/legacy/browser_tabMatchesInAwesomebar_perwindowpb.js
rename : browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js => browser/components/urlbar/tests/legacy/browser_urlbarAboutHomeLoading.js
rename : browser/base/content/test/urlbar/browser_urlbarAddonIframe.js => browser/components/urlbar/tests/legacy/browser_urlbarAddonIframe.js
rename : browser/base/content/test/urlbar/browser_urlbarAutoFillTrimURLs.js => browser/components/urlbar/tests/legacy/browser_urlbarAutoFillTrimURLs.js
rename : browser/base/content/test/urlbar/browser_urlbarAutofillPreserveCase.js => browser/components/urlbar/tests/legacy/browser_urlbarAutofillPreserveCase.js
rename : browser/base/content/test/urlbar/browser_urlbarDecode.js => browser/components/urlbar/tests/legacy/browser_urlbarDecode.js
rename : browser/base/content/test/urlbar/browser_urlbarDelete.js => browser/components/urlbar/tests/legacy/browser_urlbarDelete.js
rename : browser/base/content/test/urlbar/browser_urlbarEnterAfterMouseOver.js => browser/components/urlbar/tests/legacy/browser_urlbarEnterAfterMouseOver.js
rename : browser/base/content/test/urlbar/browser_urlbarKeepStateAcrossTabSwitches.js => browser/components/urlbar/tests/legacy/browser_urlbarKeepStateAcrossTabSwitches.js
rename : browser/base/content/test/urlbar/browser_urlbarOneOffs.js => browser/components/urlbar/tests/legacy/browser_urlbarOneOffs.js
rename : browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js => browser/components/urlbar/tests/legacy/browser_urlbarOneOffs_searchSuggestions.js
rename : browser/base/content/test/urlbar/browser_urlbarOneOffs_settings.js => browser/components/urlbar/tests/legacy/browser_urlbarOneOffs_settings.js
rename : browser/base/content/test/urlbar/browser_urlbarPrivateBrowsingWindowChange.js => browser/components/urlbar/tests/legacy/browser_urlbarPrivateBrowsingWindowChange.js
rename : browser/base/content/test/urlbar/browser_urlbarRaceWithTabs.js => browser/components/urlbar/tests/legacy/browser_urlbarRaceWithTabs.js
rename : browser/base/content/test/urlbar/browser_urlbarSearchFunction.js => browser/components/urlbar/tests/legacy/browser_urlbarSearchFunction.js
rename : browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js => browser/components/urlbar/tests/legacy/browser_urlbarSearchSuggestions.js
rename : browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js => browser/components/urlbar/tests/legacy/browser_urlbarSearchSuggestions_opt-out.js
rename : browser/base/content/test/urlbar/browser_urlbarSearchTelemetry.js => browser/components/urlbar/tests/legacy/browser_urlbarSearchTelemetry.js
rename : browser/base/content/test/urlbar/browser_urlbarStop.js => browser/components/urlbar/tests/legacy/browser_urlbarStop.js
rename : browser/base/content/test/urlbar/browser_urlbarStopSearchOnSelection.js => browser/components/urlbar/tests/legacy/browser_urlbarStopSearchOnSelection.js
rename : browser/base/content/test/urlbar/browser_urlbarTokenAlias.js => browser/components/urlbar/tests/legacy/browser_urlbarTokenAlias.js
rename : browser/base/content/test/urlbar/browser_urlbar_autoFill_backspaced.js => browser/components/urlbar/tests/legacy/browser_urlbar_autoFill_backspaced.js
rename : browser/base/content/test/urlbar/browser_urlbar_canonize_on_autofill.js => browser/components/urlbar/tests/legacy/browser_urlbar_canonize_on_autofill.js
rename : browser/base/content/test/urlbar/browser_urlbar_remove_match.js => browser/components/urlbar/tests/legacy/browser_urlbar_remove_match.js
rename : browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js => browser/components/urlbar/tests/legacy/browser_urlbar_search_no_speculative_connect_with_client_cert.js
rename : browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect.js => browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect.js
rename : browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_engine.js => browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect_engine.js
rename : browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_mousedown.js => browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect_mousedown.js
rename : browser/base/content/test/urlbar/browser_urlbar_stop_pending.js => browser/components/urlbar/tests/legacy/browser_urlbar_stop_pending.js
extra : rebase_source : fbf080c3d6caf9e4e501aebc4c085fe8babc3e27
parents 98ad049f 951d31e6

.git-blame-ignore-revs

+3 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ ad75e912fbc1d64ed63c1d0a51d7157566de1887 # gecko-dev 


# Bug 1513205 - Also update the tests to match the Google coding style

# https://hg.mozilla.org/integration/autoland/rev/09c71a7cf75a

13452f36fb36ad09d81f6b53eaf7928ee63f05e3 # cinnabar

13452f36fb36ad09d81f6b53eaf7928ee63f05e3 # cinnabar

6f45c666bc7f98c3e3250a7c2cf8dc3fb95d12d7 # gecko-dev



# Bug 1519636 - Reformat everything to the Google coding style
@@ -39,5 +39,6 @@ d25e4032d4d15e732a78082505d62b6d6ffa1445 # cinnabar 
e5e885ae3128a6878d08df4ff6baaf3fc4a4b9e8 # gecko-dev

# Bug 1513205 - Ride along, update some code to match the Google coding style

# https://hg.mozilla.org/integration/autoland/rev/039a7c0c18fb

1ce955dcb2e09fd9ce19c1ec6c470f75db486bd2 # cinnabar

1ce955dcb2e09fd9ce19c1ec6c470f75db486bd2 # cinnabar

7cf43b9bc01d650f87deceb65f336cdac7c0e78f # gecko-dev

Cargo.lock

+2 −2
Original line number Diff line number Diff line
@@ -2990,7 +2990,7 @@ dependencies = [ 


[[package]]

name = "webrender"

version = "0.58.0"

version = "0.59.0"

dependencies = [

 "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3060,7 +3060,7 @@ dependencies = [ 
 "rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

 "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

 "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",

 "webrender 0.58.0",

 "webrender 0.59.0",

]



[[package]]

browser/app/profile/firefox.js

+3 −0
Original line number Diff line number Diff line
@@ -973,6 +973,9 @@ pref("security.certerrors.recordEventTelemetry", true); 
// Whether to start the private browsing mode at application startup

pref("browser.privatebrowsing.autostart", false);



// Whether to show the new private browsing UI with in-content search box.

pref("browser.privatebrowsing.searchUI", true);



// Whether the bookmark panel should be shown when bookmarking a page.

pref("browser.bookmarks.editDialog.showForNewBookmarks", true);

browser/base/content/moz.build

+0 −3
Original line number Diff line number Diff line
@@ -97,9 +97,6 @@ with Files("test/touch/**"): 
with Files("test/trackingUI/**"):

    BUG_COMPONENT = ("Firefox", "Tracking Protection")



with Files("test/urlbar/**"):

    BUG_COMPONENT = ("Firefox", "Address Bar")



with Files("test/webextensions/**"):

    BUG_COMPONENT = ("WebExtensions", "Untriaged")

browser/base/content/safeMode.js

+2 −0
Original line number Diff line number Diff line
@@ -77,4 +77,6 @@ function onLoad() { 
    document.documentElement.getButton("extra1").hidden = true;

    document.getElementById("resetProfileInstead").hidden = true;

  }

  document.l10n.translateElements(document.querySelectorAll("label, description")).then(

    () => window.sizeToContent());

}