Bug 906190 - Persist 'disable protection' option for Mixed Content Blocker in child tabs - update load-reload inconsistency. r=tanvi, r=smaug
authorChristoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Thu, 05 Sep 2013 10:59:13 -0700
changeset 154622 13c357357876741f6dac9fbcf9b509fc60a2c857
parent 154621 a1a47e9a317d1168609415aa37f953e2d6c66c4c
child 154623 ca2dface6bfb44fe17fce7c7ed565a8d18e3ca9b
push id36143
push userryanvm@gmail.com
push dateTue, 12 Nov 2013 20:35:44 +0000
treeherdermozilla-inbound@c4483cde4683 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstanvi, smaug
bugs906190
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 906190 - Persist 'disable protection' option for Mixed Content Blocker in child tabs - update load-reload inconsistency. r=tanvi, r=smaug
docshell/base/nsDocShell.cpp
docshell/base/nsIDocShellLoadInfo.idl
docshell/shistory/src/nsSHistory.cpp
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -1142,17 +1142,17 @@ ConvertDocShellLoadInfoToLoadType(nsDocS
         loadType = LOAD_STOP_CONTENT_AND_REPLACE;
         break;
     case nsIDocShellLoadInfo::loadPushState:
         loadType = LOAD_PUSHSTATE;
         break;
     case nsIDocShellLoadInfo::loadReplaceBypassCache:
         loadType = LOAD_REPLACE_BYPASS_CACHE;
         break;
-    case nsIDocShellLoadInfo::loadMixedContent:
+    case nsIDocShellLoadInfo::loadReloadMixedContent:
         loadType = LOAD_RELOAD_ALLOW_MIXED_CONTENT;
         break;
     default:
         NS_NOTREACHED("Unexpected nsDocShellInfoLoadType value");
     }
 
     return loadType;
 }
@@ -1217,17 +1217,17 @@ nsDocShell::ConvertLoadTypeToDocShellLoa
         break;
     case LOAD_PUSHSTATE:
         docShellLoadType = nsIDocShellLoadInfo::loadPushState;
         break;
     case LOAD_REPLACE_BYPASS_CACHE:
         docShellLoadType = nsIDocShellLoadInfo::loadReplaceBypassCache;
         break;
     case LOAD_RELOAD_ALLOW_MIXED_CONTENT:
-        docShellLoadType = nsIDocShellLoadInfo::loadMixedContent;
+        docShellLoadType = nsIDocShellLoadInfo::loadReloadMixedContent;
         break;
     default:
         NS_NOTREACHED("Unexpected load type value");
     }
 
     return docShellLoadType;
 }                                                                               
 
--- a/docshell/base/nsIDocShellLoadInfo.idl
+++ b/docshell/base/nsIDocShellLoadInfo.idl
@@ -56,17 +56,17 @@ interface nsIDocShellLoadInfo : nsISuppo
     const long loadStopContent = 11;
     const long loadStopContentAndReplace = 12;
     const long loadNormalExternal = 13;
     const long loadNormalBypassCache = 14;
     const long loadNormalBypassProxy = 15;
     const long loadNormalBypassProxyAndCache = 16;
     const long loadPushState = 17;                 // history.pushState or replaceState
     const long loadReplaceBypassCache = 18;
-    const long loadMixedContent = 19;
+    const long loadReloadMixedContent = 19;
 
     /** Contains a load type as specified by the load* constants */
     attribute nsDocShellInfoLoadType loadType;
 
     /** SHEntry for this page */
     attribute nsISHEntry SHEntry;
 
     /** Target for load, like _content, _blank etc. */
--- a/docshell/shistory/src/nsSHistory.cpp
+++ b/docshell/shistory/src/nsSHistory.cpp
@@ -856,17 +856,17 @@ nsSHistory::Reload(uint32_t aReloadFlags
     loadType = nsIDocShellLoadInfo::loadReloadBypassCache;
   }
   else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE)
   {
     loadType = nsIDocShellLoadInfo::loadReloadCharsetChange;
   }
   else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_ALLOW_MIXED_CONTENT)
   {
-    loadType = nsIDocShellLoadInfo::loadMixedContent;
+    loadType = nsIDocShellLoadInfo::loadReloadMixedContent;
   }
   else
   {
     loadType = nsIDocShellLoadInfo::loadReloadNormal;
   }
 
   // We are reloading. Send Reload notifications.
   // nsDocShellLoadFlagType is not public, where as nsIWebNavigation