Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out ee27d1d8b302 (bug 836951) for depending on a patch that's being backed out

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2013-03-26 20:18:30 -07:00
parent e46c6c9dfb
commit 0983dd84b6
5 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docshell/base/nsDocShell.cpp
View File

@ -2508,7 +2508,6 @@ NS_IMETHODIMP
nsDocShell::SetSecurityUI(nsISecureBrowserUI *aSecurityUI)
{
mSecurityUI = aSecurityUI;
mSecurityUI->SetDocShell(this);
return NS_OK;
}

9
dom/ipc/TabParent.cpp
View File

@ -30,7 +30,6 @@
#include "nsFocusManager.h"
#include "nsFrameLoader.h"
#include "nsIContent.h"
#include "nsIDocShell.h"
#include "nsIDOMApplicationRegistry.h"
#include "nsIDOMElement.h"
#include "nsIDOMEvent.h"
@ -502,14 +501,6 @@ TabParent::GetState(uint32_t *aState)
return NS_OK;
}
NS_IMETHODIMP
TabParent::SetDocShell(nsIDocShell *aDocShell)
{
NS_ENSURE_ARG(aDocShell);
NS_WARNING("No mDocShell member in TabParent so there is no docShell to set");
return NS_OK;
}
NS_IMETHODIMP
TabParent::GetTooltipText(nsAString & aTooltipText)
{

4
netwerk/base/public/nsISecureBrowserUI.idl
View File

@ -8,13 +8,11 @@
interface nsIDOMWindow;
interface nsIDOMElement;
interface nsIDocShell;
[scriptable, uuid(e97e5688-add2-4a1d-acae-396d7702e382)]
[scriptable, uuid(081e31e0-a144-11d3-8c7c-00609792278c)]
interface nsISecureBrowserUI : nsISupports
{
void init(in nsIDOMWindow window);
void setDocShell(in nsIDocShell docShell);
readonly attribute unsigned long state;
readonly attribute AString tooltipText;

26
security/manager/boot/src/nsSecureBrowserUIImpl.cpp
View File

@ -19,7 +19,6 @@
#include "nsIObserverService.h"
#include "nsCURILoader.h"
#include "nsIDocShell.h"
#include "nsIDocShellTreeItem.h"
#include "nsIDocument.h"
#include "nsIPrincipal.h"
#include "nsIDOMElement.h"
@ -287,21 +286,12 @@ nsSecureBrowserUIImpl::MapInternalToExternalState(uint32_t* aState, lockIconStat
if (ev && (*aState & STATE_IS_SECURE))
*aState |= nsIWebProgressListener::STATE_IDENTITY_EV_TOPLEVEL;
nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocShell);
if (!docShell)
nsCOMPtr<nsPIDOMWindow> piwin = do_QueryReferent(mWindow);
if (!piwin)
return NS_OK;
int32_t docShellType;
// For content docShell's, the mixed content security state is set on the root docShell.
if (NS_SUCCEEDED(docShell->GetItemType(&docShellType)) && docShellType == nsIDocShellTreeItem::typeContent) {
nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem(do_QueryInterface(docShell));
nsCOMPtr<nsIDocShellTreeItem> sameTypeRoot;
docShellTreeItem->GetSameTypeRootTreeItem(getter_AddRefs(sameTypeRoot));
NS_ASSERTION(sameTypeRoot, "No document shell root tree item from document shell tree item!");
docShell = do_QueryInterface(sameTypeRoot);
if (!docShell)
return NS_OK;
}
nsIDocShell* docShell = piwin->GetDocShell();
MOZ_ASSERT(docShell);
// Has a Mixed Content Load initiated in nsMixedContentBlocker?
// If so, the state should be broken; overriding the previous state
@ -329,14 +319,6 @@ nsSecureBrowserUIImpl::MapInternalToExternalState(uint32_t* aState, lockIconStat
return NS_OK;
}
NS_IMETHODIMP
nsSecureBrowserUIImpl::SetDocShell(nsIDocShell *aDocShell)
{
nsresult rv;
mDocShell = do_GetWeakReference(aDocShell, &rv);
return rv;
}
NS_IMETHODIMP
nsSecureBrowserUIImpl::GetTooltipText(nsAString& aText)
{

2
security/manager/boot/src/nsSecureBrowserUIImpl.h
View File

@ -17,7 +17,6 @@
#include "nsIStringBundle.h"
#include "nsISecureBrowserUI.h"
#include "nsIDocShell.h"
#include "nsIDocShellTreeItem.h"
#include "nsIWebProgressListener.h"
#include "nsIFormSubmitObserver.h"
#include "nsIURI.h"
@ -67,7 +66,6 @@ protected:
mozilla::ReentrantMonitor mReentrantMonitor;
nsWeakPtr mWindow;
nsWeakPtr mDocShell;
nsCOMPtr<nsINetUtil> mIOService;
nsCOMPtr<nsIStringBundle> mStringBundle;
nsCOMPtr<nsIURI> mCurrentURI;