diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in index 4b27dcf7da81..ab9f80237d90 100644 --- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -81,7 +81,6 @@ LOCAL_INCLUDES += \ -I$(srcdir)/../../content/events/src \ -I$(srcdir)/../src/geolocation \ -I$(topsrcdir)/chrome/src \ - -I$(srcdir)/../../netwerk/base/src \ $(NULL) CXXFLAGS += $(TK_CFLAGS) diff --git a/dom/ipc/PIFrameEmbedding.ipdl b/dom/ipc/PIFrameEmbedding.ipdl index dc5509945952..1788ef2bb54e 100644 --- a/dom/ipc/PIFrameEmbedding.ipdl +++ b/dom/ipc/PIFrameEmbedding.ipdl @@ -90,10 +90,7 @@ parent: notifyStatusChange(nsresult status, nsString message); - notifySecurityChange(PRUint32 aState, - PRBool aUseSSLStatusObject, - nsString aTooltip, - nsCString aSecInfoAsString); + notifySecurityChange(PRUint32 aState); sync refreshAttempted(nsCString uri, PRInt32 millis, bool sameURI) returns (bool retval); diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 916aa253fb75..5999c30ced30 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -45,8 +45,6 @@ #include "nsComponentManagerUtils.h" #include "nsIBaseWindow.h" #include "nsIDOMWindow.h" -#include "nsIWebProgress.h" -#include "nsIDocShell.h" #include "nsIDocShellTreeItem.h" #include "nsThreadUtils.h" #include "nsIInterfaceRequestorUtils.h" @@ -78,9 +76,6 @@ #include "nsIDocument.h" #include "nsIScriptGlobalObject.h" #include "nsWeakReference.h" -#include "nsISecureBrowserUI.h" -#include "nsISSLStatusProvider.h" -#include "nsSerializationHelper.h" #ifdef MOZ_WIDGET_QT #include @@ -526,57 +521,7 @@ TabChild::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 aState) { - nsCString secInfoAsString; - if (aState & nsIWebProgressListener::STATE_IS_SECURE) { - nsCOMPtr channel = do_QueryInterface(aRequest); - if (channel) { - nsCOMPtr secInfoSupports; - channel->GetSecurityInfo(getter_AddRefs(secInfoSupports)); - - nsCOMPtr secInfoSerializable = - do_QueryInterface(secInfoSupports); - NS_SerializeToString(secInfoSerializable, secInfoAsString); - } - } - - PRBool useSSLStatusObject = PR_FALSE; - nsAutoString securityTooltip; - nsCOMPtr docShell = do_QueryInterface(aWebProgress); - if (docShell) { - nsCOMPtr secureUI; - docShell->GetSecurityUI(getter_AddRefs(secureUI)); - if (secureUI) { - secureUI->GetTooltipText(securityTooltip); - nsCOMPtr supports; - nsCOMPtr provider = - do_QueryInterface(secureUI); - nsresult rv = provider->GetSSLStatus(getter_AddRefs(supports)); - if (NS_SUCCEEDED(rv) && supports) { - /* - * useSSLStatusObject: Security UI internally holds 4 states: secure, mixed, - * broken, no security. In cases of secure, mixed and broken it holds reference - * to a valid SSL status object. But, in case of the 'broken' state it doesn't - * return the SSL status object (returns null), in contrary to the 'mixed' state - * for which it returns. - * - * However, mixed and broken states are both reported to the upper level - * as nsIWebProgressListener::STATE_IS_BROKEN, i.e. states are merged, - * so we cannot determine, if to return the status object or not. - * - * TabParent is extracting the SSL status object from the security info - * serialization (string). SSL status object is always present there - * even security UI implementation doesn't present it. This argument - * tells the parent if the SSL status object is being presented by - * the security UI here, on the child process, and so if it has to be - * presented also on the parent process. - */ - useSSLStatusObject = PR_TRUE; - } - } - } - - SendnotifySecurityChange(aState, useSSLStatusObject, securityTooltip, - secInfoAsString); + SendnotifySecurityChange(aState); return NS_OK; } diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index 60245f273350..64e34ce3d0db 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -53,7 +53,6 @@ #include "nsIWindowWatcher.h" #include "nsIDOMWindow.h" #include "nsPIDOMWindow.h" -#include "nsIIdentityInfo.h" #include "TabChild.h" #include "nsIDOMEvent.h" #include "nsIPrivateDOMEvent.h" @@ -68,7 +67,6 @@ #include "nsThreadUtils.h" #include "nsIPromptFactory.h" #include "nsIContent.h" -#include "nsSerializationHelper.h" using mozilla::ipc::DocumentRendererParent; using mozilla::ipc::DocumentRendererShmemParent; @@ -82,11 +80,9 @@ using mozilla::dom::ContentProcessParent; namespace mozilla { namespace dom { -NS_IMPL_ISUPPORTS5(TabParent, nsITabParent, nsIWebProgress, nsIAuthPromptProvider, - nsISecureBrowserUI, nsISSLStatusProvider) +NS_IMPL_ISUPPORTS3(TabParent, nsITabParent, nsIWebProgress, nsIAuthPromptProvider) TabParent::TabParent() - : mSecurityState(nsIWebProgressListener::STATE_IS_INSECURE) { } @@ -288,10 +284,7 @@ TabParent::RecvnotifyStatusChange(const nsresult& status, } bool -TabParent::RecvnotifySecurityChange(const PRUint32& aState, - const PRBool& aUseSSLStatusObject, - const nsString& aTooltip, - const nsCString& aSecInfoAsString) +TabParent::RecvnotifySecurityChange(const PRUint32& aState) { /* * First notify any listeners of the new state info... @@ -300,32 +293,6 @@ TabParent::RecvnotifySecurityChange(const PRUint32& aState, * get removed from the list it won't affect our iteration */ - mSecurityState = aState; - mSecurityTooltipText = aTooltip; - - if (!aSecInfoAsString.IsEmpty()) { - nsCOMPtr secInfoSupports; - nsresult rv = NS_DeserializeObject(aSecInfoAsString, getter_AddRefs(secInfoSupports)); - - if (NS_SUCCEEDED(rv)) { - nsCOMPtr idInfo = do_QueryInterface(secInfoSupports); - if (idInfo) { - PRBool isEV; - if (NS_SUCCEEDED(idInfo->GetIsExtendedValidation(&isEV)) && isEV) - mSecurityState |= nsIWebProgressListener::STATE_IDENTITY_EV_TOPLEVEL; - } - } - - mSecurityStatusObject = nsnull; - if (aUseSSLStatusObject) - { - nsCOMPtr sslStatusProvider = - do_QueryInterface(secInfoSupports); - if (sslStatusProvider) - sslStatusProvider->GetSSLStatus(getter_AddRefs(mSecurityStatusObject)); - } - } - nsCOMPtr listener; PRUint32 count = mListenerInfoList.Length(); @@ -342,7 +309,7 @@ TabParent::RecvnotifySecurityChange(const PRUint32& aState, continue; } - listener->OnSecurityChange(this, nsnull, mSecurityState); + listener->OnSecurityChange(this, nsnull, aState); } return true; @@ -651,34 +618,6 @@ TabParent::GetIsLoadingDocument(PRBool *aIsLoadingDocument) return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP -TabParent::Init(nsIDOMWindow *window) -{ - return NS_OK; -} - -NS_IMETHODIMP -TabParent::GetState(PRUint32 *aState) -{ - NS_ENSURE_ARG(aState); - *aState = mSecurityState; - return NS_OK; -} - -NS_IMETHODIMP -TabParent::GetTooltipText(nsAString & aTooltipText) -{ - aTooltipText = mSecurityTooltipText; - return NS_OK; -} - -NS_IMETHODIMP -TabParent::GetSSLStatus(nsISupports ** aStatus) -{ - NS_IF_ADDREF(*aStatus = mSecurityStatusObject); - return NS_OK; -} - // nsIAuthPromptProvider // This method is largely copied from nsDocShell::GetAuthPrompt diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h index cb41dad78778..4cfe53fcebb4 100644 --- a/dom/ipc/TabParent.h +++ b/dom/ipc/TabParent.h @@ -52,8 +52,6 @@ #include "nsWeakReference.h" #include "nsIDialogParamBlock.h" #include "nsIAuthPromptProvider.h" -#include "nsISecureBrowserUI.h" -#include "nsISSLStatusProvider.h" class nsIURI; class nsIDOMElement; @@ -93,8 +91,6 @@ class TabParent : public PIFrameEmbeddingParent , public nsITabParent , public nsIWebProgress , public nsIAuthPromptProvider - , public nsISecureBrowserUI - , public nsISSLStatusProvider { public: TabParent(); @@ -115,10 +111,7 @@ public: virtual bool RecvnotifyLocationChange(const nsCString& aUri); virtual bool RecvnotifyStatusChange(const nsresult& status, const nsString& message); - virtual bool RecvnotifySecurityChange(const PRUint32& aState, - const PRBool& aUseSSLStatusObject, - const nsString& aTooltip, - const nsCString& aSecInfoAsString); + virtual bool RecvnotifySecurityChange(const PRUint32& aState); virtual bool RecvrefreshAttempted(const nsCString& aURI, const PRInt32& aMillis, const bool& aSameURI, @@ -194,8 +187,6 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIWEBPROGRESS NS_DECL_NSIAUTHPROMPTPROVIDER - NS_DECL_NSISECUREBROWSERUI - NS_DECL_NSISSLSTATUSPROVIDER void HandleDelayedDialogs(); protected: @@ -211,10 +202,6 @@ protected: nsIDOMElement* mFrameElement; nsCOMPtr mBrowserDOMWindow; - PRUint32 mSecurityState; - nsString mSecurityTooltipText; - nsCOMPtr mSecurityStatusObject; - nsTArray mListenerInfoList; struct DelayedDialogData diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp index 39f0c6ad96ca..68a769d3a328 100644 --- a/netwerk/protocol/http/HttpChannelChild.cpp +++ b/netwerk/protocol/http/HttpChannelChild.cpp @@ -48,7 +48,6 @@ #include "nsHttpHandler.h" #include "nsMimeTypes.h" #include "nsNetUtil.h" -#include "nsSerializationHelper.h" namespace mozilla { namespace net { @@ -100,7 +99,6 @@ NS_INTERFACE_MAP_BEGIN(HttpChannelChild) NS_INTERFACE_MAP_ENTRY(nsITraceableChannel) NS_INTERFACE_MAP_ENTRY(nsIApplicationCacheContainer) NS_INTERFACE_MAP_ENTRY(nsIApplicationCacheChannel) - NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIAssociatedContentSecurity, GetAssociatedContentSecurity()) NS_INTERFACE_MAP_END_INHERITING(HttpBaseChannel) //----------------------------------------------------------------------------- @@ -113,8 +111,7 @@ HttpChannelChild::RecvOnStartRequest(const nsHttpResponseHead& responseHead, const PRBool& isFromCache, const PRBool& cacheEntryAvailable, const PRUint32& cacheExpirationTime, - const nsCString& cachedCharset, - const nsCString& securityInfoSerialization) + const nsCString& cachedCharset) { LOG(("HttpChannelChild::RecvOnStartRequest [this=%x]\n", this)); @@ -125,11 +122,6 @@ HttpChannelChild::RecvOnStartRequest(const nsHttpResponseHead& responseHead, else mResponseHead = nsnull; - if (!securityInfoSerialization.IsEmpty()) - NS_DeserializeObject(securityInfoSerialization, getter_AddRefs(mSecurityInfo)); - else - mSecurityInfo = nsnull; - mIsFromCache = isFromCache; mCacheEntryAvailable = cacheEntryAvailable; mCacheExpirationTime = cacheExpirationTime; @@ -288,8 +280,9 @@ HttpChannelChild::Resume() NS_IMETHODIMP HttpChannelChild::GetSecurityInfo(nsISupports **aSecurityInfo) { + // FIXME: Stub for bug 536301 . NS_ENSURE_ARG_POINTER(aSecurityInfo); - NS_IF_ADDREF(*aSecurityInfo = mSecurityInfo); + *aSecurityInfo = 0; return NS_OK; } @@ -607,127 +600,6 @@ HttpChannelChild::SetChooseApplicationCache(PRBool aChooseApplicationCache) return NS_OK; } -//----------------------------------------------------------------------------- -// HttpChannelChild::nsIAssociatedContentSecurity -//----------------------------------------------------------------------------- - -bool -HttpChannelChild::GetAssociatedContentSecurity(nsIAssociatedContentSecurity** _result) -{ - if (!mSecurityInfo) - return false; - - nsCOMPtr assoc = - do_QueryInterface(mSecurityInfo); - if (!assoc) - return false; - - if (_result) - assoc.forget(_result); - return true; -} - -/* attribute unsigned long countSubRequestsHighSecurity; */ -NS_IMETHODIMP -HttpChannelChild::GetCountSubRequestsHighSecurity(PRInt32 *aSubRequestsHighSecurity) -{ - nsCOMPtr assoc; - if (!GetAssociatedContentSecurity(getter_AddRefs(assoc))) - return NS_OK; - - return assoc->GetCountSubRequestsHighSecurity(aSubRequestsHighSecurity); -} -NS_IMETHODIMP -HttpChannelChild::SetCountSubRequestsHighSecurity(PRInt32 aSubRequestsHighSecurity) -{ - nsCOMPtr assoc; - if (!GetAssociatedContentSecurity(getter_AddRefs(assoc))) - return NS_OK; - - return assoc->SetCountSubRequestsHighSecurity(aSubRequestsHighSecurity); -} - -/* attribute unsigned long countSubRequestsLowSecurity; */ -NS_IMETHODIMP -HttpChannelChild::GetCountSubRequestsLowSecurity(PRInt32 *aSubRequestsLowSecurity) -{ - nsCOMPtr assoc; - if (!GetAssociatedContentSecurity(getter_AddRefs(assoc))) - return NS_OK; - - return assoc->GetCountSubRequestsLowSecurity(aSubRequestsLowSecurity); -} -NS_IMETHODIMP -HttpChannelChild::SetCountSubRequestsLowSecurity(PRInt32 aSubRequestsLowSecurity) -{ - nsCOMPtr assoc; - if (!GetAssociatedContentSecurity(getter_AddRefs(assoc))) - return NS_OK; - - return assoc->SetCountSubRequestsLowSecurity(aSubRequestsLowSecurity); -} - -/* attribute unsigned long countSubRequestsBrokenSecurity; */ -NS_IMETHODIMP HttpChannelChild::GetCountSubRequestsBrokenSecurity(PRInt32 *aSubRequestsBrokenSecurity) -{ - nsCOMPtr assoc; - if (!GetAssociatedContentSecurity(getter_AddRefs(assoc))) - return NS_OK; - - return assoc->GetCountSubRequestsBrokenSecurity(aSubRequestsBrokenSecurity); -} -NS_IMETHODIMP HttpChannelChild::SetCountSubRequestsBrokenSecurity(PRInt32 aSubRequestsBrokenSecurity) -{ - nsCOMPtr assoc; - if (!GetAssociatedContentSecurity(getter_AddRefs(assoc))) - return NS_OK; - - return assoc->SetCountSubRequestsBrokenSecurity(aSubRequestsBrokenSecurity); -} - -/* attribute unsigned long countSubRequestsNoSecurity; */ -NS_IMETHODIMP -HttpChannelChild::GetCountSubRequestsNoSecurity(PRInt32 *aSubRequestsNoSecurity) -{ - nsCOMPtr assoc; - if (!GetAssociatedContentSecurity(getter_AddRefs(assoc))) - return NS_OK; - - return assoc->GetCountSubRequestsNoSecurity(aSubRequestsNoSecurity); -} -NS_IMETHODIMP -HttpChannelChild::SetCountSubRequestsNoSecurity(PRInt32 aSubRequestsNoSecurity) -{ - nsCOMPtr assoc; - if (!GetAssociatedContentSecurity(getter_AddRefs(assoc))) - return NS_OK; - - return assoc->SetCountSubRequestsNoSecurity(aSubRequestsNoSecurity); -} - -NS_IMETHODIMP -HttpChannelChild::Flush() -{ - nsCOMPtr assoc; - if (!GetAssociatedContentSecurity(getter_AddRefs(assoc))) - return NS_OK; - - nsresult rv; - PRInt32 hi, low, broken, no; - - rv = assoc->GetCountSubRequestsHighSecurity(&hi); - NS_ENSURE_SUCCESS(rv, rv); - rv = assoc->GetCountSubRequestsLowSecurity(&low); - NS_ENSURE_SUCCESS(rv, rv); - rv = assoc->GetCountSubRequestsBrokenSecurity(&broken); - NS_ENSURE_SUCCESS(rv, rv); - rv = assoc->GetCountSubRequestsNoSecurity(&no); - NS_ENSURE_SUCCESS(rv, rv); - - SendUpdateAssociatedContentSecurity(hi, low, broken, no); - - return NS_OK; -} //------------------------------------------------------------------------------ }} // mozilla::net diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h index 28cbbff23fb9..a9914353b721 100644 --- a/netwerk/protocol/http/HttpChannelChild.h +++ b/netwerk/protocol/http/HttpChannelChild.h @@ -58,7 +58,6 @@ #include "nsIResumableChannel.h" #include "nsIProxiedChannel.h" #include "nsITraceableChannel.h" -#include "nsIAssociatedContentSecurity.h" namespace mozilla { namespace net { @@ -81,7 +80,6 @@ class HttpChannelChild : public PHttpChannelChild , public nsIProxiedChannel , public nsITraceableChannel , public nsIApplicationCacheChannel - , public nsIAssociatedContentSecurity { public: NS_DECL_ISUPPORTS_INHERITED @@ -92,7 +90,6 @@ public: NS_DECL_NSITRACEABLECHANNEL NS_DECL_NSIAPPLICATIONCACHECONTAINER NS_DECL_NSIAPPLICATIONCACHECHANNEL - NS_DECL_NSIASSOCIATEDCONTENTSECURITY HttpChannelChild(); virtual ~HttpChannelChild(); @@ -122,8 +119,7 @@ protected: const PRBool& isFromCache, const PRBool& cacheEntryAvailable, const PRUint32& cacheExpirationTime, - const nsCString& cachedCharset, - const nsCString& securityInfoSerialization); + const nsCString& cachedCharset); bool RecvOnDataAvailable(const nsCString& data, const PRUint32& offset, const PRUint32& count); @@ -131,11 +127,8 @@ protected: bool RecvOnProgress(const PRUint64& progress, const PRUint64& progressMax); bool RecvOnStatus(const nsresult& status, const nsString& statusArg); - bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** _result = nsnull); - private: RequestHeaderTuples mRequestHeaders; - nsCOMPtr mSecurityInfo; PRPackedBool mIsFromCache; PRPackedBool mCacheEntryAvailable; diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp index fb9d9f17d7cb..b31bc11975b9 100644 --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -48,9 +48,6 @@ #include "nsIDocShellTreeItem.h" #include "nsIBadCertListener2.h" #include "nsICacheEntryDescriptor.h" -#include "nsSerializationHelper.h" -#include "nsISerializable.h" -#include "nsIAssociatedContentSecurity.h" namespace mozilla { namespace net { @@ -201,29 +198,6 @@ HttpChannelParent::RecvOnStopRequestCompleted() return true; } -bool -HttpChannelParent::RecvUpdateAssociatedContentSecurity(const PRInt32& high, - const PRInt32& low, - const PRInt32& broken, - const PRInt32& no) -{ - nsHttpChannel *chan = static_cast(mChannel.get()); - - nsCOMPtr secInfo; - chan->GetSecurityInfo(getter_AddRefs(secInfo)); - - nsCOMPtr assoc = do_QueryInterface(secInfo); - if (!assoc) - return true; - - assoc->SetCountSubRequestsHighSecurity(high); - assoc->SetCountSubRequestsLowSecurity(low); - assoc->SetCountSubRequestsBrokenSecurity(broken); - assoc->SetCountSubRequestsNoSecurity(no); - - return true; -} - //----------------------------------------------------------------------------- // HttpChannelParent::nsIRequestObserver //----------------------------------------------------------------------------- @@ -247,20 +221,11 @@ HttpChannelParent::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) // It could be already released by nsHttpChannel at that time. chan->GetCacheToken(getter_AddRefs(mCacheDescriptor)); - nsCOMPtr secInfoSupp; - chan->GetSecurityInfo(getter_AddRefs(secInfoSupp)); - - nsCOMPtr secInfoSer = - do_QueryInterface(secInfoSupp); - - nsCString secInfoSerialization; - NS_SerializeToString(secInfoSer, secInfoSerialization); - if (mIPCClosed || !SendOnStartRequest(responseHead ? *responseHead : nsHttpResponseHead(), !!responseHead, isFromCache, mCacheDescriptor ? PR_TRUE : PR_FALSE, - expirationTime, cachedCharset, secInfoSerialization)) { + expirationTime, cachedCharset)) { return NS_ERROR_UNEXPECTED; } return NS_OK; diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h index 8338146d8981..11a87425886f 100644 --- a/netwerk/protocol/http/HttpChannelParent.h +++ b/netwerk/protocol/http/HttpChannelParent.h @@ -91,10 +91,6 @@ protected: virtual bool RecvSetPriority(const PRUint16& priority); virtual bool RecvSetCacheTokenCachedCharset(const nsCString& charset); virtual bool RecvOnStopRequestCompleted(); - virtual bool RecvUpdateAssociatedContentSecurity(const PRInt32& high, - const PRInt32& low, - const PRInt32& broken, - const PRInt32& no); virtual void ActorDestroy(ActorDestroyReason why); diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl index 26b434292912..dfbc5fe7fe98 100644 --- a/netwerk/protocol/http/PHttpChannel.ipdl +++ b/netwerk/protocol/http/PHttpChannel.ipdl @@ -82,19 +82,13 @@ parent: OnStopRequestCompleted(); - UpdateAssociatedContentSecurity(PRInt32 high, - PRInt32 low, - PRInt32 broken, - PRInt32 no); - child: OnStartRequest(nsHttpResponseHead responseHead, PRBool useResponseHead, PRBool isFromCache, PRBool cacheEntryAvailable, PRUint32 cacheExpirationTime, - nsCString cachedCharset, - nsCString securityInfoSerialization); + nsCString cachedCharset); OnDataAvailable(nsCString data, PRUint32 offset, diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp index 01d478fa3c71..2b8cd9317df6 100644 --- a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp +++ b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp @@ -567,12 +567,7 @@ nsSecureBrowserUIImpl::EvaluateAndUpdateSecurityState(nsIRequest* aRequest, nsIS PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: remember securityInfo %p\n", this, info)); - nsCOMPtr associatedContentSecurityFromRequest = - do_QueryInterface(aRequest); - if (associatedContentSecurityFromRequest) - mCurrentToplevelSecurityInfo = aRequest; - else - mCurrentToplevelSecurityInfo = info; + mCurrentToplevelSecurityInfo = info; } return UpdateSecurityState(aRequest, withNewLocation, @@ -1111,7 +1106,6 @@ nsSecureBrowserUIImpl::OnStateChange(nsIWebProgress* aWebProgress, prevContentSecurity->SetCountSubRequestsLowSecurity(saveSubLow); prevContentSecurity->SetCountSubRequestsBrokenSecurity(saveSubBroken); prevContentSecurity->SetCountSubRequestsNoSecurity(saveSubNo); - prevContentSecurity->Flush(); } PRBool retrieveAssociatedState = PR_FALSE; diff --git a/security/manager/ssl/public/nsIAssociatedContentSecurity.idl b/security/manager/ssl/public/nsIAssociatedContentSecurity.idl index f813d7832b20..4d15018e1a8c 100644 --- a/security/manager/ssl/public/nsIAssociatedContentSecurity.idl +++ b/security/manager/ssl/public/nsIAssociatedContentSecurity.idl @@ -46,12 +46,11 @@ #include "nsISupports.idl" -[scriptable, uuid(6AC9A699-D12A-45dc-9B02-9E5E0DD831B9)] +[scriptable, uuid(8DB92DDE-799F-4d33-80F7-459CAC800DC9)] interface nsIAssociatedContentSecurity : nsISupports { attribute long countSubRequestsHighSecurity; attribute long countSubRequestsLowSecurity; attribute long countSubRequestsBrokenSecurity; attribute long countSubRequestsNoSecurity; - void flush(); }; diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp index f56558064869..4f2d287854a9 100644 --- a/security/manager/ssl/src/nsNSSIOLayer.cpp +++ b/security/manager/ssl/src/nsNSSIOLayer.cpp @@ -511,10 +511,6 @@ NS_IMETHODIMP nsNSSSocketInfo::SetCountSubRequestsNoSecurity(PRInt32 aSubRequest mSubRequestsNoSecurity = aSubRequestsNoSecurity; return NS_OK; } -NS_IMETHODIMP nsNSSSocketInfo::Flush() -{ - return NS_OK; -} NS_IMETHODIMP nsNSSSocketInfo::GetShortSecurityDescription(PRUnichar** aText) {