Bug 782654 - Add Mixed Active state and an hasMixedActiveContentLoaded flag. (r=smaug)

2012-12-13 14:53:06 -08:00
parent c250a846ec
commit 9c962b4fa3
5 changed files with 97 additions and 18 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -1960,6 +1960,14 @@ nsDocShell::GetChannelIsUnsafe(bool *aUnsafe)
    return jarChannel->GetIsUnsafe(aUnsafe);
 }

+NS_IMETHODIMP
+nsDocShell::GetHasMixedActiveContentLoaded(bool *aHasMixedActiveContentLoaded)
+{
+    nsCOMPtr<nsIDocument> doc(do_GetInterface(GetAsSupports(this)));
+    *aHasMixedActiveContentLoaded = doc && doc->GetHasMixedActiveContentLoaded();
+    return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDocShell::GetAllowPlugins(bool * aAllowPlugins)
 {