wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 617539 - Fold in nsIDocShell_MOZILLA_2_0_BRANCH, r=bz

Browse Source
This commit is contained in:
Benjamin Smedberg 2011-03-25 11:03:34 -04:00
parent 634c35dcd2
commit db7fa48a66
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docshell/base/nsDocShell.cpp
View File

@ -864,7 +864,6 @@ NS_INTERFACE_MAP_BEGIN(nsDocShell)
NS_INTERFACE_MAP_ENTRY(nsIWebShellServices)
NS_INTERFACE_MAP_ENTRY(nsILinkHandler)
NS_INTERFACE_MAP_ENTRY(nsIClipboardCommands)
NS_INTERFACE_MAP_ENTRY(nsIDocShell_MOZILLA_2_0_BRANCH)
NS_INTERFACE_MAP_END_INHERITING(nsDocLoader)
///*****************************************************************************

4
docshell/base/nsDocShell.h
View File

@ -186,8 +186,7 @@ class nsDocShell : public nsDocLoader,
public nsILoadContext,
public nsIWebShellServices,
public nsILinkHandler,
public nsIClipboardCommands,
public nsIDocShell_MOZILLA_2_0_BRANCH
public nsIClipboardCommands
{
friend class nsDSURIContentListener;
@ -202,7 +201,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIDOCSHELL
NS_DECL_NSIDOCSHELL_MOZILLA_2_0_BRANCH
NS_DECL_NSIDOCSHELLTREEITEM
NS_DECL_NSIDOCSHELLTREENODE
NS_DECL_NSIDOCSHELLHISTORY

5
docshell/base/nsIDocShell.idl
View File

@ -71,7 +71,7 @@ interface nsIPrincipal;
interface nsIWebBrowserPrint;
interface nsIVariant;
[scriptable, uuid(98cdbcc4-2d81-4191-a63f-b6c52085edbc)]
[scriptable, uuid(1917a6d6-31f6-4033-868d-f15ca08ca2df)]
interface nsIDocShell : nsISupports
{
/**
@ -540,10 +540,7 @@ interface nsIDocShell : nsISupports
* handling link clicks. Docshells are not app tabs unless told otherwise.
*/
attribute boolean isAppTab;
};
[uuid(5f7a2184-31b6-4d67-9c75-0c17477766e2)]
interface nsIDocShell_MOZILLA_2_0_BRANCH : nsISupports {
/**
* Create a new about:blank document and content viewer.
* @param aPrincipal the principal to use for the new document.

3
dom/base/nsGlobalWindow.cpp
View File

@ -1609,8 +1609,7 @@ nsGlobalWindow::SetOpenerScriptPrincipal(nsIPrincipal* aPrincipal)
"Unexpected original document");
#endif
nsCOMPtr<nsIDocShell_MOZILLA_2_0_BRANCH> ds(do_QueryInterface(GetDocShell()));
ds->CreateAboutBlankContentViewer(aPrincipal);
GetDocShell()->CreateAboutBlankContentViewer(aPrincipal);
mDoc->SetIsInitialDocument(PR_TRUE);
nsCOMPtr<nsIPresShell> shell;