Backout f10e28d82786 for mochitest orange on a CLOSED TREE

This commit is contained in:
David Zbarsky 2013-07-29 21:11:38 -07:00
parent 10f3eae40e
commit 976615cfaa
3 changed files with 32 additions and 1 deletions

View File

@ -20,6 +20,7 @@ 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)
@ -39,6 +40,27 @@ 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
{

View File

@ -6,6 +6,7 @@
#define nsDOMTouchEvent_h_
#include "nsDOMUIEvent.h"
#include "nsIDOMTouchEvent.h"
#include "nsString.h"
#include "nsTArray.h"
#include "mozilla/Attributes.h"
@ -13,7 +14,7 @@
#include "mozilla/dom/TouchEventBinding.h"
#include "nsWrapperCache.h"
class nsDOMTouchList MOZ_FINAL : public nsISupports
class nsDOMTouchList MOZ_FINAL : public nsIDOMTouchList
, public nsWrapperCache
{
typedef mozilla::dom::Touch Touch;
@ -21,6 +22,7 @@ class nsDOMTouchList MOZ_FINAL : public nsISupports
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsDOMTouchList)
NS_DECL_NSIDOMTOUCHLIST
nsDOMTouchList(nsISupports* aParent)
: mParent(aParent)

View File

@ -38,6 +38,13 @@ interface nsIDOMTouch : nsISupports {
%}
};
[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;