Backout of extraneous hunk from changeset 61279de5ae37
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sun, 26 Apr 2015 22:45:25 +0100
changeset 25875 b8ca02cdc580ae3887fe7a17b7f69d07267dae93
parent 25874 61279de5ae37d4988d90cda026139bc898ec5298
child 25876 0212fcc20979ce0f2d03f034488a42803e18967d
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
Backout of extraneous hunk from changeset 61279de5ae37
mailnews/base/src/nsMsgContentPolicy.cpp
--- a/mailnews/base/src/nsMsgContentPolicy.cpp
+++ b/mailnews/base/src/nsMsgContentPolicy.cpp
@@ -694,34 +694,27 @@ nsresult nsMsgContentPolicy::SetDisableI
   rv = docshellTreeItem->GetItemType(&itemType);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // we're only worried about policy settings in content docshells
   if (itemType != nsIDocShellTreeItem::typeContent) {
     return NS_OK;
   }
 
-  nsCOMPtr<nsIDocShell_ESR38> docShellESR38(do_QueryInterface(docShell));
-  NS_ENSURE_SUCCESS(rv, rv);
-
   if (!isAllowedContent) {
     // Disable JavaScript on message URLs.
     rv = docShell->SetAllowJavascript(false);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = docShellESR38->SetAllowContentRetargetingOnChildren(false);
-    NS_ENSURE_SUCCESS(rv, rv);
     rv = docShell->SetAllowPlugins(mAllowPlugins);
     NS_ENSURE_SUCCESS(rv, rv);
   }
   else {
     // JavaScript and plugins are allowed on non-message URLs.
     rv = docShell->SetAllowJavascript(true);
     NS_ENSURE_SUCCESS(rv, rv);
-    rv = docShellESR38->SetAllowContentRetargetingOnChildren(true);
-    NS_ENSURE_SUCCESS(rv, rv);
     rv = docShell->SetAllowPlugins(true);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   return NS_OK;
 }
 
 /**