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 nsIDOMHistory_MOZILLA_2_0_BRANCH back into the main interface, r=smaug

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

1
dom/base/nsDOMClassInfo.cpp
View File

@ -2330,7 +2330,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(History, nsIDOMHistory)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMHistory)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMHistory_MOZILLA_2_0_BRANCH)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(Screen, nsIDOMScreen)

1
dom/base/nsHistory.cpp
View File

@ -85,7 +85,6 @@ DOMCI_DATA(History, nsHistory)
NS_INTERFACE_MAP_BEGIN(nsHistory)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMHistory)
NS_INTERFACE_MAP_ENTRY(nsIDOMHistory)
NS_INTERFACE_MAP_ENTRY(nsIDOMHistory_MOZILLA_2_0_BRANCH)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(History)
NS_INTERFACE_MAP_END

4
dom/base/nsHistory.h
View File

@ -49,8 +49,7 @@
class nsIDocShell;
// Script "History" object
class nsHistory : public nsIDOMHistory,
public nsIDOMHistory_MOZILLA_2_0_BRANCH
class nsHistory : public nsIDOMHistory
{
public:
nsHistory(nsPIDOMWindow* aInnerWindow);
@ -61,7 +60,6 @@ public:
// nsIDOMHistory
NS_DECL_NSIDOMHISTORY
NS_DECL_NSIDOMHISTORY_MOZILLA_2_0_BRANCH
nsIDocShell *GetDocShell() {
nsCOMPtr<nsPIDOMWindow> win(do_QueryReferent(mInnerWindow));

6
dom/interfaces/base/nsIDOMHistory.idl
View File

@ -41,7 +41,7 @@
interface nsIVariant;
[scriptable, uuid(208f2af7-9f2e-497c-8a53-9e7803280898)]
[scriptable, uuid(dba2e0d5-1682-40a3-be46-28eda99d757e)]
interface nsIDOMHistory : nsISupports
{
readonly attribute long length;
@ -60,10 +60,6 @@ interface nsIDOMHistory : nsISupports
void replaceState(in nsIVariant aData,
in DOMString aTitle,
[optional] in DOMString aURL);
};
[scriptable, uuid(949fcdc1-664b-4a4b-939a-7144c94b48ac)]
interface nsIDOMHistory_MOZILLA_2_0_BRANCH : nsISupports
{
readonly attribute nsIVariant state;
};