Bug 664543 - Remove nsIDOMWindow_2_0_BRANCH interface; r=peterv

This commit is contained in:
Ms2ger 2011-07-03 11:53:41 +02:00
parent e6aaa3671f
commit 4e883d2c6f
4 changed files with 8 additions and 21 deletions

View File

@ -2400,7 +2400,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowPerformance)
DOM_CLASSINFO_MAP_END
} else {
@ -2411,7 +2410,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
DOM_CLASSINFO_MAP_END
}
} else {
@ -2422,7 +2420,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowPerformance)
DOM_CLASSINFO_MAP_END
} else {
@ -2432,7 +2429,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
DOM_CLASSINFO_MAP_END
}
}

View File

@ -1351,7 +1351,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow)
NS_INTERFACE_MAP_ENTRY(nsIDOMStorageIndexedDB)
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
NS_INTERFACE_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
NS_INTERFACE_MAP_ENTRY(nsIDOMWindowPerformance)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Window)
OUTER_WINDOW_ONLY

View File

@ -280,7 +280,6 @@ class nsGlobalWindow : public nsPIDOMWindow,
public nsIDOMStorageIndexedDB,
public nsSupportsWeakReference,
public nsIInterfaceRequestor,
public nsIDOMWindow_2_0_BRANCH,
public nsWrapperCache,
public PRCListStr,
public nsIDOMWindowPerformance
@ -338,9 +337,6 @@ public:
// nsIDOMEventTarget
NS_DECL_NSIDOMEVENTTARGET
// nsIDOMWindow_2_0_BRANCH
NS_DECL_NSIDOMWINDOW_2_0_BRANCH
// nsPIDOMWindow
virtual NS_HIDDEN_(nsPIDOMWindow*) GetPrivateRoot();
virtual NS_HIDDEN_(void) ActivateOrDeactivate(PRBool aActivate);

View File

@ -52,7 +52,14 @@ interface nsIAnimationFrameListener;
interface nsIDOMMediaQueryList;
interface nsIDOMBlob;
[scriptable, uuid(9d96565f-2064-4d2f-b0e0-6f67a1fad89c)]
[scriptable, uuid(8fc58f56-f769-4368-a098-edd08550cf1a)]
interface nsIDOMMozURLProperty : nsISupports
{
DOMString createObjectURL(in nsIDOMBlob blob);
void revokeObjectURL(in DOMString URL);
};
[scriptable, uuid(7fec9403-7562-4ae0-8d9b-0735f0a55d7d)]
interface nsIDOMWindowInternal : nsIDOMWindow
{
readonly attribute nsIDOMWindowInternal window;
@ -244,18 +251,7 @@ interface nsIDOMWindowInternal : nsIDOMWindow
* http://dev.w3.org/csswg/cssom-view/#extensions-to-the-window-interface
*/
nsIDOMMediaQueryList matchMedia(in DOMString media_query_list);
};
[scriptable, uuid(8fc58f56-f769-4368-a098-edd08550cf1a)]
interface nsIDOMMozURLProperty : nsISupports
{
DOMString createObjectURL(in nsIDOMBlob blob);
void revokeObjectURL(in DOMString URL);
};
[scriptable, uuid(05563c0c-b74c-41ad-91d1-bc22d580a581)]
interface nsIDOMWindow_2_0_BRANCH : nsISupports
{
readonly attribute nsIDOMMozURLProperty URL;
};