Backed out changeset 149e69327bbb (bug 1746524) for causing gv-junit …

…failures on bypassHTTPSOnlyError. CLOSED TREE UltraBlame original commit: 5d6699b34edce04ffd8886be86de9d604d88a89a
marco-c · Nov 8, 2023 · 367c3fb · 367c3fb
1 parent 0ba019b
commit 367c3fb
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 84 deletions.
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
@@ -11401,34 +11401,6 @@ aOuterWindowId
 {
 if
 (
-!
-IsTopContent
-(
-)
-|
-|
-!
-GetContentParent
-(
-)
-|
-|
-(
-StaticPrefs
-:
-:
-browser_tabs_documentchannel_parent_controlled
-(
-)
-)
-)
-{
-return
-false
-;
-}
-if
-(
 WatchedByDevTools
 (
 )
@@ -11611,6 +11583,33 @@ bool
 aSetNavigating
 )
 {
+if
+(
+!
+IsTopContent
+(
+)
+|
+|
+!
+GetContentParent
+(
+)
+|
+|
+!
+StaticPrefs
+:
+:
+browser_tabs_documentchannel_parent_controlled
+(
+)
+)
+{
+return
+false
+;
+}
 uint64_t
 outerWindowId
 =
@@ -11684,22 +11683,41 @@ nsDocShellLoadState
 aLoadState
 )
 {
-uint64_t
-outerWindowId
-=
-0
-;
 if
 (
 !
+IsTopContent
+(
+)
+|
+|
+!
+GetContentParent
+(
+)
+|
+|
+(
 StaticPrefs
 :
 :
-browser_tabs_documentchannel_speculative_load
+browser_tabs_documentchannel_parent_controlled
 (
 )
-|
-|
+)
+)
+{
+return
+false
+;
+}
+uint64_t
+outerWindowId
+=
+0
+;
+if
+(
 !
 SupportsLoadingInParent
 (

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -9559,54 +9559,6 @@ type
 bool
 value
 :
-true
-mirror
-:
-always
-#
-If
-set
-use
-DocumentChannel
-to
-attempt
-a
-speculative
-load
-from
-the
-#
-parent
-whenever
-it
-'
-s
-not
-possible
-to
-directly
-load
-from
-the
-parent
-.
--
-name
-:
-browser
-.
-tabs
-.
-documentchannel
-.
-speculative
--
-load
-type
-:
-bool
-value
-:
 false
 mirror
 :