diff --git a/content/base/public/FragmentOrElement.h b/content/base/public/FragmentOrElement.h index ce4df9199da..feea20dcd91 100644 --- a/content/base/public/FragmentOrElement.h +++ b/content/base/public/FragmentOrElement.h @@ -17,7 +17,6 @@ #include "nsAttrAndChildArray.h" // member #include "nsCycleCollectionParticipant.h" // NS_DECL_CYCLE_* #include "nsIContent.h" // base class -#include "nsIDOMTouchEvent.h" // base class (nsITouchEventReceiver) #include "nsIDOMXPathNSResolver.h" // base class #include "nsIInlineEventHandlers.h" // base class #include "nsINodeList.h" // base class @@ -404,26 +403,6 @@ protected: } // namespace dom } // namespace mozilla -/** - * Tearoff class to implement nsITouchEventReceiver - */ -class nsTouchEventReceiverTearoff MOZ_FINAL : public nsITouchEventReceiver -{ -public: - NS_DECL_CYCLE_COLLECTING_ISUPPORTS - - NS_FORWARD_NSITOUCHEVENTRECEIVER(mElement->) - - NS_DECL_CYCLE_COLLECTION_CLASS(nsTouchEventReceiverTearoff) - - nsTouchEventReceiverTearoff(mozilla::dom::FragmentOrElement *aElement) : mElement(aElement) - { - } - -private: - nsRefPtr mElement; -}; - /** * Tearoff class to implement nsIInlineEventHandlers */ diff --git a/content/base/src/FragmentOrElement.cpp b/content/base/src/FragmentOrElement.cpp index 369274c38ef..1dd778a6f9b 100644 --- a/content/base/src/FragmentOrElement.cpp +++ b/content/base/src/FragmentOrElement.cpp @@ -504,17 +504,6 @@ nsNodeSupportsWeakRefTearoff::GetWeakReference(nsIWeakReference** aInstancePtr) //---------------------------------------------------------------------- -NS_IMPL_CYCLE_COLLECTION_1(nsTouchEventReceiverTearoff, mElement) - -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsTouchEventReceiverTearoff) - NS_INTERFACE_MAP_ENTRY(nsITouchEventReceiver) -NS_INTERFACE_MAP_END_AGGREGATED(mElement) - -NS_IMPL_CYCLE_COLLECTING_ADDREF(nsTouchEventReceiverTearoff) -NS_IMPL_CYCLE_COLLECTING_RELEASE(nsTouchEventReceiverTearoff) - -//---------------------------------------------------------------------- - NS_IMPL_CYCLE_COLLECTION_1(nsInlineEventHandlersTearoff, mElement) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsInlineEventHandlersTearoff) @@ -1761,8 +1750,6 @@ NS_INTERFACE_MAP_BEGIN(FragmentOrElement) new nsNodeSupportsWeakRefTearoff(this)) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMXPathNSResolver, new nsNode3Tearoff(this)) - NS_INTERFACE_MAP_ENTRY_TEAROFF(nsITouchEventReceiver, - new nsTouchEventReceiverTearoff(this)) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIInlineEventHandlers, new nsInlineEventHandlersTearoff(this)) // DOM bindings depend on the identity pointer being the diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index e86fc782bb8..4a9c8a70139 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -1576,7 +1576,6 @@ NS_INTERFACE_TABLE_HEAD(nsDocument) NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIRadioGroupContainer) NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIMutationObserver) NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIApplicationCacheContainer) - NS_INTERFACE_TABLE_ENTRY(nsDocument, nsITouchEventReceiver) NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIInlineEventHandlers) NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIObserver) NS_INTERFACE_TABLE_END @@ -11005,11 +11004,9 @@ nsDocument::XPCOMShutdown() NS_IMETHODIMP nsDocument::SetOn##name_(JSContext *cx, const JS::Value &v) { \ return nsINode::SetOn##name_(cx, v); \ } -#define TOUCH_EVENT EVENT #define DOCUMENT_ONLY_EVENT EVENT #include "nsEventNameList.h" #undef DOCUMENT_ONLY_EVENT -#undef TOUCH_EVENT #undef EVENT void diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h index 6e5be84f066..12102b92687 100644 --- a/content/base/src/nsDocument.h +++ b/content/base/src/nsDocument.h @@ -503,7 +503,6 @@ class nsDocument : public nsIDocument, public nsIRadioGroupContainer, public nsIApplicationCacheContainer, public nsStubMutationObserver, - public nsITouchEventReceiver, public nsIInlineEventHandlers, public nsIObserver { @@ -780,9 +779,6 @@ public: // nsIApplicationCacheContainer NS_DECL_NSIAPPLICATIONCACHECONTAINER - // nsITouchEventReceiver - NS_DECL_NSITOUCHEVENTRECEIVER - // nsIInlineEventHandlers NS_DECL_NSIINLINEEVENTHANDLERS diff --git a/content/html/content/test/test_bug389797.html b/content/html/content/test/test_bug389797.html index a8726709064..4551fc243d7 100644 --- a/content/html/content/test/test_bug389797.html +++ b/content/html/content/test/test_bug389797.html @@ -33,7 +33,6 @@ function HTML_TAG(aTagName, aImplClass) { interfaces[aTagName] = [ "nsIDOMEventTarget", "nsIDOMElementCSSInlineStyle", - "nsITouchEventReceiver", "nsIInlineEventHandlers" ]; // Some interfaces don't appear in classinfo because other interfaces that