зеркало из https://github.com/mozilla/pjs.git
Bug 421662. Rename TextRectangle* to ClientRect*. r+sr=sicking,a=damon
This commit is contained in:
Родитель
4a46b57113
Коммит
872a7b6cf7
|
@ -113,8 +113,8 @@
|
||||||
#include "nsIDOMMediaList.h"
|
#include "nsIDOMMediaList.h"
|
||||||
#include "nsIDOMChromeWindow.h"
|
#include "nsIDOMChromeWindow.h"
|
||||||
#include "nsIDOMConstructor.h"
|
#include "nsIDOMConstructor.h"
|
||||||
#include "nsIDOMTextRectangle.h"
|
#include "nsIDOMClientRect.h"
|
||||||
#include "nsIDOMTextRectangleList.h"
|
#include "nsIDOMClientRectList.h"
|
||||||
|
|
||||||
// DOM core includes
|
// DOM core includes
|
||||||
#include "nsDOMError.h"
|
#include "nsDOMError.h"
|
||||||
|
@ -1185,9 +1185,9 @@ static nsDOMClassInfoData sClassInfoData[] = {
|
||||||
NS_DEFINE_CLASSINFO_DATA(XMLHttpRequest, nsDOMGenericSH,
|
NS_DEFINE_CLASSINFO_DATA(XMLHttpRequest, nsDOMGenericSH,
|
||||||
DOM_DEFAULT_SCRIPTABLE_FLAGS)
|
DOM_DEFAULT_SCRIPTABLE_FLAGS)
|
||||||
|
|
||||||
NS_DEFINE_CLASSINFO_DATA(TextRectangle, nsDOMGenericSH,
|
NS_DEFINE_CLASSINFO_DATA(ClientRect, nsDOMGenericSH,
|
||||||
DOM_DEFAULT_SCRIPTABLE_FLAGS)
|
DOM_DEFAULT_SCRIPTABLE_FLAGS)
|
||||||
NS_DEFINE_CLASSINFO_DATA(TextRectangleList, nsTextRectangleListSH,
|
NS_DEFINE_CLASSINFO_DATA(ClientRectList, nsClientRectListSH,
|
||||||
ARRAY_SCRIPTABLE_FLAGS)
|
ARRAY_SCRIPTABLE_FLAGS)
|
||||||
|
|
||||||
// Define MOZ_SVG_FOREIGNOBJECT here so that when it gets switched on,
|
// Define MOZ_SVG_FOREIGNOBJECT here so that when it gets switched on,
|
||||||
|
@ -3327,12 +3327,12 @@ nsDOMClassInfo::Init()
|
||||||
DOM_CLASSINFO_EVENT_MAP_ENTRIES
|
DOM_CLASSINFO_EVENT_MAP_ENTRIES
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(TextRectangle, nsIDOMTextRectangle)
|
DOM_CLASSINFO_MAP_BEGIN(ClientRect, nsIDOMClientRect)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMTextRectangle)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMClientRect)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(TextRectangleList, nsIDOMTextRectangleList)
|
DOM_CLASSINFO_MAP_BEGIN(ClientRectList, nsIDOMClientRectList)
|
||||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMTextRectangleList)
|
DOM_CLASSINFO_MAP_ENTRY(nsIDOMClientRectList)
|
||||||
DOM_CLASSINFO_MAP_END
|
DOM_CLASSINFO_MAP_END
|
||||||
|
|
||||||
DOM_CLASSINFO_MAP_BEGIN(FileList, nsIDOMFileList)
|
DOM_CLASSINFO_MAP_BEGIN(FileList, nsIDOMFileList)
|
||||||
|
@ -9753,16 +9753,16 @@ nsCSSRuleListSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TextRectangleList scriptable helper
|
// ClientRectList scriptable helper
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
nsTextRectangleListSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
|
nsClientRectListSH::GetItemAt(nsISupports *aNative, PRUint32 aIndex,
|
||||||
nsISupports **aResult)
|
nsISupports **aResult)
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsIDOMTextRectangleList> list(do_QueryInterface(aNative));
|
nsCOMPtr<nsIDOMClientRectList> list(do_QueryInterface(aNative));
|
||||||
NS_ENSURE_TRUE(list, NS_ERROR_UNEXPECTED);
|
NS_ENSURE_TRUE(list, NS_ERROR_UNEXPECTED);
|
||||||
|
|
||||||
nsIDOMTextRectangle *rule = nsnull; // Weak, transfer the ownership over to aResult
|
nsIDOMClientRect *rule = nsnull; // Weak, transfer the ownership over to aResult
|
||||||
nsresult rv = list->Item(aIndex, &rule);
|
nsresult rv = list->Item(aIndex, &rule);
|
||||||
|
|
||||||
*aResult = rule;
|
*aResult = rule;
|
||||||
|
|
|
@ -1331,16 +1331,16 @@ public:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// TextRectangleList helper
|
// ClientRectList helper
|
||||||
|
|
||||||
class nsTextRectangleListSH : public nsArraySH
|
class nsClientRectListSH : public nsArraySH
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
nsTextRectangleListSH(nsDOMClassInfoData* aData) : nsArraySH(aData)
|
nsClientRectListSH(nsDOMClassInfoData* aData) : nsArraySH(aData)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~nsTextRectangleListSH()
|
virtual ~nsClientRectListSH()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1352,7 +1352,7 @@ protected:
|
||||||
public:
|
public:
|
||||||
static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
|
static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
|
||||||
{
|
{
|
||||||
return new nsTextRectangleListSH(aData);
|
return new nsClientRectListSH(aData);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче