Bug 1547800 - Remove superfluous static cast of loadInfo in nsDocShell::DoURILoad(). r=qdot
authorAndrew McCreight <continuation@gmail.com>
Mon, 29 Apr 2019 19:53:33 +0000
changeset 471813 6a60bb97e7ed4ce6fd3d718b983da6a55889b2fe
parent 471812 d6564ee9d9417fe9eea7b4fdbe96ce04a198afb4
child 471814 d93d203fad60226f727931e2ba295e5299c0c86c
push id35935
push usershindli@mozilla.com
push dateTue, 30 Apr 2019 03:46:04 +0000
treeherdermozilla-central@f3c2a7206699 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersqdot
bugs1547800, 1487964
milestone68.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 1547800 - Remove superfluous static cast of loadInfo in nsDocShell::DoURILoad(). r=qdot Bug 1487964 changed loadInfo to have a concrete type, so this cast is no longer needed. Differential Revision: https://phabricator.services.mozilla.com/D29246
docshell/base/nsDocShell.cpp
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -9954,17 +9954,17 @@ nsresult nsDocShell::DoURILoad(nsDocShel
     if (upgradeInsecureRequests) {
       // only upgrade if the navigation is same origin
       nsCOMPtr<nsIPrincipal> resultPrincipal;
       rv = nsContentUtils::GetSecurityManager()->GetChannelResultPrincipal(
           channel, getter_AddRefs(resultPrincipal));
       NS_ENSURE_SUCCESS(rv, rv);
       if (IsConsideredSameOriginForUIR(aLoadState->TriggeringPrincipal(),
                                        resultPrincipal)) {
-        static_cast<LoadInfo*>(loadInfo.get())->SetUpgradeInsecureRequests();
+        loadInfo->SetUpgradeInsecureRequests();
       }
     }
   }
 
   nsCOMPtr<nsIApplicationCacheChannel> appCacheChannel =
       do_QueryInterface(channel);
   if (appCacheChannel) {
     // Any document load should not inherit application cache.