diff --git a/content/events/src/nsDOMTouchEvent.cpp b/content/events/src/nsDOMTouchEvent.cpp index 9fc4e8d70f5..61dc5e44349 100644 --- a/content/events/src/nsDOMTouchEvent.cpp +++ b/content/events/src/nsDOMTouchEvent.cpp @@ -20,7 +20,6 @@ using namespace mozilla::dom; NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMTouchList) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY(nsIDOMTouchList) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(nsDOMTouchList, mParent, mPoints) @@ -40,27 +39,6 @@ nsDOMTouchList::PrefEnabled() return nsDOMTouchEvent::PrefEnabled(); } -NS_IMETHODIMP -nsDOMTouchList::GetLength(uint32_t* aLength) -{ - *aLength = Length(); - return NS_OK; -} - -NS_IMETHODIMP -nsDOMTouchList::Item(uint32_t aIndex, nsIDOMTouch** aRetVal) -{ - NS_IF_ADDREF(*aRetVal = Item(aIndex)); - return NS_OK; -} - -NS_IMETHODIMP -nsDOMTouchList::IdentifiedTouch(int32_t aIdentifier, nsIDOMTouch** aRetVal) -{ - NS_IF_ADDREF(*aRetVal = IdentifiedTouch(aIdentifier)); - return NS_OK; -} - Touch* nsDOMTouchList::IdentifiedTouch(int32_t aIdentifier) const { diff --git a/content/events/src/nsDOMTouchEvent.h b/content/events/src/nsDOMTouchEvent.h index 645b075fa17..744056d4f55 100644 --- a/content/events/src/nsDOMTouchEvent.h +++ b/content/events/src/nsDOMTouchEvent.h @@ -6,7 +6,6 @@ #define nsDOMTouchEvent_h_ #include "nsDOMUIEvent.h" -#include "nsIDOMTouchEvent.h" #include "nsString.h" #include "nsTArray.h" #include "mozilla/Attributes.h" @@ -14,7 +13,7 @@ #include "mozilla/dom/TouchEventBinding.h" #include "nsWrapperCache.h" -class nsDOMTouchList MOZ_FINAL : public nsIDOMTouchList +class nsDOMTouchList MOZ_FINAL : public nsISupports , public nsWrapperCache { typedef mozilla::dom::Touch Touch; @@ -22,7 +21,6 @@ class nsDOMTouchList MOZ_FINAL : public nsIDOMTouchList public: NS_DECL_CYCLE_COLLECTING_ISUPPORTS NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsDOMTouchList) - NS_DECL_NSIDOMTOUCHLIST nsDOMTouchList(nsISupports* aParent) : mParent(aParent) diff --git a/dom/interfaces/events/nsIDOMTouchEvent.idl b/dom/interfaces/events/nsIDOMTouchEvent.idl index bcaca7a0720..d50b47ef617 100644 --- a/dom/interfaces/events/nsIDOMTouchEvent.idl +++ b/dom/interfaces/events/nsIDOMTouchEvent.idl @@ -30,13 +30,6 @@ interface nsIDOMTouch : nsISupports { readonly attribute float force; }; -[scriptable, builtinclass, uuid(60706eb7-d50d-4379-b01c-e78e6af84213)] -interface nsIDOMTouchList : nsISupports { - readonly attribute unsigned long length; - nsIDOMTouch item(in unsigned long index); - nsIDOMTouch identifiedTouch(in long identifier); -}; - [scriptable, uuid(6d5484f7-92ac-45f8-9388-39b5bad055ce)] interface nsITouchEventReceiver : nsISupports { [implicit_jscontext] attribute jsval ontouchstart;