mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 658714 Part 2: Merge nsIDOMNSEventTarget into nsIDOMEventTarget. r=smaug
This commit is contained in:
parent
8fed9108b1
commit
6c4113f213
@ -76,7 +76,6 @@
|
|||||||
#include "nsIWebBrowserChrome.h"
|
#include "nsIWebBrowserChrome.h"
|
||||||
#include "nsReadableUtils.h"
|
#include "nsReadableUtils.h"
|
||||||
#include "nsRootAccessible.h"
|
#include "nsRootAccessible.h"
|
||||||
#include "nsIDOMNSEventTarget.h"
|
|
||||||
#include "nsIPrivateDOMEvent.h"
|
#include "nsIPrivateDOMEvent.h"
|
||||||
#include "nsFocusManager.h"
|
#include "nsFocusManager.h"
|
||||||
|
|
||||||
@ -251,11 +250,11 @@ const char* const docEvents[] = {
|
|||||||
|
|
||||||
nsresult nsRootAccessible::AddEventListeners()
|
nsresult nsRootAccessible::AddEventListeners()
|
||||||
{
|
{
|
||||||
// nsIDOMNSEventTarget interface allows to register event listeners to
|
// nsIDOMEventTarget interface allows to register event listeners to
|
||||||
// receive untrusted events (synthetic events generated by untrusted code).
|
// receive untrusted events (synthetic events generated by untrusted code).
|
||||||
// For example, XBL bindings implementations for elements that are hosted in
|
// For example, XBL bindings implementations for elements that are hosted in
|
||||||
// non chrome document fire untrusted events.
|
// non chrome document fire untrusted events.
|
||||||
nsCOMPtr<nsIDOMNSEventTarget> nstarget(do_QueryInterface(mDocument));
|
nsCOMPtr<nsIDOMEventTarget> nstarget(do_QueryInterface(mDocument));
|
||||||
|
|
||||||
if (nstarget) {
|
if (nstarget) {
|
||||||
for (const char* const* e = docEvents,
|
for (const char* const* e = docEvents,
|
||||||
|
@ -138,8 +138,6 @@ NS_INTERFACE_TABLE_HEAD(nsDOMAttribute)
|
|||||||
new nsNodeSupportsWeakRefTearoff(this))
|
new nsNodeSupportsWeakRefTearoff(this))
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3EventTarget,
|
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3EventTarget,
|
||||||
nsDOMEventRTTearoff::Create(this))
|
nsDOMEventRTTearoff::Create(this))
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNSEventTarget,
|
|
||||||
nsDOMEventRTTearoff::Create(this))
|
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMXPathNSResolver,
|
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMXPathNSResolver,
|
||||||
new nsNode3Tearoff(this))
|
new nsNode3Tearoff(this))
|
||||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Attr)
|
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Attr)
|
||||||
@ -794,10 +792,13 @@ NS_IMPL_DOMTARGET_DEFAULTS(nsDOMAttribute)
|
|||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDOMAttribute::AddEventListener(const nsAString& aType,
|
nsDOMAttribute::AddEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener *aListener,
|
nsIDOMEventListener* aListener,
|
||||||
PRBool useCapture)
|
PRBool aUseCapture,
|
||||||
|
PRBool aWantsUntrusted,
|
||||||
|
PRUint8 optional_argc)
|
||||||
{
|
{
|
||||||
return AddEventListener(aType, aListener, useCapture, PR_FALSE, 1);
|
return nsIAttribute::AddEventListener(aType, aListener, aUseCapture,
|
||||||
|
aWantsUntrusted, optional_argc);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
|
@ -82,16 +82,6 @@ public:
|
|||||||
|
|
||||||
NS_DECL_NSIDOMEVENTTARGET
|
NS_DECL_NSIDOMEVENTTARGET
|
||||||
|
|
||||||
nsresult AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener *aListener,
|
|
||||||
PRBool aUseCapture,
|
|
||||||
PRBool aWantsUntrusted,
|
|
||||||
PRUint8 optional_argc)
|
|
||||||
{
|
|
||||||
return nsIAttribute::AddEventListener(aType, aListener, aUseCapture,
|
|
||||||
aWantsUntrusted, optional_argc);
|
|
||||||
}
|
|
||||||
|
|
||||||
// nsIAttribute interface
|
// nsIAttribute interface
|
||||||
void SetMap(nsDOMAttributeMap *aMap);
|
void SetMap(nsDOMAttributeMap *aMap);
|
||||||
nsIContent *GetContent() const;
|
nsIContent *GetContent() const;
|
||||||
|
@ -101,7 +101,6 @@ public:
|
|||||||
PRUint32 argc, jsval* argv);
|
PRUint32 argc, jsval* argv);
|
||||||
|
|
||||||
NS_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget::)
|
NS_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget::)
|
||||||
NS_FORWARD_NSIDOMNSEVENTTARGET(nsXHREventTarget::)
|
|
||||||
|
|
||||||
// nsICharsetDetectionObserver
|
// nsICharsetDetectionObserver
|
||||||
NS_IMETHOD Notify(const char *aCharset, nsDetectionConfident aConf);
|
NS_IMETHOD Notify(const char *aCharset, nsDetectionConfident aConf);
|
||||||
|
@ -1694,7 +1694,6 @@ NS_INTERFACE_TABLE_HEAD(nsDocument)
|
|||||||
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIScriptObjectPrincipal)
|
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIScriptObjectPrincipal)
|
||||||
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOMEventTarget)
|
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOMEventTarget)
|
||||||
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOM3EventTarget)
|
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOM3EventTarget)
|
||||||
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOMNSEventTarget)
|
|
||||||
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsISupportsWeakReference)
|
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsISupportsWeakReference)
|
||||||
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIRadioGroupContainer)
|
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIRadioGroupContainer)
|
||||||
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIRadioGroupContainer_MOZILLA_2_0_BRANCH)
|
NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIRadioGroupContainer_MOZILLA_2_0_BRANCH)
|
||||||
@ -6293,14 +6292,6 @@ nsDocument::RemoveEventListenerByIID(nsIDOMEventListener *aListener,
|
|||||||
NS_OK;
|
NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
nsresult
|
|
||||||
nsDocument::AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture)
|
|
||||||
{
|
|
||||||
return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
nsDocument::RemoveEventListener(const nsAString& aType,
|
nsDocument::RemoveEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
@ -7683,20 +7674,6 @@ nsDocument::RefreshLinkHrefs()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDocument::GetScriptTypeID(PRUint32 *aScriptType)
|
|
||||||
{
|
|
||||||
NS_ERROR("No default script type here - ask some element");
|
|
||||||
return nsIProgrammingLanguage::UNKNOWN;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDocument::SetScriptTypeID(PRUint32 aScriptType)
|
|
||||||
{
|
|
||||||
NS_ERROR("Can't change default script type for a document");
|
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
nsDocument::CloneDocHelper(nsDocument* clone) const
|
nsDocument::CloneDocHelper(nsDocument* clone) const
|
||||||
{
|
{
|
||||||
|
@ -55,7 +55,6 @@
|
|||||||
#include "nsIDOMDocumentXBL.h"
|
#include "nsIDOMDocumentXBL.h"
|
||||||
#include "nsStubDocumentObserver.h"
|
#include "nsStubDocumentObserver.h"
|
||||||
#include "nsIDOM3EventTarget.h"
|
#include "nsIDOM3EventTarget.h"
|
||||||
#include "nsIDOMNSEventTarget.h"
|
|
||||||
#include "nsIDOMStyleSheetList.h"
|
#include "nsIDOMStyleSheetList.h"
|
||||||
#include "nsIScriptGlobalObject.h"
|
#include "nsIScriptGlobalObject.h"
|
||||||
#include "nsIDOMEventTarget.h"
|
#include "nsIDOMEventTarget.h"
|
||||||
@ -493,7 +492,6 @@ class nsDocument : public nsIDocument,
|
|||||||
public nsIDOMDocumentXBL,
|
public nsIDOMDocumentXBL,
|
||||||
public nsSupportsWeakReference,
|
public nsSupportsWeakReference,
|
||||||
public nsIDOM3EventTarget,
|
public nsIDOM3EventTarget,
|
||||||
public nsIDOMNSEventTarget,
|
|
||||||
public nsIScriptObjectPrincipal,
|
public nsIScriptObjectPrincipal,
|
||||||
public nsIRadioGroupContainer_MOZILLA_2_0_BRANCH,
|
public nsIRadioGroupContainer_MOZILLA_2_0_BRANCH,
|
||||||
public nsIApplicationCacheContainer,
|
public nsIApplicationCacheContainer,
|
||||||
@ -782,9 +780,6 @@ public:
|
|||||||
// nsIDOM3EventTarget
|
// nsIDOM3EventTarget
|
||||||
NS_DECL_NSIDOM3EVENTTARGET
|
NS_DECL_NSIDOM3EVENTTARGET
|
||||||
|
|
||||||
// nsIDOMNSEventTarget
|
|
||||||
NS_DECL_NSIDOMNSEVENTTARGET
|
|
||||||
|
|
||||||
// nsIScriptObjectPrincipal
|
// nsIScriptObjectPrincipal
|
||||||
virtual nsIPrincipal* GetPrincipal();
|
virtual nsIPrincipal* GetPrincipal();
|
||||||
|
|
||||||
|
@ -129,8 +129,6 @@ NS_INTERFACE_MAP_BEGIN(nsGenericDOMDataNode)
|
|||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
|
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3EventTarget,
|
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3EventTarget,
|
||||||
nsDOMEventRTTearoff::Create(this))
|
nsDOMEventRTTearoff::Create(this))
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNSEventTarget,
|
|
||||||
nsDOMEventRTTearoff::Create(this))
|
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsISupportsWeakReference,
|
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsISupportsWeakReference,
|
||||||
new nsNodeSupportsWeakRefTearoff(this))
|
new nsNodeSupportsWeakRefTearoff(this))
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMXPathNSResolver,
|
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMXPathNSResolver,
|
||||||
@ -633,10 +631,13 @@ NS_IMPL_DOMTARGET_DEFAULTS(nsGenericDOMDataNode)
|
|||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsGenericDOMDataNode::AddEventListener(const nsAString& aType,
|
nsGenericDOMDataNode::AddEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener *aListener,
|
nsIDOMEventListener* aListener,
|
||||||
PRBool useCapture)
|
PRBool aUseCapture,
|
||||||
|
PRBool aWantsUntrusted,
|
||||||
|
PRUint8 optional_argc)
|
||||||
{
|
{
|
||||||
return AddEventListener(aType, aListener, useCapture, PR_FALSE, 1);
|
return nsIContent::AddEventListener(aType, aListener, aUseCapture,
|
||||||
|
aWantsUntrusted, optional_argc);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
|
@ -87,16 +87,6 @@ public:
|
|||||||
|
|
||||||
NS_DECL_NSIDOMEVENTTARGET
|
NS_DECL_NSIDOMEVENTTARGET
|
||||||
|
|
||||||
nsresult AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener *aListener,
|
|
||||||
PRBool aUseCapture,
|
|
||||||
PRBool aWantsUntrusted,
|
|
||||||
PRUint8 optional_argc)
|
|
||||||
{
|
|
||||||
return nsIContent::AddEventListener(aType, aListener, aUseCapture,
|
|
||||||
aWantsUntrusted, optional_argc);
|
|
||||||
}
|
|
||||||
|
|
||||||
nsGenericDOMDataNode(already_AddRefed<nsINodeInfo> aNodeInfo);
|
nsGenericDOMDataNode(already_AddRefed<nsINodeInfo> aNodeInfo);
|
||||||
virtual ~nsGenericDOMDataNode();
|
virtual ~nsGenericDOMDataNode();
|
||||||
|
|
||||||
|
@ -2012,7 +2012,6 @@ NS_IMPL_CYCLE_COLLECTION_1(nsDOMEventRTTearoff, mNode)
|
|||||||
|
|
||||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEventRTTearoff)
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEventRTTearoff)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget)
|
NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
NS_INTERFACE_MAP_END_AGGREGATED(mNode)
|
NS_INTERFACE_MAP_END_AGGREGATED(mNode)
|
||||||
|
|
||||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMEventRTTearoff)
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMEventRTTearoff)
|
||||||
@ -2083,20 +2082,6 @@ nsDOMEventRTTearoff::GetDOM3EventTarget(nsIDOM3EventTarget **aTarget)
|
|||||||
return CallQueryInterface(listener_manager, aTarget);
|
return CallQueryInterface(listener_manager, aTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMEventRTTearoff::GetScriptTypeID(PRUint32 *aLang)
|
|
||||||
{
|
|
||||||
*aLang = mNode->GetScriptTypeID();
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMEventRTTearoff::SetScriptTypeID(PRUint32 aLang)
|
|
||||||
{
|
|
||||||
return mNode->SetScriptTypeID(aLang);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// nsIDOM3EventTarget
|
// nsIDOM3EventTarget
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDOMEventRTTearoff::AddGroupedEventListener(const nsAString& aType,
|
nsDOMEventRTTearoff::AddGroupedEventListener(const nsAString& aType,
|
||||||
@ -2138,35 +2123,6 @@ nsDOMEventRTTearoff::IsRegisteredHere(const nsAString & type, PRBool *_retval)
|
|||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
return NS_ERROR_NOT_IMPLEMENTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
// nsIDOMNSEventTarget
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMEventRTTearoff::AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener *aListener,
|
|
||||||
PRBool aUseCapture,
|
|
||||||
PRBool aWantsUntrusted,
|
|
||||||
PRUint8 optional_argc)
|
|
||||||
{
|
|
||||||
NS_ASSERTION(!aWantsUntrusted || optional_argc > 1,
|
|
||||||
"Won't check if this is chrome, you want to set "
|
|
||||||
"aWantsUntrusted to PR_FALSE or make the aWantsUntrusted "
|
|
||||||
"explicit by making optional_argc non-zero.");
|
|
||||||
|
|
||||||
nsIEventListenerManager* listener_manager =
|
|
||||||
mNode->GetListenerManager(PR_TRUE);
|
|
||||||
NS_ENSURE_STATE(listener_manager);
|
|
||||||
|
|
||||||
PRInt32 flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
|
|
||||||
|
|
||||||
if (aWantsUntrusted ||
|
|
||||||
(optional_argc < 2 &&
|
|
||||||
!nsContentUtils::IsChromeDoc(mNode->GetOwnerDoc()))) {
|
|
||||||
flags |= NS_PRIV_EVENT_UNTRUSTED_PERMITTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
return listener_manager->AddEventListenerByType(aListener, aType, flags,
|
|
||||||
nsnull);
|
|
||||||
}
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
|
|
||||||
NS_IMPL_CYCLE_COLLECTION_1(nsNodeSelectorTearoff, mNode)
|
NS_IMPL_CYCLE_COLLECTION_1(nsNodeSelectorTearoff, mNode)
|
||||||
@ -3189,10 +3145,13 @@ nsGenericElement::GetChildren(PRUint32 aFilter)
|
|||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsGenericElement::AddEventListener(const nsAString& aType,
|
nsGenericElement::AddEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener *aListener,
|
nsIDOMEventListener* aListener,
|
||||||
PRBool useCapture)
|
PRBool aUseCapture,
|
||||||
|
PRBool aWantsUntrusted,
|
||||||
|
PRUint8 optional_argc)
|
||||||
{
|
{
|
||||||
return AddEventListener(aType, aListener, useCapture, PR_FALSE, 1);
|
return nsIContent::AddEventListener(aType, aListener, aUseCapture,
|
||||||
|
aWantsUntrusted, optional_argc);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
@ -4449,8 +4408,6 @@ NS_INTERFACE_MAP_BEGIN(nsGenericElement)
|
|||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNSElement, new nsNSElementTearoff(this))
|
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNSElement, new nsNSElementTearoff(this))
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3EventTarget,
|
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3EventTarget,
|
||||||
nsDOMEventRTTearoff::Create(this))
|
nsDOMEventRTTearoff::Create(this))
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNSEventTarget,
|
|
||||||
nsDOMEventRTTearoff::Create(this))
|
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsISupportsWeakReference,
|
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsISupportsWeakReference,
|
||||||
new nsNodeSupportsWeakRefTearoff(this))
|
new nsNodeSupportsWeakRefTearoff(this))
|
||||||
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNodeSelector,
|
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNodeSelector,
|
||||||
|
@ -51,7 +51,6 @@
|
|||||||
#include "nsIDOMDocumentFragment.h"
|
#include "nsIDOMDocumentFragment.h"
|
||||||
#include "nsIDOMEventTarget.h"
|
#include "nsIDOMEventTarget.h"
|
||||||
#include "nsIDOM3EventTarget.h"
|
#include "nsIDOM3EventTarget.h"
|
||||||
#include "nsIDOMNSEventTarget.h"
|
|
||||||
#include "nsIDOMNSElement.h"
|
#include "nsIDOMNSElement.h"
|
||||||
#include "nsILinkHandler.h"
|
#include "nsILinkHandler.h"
|
||||||
#include "nsContentUtils.h"
|
#include "nsContentUtils.h"
|
||||||
@ -205,15 +204,14 @@ private:
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* nsDOMEventRTTearoff is a tearoff class used by nsGenericElement and
|
* nsDOMEventRTTearoff is a tearoff class used by nsGenericElement and
|
||||||
* nsGenericDOMDataNode classes for implementing the interfaces
|
* nsGenericDOMDataNode classes for implementing the nsIDOM3EventTarget
|
||||||
* nsIDOMEventTarget, nsIDOM3EventTarget and nsIDOMNSEventTarget.
|
* interface.
|
||||||
*
|
*
|
||||||
* Use the method nsDOMEventRTTearoff::Create() to create one of these babies.
|
* Use the method nsDOMEventRTTearoff::Create() to create one of these babies.
|
||||||
* @see nsDOMEventRTTearoff::Create
|
* @see nsDOMEventRTTearoff::Create
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class nsDOMEventRTTearoff : public nsIDOM3EventTarget,
|
class nsDOMEventRTTearoff : public nsIDOM3EventTarget
|
||||||
public nsIDOMNSEventTarget
|
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
// This class uses a caching scheme so we don't let users of this
|
// This class uses a caching scheme so we don't let users of this
|
||||||
@ -256,11 +254,7 @@ public:
|
|||||||
// nsIDOM3EventTarget
|
// nsIDOM3EventTarget
|
||||||
NS_DECL_NSIDOM3EVENTTARGET
|
NS_DECL_NSIDOM3EVENTTARGET
|
||||||
|
|
||||||
// nsIDOMNSEventTarget
|
NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMEventRTTearoff)
|
||||||
NS_DECL_NSIDOMNSEVENTTARGET
|
|
||||||
|
|
||||||
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDOMEventRTTearoff,
|
|
||||||
nsIDOM3EventTarget)
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/**
|
/**
|
||||||
@ -312,16 +306,6 @@ public:
|
|||||||
|
|
||||||
NS_DECL_NSIDOMEVENTTARGET
|
NS_DECL_NSIDOMEVENTTARGET
|
||||||
|
|
||||||
nsresult AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener *aListener,
|
|
||||||
PRBool aUseCapture,
|
|
||||||
PRBool aWantsUntrusted,
|
|
||||||
PRUint8 optional_argc)
|
|
||||||
{
|
|
||||||
return nsINode::AddEventListener(aType, aListener, aUseCapture,
|
|
||||||
aWantsUntrusted, optional_argc);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called during QueryInterface to give the binding manager a chance to
|
* Called during QueryInterface to give the binding manager a chance to
|
||||||
* get an interface for this element.
|
* get an interface for this element.
|
||||||
|
@ -1145,21 +1145,6 @@ nsWebSocket::DontKeepAliveAnyMore()
|
|||||||
mCheckMustKeepAlive = PR_FALSE;
|
mCheckMustKeepAlive = PR_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsWebSocket::AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture)
|
|
||||||
{
|
|
||||||
NS_ABORT_IF_FALSE(NS_IsMainThread(), "Not running on main thread");
|
|
||||||
nsresult rv = nsDOMEventTargetHelper::AddEventListener(aType,
|
|
||||||
aListener,
|
|
||||||
aUseCapture);
|
|
||||||
if (NS_SUCCEEDED(rv)) {
|
|
||||||
UpdateMustKeepAlive();
|
|
||||||
}
|
|
||||||
return rv;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsWebSocket::RemoveEventListener(const nsAString& aType,
|
nsWebSocket::RemoveEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
|
@ -86,19 +86,14 @@ public:
|
|||||||
JSObject* aObject, PRUint32 aArgc, jsval* aArgv);
|
JSObject* aObject, PRUint32 aArgc, jsval* aArgv);
|
||||||
|
|
||||||
// nsIDOMEventTarget
|
// nsIDOMEventTarget
|
||||||
NS_IMETHOD AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture);
|
|
||||||
NS_IMETHOD RemoveEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture);
|
|
||||||
|
|
||||||
// nsIDOMNSEventTarget
|
|
||||||
NS_IMETHOD AddEventListener(const nsAString& aType,
|
NS_IMETHOD AddEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener *aListener,
|
nsIDOMEventListener *aListener,
|
||||||
PRBool aUseCapture,
|
PRBool aUseCapture,
|
||||||
PRBool aWantsUntrusted,
|
PRBool aWantsUntrusted,
|
||||||
PRUint8 optional_argc);
|
PRUint8 optional_argc);
|
||||||
|
NS_IMETHOD RemoveEventListener(const nsAString& aType,
|
||||||
|
nsIDOMEventListener* aListener,
|
||||||
|
PRBool aUseCapture);
|
||||||
|
|
||||||
// Determine if preferences allow WebSocket
|
// Determine if preferences allow WebSocket
|
||||||
static PRBool PrefEnabled();
|
static PRBool PrefEnabled();
|
||||||
|
@ -79,7 +79,6 @@ public:
|
|||||||
nsDOMEventTargetWrapperCache)
|
nsDOMEventTargetWrapperCache)
|
||||||
NS_DECL_NSIXMLHTTPREQUESTEVENTTARGET
|
NS_DECL_NSIXMLHTTPREQUESTEVENTTARGET
|
||||||
NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
|
NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
|
||||||
NS_FORWARD_NSIDOMNSEVENTTARGET(nsDOMEventTargetHelper::)
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
nsRefPtr<nsDOMEventListenerWrapper> mOnLoadListener;
|
nsRefPtr<nsDOMEventListenerWrapper> mOnLoadListener;
|
||||||
@ -104,7 +103,6 @@ public:
|
|||||||
NS_DECL_ISUPPORTS_INHERITED
|
NS_DECL_ISUPPORTS_INHERITED
|
||||||
NS_FORWARD_NSIXMLHTTPREQUESTEVENTTARGET(nsXHREventTarget::)
|
NS_FORWARD_NSIXMLHTTPREQUESTEVENTTARGET(nsXHREventTarget::)
|
||||||
NS_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget::)
|
NS_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget::)
|
||||||
NS_FORWARD_NSIDOMNSEVENTTARGET(nsXHREventTarget::)
|
|
||||||
NS_DECL_NSIXMLHTTPREQUESTUPLOAD
|
NS_DECL_NSIXMLHTTPREQUESTUPLOAD
|
||||||
|
|
||||||
PRBool HasListeners()
|
PRBool HasListeners()
|
||||||
@ -162,7 +160,6 @@ public:
|
|||||||
PRUint32 argc, jsval* argv);
|
PRUint32 argc, jsval* argv);
|
||||||
|
|
||||||
NS_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget::)
|
NS_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget::)
|
||||||
NS_FORWARD_NSIDOMNSEVENTTARGET(nsXHREventTarget::)
|
|
||||||
|
|
||||||
// This creates a trusted readystatechange event, which is not cancelable and
|
// This creates a trusted readystatechange event, which is not cancelable and
|
||||||
// doesn't bubble.
|
// doesn't bubble.
|
||||||
|
@ -82,7 +82,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
|
|||||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEventTargetHelper)
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEventTargetHelper)
|
||||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsPIDOMEventTarget)
|
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsPIDOMEventTarget)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
|
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
NS_INTERFACE_MAP_END
|
NS_INTERFACE_MAP_END
|
||||||
|
|
||||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMEventTargetHelper)
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMEventTargetHelper)
|
||||||
@ -90,14 +89,6 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMEventTargetHelper)
|
|||||||
|
|
||||||
NS_IMPL_DOMTARGET_DEFAULTS(nsDOMEventTargetHelper);
|
NS_IMPL_DOMTARGET_DEFAULTS(nsDOMEventTargetHelper);
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMEventTargetHelper::AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture)
|
|
||||||
{
|
|
||||||
return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDOMEventTargetHelper::RemoveEventListener(const nsAString& aType,
|
nsDOMEventTargetHelper::RemoveEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
@ -144,20 +135,6 @@ nsDOMEventTargetHelper::AddEventListener(const nsAString& aType,
|
|||||||
return elm->AddEventListenerByType(aListener, aType, flags, nsnull);
|
return elm->AddEventListenerByType(aListener, aType, flags, nsnull);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMEventTargetHelper::GetScriptTypeID(PRUint32 *aLang)
|
|
||||||
{
|
|
||||||
*aLang = mLang;
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMEventTargetHelper::SetScriptTypeID(PRUint32 aLang)
|
|
||||||
{
|
|
||||||
mLang = aLang;
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDOMEventTargetHelper::DispatchEvent(nsIDOMEvent* aEvent, PRBool* aRetVal)
|
nsDOMEventTargetHelper::DispatchEvent(nsIDOMEvent* aEvent, PRBool* aRetVal)
|
||||||
{
|
{
|
||||||
@ -182,7 +159,7 @@ nsDOMEventTargetHelper::RemoveAddEventListener(const nsAString& aType,
|
|||||||
if (aNew) {
|
if (aNew) {
|
||||||
aCurrent = new nsDOMEventListenerWrapper(aNew);
|
aCurrent = new nsDOMEventListenerWrapper(aNew);
|
||||||
NS_ENSURE_TRUE(aCurrent, NS_ERROR_OUT_OF_MEMORY);
|
NS_ENSURE_TRUE(aCurrent, NS_ERROR_OUT_OF_MEMORY);
|
||||||
AddEventListener(aType, aCurrent, PR_FALSE);
|
nsIDOMEventTarget::AddEventListener(aType, aCurrent, PR_FALSE);
|
||||||
}
|
}
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,6 @@
|
|||||||
#include "nsAutoPtr.h"
|
#include "nsAutoPtr.h"
|
||||||
#include "nsPIDOMEventTarget.h"
|
#include "nsPIDOMEventTarget.h"
|
||||||
#include "nsIDOMEventListener.h"
|
#include "nsIDOMEventListener.h"
|
||||||
#include "nsIDOMNSEventTarget.h"
|
|
||||||
#include "nsIDOMEventTarget.h"
|
#include "nsIDOMEventTarget.h"
|
||||||
#include "nsCycleCollectionParticipant.h"
|
#include "nsCycleCollectionParticipant.h"
|
||||||
#include "nsPIDOMWindow.h"
|
#include "nsPIDOMWindow.h"
|
||||||
@ -67,17 +66,15 @@ protected:
|
|||||||
nsCOMPtr<nsIDOMEventListener> mListener;
|
nsCOMPtr<nsIDOMEventListener> mListener;
|
||||||
};
|
};
|
||||||
|
|
||||||
class nsDOMEventTargetHelper : public nsIDOMEventTarget,
|
class nsDOMEventTargetHelper : public nsIDOMEventTarget
|
||||||
public nsIDOMNSEventTarget
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
nsDOMEventTargetHelper() : mLang(nsIProgrammingLanguage::JAVASCRIPT) {}
|
nsDOMEventTargetHelper() {}
|
||||||
virtual ~nsDOMEventTargetHelper() {}
|
virtual ~nsDOMEventTargetHelper() {}
|
||||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||||
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDOMEventTargetHelper,
|
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDOMEventTargetHelper,
|
||||||
nsPIDOMEventTarget)
|
nsPIDOMEventTarget)
|
||||||
|
|
||||||
NS_DECL_NSIDOMNSEVENTTARGET
|
|
||||||
NS_DECL_NSIDOMEVENTTARGET
|
NS_DECL_NSIDOMEVENTTARGET
|
||||||
|
|
||||||
PRBool HasListenersFor(const nsAString& aType)
|
PRBool HasListenersFor(const nsAString& aType)
|
||||||
@ -104,7 +101,6 @@ public:
|
|||||||
}
|
}
|
||||||
protected:
|
protected:
|
||||||
nsCOMPtr<nsIEventListenerManager> mListenerManager;
|
nsCOMPtr<nsIEventListenerManager> mListenerManager;
|
||||||
PRUint32 mLang;
|
|
||||||
// These may be null (native callers or xpcshell).
|
// These may be null (native callers or xpcshell).
|
||||||
nsCOMPtr<nsIScriptContext> mScriptContext;
|
nsCOMPtr<nsIScriptContext> mScriptContext;
|
||||||
nsCOMPtr<nsPIDOMWindow> mOwner; // Inner window.
|
nsCOMPtr<nsPIDOMWindow> mOwner; // Inner window.
|
||||||
|
@ -1303,9 +1303,17 @@ nsEventListenerManager::GetDOM2EventGroup(nsIDOMEventGroup **aGroup)
|
|||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsEventListenerManager::AddEventListener(const nsAString& aType,
|
nsEventListenerManager::AddEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
PRBool aUseCapture)
|
PRBool aUseCapture,
|
||||||
|
PRBool aWantsUntrusted,
|
||||||
|
PRUint8 optional_argc)
|
||||||
{
|
{
|
||||||
|
NS_ASSERTION(optional_argc == 2,
|
||||||
|
"Don't want to try to get caller from the the ELM");
|
||||||
|
|
||||||
PRInt32 flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
|
PRInt32 flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
|
||||||
|
if (aWantsUntrusted) {
|
||||||
|
flags |= NS_PRIV_EVENT_UNTRUSTED_PERMITTED;
|
||||||
|
}
|
||||||
|
|
||||||
nsresult rv = AddEventListenerByType(aListener, aType, flags, nsnull);
|
nsresult rv = AddEventListenerByType(aListener, aType, flags, nsnull);
|
||||||
NS_ASSERTION(NS_FAILED(rv) || HasListenersFor(aType),
|
NS_ASSERTION(NS_FAILED(rv) || HasListenersFor(aType),
|
||||||
|
@ -34,7 +34,6 @@ function HTML_TAG(aTagName, aImplClass) {
|
|||||||
interfaces[aTagName] =
|
interfaces[aTagName] =
|
||||||
[ "nsIDOMNSElement",
|
[ "nsIDOMNSElement",
|
||||||
"nsIDOMEventTarget",
|
"nsIDOMEventTarget",
|
||||||
"nsIDOMNSEventTarget",
|
|
||||||
"nsIDOMNSHTMLElement",
|
"nsIDOMNSHTMLElement",
|
||||||
"nsIDOMElementCSSInlineStyle",
|
"nsIDOMElementCSSInlineStyle",
|
||||||
"nsIDOMNodeSelector" ];
|
"nsIDOMNodeSelector" ];
|
||||||
|
@ -179,7 +179,6 @@
|
|||||||
// Event related includes
|
// Event related includes
|
||||||
#include "nsIEventListenerManager.h"
|
#include "nsIEventListenerManager.h"
|
||||||
#include "nsIDOMEventTarget.h"
|
#include "nsIDOMEventTarget.h"
|
||||||
#include "nsIDOMNSEventTarget.h"
|
|
||||||
|
|
||||||
// CSS related includes
|
// CSS related includes
|
||||||
#include "nsIDOMStyleSheet.h"
|
#include "nsIDOMStyleSheet.h"
|
||||||
@ -2321,7 +2320,6 @@ nsDOMClassInfo::RegisterExternalClasses()
|
|||||||
|
|
||||||
#define DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES \
|
#define DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentXBL) \
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentXBL) \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget) \
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) \
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMXPathEvaluator) \
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMXPathEvaluator) \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
|
||||||
@ -2330,7 +2328,6 @@ nsDOMClassInfo::RegisterExternalClasses()
|
|||||||
#define DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES \
|
#define DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLElement) \
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLElement) \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElementCSSInlineStyle) \
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElementCSSInlineStyle) \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget) \
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) \
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement) \
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement) \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
|
||||||
@ -2391,7 +2388,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
|
||||||
@ -2403,7 +2399,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
|
||||||
@ -2416,7 +2411,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
|
||||||
@ -2427,7 +2421,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow_2_0_BRANCH)
|
||||||
@ -2526,7 +2519,6 @@ nsDOMClassInfo::Init()
|
|||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(DocumentType, nsIDOMDocumentType)
|
DOM_CLASSINFO_MAP_BEGIN(DocumentType, nsIDOMDocumentType)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentType)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentType)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
@ -2550,14 +2542,12 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN(DocumentFragment, nsIDOMDocumentFragment)
|
DOM_CLASSINFO_MAP_BEGIN(DocumentFragment, nsIDOMDocumentFragment)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentFragment)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentFragment)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(Element, nsIDOMElement)
|
DOM_CLASSINFO_MAP_BEGIN(Element, nsIDOMElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
@ -2565,31 +2555,26 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN(Attr, nsIDOMAttr)
|
DOM_CLASSINFO_MAP_BEGIN(Attr, nsIDOMAttr)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMAttr)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMAttr)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOM3Attr)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOM3Attr)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(Text, nsIDOMText)
|
DOM_CLASSINFO_MAP_BEGIN(Text, nsIDOMText)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMText)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMText)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(Comment, nsIDOMComment)
|
DOM_CLASSINFO_MAP_BEGIN(Comment, nsIDOMComment)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMComment)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMComment)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(CDATASection, nsIDOMCDATASection)
|
DOM_CLASSINFO_MAP_BEGIN(CDATASection, nsIDOMCDATASection)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMCDATASection)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMCDATASection)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(ProcessingInstruction, nsIDOMProcessingInstruction)
|
DOM_CLASSINFO_MAP_BEGIN(ProcessingInstruction, nsIDOMProcessingInstruction)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMProcessingInstruction)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMProcessingInstruction)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
@ -3111,7 +3096,6 @@ nsDOMClassInfo::Init()
|
|||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(XULElement, nsIDOMXULElement)
|
DOM_CLASSINFO_MAP_BEGIN(XULElement, nsIDOMXULElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMXULElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMXULElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElementCSSInlineStyle)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElementCSSInlineStyle)
|
||||||
@ -3153,7 +3137,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(XMLStylesheetProcessingInstruction, nsIDOMProcessingInstruction)
|
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(XMLStylesheetProcessingInstruction, nsIDOMProcessingInstruction)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMProcessingInstruction)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMProcessingInstruction)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMLinkStyle)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMLinkStyle)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
@ -3162,7 +3145,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMChromeWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMChromeWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
|
||||||
@ -3223,7 +3205,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
#define DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES \
|
#define DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget) \
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) \
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGElement) \
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGElement) \
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement) \
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement) \
|
||||||
@ -3273,7 +3254,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextPositioningElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextPositioningElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextContentElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextContentElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGStylable)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGStylable)
|
||||||
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
|
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
|
||||||
@ -3617,7 +3597,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(SVGSVGElement, nsIDOMSVGSVGElement)
|
DOM_CLASSINFO_MAP_BEGIN(SVGSVGElement, nsIDOMSVGSVGElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGSVGElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGSVGElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFitToViewBox)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFitToViewBox)
|
||||||
@ -3633,7 +3612,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(SVGSymbolElement, nsIDOMSVGSymbolElement)
|
DOM_CLASSINFO_MAP_BEGIN(SVGSymbolElement, nsIDOMSVGSymbolElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGSymbolElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGSymbolElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFitToViewBox)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFitToViewBox)
|
||||||
@ -3650,7 +3628,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN(SVGTextPathElement, nsIDOMSVGTextPathElement)
|
DOM_CLASSINFO_MAP_BEGIN(SVGTextPathElement, nsIDOMSVGTextPathElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextContentElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextContentElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGStylable)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGStylable)
|
||||||
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
|
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
|
||||||
@ -3665,7 +3642,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN(SVGTSpanElement, nsIDOMSVGTSpanElement)
|
DOM_CLASSINFO_MAP_BEGIN(SVGTSpanElement, nsIDOMSVGTSpanElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextPositioningElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextPositioningElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextContentElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextContentElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGStylable)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGStylable)
|
||||||
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
|
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
|
||||||
@ -3975,7 +3951,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_ENTRY(nsIXMLHttpRequest)
|
DOM_CLASSINFO_MAP_ENTRY(nsIXMLHttpRequest)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIJSXMLHttpRequest)
|
DOM_CLASSINFO_MAP_ENTRY(nsIJSXMLHttpRequest)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIXMLHttpRequestEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIXMLHttpRequestEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIInterfaceRequestor)
|
DOM_CLASSINFO_MAP_ENTRY(nsIInterfaceRequestor)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
@ -3989,7 +3964,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN(EventSource, nsIEventSource)
|
DOM_CLASSINFO_MAP_BEGIN(EventSource, nsIEventSource)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIEventSource)
|
DOM_CLASSINFO_MAP_ENTRY(nsIEventSource)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(SVGForeignObjectElement, nsIDOMSVGForeignObjectElement)
|
DOM_CLASSINFO_MAP_BEGIN(SVGForeignObjectElement, nsIDOMSVGForeignObjectElement)
|
||||||
@ -4009,7 +3983,6 @@ nsDOMClassInfo::Init()
|
|||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(OfflineResourceList, nsIDOMOfflineResourceList)
|
DOM_CLASSINFO_MAP_BEGIN(OfflineResourceList, nsIDOMOfflineResourceList)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMOfflineResourceList)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMOfflineResourceList)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
@ -4046,7 +4019,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN(FileReader, nsIDOMFileReader)
|
DOM_CLASSINFO_MAP_BEGIN(FileReader, nsIDOMFileReader)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMFileReader)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMFileReader)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIXMLHttpRequestEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIXMLHttpRequestEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIInterfaceRequestor)
|
DOM_CLASSINFO_MAP_ENTRY(nsIInterfaceRequestor)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
@ -4067,7 +4039,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowInternal)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageWindow)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMStorageIndexedDB)
|
||||||
@ -4146,7 +4117,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN(XMLHttpRequestUpload, nsIXMLHttpRequestUpload)
|
DOM_CLASSINFO_MAP_BEGIN(XMLHttpRequestUpload, nsIXMLHttpRequestUpload)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIXMLHttpRequestEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIXMLHttpRequestEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIXMLHttpRequestUpload)
|
DOM_CLASSINFO_MAP_ENTRY(nsIXMLHttpRequestUpload)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
@ -4182,7 +4152,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(MathMLElement, nsIDOMElement)
|
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(MathMLElement, nsIDOMElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
@ -4190,14 +4159,12 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN(Worker, nsIWorker)
|
DOM_CLASSINFO_MAP_BEGIN(Worker, nsIWorker)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIWorker)
|
DOM_CLASSINFO_MAP_ENTRY(nsIWorker)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIAbstractWorker)
|
DOM_CLASSINFO_MAP_ENTRY(nsIAbstractWorker)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(ChromeWorker, nsIWorker)
|
DOM_CLASSINFO_MAP_BEGIN(ChromeWorker, nsIWorker)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIWorker)
|
DOM_CLASSINFO_MAP_ENTRY(nsIWorker)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIAbstractWorker)
|
DOM_CLASSINFO_MAP_ENTRY(nsIAbstractWorker)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
@ -4270,7 +4237,6 @@ nsDOMClassInfo::Init()
|
|||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ContentFrameMessageManager, nsIContentFrameMessageManager)
|
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ContentFrameMessageManager, nsIContentFrameMessageManager)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIFrameMessageManager)
|
DOM_CLASSINFO_MAP_ENTRY(nsIFrameMessageManager)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsISyncMessageSender)
|
DOM_CLASSINFO_MAP_ENTRY(nsISyncMessageSender)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIContentFrameMessageManager)
|
DOM_CLASSINFO_MAP_ENTRY(nsIContentFrameMessageManager)
|
||||||
@ -4291,7 +4257,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN(WebSocket, nsIWebSocket)
|
DOM_CLASSINFO_MAP_BEGIN(WebSocket, nsIWebSocket)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIWebSocket)
|
DOM_CLASSINFO_MAP_ENTRY(nsIWebSocket)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(CloseEvent, nsIDOMCloseEvent)
|
DOM_CLASSINFO_MAP_BEGIN(CloseEvent, nsIDOMCloseEvent)
|
||||||
@ -4305,13 +4270,11 @@ nsDOMClassInfo::Init()
|
|||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(IDBRequest, nsIIDBRequest)
|
DOM_CLASSINFO_MAP_BEGIN(IDBRequest, nsIIDBRequest)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIIDBRequest)
|
DOM_CLASSINFO_MAP_ENTRY(nsIIDBRequest)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(IDBDatabase, nsIIDBDatabase)
|
DOM_CLASSINFO_MAP_BEGIN(IDBDatabase, nsIIDBDatabase)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIIDBDatabase)
|
DOM_CLASSINFO_MAP_ENTRY(nsIIDBDatabase)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
@ -4321,7 +4284,6 @@ nsDOMClassInfo::Init()
|
|||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(IDBTransaction, nsIIDBTransaction)
|
DOM_CLASSINFO_MAP_BEGIN(IDBTransaction, nsIIDBTransaction)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIIDBTransaction)
|
DOM_CLASSINFO_MAP_ENTRY(nsIIDBTransaction)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
@ -4350,7 +4312,6 @@ nsDOMClassInfo::Init()
|
|||||||
DOM_CLASSINFO_MAP_BEGIN(IDBVersionChangeRequest, nsIIDBVersionChangeRequest)
|
DOM_CLASSINFO_MAP_BEGIN(IDBVersionChangeRequest, nsIIDBVersionChangeRequest)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIIDBVersionChangeRequest)
|
DOM_CLASSINFO_MAP_ENTRY(nsIIDBVersionChangeRequest)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIIDBRequest)
|
DOM_CLASSINFO_MAP_ENTRY(nsIIDBRequest)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
|
@ -1336,7 +1336,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow)
|
|||||||
NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal)
|
NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
|
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget)
|
NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
NS_INTERFACE_MAP_ENTRY(nsPIDOMWindow)
|
NS_INTERFACE_MAP_ENTRY(nsPIDOMWindow)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMStorageWindow)
|
NS_INTERFACE_MAP_ENTRY(nsIDOMStorageWindow)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMStorageIndexedDB)
|
NS_INTERFACE_MAP_ENTRY(nsIDOMStorageIndexedDB)
|
||||||
@ -7212,17 +7211,6 @@ nsGlobalWindow::Btoa(const nsAString& aBinaryData,
|
|||||||
// nsGlobalWindow::nsIDOMEventTarget
|
// nsGlobalWindow::nsIDOMEventTarget
|
||||||
//*****************************************************************************
|
//*****************************************************************************
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsGlobalWindow::AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture)
|
|
||||||
{
|
|
||||||
FORWARD_TO_INNER_CREATE(AddEventListener, (aType, aListener, aUseCapture),
|
|
||||||
NS_ERROR_NOT_AVAILABLE);
|
|
||||||
|
|
||||||
return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsGlobalWindow::RemoveEventListener(const nsAString& aType,
|
nsGlobalWindow::RemoveEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
@ -10072,20 +10060,6 @@ nsGlobalWindow::TimeoutSuspendCount()
|
|||||||
return mTimeoutsSuspendDepth;
|
return mTimeoutsSuspendDepth;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsGlobalWindow::GetScriptTypeID(PRUint32 *aScriptType)
|
|
||||||
{
|
|
||||||
NS_ERROR("No default script type here - ask some element");
|
|
||||||
return nsIProgrammingLanguage::UNKNOWN;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsGlobalWindow::SetScriptTypeID(PRUint32 aScriptType)
|
|
||||||
{
|
|
||||||
NS_ERROR("Can't change default script type for a document");
|
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
nsGlobalWindow::SetHasOrientationEventListener()
|
nsGlobalWindow::SetHasOrientationEventListener()
|
||||||
{
|
{
|
||||||
|
@ -64,7 +64,6 @@
|
|||||||
#include "nsIDOMClientInformation.h"
|
#include "nsIDOMClientInformation.h"
|
||||||
#include "nsIDOMEventTarget.h"
|
#include "nsIDOMEventTarget.h"
|
||||||
#include "nsIDOM3EventTarget.h"
|
#include "nsIDOM3EventTarget.h"
|
||||||
#include "nsIDOMNSEventTarget.h"
|
|
||||||
#include "nsIDOMNavigator.h"
|
#include "nsIDOMNavigator.h"
|
||||||
#include "nsIDOMNavigatorGeolocation.h"
|
#include "nsIDOMNavigatorGeolocation.h"
|
||||||
#include "nsIDOMNavigatorDesktopNotification.h"
|
#include "nsIDOMNavigatorDesktopNotification.h"
|
||||||
@ -277,7 +276,6 @@ class nsGlobalWindow : public nsPIDOMWindow,
|
|||||||
public nsIScriptObjectPrincipal,
|
public nsIScriptObjectPrincipal,
|
||||||
public nsIDOMEventTarget,
|
public nsIDOMEventTarget,
|
||||||
public nsIDOM3EventTarget,
|
public nsIDOM3EventTarget,
|
||||||
public nsIDOMNSEventTarget,
|
|
||||||
public nsIDOMStorageWindow,
|
public nsIDOMStorageWindow,
|
||||||
public nsIDOMStorageIndexedDB,
|
public nsIDOMStorageIndexedDB,
|
||||||
public nsSupportsWeakReference,
|
public nsSupportsWeakReference,
|
||||||
@ -342,9 +340,6 @@ public:
|
|||||||
// nsIDOM3EventTarget
|
// nsIDOM3EventTarget
|
||||||
NS_DECL_NSIDOM3EVENTTARGET
|
NS_DECL_NSIDOM3EVENTTARGET
|
||||||
|
|
||||||
// nsIDOMNSEventTarget
|
|
||||||
NS_DECL_NSIDOMNSEVENTTARGET
|
|
||||||
|
|
||||||
// nsIDOMWindow_2_0_BRANCH
|
// nsIDOMWindow_2_0_BRANCH
|
||||||
NS_DECL_NSIDOMWINDOW_2_0_BRANCH
|
NS_DECL_NSIDOMWINDOW_2_0_BRANCH
|
||||||
|
|
||||||
|
@ -87,7 +87,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot)
|
|||||||
NS_INTERFACE_MAP_ENTRY(nsPIWindowRoot)
|
NS_INTERFACE_MAP_ENTRY(nsPIWindowRoot)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
|
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget)
|
NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget)
|
|
||||||
NS_INTERFACE_MAP_END
|
NS_INTERFACE_MAP_END
|
||||||
|
|
||||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsWindowRoot)
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsWindowRoot)
|
||||||
@ -95,12 +94,6 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsWindowRoot)
|
|||||||
|
|
||||||
NS_IMPL_DOMTARGET_DEFAULTS(nsWindowRoot)
|
NS_IMPL_DOMTARGET_DEFAULTS(nsWindowRoot)
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsWindowRoot::AddEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)
|
|
||||||
{
|
|
||||||
return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsWindowRoot::RemoveEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)
|
nsWindowRoot::RemoveEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)
|
||||||
{
|
{
|
||||||
@ -260,20 +253,6 @@ nsWindowRoot::GetWindow()
|
|||||||
return mWindow;
|
return mWindow;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsWindowRoot::GetScriptTypeID(PRUint32 *aScriptType)
|
|
||||||
{
|
|
||||||
NS_ERROR("No default script type here - ask some element");
|
|
||||||
return nsIProgrammingLanguage::UNKNOWN;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsWindowRoot::SetScriptTypeID(PRUint32 aScriptType)
|
|
||||||
{
|
|
||||||
NS_ERROR("Can't change default script type for a document");
|
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
nsWindowRoot::GetControllers(nsIControllers** aResult)
|
nsWindowRoot::GetControllers(nsIControllers** aResult)
|
||||||
{
|
{
|
||||||
|
@ -49,14 +49,12 @@ class nsEventChainPostVisitor;
|
|||||||
|
|
||||||
#include "nsIDOMEventTarget.h"
|
#include "nsIDOMEventTarget.h"
|
||||||
#include "nsIDOM3EventTarget.h"
|
#include "nsIDOM3EventTarget.h"
|
||||||
#include "nsIDOMNSEventTarget.h"
|
|
||||||
#include "nsIEventListenerManager.h"
|
#include "nsIEventListenerManager.h"
|
||||||
#include "nsPIWindowRoot.h"
|
#include "nsPIWindowRoot.h"
|
||||||
#include "nsIDOMEventTarget.h"
|
#include "nsIDOMEventTarget.h"
|
||||||
#include "nsCycleCollectionParticipant.h"
|
#include "nsCycleCollectionParticipant.h"
|
||||||
|
|
||||||
class nsWindowRoot : public nsIDOM3EventTarget,
|
class nsWindowRoot : public nsIDOM3EventTarget,
|
||||||
public nsIDOMNSEventTarget,
|
|
||||||
public nsPIWindowRoot
|
public nsPIWindowRoot
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
@ -66,7 +64,6 @@ public:
|
|||||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||||
NS_DECL_NSIDOMEVENTTARGET
|
NS_DECL_NSIDOMEVENTTARGET
|
||||||
NS_DECL_NSIDOM3EVENTTARGET
|
NS_DECL_NSIDOM3EVENTTARGET
|
||||||
NS_DECL_NSIDOMNSEVENTTARGET
|
|
||||||
|
|
||||||
// nsPIWindowRoot
|
// nsPIWindowRoot
|
||||||
|
|
||||||
|
@ -68,7 +68,6 @@ XPIDLSRCS = \
|
|||||||
nsIDOMDataTransfer.idl \
|
nsIDOMDataTransfer.idl \
|
||||||
nsIDOMPopupBlockedEvent.idl \
|
nsIDOMPopupBlockedEvent.idl \
|
||||||
nsIDOMBeforeUnloadEvent.idl \
|
nsIDOMBeforeUnloadEvent.idl \
|
||||||
nsIDOMNSEventTarget.idl \
|
|
||||||
nsIDOMSmartCardEvent.idl \
|
nsIDOMSmartCardEvent.idl \
|
||||||
nsIDOMPageTransitionEvent.idl \
|
nsIDOMPageTransitionEvent.idl \
|
||||||
nsIDOMCommandEvent.idl \
|
nsIDOMCommandEvent.idl \
|
||||||
|
@ -69,7 +69,7 @@ interface nsIDOMEventListener;
|
|||||||
interface nsIDOMEventGroup;
|
interface nsIDOMEventGroup;
|
||||||
interface nsIDOMEvent;
|
interface nsIDOMEvent;
|
||||||
|
|
||||||
[scriptable, builtinclass, uuid(d56b0ac7-16e0-4fda-8255-06158d475606)]
|
[scriptable, builtinclass, uuid(1797d5a4-b12a-428d-9eef-a0e13839728c)]
|
||||||
interface nsIDOMEventTarget : nsISupports
|
interface nsIDOMEventTarget : nsISupports
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
@ -96,10 +96,25 @@ interface nsIDOMEventTarget : nsISupports
|
|||||||
* in the tree. Events which are bubbling upward
|
* in the tree. Events which are bubbling upward
|
||||||
* through the tree will not trigger an
|
* through the tree will not trigger an
|
||||||
* EventListener designated to use capture.
|
* EventListener designated to use capture.
|
||||||
|
* @param wantsUntrusted If false, the listener will not receive any
|
||||||
|
* untrusted events (see above), if true, the
|
||||||
|
* listener will receive events whether or not
|
||||||
|
* they're trusted
|
||||||
*/
|
*/
|
||||||
[noscript] void addEventListener(in DOMString type,
|
[optional_argc] void addEventListener(in DOMString type,
|
||||||
in nsIDOMEventListener listener,
|
in nsIDOMEventListener listener,
|
||||||
in boolean useCapture);
|
[optional] in boolean useCapture,
|
||||||
|
[optional] in boolean wantsUntrusted);
|
||||||
|
|
||||||
|
%{C++
|
||||||
|
// non-virtual so it won't affect the vtable
|
||||||
|
nsresult AddEventListener(const nsAString& aType,
|
||||||
|
nsIDOMEventListener* aListener,
|
||||||
|
PRBool aUseCapture)
|
||||||
|
{
|
||||||
|
return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
|
||||||
|
}
|
||||||
|
%}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method allows the removal of event listeners from the event
|
* This method allows the removal of event listeners from the event
|
||||||
|
@ -1,83 +0,0 @@
|
|||||||
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
||||||
/* ***** BEGIN LICENSE BLOCK *****
|
|
||||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
||||||
*
|
|
||||||
* The contents of this file are subject to the Mozilla Public License Version
|
|
||||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
* http://www.mozilla.org/MPL/
|
|
||||||
*
|
|
||||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
|
||||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
||||||
* for the specific language governing rights and limitations under the
|
|
||||||
* License.
|
|
||||||
*
|
|
||||||
* The Original Code is mozilla.org code.
|
|
||||||
*
|
|
||||||
* The Initial Developer of the Original Code is
|
|
||||||
* The Mozilla Foundation.
|
|
||||||
* Portions created by the Initial Developer are Copyright (C) 2005
|
|
||||||
* the Initial Developer. All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Contributor(s):
|
|
||||||
* Johnny Stenback <jst@mozilla.org> (original author)
|
|
||||||
*
|
|
||||||
* Alternatively, the contents of this file may be used under the terms of
|
|
||||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
|
||||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
||||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
|
||||||
* of those above. If you wish to allow use of your version of this file only
|
|
||||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
|
||||||
* use your version of this file under the terms of the MPL, indicate your
|
|
||||||
* decision by deleting the provisions above and replace them with the notice
|
|
||||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
|
||||||
* the provisions above, a recipient may use your version of this file under
|
|
||||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
|
||||||
*
|
|
||||||
* ***** END LICENSE BLOCK ***** */
|
|
||||||
|
|
||||||
#include "domstubs.idl"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The nsIDOMNSEventTarget interface is an extension to the standard
|
|
||||||
* nsIDOMEventTarget interface, implemented by all event targets in
|
|
||||||
* the Document Object Model.
|
|
||||||
*/
|
|
||||||
|
|
||||||
[scriptable, uuid(c8b658d5-d583-472a-a7ec-cbc2e79f75dd)]
|
|
||||||
interface nsIDOMNSEventTarget : nsISupports
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* This method is the same as the addEventListener() method defined
|
|
||||||
* in nsIDOMEventTarget, but it takes one additional argument which
|
|
||||||
* lets callers control whether or not they want to receive
|
|
||||||
* untrusted events (synthetic events generated by untrusted code)
|
|
||||||
*
|
|
||||||
* @param type See the type argument to the same method in
|
|
||||||
* nsIDOMEventTarget.
|
|
||||||
* @param listener See the listener argument to the same method in
|
|
||||||
* nsIDOMEventTarget.
|
|
||||||
* @param useCapture See the listener argument to the same method in
|
|
||||||
* nsIDOMEventTarget.
|
|
||||||
* @param wantsUntrusted If false, the listener will not receive any
|
|
||||||
* untrusted events (see above), if true, the
|
|
||||||
* listener will receive events whether or not
|
|
||||||
* they're trusted
|
|
||||||
*/
|
|
||||||
[optional_argc] void addEventListener(in DOMString type,
|
|
||||||
in nsIDOMEventListener listener,
|
|
||||||
[optional] in boolean useCapture,
|
|
||||||
[optional] in boolean wantsUntrusted);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The default script type (language) for events firing on this target.
|
|
||||||
* Must be one of the nsIProgrammingLanguage enums, but must not be
|
|
||||||
* nsIProgrammingLanguage::UNKNOWN. Most implementations will provide
|
|
||||||
* a default type of nsIProgrammingLanguage::JAVASCRIPT.
|
|
||||||
*
|
|
||||||
* All targets must support fetching the script language, but not all
|
|
||||||
* script targets must support changing it - ie, some targets may only
|
|
||||||
* support event handlers written in their default language.
|
|
||||||
*/
|
|
||||||
[noscript] attribute PRUint32 scriptTypeID;
|
|
||||||
};
|
|
@ -853,9 +853,8 @@ NS_IMPL_ISUPPORTS_INHERITED3(nsDOMWorkerScope, nsDOMWorkerMessageHandler,
|
|||||||
nsIWorkerGlobalScope,
|
nsIWorkerGlobalScope,
|
||||||
nsIXPCScriptable)
|
nsIXPCScriptable)
|
||||||
|
|
||||||
NS_IMPL_CI_INTERFACE_GETTER5(nsDOMWorkerScope, nsIWorkerScope,
|
NS_IMPL_CI_INTERFACE_GETTER4(nsDOMWorkerScope, nsIWorkerScope,
|
||||||
nsIWorkerGlobalScope,
|
nsIWorkerGlobalScope,
|
||||||
nsIDOMNSEventTarget,
|
|
||||||
nsIDOMEventTarget,
|
nsIDOMEventTarget,
|
||||||
nsIXPCScriptable)
|
nsIXPCScriptable)
|
||||||
|
|
||||||
@ -1158,14 +1157,6 @@ nsDOMWorkerScope::SetOnclose(nsIDOMEventListener* aOnclose)
|
|||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMWorkerScope::AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture)
|
|
||||||
{
|
|
||||||
return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDOMWorkerScope::RemoveEventListener(const nsAString& aType,
|
nsDOMWorkerScope::RemoveEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
@ -1439,9 +1430,8 @@ NS_INTERFACE_MAP_BEGIN(nsDOMWorker)
|
|||||||
NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
|
NS_INTERFACE_MAP_ENTRY(nsIXPCScriptable)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIWorker)
|
NS_INTERFACE_MAP_ENTRY(nsIWorker)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIAbstractWorker)
|
NS_INTERFACE_MAP_ENTRY(nsIAbstractWorker)
|
||||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMNSEventTarget,
|
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventTarget,
|
||||||
nsDOMWorkerMessageHandler)
|
nsDOMWorkerMessageHandler)
|
||||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventTarget, nsDOMWorkerMessageHandler)
|
|
||||||
NS_INTERFACE_MAP_ENTRY(nsIJSNativeInitializer)
|
NS_INTERFACE_MAP_ENTRY(nsIJSNativeInitializer)
|
||||||
NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
|
NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
|
||||||
NS_INTERFACE_MAP_END
|
NS_INTERFACE_MAP_END
|
||||||
@ -1547,9 +1537,8 @@ nsDOMWorker::Finalize(nsIXPConnectWrappedNative* /* aWrapper */,
|
|||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMPL_CI_INTERFACE_GETTER4(nsDOMWorker, nsIWorker,
|
NS_IMPL_CI_INTERFACE_GETTER3(nsDOMWorker, nsIWorker,
|
||||||
nsIAbstractWorker,
|
nsIAbstractWorker,
|
||||||
nsIDOMNSEventTarget,
|
|
||||||
nsIDOMEventTarget)
|
nsIDOMEventTarget)
|
||||||
NS_IMPL_THREADSAFE_DOM_CI_GETINTERFACES(nsDOMWorker)
|
NS_IMPL_THREADSAFE_DOM_CI_GETINTERFACES(nsDOMWorker)
|
||||||
NS_IMPL_THREADSAFE_DOM_CI_ALL_THE_REST(nsDOMWorker)
|
NS_IMPL_THREADSAFE_DOM_CI_ALL_THE_REST(nsDOMWorker)
|
||||||
@ -2561,14 +2550,6 @@ nsDOMWorker::QueueSuspendedRunnable(nsIRunnable* aRunnable)
|
|||||||
return mQueuedRunnables.AppendElement(aRunnable) ? PR_TRUE : PR_FALSE;
|
return mQueuedRunnables.AppendElement(aRunnable) ? PR_TRUE : PR_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMWorker::AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture)
|
|
||||||
{
|
|
||||||
return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDOMWorker::RemoveEventListener(const nsAString& aType,
|
nsDOMWorker::RemoveEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
|
@ -86,18 +86,14 @@ public:
|
|||||||
NS_FORWARD_INTERNAL_NSIDOMEVENTTARGET(nsDOMWorkerMessageHandler::)
|
NS_FORWARD_INTERNAL_NSIDOMEVENTTARGET(nsDOMWorkerMessageHandler::)
|
||||||
NS_IMETHOD AddEventListener(const nsAString& aType,
|
NS_IMETHOD AddEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
PRBool aUseCapture);
|
PRBool aUseCapture,
|
||||||
|
PRBool aWantsUntrusted,
|
||||||
|
PRUint8 optional_argc);
|
||||||
NS_IMETHOD RemoveEventListener(const nsAString& aType,
|
NS_IMETHOD RemoveEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
PRBool aUseCapture);
|
PRBool aUseCapture);
|
||||||
NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvent,
|
NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvent,
|
||||||
PRBool* _retval);
|
PRBool* _retval);
|
||||||
// nsIDOMNSEventTarget
|
|
||||||
NS_IMETHOD AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture,
|
|
||||||
PRBool aWantsUntrusted,
|
|
||||||
PRUint8 optional_argc);
|
|
||||||
NS_DECL_NSIWORKERGLOBALSCOPE
|
NS_DECL_NSIWORKERGLOBALSCOPE
|
||||||
NS_DECL_NSIWORKERSCOPE
|
NS_DECL_NSIWORKERSCOPE
|
||||||
NS_DECL_NSIXPCSCRIPTABLE
|
NS_DECL_NSIXPCSCRIPTABLE
|
||||||
@ -177,19 +173,15 @@ public:
|
|||||||
NS_FORWARD_INTERNAL_NSIDOMEVENTTARGET(nsDOMWorkerMessageHandler::)
|
NS_FORWARD_INTERNAL_NSIDOMEVENTTARGET(nsDOMWorkerMessageHandler::)
|
||||||
NS_IMETHOD AddEventListener(const nsAString& aType,
|
NS_IMETHOD AddEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
PRBool aUseCapture);
|
PRBool aUseCapture,
|
||||||
|
PRBool aWantsUntrusted,
|
||||||
|
PRUint8 optional_argc);
|
||||||
NS_IMETHOD RemoveEventListener(const nsAString& aType,
|
NS_IMETHOD RemoveEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
PRBool aUseCapture);
|
PRBool aUseCapture);
|
||||||
NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvent,
|
NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvent,
|
||||||
PRBool* _retval);
|
PRBool* _retval);
|
||||||
|
|
||||||
// nsIDOMNSEventTarget
|
|
||||||
NS_IMETHOD AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture,
|
|
||||||
PRBool aWantsUntrusted,
|
|
||||||
PRUint8 optional_argc);
|
|
||||||
NS_DECL_NSIABSTRACTWORKER
|
NS_DECL_NSIABSTRACTWORKER
|
||||||
NS_DECL_NSIWORKER
|
NS_DECL_NSIWORKER
|
||||||
NS_DECL_NSITIMERCALLBACK
|
NS_DECL_NSITIMERCALLBACK
|
||||||
|
@ -89,13 +89,11 @@ nsDOMWorkerWrappedWeakEventListener(nsDOMWorkerWeakEventListener* aInner)
|
|||||||
NS_ASSERTION(aInner, "Null pointer!");
|
NS_ASSERTION(aInner, "Null pointer!");
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMPL_THREADSAFE_ISUPPORTS3(nsDOMWorkerMessageHandler,
|
NS_IMPL_THREADSAFE_ISUPPORTS2(nsDOMWorkerMessageHandler,
|
||||||
nsIDOMNSEventTarget,
|
|
||||||
nsIDOMEventTarget,
|
nsIDOMEventTarget,
|
||||||
nsIClassInfo)
|
nsIClassInfo)
|
||||||
|
|
||||||
NS_IMPL_CI_INTERFACE_GETTER2(nsDOMWorkerMessageHandler,
|
NS_IMPL_CI_INTERFACE_GETTER1(nsDOMWorkerMessageHandler,
|
||||||
nsIDOMNSEventTarget,
|
|
||||||
nsIDOMEventTarget)
|
nsIDOMEventTarget)
|
||||||
|
|
||||||
NS_IMPL_THREADSAFE_DOM_CI(nsDOMWorkerMessageHandler)
|
NS_IMPL_THREADSAFE_DOM_CI(nsDOMWorkerMessageHandler)
|
||||||
@ -246,17 +244,6 @@ nsDOMWorkerMessageHandler::Trace(JSTracer* aTracer)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* See nsIDOMEventTarget
|
|
||||||
*/
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMWorkerMessageHandler::AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture)
|
|
||||||
{
|
|
||||||
return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* See nsIDOMEventTarget
|
* See nsIDOMEventTarget
|
||||||
*/
|
*/
|
||||||
@ -337,7 +324,7 @@ nsDOMWorkerMessageHandler::DispatchEvent(nsIDOMEvent* aEvent,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* See nsIDOMNSEventTarget
|
* See nsIDOMEventTarget
|
||||||
*/
|
*/
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDOMWorkerMessageHandler::AddEventListener(const nsAString& aType,
|
nsDOMWorkerMessageHandler::AddEventListener(const nsAString& aType,
|
||||||
@ -458,22 +445,3 @@ nsDOMWorkerMessageHandler::GetJSContextForEventHandlers()
|
|||||||
NS_ERROR("Should not be called");
|
NS_ERROR("Should not be called");
|
||||||
return nsnull;
|
return nsnull;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* See nsIDOMNSEventTarget
|
|
||||||
*/
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMWorkerMessageHandler::GetScriptTypeID(PRUint32 *aScriptType)
|
|
||||||
{
|
|
||||||
*aScriptType = nsIProgrammingLanguage::JAVASCRIPT;
|
|
||||||
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMWorkerMessageHandler::SetScriptTypeID(PRUint32 aScriptType)
|
|
||||||
{
|
|
||||||
NS_ERROR("Can't change default script type for workers");
|
|
||||||
|
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
|
||||||
}
|
|
||||||
|
@ -42,7 +42,6 @@
|
|||||||
#include "nsIClassInfo.h"
|
#include "nsIClassInfo.h"
|
||||||
#include "nsIDOMEventListener.h"
|
#include "nsIDOMEventListener.h"
|
||||||
#include "nsIDOMEventTarget.h"
|
#include "nsIDOMEventTarget.h"
|
||||||
#include "nsIDOMNSEventTarget.h"
|
|
||||||
#include "nsIDOMWorkers.h"
|
#include "nsIDOMWorkers.h"
|
||||||
|
|
||||||
#include "nsIProgrammingLanguage.h"
|
#include "nsIProgrammingLanguage.h"
|
||||||
@ -106,13 +105,11 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
class nsDOMWorkerMessageHandler : public nsIDOMEventTarget,
|
class nsDOMWorkerMessageHandler : public nsIDOMEventTarget,
|
||||||
public nsIDOMNSEventTarget,
|
|
||||||
public nsIClassInfo
|
public nsIClassInfo
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
NS_DECL_ISUPPORTS
|
NS_DECL_ISUPPORTS
|
||||||
NS_DECL_NSIDOMEVENTTARGET
|
NS_DECL_NSIDOMEVENTTARGET
|
||||||
NS_DECL_NSIDOMNSEVENTTARGET
|
|
||||||
NS_DECL_NSICLASSINFO
|
NS_DECL_NSICLASSINFO
|
||||||
|
|
||||||
virtual nsresult SetOnXListener(const nsAString& aType,
|
virtual nsresult SetOnXListener(const nsAString& aType,
|
||||||
|
@ -274,21 +274,12 @@ nsDOMWorkerXHRUpload::nsDOMWorkerXHRUpload(nsDOMWorkerXHR* aWorkerXHR)
|
|||||||
NS_IMPL_ISUPPORTS_INHERITED1(nsDOMWorkerXHRUpload, nsDOMWorkerXHREventTarget,
|
NS_IMPL_ISUPPORTS_INHERITED1(nsDOMWorkerXHRUpload, nsDOMWorkerXHREventTarget,
|
||||||
nsIXMLHttpRequestUpload)
|
nsIXMLHttpRequestUpload)
|
||||||
|
|
||||||
NS_IMPL_CI_INTERFACE_GETTER4(nsDOMWorkerXHRUpload, nsIDOMNSEventTarget,
|
NS_IMPL_CI_INTERFACE_GETTER3(nsDOMWorkerXHRUpload, nsIDOMEventTarget,
|
||||||
nsIDOMEventTarget,
|
|
||||||
nsIXMLHttpRequestEventTarget,
|
nsIXMLHttpRequestEventTarget,
|
||||||
nsIXMLHttpRequestUpload)
|
nsIXMLHttpRequestUpload)
|
||||||
|
|
||||||
NS_IMPL_THREADSAFE_DOM_CI_GETINTERFACES(nsDOMWorkerXHRUpload)
|
NS_IMPL_THREADSAFE_DOM_CI_GETINTERFACES(nsDOMWorkerXHRUpload)
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsDOMWorkerXHRUpload::AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture)
|
|
||||||
{
|
|
||||||
return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDOMWorkerXHRUpload::RemoveEventListener(const nsAString& aType,
|
nsDOMWorkerXHRUpload::RemoveEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
@ -405,8 +396,7 @@ NS_IMPL_QUERY_INTERFACE_INHERITED2(nsDOMWorkerXHR, nsDOMWorkerXHREventTarget,
|
|||||||
nsIXMLHttpRequest,
|
nsIXMLHttpRequest,
|
||||||
nsIXPCScriptable)
|
nsIXPCScriptable)
|
||||||
|
|
||||||
NS_IMPL_CI_INTERFACE_GETTER4(nsDOMWorkerXHR, nsIDOMNSEventTarget,
|
NS_IMPL_CI_INTERFACE_GETTER3(nsDOMWorkerXHR, nsIDOMEventTarget,
|
||||||
nsIDOMEventTarget,
|
|
||||||
nsIXMLHttpRequestEventTarget,
|
nsIXMLHttpRequestEventTarget,
|
||||||
nsIXMLHttpRequest)
|
nsIXMLHttpRequest)
|
||||||
|
|
||||||
|
@ -71,7 +71,6 @@ class nsDOMWorkerXHREventTarget : public nsDOMWorkerMessageHandler,
|
|||||||
public:
|
public:
|
||||||
NS_DECL_ISUPPORTS_INHERITED
|
NS_DECL_ISUPPORTS_INHERITED
|
||||||
NS_FORWARD_NSIDOMEVENTTARGET(nsDOMWorkerMessageHandler::)
|
NS_FORWARD_NSIDOMEVENTTARGET(nsDOMWorkerMessageHandler::)
|
||||||
NS_FORWARD_NSIDOMNSEVENTTARGET(nsDOMWorkerMessageHandler::)
|
|
||||||
NS_DECL_NSIXMLHTTPREQUESTEVENTTARGET
|
NS_DECL_NSIXMLHTTPREQUESTEVENTTARGET
|
||||||
|
|
||||||
static const char* const sListenerTypes[];
|
static const char* const sListenerTypes[];
|
||||||
@ -146,17 +145,14 @@ public:
|
|||||||
NS_FORWARD_INTERNAL_NSIDOMEVENTTARGET(nsDOMWorkerMessageHandler::)
|
NS_FORWARD_INTERNAL_NSIDOMEVENTTARGET(nsDOMWorkerMessageHandler::)
|
||||||
NS_IMETHOD AddEventListener(const nsAString& aType,
|
NS_IMETHOD AddEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
PRBool aUseCapture);
|
PRBool aUseCapture,
|
||||||
|
PRBool aWantsUntrusted,
|
||||||
|
PRUint8 optional_argc);
|
||||||
NS_IMETHOD RemoveEventListener(const nsAString& aType,
|
NS_IMETHOD RemoveEventListener(const nsAString& aType,
|
||||||
nsIDOMEventListener* aListener,
|
nsIDOMEventListener* aListener,
|
||||||
PRBool aUseCapture);
|
PRBool aUseCapture);
|
||||||
NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvent,
|
NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvent,
|
||||||
PRBool* _retval);
|
PRBool* _retval);
|
||||||
NS_IMETHOD AddEventListener(const nsAString& aType,
|
|
||||||
nsIDOMEventListener* aListener,
|
|
||||||
PRBool aUseCapture,
|
|
||||||
PRBool aWantsUntrusted,
|
|
||||||
PRUint8 optional_argc);
|
|
||||||
NS_FORWARD_NSIXMLHTTPREQUESTEVENTTARGET(nsDOMWorkerXHREventTarget::)
|
NS_FORWARD_NSIXMLHTTPREQUESTEVENTTARGET(nsDOMWorkerXHREventTarget::)
|
||||||
NS_DECL_NSIXMLHTTPREQUESTUPLOAD
|
NS_DECL_NSIXMLHTTPREQUESTUPLOAD
|
||||||
NS_FORWARD_NSICLASSINFO_NOGETINTERFACES(nsDOMWorkerXHREventTarget::)
|
NS_FORWARD_NSICLASSINFO_NOGETINTERFACES(nsDOMWorkerXHREventTarget::)
|
||||||
|
@ -495,11 +495,6 @@ nsDOMWorkerXHRProxy::AddRemoveXHRListeners(PRBool aAdd)
|
|||||||
nsCOMPtr<nsIDOMEventTarget> xhrTarget(do_QueryInterface(mXHR));
|
nsCOMPtr<nsIDOMEventTarget> xhrTarget(do_QueryInterface(mXHR));
|
||||||
NS_ASSERTION(xhrTarget, "This shouldn't fail!");
|
NS_ASSERTION(xhrTarget, "This shouldn't fail!");
|
||||||
|
|
||||||
EventListenerFunction addRemoveEventListener =
|
|
||||||
aAdd ?
|
|
||||||
&nsIDOMEventTarget::AddEventListener :
|
|
||||||
&nsIDOMEventTarget::RemoveEventListener;
|
|
||||||
|
|
||||||
nsAutoString eventName;
|
nsAutoString eventName;
|
||||||
PRUint32 index = 0;
|
PRUint32 index = 0;
|
||||||
|
|
||||||
@ -509,14 +504,25 @@ nsDOMWorkerXHRProxy::AddRemoveXHRListeners(PRBool aAdd)
|
|||||||
|
|
||||||
for (; index < MAX_UPLOAD_LISTENER_TYPE; index++) {
|
for (; index < MAX_UPLOAD_LISTENER_TYPE; index++) {
|
||||||
eventName.AssignASCII(nsDOMWorkerXHREventTarget::sListenerTypes[index]);
|
eventName.AssignASCII(nsDOMWorkerXHREventTarget::sListenerTypes[index]);
|
||||||
(xhrTarget.get()->*addRemoveEventListener)(eventName, this, PR_FALSE);
|
if (aAdd) {
|
||||||
(uploadTarget.get()->*addRemoveEventListener)(eventName, this, PR_FALSE);
|
xhrTarget->AddEventListener(eventName, this, PR_FALSE);
|
||||||
|
uploadTarget->AddEventListener(eventName, this, PR_FALSE);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
xhrTarget->RemoveEventListener(eventName, this, PR_FALSE);
|
||||||
|
uploadTarget->RemoveEventListener(eventName, this, PR_FALSE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (; index < MAX_XHR_LISTENER_TYPE; index++) {
|
for (; index < MAX_XHR_LISTENER_TYPE; index++) {
|
||||||
eventName.AssignASCII(nsDOMWorkerXHREventTarget::sListenerTypes[index]);
|
eventName.AssignASCII(nsDOMWorkerXHREventTarget::sListenerTypes[index]);
|
||||||
(xhrTarget.get()->*addRemoveEventListener)(eventName, this, PR_FALSE);
|
if (aAdd) {
|
||||||
|
xhrTarget->AddEventListener(eventName, this, PR_FALSE);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
xhrTarget->RemoveEventListener(eventName, this, PR_FALSE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,10 +75,6 @@ class nsDOMWorkerXHRProxy : public nsIRunnable,
|
|||||||
friend class nsDOMWorkerXHR;
|
friend class nsDOMWorkerXHR;
|
||||||
friend class nsDOMWorkerXHRUpload;
|
friend class nsDOMWorkerXHRUpload;
|
||||||
|
|
||||||
typedef NS_STDCALL_FUNCPROTO(nsresult, EventListenerFunction, nsIDOMEventTarget,
|
|
||||||
AddEventListener,
|
|
||||||
(const nsAString&, nsIDOMEventListener*, PRBool));
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
typedef nsAutoTArray<nsCOMPtr<nsIRunnable>, 5> SyncEventQueue;
|
typedef nsAutoTArray<nsCOMPtr<nsIRunnable>, 5> SyncEventQueue;
|
||||||
|
|
||||||
|
@ -159,9 +159,9 @@ members = [
|
|||||||
'nsIDOMCSSStyleDeclaration.*',
|
'nsIDOMCSSStyleDeclaration.*',
|
||||||
|
|
||||||
# dom/interfaces/events
|
# dom/interfaces/events
|
||||||
'nsIDOMEventTarget.dispatchEvent',
|
'nsIDOMEventTarget.addEventListener',
|
||||||
'nsIDOMEventTarget.removeEventListener',
|
'nsIDOMEventTarget.removeEventListener',
|
||||||
'nsIDOMNSEventTarget.addEventListener',
|
'nsIDOMEventTarget.dispatchEvent',
|
||||||
|
|
||||||
'nsIDOMEvent.*',
|
'nsIDOMEvent.*',
|
||||||
'nsIDOMMouseEvent.*',
|
'nsIDOMMouseEvent.*',
|
||||||
|
Loading…
Reference in New Issue
Block a user