diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index cfa30f4c8a9f..ae0002fb4b65 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -11576,6 +11576,12 @@ end j ! = +start +& +& +j +! += index ) { diff --git a/browser/base/content/test/about/browser_aboutCertError.js b/browser/base/content/test/about/browser_aboutCertError.js index 1a33f66ff108..b988c7120ef5 100644 --- a/browser/base/content/test/about/browser_aboutCertError.js +++ b/browser/base/content/test/about/browser_aboutCertError.js @@ -176,30 +176,6 @@ tab . linkedBrowser ; -await -SpecialPowers -. -spawn -( -browser -[ -] -( -) -= -> -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; is ( browser @@ -540,30 +516,6 @@ tab . linkedBrowser ; -await -SpecialPowers -. -spawn -( -browser -[ -] -( -) -= -> -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; BrowserTestUtils . startLoadingURIString @@ -609,30 +561,6 @@ gBrowser . selectedBrowser ; -await -SpecialPowers -. -spawn -( -browser -[ -] -( -) -= -> -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; info ( " diff --git a/browser/base/content/test/general/browser_backButtonFitts.js b/browser/base/content/test/general/browser_backButtonFitts.js index 84684d028dd4..f15ed4a6a1e7 100644 --- a/browser/base/content/test/general/browser_backButtonFitts.js +++ b/browser/base/content/test/general/browser_backButtonFitts.js @@ -60,14 +60,6 @@ function { content . -document -. -notifyUserGestureActivation -( -) -; -content -. history . pushState diff --git a/browser/base/content/test/general/browser_bug1299667.js b/browser/base/content/test/general/browser_bug1299667.js index ff6f285e938a..055a00b1b686 100644 --- a/browser/base/content/test/general/browser_bug1299667.js +++ b/browser/base/content/test/general/browser_bug1299667.js @@ -39,14 +39,6 @@ function { content . -document -. -notifyUserGestureActivation -( -) -; -content -. history . pushState diff --git a/browser/base/content/test/general/browser_invalid_uri_back_forward_manipulation.js b/browser/base/content/test/general/browser_invalid_uri_back_forward_manipulation.js index 63478f169fff..9f9f96ee6e6f 100644 --- a/browser/base/content/test/general/browser_invalid_uri_back_forward_manipulation.js +++ b/browser/base/content/test/general/browser_invalid_uri_back_forward_manipulation.js @@ -41,32 +41,6 @@ robots true ) ; -await -ContentTask -. -spawn -( -gBrowser -. -selectedBrowser -{ -} -async -function -( -) -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; info ( " diff --git a/browser/base/content/test/sanitize/browser_purgehistory_clears_sh.js b/browser/base/content/test/sanitize/browser_purgehistory_clears_sh.js index fc2cdd6a31ca..8e135539b991 100644 --- a/browser/base/content/test/sanitize/browser_purgehistory_clears_sh.js +++ b/browser/base/content/test/sanitize/browser_purgehistory_clears_sh.js @@ -203,14 +203,6 @@ length ; content . -document -. -notifyUserGestureActivation -( -) -; -content -. history . pushState @@ -223,14 +215,6 @@ pushState ; content . -document -. -notifyUserGestureActivation -( -) -; -content -. history . pushState @@ -243,14 +227,6 @@ pushState ; content . -document -. -notifyUserGestureActivation -( -) -; -content -. history . back diff --git a/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_multistage_addonspicker.js b/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_multistage_addonspicker.js index c819e5bcaf4f..d680da6174d4 100644 --- a/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_multistage_addonspicker.js +++ b/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_multistage_addonspicker.js @@ -1331,29 +1331,6 @@ install ] ) ; -SpecialPowers -. -spawn -( -browser -[ -] -( -) -= -> -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; await clickVisibleButton ( diff --git a/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_multistage_default.js b/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_multistage_default.js index 8bff4c5d349b..3d608e39e19e 100644 --- a/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_multistage_default.js +++ b/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_multistage_default.js @@ -603,32 +603,6 @@ welcome true ) ; -await -ContentTask -. -spawn -( -gBrowser -. -selectedBrowser -{ -} -async -function -( -) -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; registerCleanupFunction ( ( diff --git a/browser/components/aboutwelcome/tests/browser/head.js b/browser/components/aboutwelcome/tests/browser/head.js index e01af2775f1f..3d74895cfbc7 100644 --- a/browser/components/aboutwelcome/tests/browser/head.js +++ b/browser/components/aboutwelcome/tests/browser/head.js @@ -209,32 +209,6 @@ welcome true ) ; -await -ContentTask -. -spawn -( -gBrowser -. -selectedBrowser -{ -} -async -function -( -) -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; return { browser diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_history_shift_click.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_history_shift_click.js index 87c3fee4d873..d93842d6455b 100644 --- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_history_shift_click.js +++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_history_shift_click.js @@ -97,14 +97,6 @@ function { content . -document -. -notifyUserGestureActivation -( -) -; -content -. history . pushState @@ -126,14 +118,6 @@ html ; content . -document -. -notifyUserGestureActivation -( -) -; -content -. history . pushState @@ -155,14 +139,6 @@ html ; content . -document -. -notifyUserGestureActivation -( -) -; -content -. history . pushState diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_abandonment.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_abandonment.js index f8e60bc9099d..69408b156b72 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_abandonment.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_abandonment.js @@ -667,30 +667,6 @@ false serpUrl ) ; -await -SpecialPowers -. -spawn -( -browser -[ -] -( -) -= -> -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; BrowserTestUtils . startLoadingURIString diff --git a/browser/components/sessionstore/test/browser_scrollPositions.js b/browser/components/sessionstore/test/browser_scrollPositions.js index 3429a5880d37..652041570135 100644 --- a/browser/components/sessionstore/test/browser_scrollPositions.js +++ b/browser/components/sessionstore/test/browser_scrollPositions.js @@ -874,30 +874,6 @@ browser ) ; await -SpecialPowers -. -spawn -( -browser -[ -] -( -) -= -> -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; -await setScrollPosition ( browser diff --git a/browser/components/sessionstore/test/browser_sessionHistory.js b/browser/components/sessionstore/test/browser_sessionHistory.js index 768bd929ea0b..da6d6680f1ec 100644 --- a/browser/components/sessionstore/test/browser_sessionHistory.js +++ b/browser/components/sessionstore/test/browser_sessionHistory.js @@ -763,14 +763,6 @@ content . document . -notifyUserGestureActivation -( -) -; -content -. -document -. querySelector ( " diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js index cd1567d4c5d8..c05dab248d39 100644 --- a/browser/components/tabbrowser/content/tabbrowser.js +++ b/browser/components/tabbrowser/content/tabbrowser.js @@ -2348,19 +2348,6 @@ canGoBack ; } get -canGoBackIgnoringUserInteraction -( -) -{ -return -this -. -selectedBrowser -. -canGoBackIgnoringUserInteraction -; -} -get canGoForward ( ) diff --git a/browser/components/tabbrowser/test/browser/tabs/browser_bfcache_exemption_about_pages.js b/browser/components/tabbrowser/test/browser/tabs/browser_bfcache_exemption_about_pages.js index 2ba92425ee84..822d8f7ae44b 100644 --- a/browser/components/tabbrowser/test/browser/tabs/browser_bfcache_exemption_about_pages.js +++ b/browser/components/tabbrowser/test/browser/tabs/browser_bfcache_exemption_about_pages.js @@ -174,7 +174,6 @@ browser . goBack ( -false ) ; await @@ -319,7 +318,6 @@ browser . goBack ( -false ) ; await diff --git a/browser/components/urlbar/tests/browser/browser_UrlbarInput_searchTerms_searchMode.js b/browser/components/urlbar/tests/browser/browser_UrlbarInput_searchTerms_searchMode.js index edc7ae7e346c..2fdc5ccc4b40 100644 --- a/browser/components/urlbar/tests/browser/browser_UrlbarInput_searchTerms_searchMode.js +++ b/browser/components/urlbar/tests/browser/browser_UrlbarInput_searchTerms_searchMode.js @@ -1106,7 +1106,6 @@ gBrowser . goBack ( -false ) ; await @@ -1282,7 +1281,6 @@ gBrowser . goBack ( -false ) ; await @@ -1355,7 +1353,6 @@ gBrowser . goForward ( -false ) ; await diff --git a/browser/components/urlbar/tests/browser/browser_UrlbarInput_searchTerms_telemetry.js b/browser/components/urlbar/tests/browser/browser_UrlbarInput_searchTerms_telemetry.js index b2bcca444db6..3772fecacc8f 100644 --- a/browser/components/urlbar/tests/browser/browser_UrlbarInput_searchTerms_telemetry.js +++ b/browser/components/urlbar/tests/browser/browser_UrlbarInput_searchTerms_telemetry.js @@ -879,7 +879,6 @@ linkedBrowser . goBack ( -false ) ; await diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp index 656917b65846..21f8f8c716db 100644 --- a/docshell/base/CanonicalBrowsingContext.cpp +++ b/docshell/base/CanonicalBrowsingContext.cpp @@ -6331,6 +6331,25 @@ aUpdatedCacheKey } if ( +oldActiveEntry +) +{ +mActiveEntry +- +> +SetHasUserInteraction +( +oldActiveEntry +- +> +GetHasUserInteraction +( +) +) +; +} +if +( IsTop ( ) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index add3a83c248d..f586fecfe016 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -14373,12 +14373,6 @@ CanGo ( - 1 -StaticPrefs -: -: -browser_navigation_requireUserInteraction -( -) ) ; MOZ_LOG @@ -14419,97 +14413,6 @@ NS_IMETHODIMP nsDocShell : : -GetCanGoBackIgnoringUserInteraction -( -bool -* -aCanGoBack -) -{ -* -aCanGoBack -= -false -; -if -( -! -IsNavigationAllowed -( -false -) -) -{ -return -NS_OK -; -} -RefPtr -< -ChildSHistory -> -rootSH -= -GetRootSessionHistory -( -) -; -if -( -rootSH -) -{ -* -aCanGoBack -= -rootSH -- -> -CanGo -( -- -1 -false -) -; -MOZ_LOG -( -gSHLog -LogLevel -: -: -Verbose -( -" -nsDocShell -% -p -CanGoBackIgnoringUserInteraction -( -) -- -> -% -d -" -this -* -aCanGoBack -) -) -; -return -NS_OK -; -} -return -NS_ERROR_FAILURE -; -} -NS_IMETHODIMP -nsDocShell -: -: GetCanGoForward ( bool @@ -14559,12 +14462,6 @@ rootSH CanGo ( 1 -StaticPrefs -: -: -browser_navigation_requireUserInteraction -( -) ) ; MOZ_LOG diff --git a/docshell/base/nsIWebNavigation.idl b/docshell/base/nsIWebNavigation.idl index a19674a0a91f..423f591557c2 100644 --- a/docshell/base/nsIWebNavigation.idl +++ b/docshell/base/nsIWebNavigation.idl @@ -314,54 +314,6 @@ the object can go -back -. -If -true -this -indicates -that -* -there -is -back -session -history -available -for -navigation -ignoring -* -whether -or -not -the -history -has -been -interacted -with -by -the -user -. -* -/ -readonly -attribute -boolean -canGoBackIgnoringUserInteraction -; -/ -* -* -* -Indicates -if -the -object -can -go forward . If diff --git a/docshell/shistory/ChildSHistory.cpp b/docshell/shistory/ChildSHistory.cpp index f1989be73b92..6f0ed7c49adb 100644 --- a/docshell/shistory/ChildSHistory.cpp +++ b/docshell/shistory/ChildSHistory.cpp @@ -660,8 +660,6 @@ CanGo ( int32_t aOffset -bool -aRequireUserInteraction ) { CheckedInt @@ -693,18 +691,6 @@ return false ; } -if -( -! -mHistory -| -| -aOffset -> -= -0 -) -{ return index . @@ -727,42 +713,6 @@ value 0 ; } -if -( -! -aRequireUserInteraction -) -{ -return -index -. -value -( -) -> -= -0 -; -} -bool -canGoBack -; -mHistory -- -> -CanGoBackFromEntryAtIndex -( -Index -( -) -& -canGoBack -) -; -return -canGoBack -; -} void ChildSHistory : diff --git a/docshell/shistory/ChildSHistory.h b/docshell/shistory/ChildSHistory.h index 451801ed047f..299e4864c5c1 100644 --- a/docshell/shistory/ChildSHistory.h +++ b/docshell/shistory/ChildSHistory.h @@ -177,8 +177,6 @@ CanGo ( int32_t aOffset -bool -aRequireUserInteraction ) ; MOZ_CAN_RUN_SCRIPT diff --git a/docshell/shistory/nsISHistory.idl b/docshell/shistory/nsISHistory.idl index a83d4dab1e86..098059943ee8 100644 --- a/docshell/shistory/nsISHistory.idl +++ b/docshell/shistory/nsISHistory.idl @@ -1762,41 +1762,5 @@ isEmptyOrHasEntriesForSingleTopLevelPage ( ) ; -/ -* -* -* -Determine -if -we -can -navigate -back -in -history -from -the -entry -at -aIndex -* -to -an -entry -that -has -user -interaction -. -* -/ -boolean -canGoBackFromEntryAtIndex -( -in -long -aIndex -) -; } ; diff --git a/docshell/shistory/nsSHistory.cpp b/docshell/shistory/nsSHistory.cpp index e7e494cb9efa..f588d4931925 100644 --- a/docshell/shistory/nsSHistory.cpp +++ b/docshell/shistory/nsSHistory.cpp @@ -9777,86 +9777,6 @@ GetHasUserInteraction ) ; } -NS_IMETHODIMP -nsSHistory -: -: -CanGoBackFromEntryAtIndex -( -int32_t -aIndex -bool -* -aCanGoBack -) -{ -* -aCanGoBack -= -false -; -if -( -! -StaticPrefs -: -: -browser_navigation_requireUserInteraction -( -) -) -{ -* -aCanGoBack -= -aIndex -> -0 -; -return -NS_OK -; -} -for -( -int32_t -i -= -aIndex -- -1 -; -i -> -= -0 -; -i -- -- -) -{ -if -( -HasUserInteractionAtIndex -( -i -) -) -{ -* -aCanGoBack -= -true -; -break -; -} -} -return -NS_OK -; -} nsresult nsSHistory : diff --git a/docshell/test/browser/browser.toml b/docshell/test/browser/browser.toml index c3403922d76f..7cee4ef8744a 100644 --- a/docshell/test/browser/browser.toml +++ b/docshell/test/browser/browser.toml @@ -1446,13 +1446,6 @@ https_first_disabled true [ " -browser_initial_entry_without_interaction -. -js -" -] -[ -" browser_isInitialDocument . js diff --git a/docshell/test/browser/browser_backforward_text_fragment_restore_urlbar.js b/docshell/test/browser/browser_backforward_text_fragment_restore_urlbar.js index 1b0dbfb11c75..0af30c8881ef 100644 --- a/docshell/test/browser/browser_backforward_text_fragment_restore_urlbar.js +++ b/docshell/test/browser/browser_backforward_text_fragment_restore_urlbar.js @@ -103,30 +103,6 @@ browser = > { -await -SpecialPowers -. -spawn -( -browser -[ -] -( -) -= -> -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; let loaded = diff --git a/docshell/test/browser/browser_backforward_userinteraction.js b/docshell/test/browser/browser_backforward_userinteraction.js index 3283fdb7cfa2..a94be2fd9ce6 100644 --- a/docshell/test/browser/browser_backforward_userinteraction.js +++ b/docshell/test/browser/browser_backforward_userinteraction.js @@ -384,24 +384,6 @@ tab . linkedBrowser ; -await -BrowserTestUtils -. -synthesizeMouse -( -" -body -" -0 -0 -{ -} -browser -. -browsingContext -true -) -; assertBackForwardState ( false @@ -1012,24 +994,6 @@ tab . linkedBrowser ; -await -BrowserTestUtils -. -synthesizeMouse -( -" -body -" -0 -0 -{ -} -browser -. -browsingContext -true -) -; assertBackForwardState ( false @@ -1374,24 +1338,6 @@ tab linkedBrowser ; await -BrowserTestUtils -. -synthesizeMouse -( -" -body -" -0 -0 -{ -} -browser -. -browsingContext -true -) -; -await loadMethod ( IFRAME_PAGE diff --git a/docshell/test/browser/browser_backforward_userinteraction_about.js b/docshell/test/browser/browser_backforward_userinteraction_about.js index 6873db11b516..5f14c0037786 100644 --- a/docshell/test/browser/browser_backforward_userinteraction_about.js +++ b/docshell/test/browser/browser_backforward_userinteraction_about.js @@ -107,22 +107,6 @@ false ) ; await -BrowserTestUtils -. -synthesizeMouse -( -" -body -" -0 -0 -{ -} -browser -true -) -; -await followLink ( TEST_PAGE diff --git a/docshell/test/browser/browser_backforward_userinteraction_systemprincipal.js b/docshell/test/browser/browser_backforward_userinteraction_systemprincipal.js index e0663baac8a8..38d669f0da0e 100644 --- a/docshell/test/browser/browser_backforward_userinteraction_systemprincipal.js +++ b/docshell/test/browser/browser_backforward_userinteraction_systemprincipal.js @@ -131,37 +131,6 @@ entry " ) ; -let -browser -= -tab -. -linkedBrowser -; -await -SpecialPowers -. -spawn -( -browser -[ -] -( -) -= -> -{ -content -. -document -. -notifyUserGestureActivation -( -) -; -} -) -; assertBackForwardState ( false diff --git a/docshell/test/browser/browser_current_entry_always_in_history_menu.js b/docshell/test/browser/browser_current_entry_always_in_history_menu.js index f61a841654af..21f4e205bb43 100644 --- a/docshell/test/browser/browser_current_entry_always_in_history_menu.js +++ b/docshell/test/browser/browser_current_entry_always_in_history_menu.js @@ -69,31 +69,17 @@ browser = > { -await SpecialPowers . -spawn -( -browser -[ -] -async +wrap ( -) -= -> -{ -content -. document +) . notifyUserGestureActivation ( ) ; -} -) -; await followLink ( @@ -115,10 +101,9 @@ browser [ ] async +function ( ) -= -> { content . @@ -190,10 +175,9 @@ browser [ ] async +function ( ) -= -> { content . diff --git a/docshell/test/browser/browser_initial_entry_without_interaction.js b/docshell/test/browser/browser_initial_entry_without_interaction.js deleted file mode 100644 index de20e55db779..000000000000 --- a/docshell/test/browser/browser_initial_entry_without_interaction.js +++ /dev/null @@ -1,152 +0,0 @@ -" -use -strict -" -; -const -TEST_URI -= -" -https -: -/ -/ -example -. -com -/ -" -; -add_setup -( -async -function -( -) -{ -await -SpecialPowers -. -pushPrefEnv -( -{ -set -: -[ -[ -" -browser -. -navigation -. -requireUserInteraction -" -true -] -] -} -) -; -} -) -; -add_task -( -async -( -) -= -> -{ -await -BrowserTestUtils -. -withNewTab -( -TEST_URI -async -( -) -= -> -{ -await -followLink -( -TEST_URI -+ -" -2 -. -html -" -) -; -await -new -Promise -( -resolve -= -> -SessionStore -. -getSessionHistory -( -gBrowser -. -selectedTab -resolve -) -) -; -await -assertMenulist -( -[ -TEST_URI -+ -" -2 -. -html -" -] -) -; -const -backButton -= -document -. -getElementById -( -" -back -- -button -" -) -; -ok -( -backButton -. -disabled -" -The -back -button -should -be -disabled -. -" -) -; -} -) -; -} -) -; diff --git a/docshell/test/browser/browser_replace_state_during_navigation.js b/docshell/test/browser/browser_replace_state_during_navigation.js index 721bed5ba648..c9e5487d5372 100644 --- a/docshell/test/browser/browser_replace_state_during_navigation.js +++ b/docshell/test/browser/browser_replace_state_during_navigation.js @@ -171,6 +171,12 @@ TEST_URI_2 1 " TEST_URI_2 ++ +" +# +inject +" +TEST_URI_2 TEST_URI ] ) diff --git a/docshell/test/browser/browser_replace_state_during_navigation_from_first_page.js b/docshell/test/browser/browser_replace_state_during_navigation_from_first_page.js index efb6fcbd4304..ac079e160c77 100644 --- a/docshell/test/browser/browser_replace_state_during_navigation_from_first_page.js +++ b/docshell/test/browser/browser_replace_state_during_navigation_from_first_page.js @@ -129,6 +129,12 @@ TEST_URI 1 " TEST_URI ++ +" +# +inject +" +TEST_URI ] ) ; diff --git a/docshell/test/navigation/file_bug1300461.html b/docshell/test/navigation/file_bug1300461.html index 0c998b8e1c92..1a59e8138413 100644 --- a/docshell/test/navigation/file_bug1300461.html +++ b/docshell/test/navigation/file_bug1300461.html @@ -442,17 +442,6 @@ ( ) { -SpecialPowers -. -wrap -( -document -) -. -notifyUserGestureActivation -( -) -; if ( opener diff --git a/docshell/test/navigation/file_bug1300461_back.html b/docshell/test/navigation/file_bug1300461_back.html index 9274f7cc122d..5c402d82e288 100644 --- a/docshell/test/navigation/file_bug1300461_back.html +++ b/docshell/test/navigation/file_bug1300461_back.html @@ -243,10 +243,10 @@ ( webNav . -canGoBackIgnoringUserInteraction +canGoBack " check -canGoBackIgnoringUserInteraction +canGoBack " ) ; diff --git a/dom/base/test/browser_set_focus_after_reuse_bcg.js b/dom/base/test/browser_set_focus_after_reuse_bcg.js index 860bf6a80c4e..880b01fe6c06 100644 --- a/dom/base/test/browser_set_focus_after_reuse_bcg.js +++ b/dom/base/test/browser_set_focus_after_reuse_bcg.js @@ -123,14 +123,6 @@ function ( ) { -content -. -document -. -notifyUserGestureActivation -( -) -; var button = diff --git a/dom/chrome-webidl/ChildSHistory.webidl b/dom/chrome-webidl/ChildSHistory.webidl index 037b0c6a78cc..f3703346a522 100644 --- a/dom/chrome-webidl/ChildSHistory.webidl +++ b/dom/chrome-webidl/ChildSHistory.webidl @@ -147,11 +147,6 @@ canGo ( long aOffset -optional -boolean -aRequireUserInteraction -= -false ) ; [ diff --git a/dom/interfaces/base/nsIBrowser.idl b/dom/interfaces/base/nsIBrowser.idl index 2dd85af90e2d..618fc7f7a5ef 100644 --- a/dom/interfaces/base/nsIBrowser.idl +++ b/dom/interfaces/base/nsIBrowser.idl @@ -557,25 +557,6 @@ in history * param -aCanGoBackIgnoringUserInteraction -whether -or -not -the -nsIWebNavigation -* -can -go -backwards -in -history -regardless -* -of -user -interactions -* -param aCanGoForward whether or @@ -598,9 +579,6 @@ boolean aCanGoBack in boolean -aCanGoBackIgnoringUserInteraction -in -boolean aCanGoForward ) ; diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp index aa08e8fb25a7..743e8bf0ed7a 100644 --- a/dom/ipc/BrowserChild.cpp +++ b/dom/ipc/BrowserChild.cpp @@ -17995,11 +17995,6 @@ canGoBack false ; bool -canGoBackIgnoringUserInteraction -= -false -; -bool canGoForward = false @@ -18036,20 +18031,6 @@ WebNavigation ) - > -GetCanGoBackIgnoringUserInteraction -( -& -canGoBackIgnoringUserInteraction -) -) -; -MOZ_TRY -( -WebNavigation -( -) -- -> GetCanGoForward ( & @@ -18380,7 +18361,6 @@ requestData aLocation aFlags canGoBack -canGoBackIgnoringUserInteraction canGoForward locationChangeData ) diff --git a/dom/ipc/BrowserParent.cpp b/dom/ipc/BrowserParent.cpp index db28a374f813..7dc569abeaef 100644 --- a/dom/ipc/BrowserParent.cpp +++ b/dom/ipc/BrowserParent.cpp @@ -15343,9 +15343,6 @@ bool aCanGoBack const bool -aCanGoBackIgnoringUserInteraction -const -bool aCanGoForward const Maybe @@ -15472,7 +15469,6 @@ browser UpdateWebNavigationForLocationChange ( aCanGoBack -aCanGoBackIgnoringUserInteraction aCanGoForward ) ; diff --git a/dom/ipc/BrowserParent.h b/dom/ipc/BrowserParent.h index a4a58d94ddc1..0e192b7e8886 100644 --- a/dom/ipc/BrowserParent.h +++ b/dom/ipc/BrowserParent.h @@ -1087,9 +1087,6 @@ bool aCanGoBack const bool -aCanGoBackIgnoringUserInteraction -const -bool aCanGoForward const Maybe diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl index 85a502943047..3203aeab8f4c 100644 --- a/dom/ipc/PBrowser.ipdl +++ b/dom/ipc/PBrowser.ipdl @@ -2131,8 +2131,6 @@ aFlags bool aCanGoBack bool -aCanGoBackIgnoringUserInteraction -bool aCanGoForward WebProgressLocationChangeData ? diff --git a/dom/tests/browser/browser_bug1685807.js b/dom/tests/browser/browser_bug1685807.js index 1cb8a11781cf..b236483ea685 100644 --- a/dom/tests/browser/browser_bug1685807.js +++ b/dom/tests/browser/browser_bug1685807.js @@ -166,14 +166,6 @@ aTestDocDomain { content . -document -. -notifyUserGestureActivation -( -) -; -content -. name = " diff --git a/remote/marionette/driver.sys.mjs b/remote/marionette/driver.sys.mjs index ba89eec8ec16..9d09a97389ee 100644 --- a/remote/marionette/driver.sys.mjs +++ b/remote/marionette/driver.sys.mjs @@ -7952,7 +7952,7 @@ browsingContext embedderElement ? . -canGoBackIgnoringUserInteraction +canGoBack ) { return diff --git a/toolkit/components/browser/nsWebBrowser.cpp b/toolkit/components/browser/nsWebBrowser.cpp index 61f393afc818..d5f86938c7b0 100644 --- a/toolkit/components/browser/nsWebBrowser.cpp +++ b/toolkit/components/browser/nsWebBrowser.cpp @@ -1841,32 +1841,6 @@ NS_IMETHODIMP nsWebBrowser : : -GetCanGoBackIgnoringUserInteraction -( -bool -* -aCanGoBack -) -{ -NS_ENSURE_STATE -( -mDocShell -) -; -return -mDocShell -- -> -GetCanGoBackIgnoringUserInteraction -( -aCanGoBack -) -; -} -NS_IMETHODIMP -nsWebBrowser -: -: GetCanGoForward ( bool diff --git a/toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs b/toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs index 327588463b1e..6766a5b5c2b8 100644 --- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs +++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs @@ -157,12 +157,6 @@ false ; this . -_canGoBackIgnoringUserInteraction -= -false -; -this -. _canGoForward = false @@ -242,53 +236,7 @@ appinfo sessionHistoryInParent ) { -const -sessionHistory -= -this -. -_browser -. -browsingContext -. -sessionHistory -; return -sessionHistory -? -. -canGoBackFromEntryAtIndex -( -sessionHistory -? -. -index -) -; -} -return -this -. -_canGoBack -; -} -get -canGoBackIgnoringUserInteraction -( -) -{ -if -( -Services -. -appinfo -. -sessionHistoryInParent -) -{ -const -sessionHistory -= this . _browser @@ -296,9 +244,6 @@ _browser browsingContext . sessionHistory -; -return -sessionHistory ? . index @@ -309,7 +254,7 @@ index return this . -_canGoBackIgnoringUserInteraction +_canGoBack ; } get diff --git a/toolkit/content/widgets/browser-custom-element.js b/toolkit/content/widgets/browser-custom-element.js index bf9c25a51cac..720c907a055b 100644 --- a/toolkit/content/widgets/browser-custom-element.js +++ b/toolkit/content/widgets/browser-custom-element.js @@ -1855,19 +1855,6 @@ canGoBack ; } get -canGoBackIgnoringUserInteraction -( -) -{ -return -this -. -webNavigation -. -canGoBackIgnoringUserInteraction -; -} -get canGoForward ( ) @@ -3582,15 +3569,9 @@ webNavigation ; if ( -requireUserInteraction -? webNavigation . canGoBack -: -webNavigation -. -canGoBackIgnoringUserInteraction ) { this @@ -5014,7 +4995,6 @@ aContentType updateWebNavigationForLocationChange ( aCanGoBack -aCanGoBackIgnoringUserInteraction aCanGoForward ) { @@ -5050,14 +5030,6 @@ this . _remoteWebNavigation . -_canGoBackIgnoringUserInteraction -= -aCanGoBackIgnoringUserInteraction -; -this -. -_remoteWebNavigation -. _canGoForward = aCanGoForward @@ -5216,14 +5188,6 @@ this . _remoteWebNavigation . -_canGoBackIgnoringUserInteraction -= -false -; -this -. -_remoteWebNavigation -. _canGoForward = false diff --git a/toolkit/crashreporter/test/browser/browser_aboutCrashesResubmit.js b/toolkit/crashreporter/test/browser/browser_aboutCrashesResubmit.js index 56d935990fd2..9e32f0e4d538 100644 --- a/toolkit/crashreporter/test/browser/browser_aboutCrashesResubmit.js +++ b/toolkit/crashreporter/test/browser/browser_aboutCrashesResubmit.js @@ -1007,14 +1007,6 @@ tab = > { -content -. -document -. -notifyUserGestureActivation -( -) -; SpecialPowers . spawn