mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixing ports bustage. b=105137. r=dbaron, sr=jag

This commit is contained in:
harishd%netscape.com 2002-01-09 21:50:08 +00:00
Родитель 98921ccfde
Коммит bb1aee3d50
12 изменённых файлов: 85 добавлений и 99 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
content/xbl/public/nsIXBLPrototypeHandler.h
Просмотреть файл

@ -86,11 +86,11 @@ public:
};
extern nsresult
NS_NewXBLPrototypeHandler(nsAReadableString* aEvent, nsAReadableString* aPhase,
nsAReadableString* aAction, nsAReadableString* aCommand,
nsAReadableString* aKeyCode, nsAReadableString* aCharCode,
nsAReadableString* aModifiers, nsAReadableString* aButton,
nsAReadableString* aClickCount,
NS_NewXBLPrototypeHandler(const PRUnichar* aEvent, const PRUnichar* aPhase,
const PRUnichar* aAction, const PRUnichar* aCommand,
const PRUnichar* aKeyCode, const PRUnichar* aCharCode,
const PRUnichar* aModifiers, const PRUnichar* aButton,
const PRUnichar* aClickCount,
nsIXBLPrototypeHandler** aResult);
extern nsresult

25
content/xbl/src/nsXBLContentSink.cpp
Просмотреть файл

@ -459,16 +459,9 @@ nsXBLContentSink::ConstructHandler(const PRUnichar **aAtts)
// All of our pointers are now filled in. Construct our handler with all of these
// parameters.
nsCOMPtr<nsIXBLPrototypeHandler> newHandler;
NS_NewXBLPrototypeHandler(event? &nsDependentString(event):0,
phase? &nsDependentString(phase):0,
action? &nsDependentString(action):0,
command? &nsDependentString(command):0,
keycode? &nsDependentString(keycode):0,
charcode? &nsDependentString(charcode):0,
modifiers? &nsDependentString(modifiers):0,
button? &nsDependentString(button):0,
clickcount? &nsDependentString(clickcount):0,
getter_AddRefs(newHandler));
NS_NewXBLPrototypeHandler(event, phase, action, command,
keycode, charcode, modifiers, button,
clickcount, getter_AddRefs(newHandler));
if (newHandler) {
// Add this handler to our chain of handlers.
if (mHandler)
@ -538,7 +531,7 @@ nsXBLContentSink::ConstructImplementation(const PRUnichar **aAtts)
}
}
NS_NewXBLProtoImpl(mBinding, name? &nsDependentString(name):0, &mImplementation);
NS_NewXBLProtoImpl(mBinding, name, &mImplementation);
}
void
@ -568,8 +561,7 @@ nsXBLContentSink::ConstructField(const PRUnichar **aAtts)
// All of our pointers are now filled in. Construct our field with all of these
// parameters.
mField = new nsXBLProtoImplField(name? &nsDependentString(name):0,
readonly? &nsDependentString(readonly):0);
mField = new nsXBLProtoImplField(name, readonly);
if (mField) {
// Add this member to our chain.
if (mImplMember)
@ -617,10 +609,7 @@ nsXBLContentSink::ConstructProperty(const PRUnichar **aAtts)
// All of our pointers are now filled in. Construct our property with all of these
// parameters.
mProperty = new nsXBLProtoImplProperty(name? &nsDependentString(name):0,
onget? &nsDependentString(onget):0,
onset? &nsDependentString(onset):0,
readonly? &nsDependentString(readonly):0);
mProperty = new nsXBLProtoImplProperty(name, onget, onset, readonly);
if (mProperty) {
// Add this member to our chain.
if (mImplMember)
@ -650,7 +639,7 @@ nsXBLContentSink::ConstructMethod(const PRUnichar **aAtts)
// Is this attribute one of the ones we care about?
if (nameAtom == nsXBLAtoms::name) {
mMethod = new nsXBLProtoImplMethod(nsDependentString(aAtts[1]));
mMethod = new nsXBLProtoImplMethod(aAtts[1]);
break;
}
}

6
content/xbl/src/nsXBLProtoImpl.h
Просмотреть файл

@ -85,13 +85,13 @@ public:
static nsresult
NS_NewXBLProtoImpl(nsIXBLPrototypeBinding* aBinding,
const nsAReadableString* aClassName,
const PRUnichar* aClassName,
nsXBLProtoImpl** aResult) {
nsXBLProtoImpl* impl = new nsXBLProtoImpl();
if (!impl)
return NS_ERROR_OUT_OF_MEMORY;
if (aClassName && !aClassName->IsEmpty())
impl->mClassName.AssignWithConversion(*aClassName);
if (aClassName)
impl->mClassName.AssignWithConversion(aClassName);
else
aBinding->GetBindingURI(impl->mClassName);
aBinding->SetImplementation(impl);

2
content/xbl/src/nsXBLProtoImplField.cpp
Просмотреть файл

@ -49,7 +49,7 @@
MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplField);
nsXBLProtoImplField::nsXBLProtoImplField(const nsAReadableString* aName, const nsAReadableString* aReadOnly)
nsXBLProtoImplField::nsXBLProtoImplField(const PRUnichar* aName, const PRUnichar* aReadOnly)
: nsXBLProtoImplMember(aName),
mFieldText(nsnull),
mFieldTextLength(0)

2
content/xbl/src/nsXBLProtoImplField.h
Просмотреть файл

@ -50,7 +50,7 @@
class nsXBLProtoImplField: public nsXBLProtoImplMember
{
public:
nsXBLProtoImplField(const nsAReadableString* aName, const nsAReadableString* aReadOnly);
nsXBLProtoImplField(const PRUnichar* aName, const PRUnichar* aReadOnly);
virtual ~nsXBLProtoImplField();
virtual void Destroy(PRBool aIsCompiled);

2
content/xbl/src/nsXBLProtoImplMember.h
Просмотреть файл

@ -54,7 +54,7 @@ class nsIScriptContext;
class nsXBLProtoImplMember
{
public:
nsXBLProtoImplMember(const nsAReadableString* aName) :mNext(nsnull) { mName = ToNewUnicode(*aName); };
nsXBLProtoImplMember(const PRUnichar* aName) :mNext(nsnull) { mName = ToNewUnicode(nsDependentString(aName)); };
virtual ~nsXBLProtoImplMember() { nsMemory::Free(mName); delete mNext; };
virtual void Destroy(PRBool aIsCompiled)=0;

4
content/xbl/src/nsXBLProtoImplMethod.cpp
Просмотреть файл

@ -99,8 +99,8 @@ RemoveJSGCRoot(void* aScriptObjectRef)
MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplMethod);
nsXBLProtoImplMethod::nsXBLProtoImplMethod(const nsAReadableString& aName)
:nsXBLProtoImplMember(&aName),
nsXBLProtoImplMethod::nsXBLProtoImplMethod(const PRUnichar* aName)
:nsXBLProtoImplMember(aName),
mUncompiledMethod(nsnull)
{
MOZ_COUNT_CTOR(nsXBLProtoImplMethod);

2
content/xbl/src/nsXBLProtoImplMethod.h
Просмотреть файл

@ -118,7 +118,7 @@ struct nsXBLUncompiledMethod {
class nsXBLProtoImplMethod: public nsXBLProtoImplMember
{
public:
nsXBLProtoImplMethod(const nsAReadableString& aName);
nsXBLProtoImplMethod(const PRUnichar* aName);
virtual ~nsXBLProtoImplMethod();
virtual void Destroy(PRBool aIsCompiled);

12
content/xbl/src/nsXBLProtoImplProperty.cpp
Просмотреть файл

@ -99,10 +99,10 @@ RemoveJSGCRoot(void* aScriptObjectRef)
MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplProperty);
nsXBLProtoImplProperty::nsXBLProtoImplProperty(const nsAReadableString* aName,
const nsAReadableString* aGetter,
const nsAReadableString* aSetter,
const nsAReadableString* aReadOnly)
nsXBLProtoImplProperty::nsXBLProtoImplProperty(const PRUnichar* aName,
const PRUnichar* aGetter,
const PRUnichar* aSetter,
const PRUnichar* aReadOnly)
:nsXBLProtoImplMember(aName),
mGetterText(nsnull),
mSetterText(nsnull)
@ -117,9 +117,9 @@ nsXBLProtoImplProperty::nsXBLProtoImplProperty(const nsAReadableString* aName,
}
if (aGetter)
AppendGetterText(*aGetter);
AppendGetterText(nsDependentString(aGetter));
if (aSetter)
AppendSetterText(*aSetter);
AppendSetterText(nsDependentString(aSetter));
}
nsXBLProtoImplProperty::~nsXBLProtoImplProperty()

8
content/xbl/src/nsXBLProtoImplProperty.h
Просмотреть файл

@ -50,10 +50,10 @@
class nsXBLProtoImplProperty: public nsXBLProtoImplMember
{
public:
nsXBLProtoImplProperty(const nsAReadableString* aName,
const nsAReadableString* aGetter,
const nsAReadableString* aSetter,
const nsAReadableString* aReadOnly);
nsXBLProtoImplProperty(const PRUnichar* aName,
const PRUnichar* aGetter,
const PRUnichar* aSetter,
const PRUnichar* aReadOnly);
virtual ~nsXBLProtoImplProperty();
virtual void Destroy(PRBool aIsCompiled);

81
content/xbl/src/nsXBLPrototypeHandler.cpp
Просмотреть файл

@ -93,11 +93,11 @@ const PRInt32 nsXBLPrototypeHandler::cAlt = (1<<2);
const PRInt32 nsXBLPrototypeHandler::cControl = (1<<3);
const PRInt32 nsXBLPrototypeHandler::cMeta = (1<<4);
nsXBLPrototypeHandler::nsXBLPrototypeHandler(nsAReadableString* aEvent, nsAReadableString* aPhase,
nsAReadableString* aAction, nsAReadableString* aCommand,
nsAReadableString* aKeyCode, nsAReadableString* aCharCode,
nsAReadableString* aModifiers, nsAReadableString* aButton,
nsAReadableString* aClickCount)
nsXBLPrototypeHandler::nsXBLPrototypeHandler(const PRUnichar* aEvent, const PRUnichar* aPhase,
const PRUnichar* aAction, const PRUnichar* aCommand,
const PRUnichar* aKeyCode, const PRUnichar* aCharCode,
const PRUnichar* aModifiers, const PRUnichar* aButton,
const PRUnichar* aClickCount)
{
NS_INIT_REFCNT();
gRefCnt++;
@ -935,11 +935,11 @@ nsXBLPrototypeHandler::GetEventType(nsAWritableString& aEvent)
void
nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement,
nsAReadableString* aEvent, nsAReadableString* aPhase,
nsAReadableString* aAction, nsAReadableString* aCommand,
nsAReadableString* aKeyCode, nsAReadableString* aCharCode,
nsAReadableString* aModifiers, nsAReadableString* aButton,
nsAReadableString* aClickCount)
const PRUnichar* aEvent, const PRUnichar* aPhase,
const PRUnichar* aAction, const PRUnichar* aCommand,
const PRUnichar* aKeyCode, const PRUnichar* aCharCode,
const PRUnichar* aModifiers, const PRUnichar* aButton,
const PRUnichar* aClickCount)
{
if (aKeyElement) {
mType = NS_HANDLER_TYPE_XUL;
@ -956,46 +956,45 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement,
mPhase = NS_PHASE_BUBBLING;
if (aAction)
mHandlerText = ToNewUnicode(*aAction);
mHandlerText = ToNewUnicode(nsDependentString(aAction));
else if (aCommand)
mHandlerText = ToNewUnicode(*aCommand);
mHandlerText = ToNewUnicode(nsDependentString(aCommand));
nsAutoString event;
if (!aEvent) {
nsAutoString event(aEvent);
if (event.IsEmpty()) {
if (mType == NS_HANDLER_TYPE_XUL)
GetEventType(event);
if (event.IsEmpty())
return;
aEvent = &event;
}
if ((*aEvent).IsEmpty())
if (event.IsEmpty())
return;
mEventName = getter_AddRefs(NS_NewAtom(*aEvent));
mEventName = getter_AddRefs(NS_NewAtom(event));
if (aPhase) {
if ((*aPhase).Equals(NS_LITERAL_STRING("capturing")))
if (Compare(nsDependentString(aPhase), NS_LITERAL_STRING("capturing")) == 0)
mPhase = NS_PHASE_CAPTURING;
else if ((*aPhase).Equals(NS_LITERAL_STRING("target")))
else if (Compare(nsDependentString(aPhase), NS_LITERAL_STRING("target")) == 0)
mPhase = NS_PHASE_TARGET;
}
// Button and clickcount apply only to XBL handlers and don't apply to XUL key
// handlers.
if (aButton && !(*aButton).IsEmpty())
mDetail = (*aButton).First() - '0';
if (aClickCount && !(*aClickCount).IsEmpty())
mMisc = (*aClickCount).First() - '0';
nsAutoString button(aButton);
nsAutoString clickcount(aClickCount);
if (!button.IsEmpty())
mDetail = button.First() - '0';
if (!clickcount.IsEmpty())
mMisc = clickcount.First() - '0';
// Modifiers are supported by both types of handlers (XUL and XBL).
nsAutoString modifiers;
if (!aModifiers)
aModifiers = &modifiers;
nsAutoString modifiers(aModifiers);
if (mType == NS_HANDLER_TYPE_XUL)
mHandlerElement->GetAttr(kNameSpaceID_None, nsXBLAtoms::modifiers, modifiers);
if (!(*aModifiers).IsEmpty()) {
char* str = ToNewCString(*aModifiers);
if (!modifiers.IsEmpty()) {
char* str = ToNewCString(modifiers);
char* newStr;
char* token = nsCRT::strtok( str, ", ", &newStr );
while( token != NULL ) {
@ -1018,9 +1017,8 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement,
nsMemory::Free(str);
}
nsAutoString key;
if (!aCharCode) {
aCharCode = &key;
nsAutoString key(aCharCode);
if (key.IsEmpty()) {
if (mType == NS_HANDLER_TYPE_XUL) {
mHandlerElement->GetAttr(kNameSpaceID_None, nsXBLAtoms::key, key);
if (key.IsEmpty())
@ -1028,8 +1026,8 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement,
}
}
if (!(*aCharCode).IsEmpty()) {
nsAutoString charCode(*aCharCode);
if (!key.IsEmpty()) {
nsAutoString charCode(aCharCode);
if ((mKeyMask & cShift) != 0)
ToUpperCase(charCode);
else
@ -1040,13 +1038,12 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement,
mDetail = charCode[0];
}
else {
if (!aKeyCode)
aKeyCode = &key;
key.Assign(aKeyCode);
if (mType == NS_HANDLER_TYPE_XUL)
mHandlerElement->GetAttr(kNameSpaceID_None, nsXBLAtoms::keycode, key);
if (!(*aKeyCode).IsEmpty())
mDetail = GetMatchingKeyCode(*aKeyCode);
if (!key.IsEmpty())
mDetail = GetMatchingKeyCode(key);
}
}
@ -1103,11 +1100,11 @@ nsXBLPrototypeHandler::GetTextData(nsIContent *aParent, nsString& aResult)
///////////////////////////////////////////////////////////////////////////////////
nsresult
NS_NewXBLPrototypeHandler(nsAReadableString* aEvent, nsAReadableString* aPhase,
nsAReadableString* aAction, nsAReadableString* aCommand,
nsAReadableString* aKeyCode, nsAReadableString* aCharCode,
nsAReadableString* aModifiers, nsAReadableString* aButton,
nsAReadableString* aClickCount,
NS_NewXBLPrototypeHandler(const PRUnichar* aEvent, const PRUnichar* aPhase,
const PRUnichar* aAction, const PRUnichar* aCommand,
const PRUnichar* aKeyCode, const PRUnichar* aCharCode,
const PRUnichar* aModifiers, const PRUnichar* aButton,
const PRUnichar* aClickCount,
nsIXBLPrototypeHandler** aResult)
{
*aResult = new nsXBLPrototypeHandler(aEvent, aPhase, aAction, aCommand, aKeyCode,

30
content/xbl/src/nsXBLPrototypeHandler.h
Просмотреть файл

@ -63,11 +63,11 @@ class nsXBLPrototypeHandler : public nsIXBLPrototypeHandler
{
public:
// This constructor is used by XBL handlers (both the JS and command shorthand variety)
nsXBLPrototypeHandler(nsAReadableString* aEvent, nsAReadableString* aPhase,
nsAReadableString* aAction, nsAReadableString* aCommand,
nsAReadableString* aKeyCode, nsAReadableString* aCharCode,
nsAReadableString* aModifiers, nsAReadableString* aButton,
nsAReadableString* aClickCount);
nsXBLPrototypeHandler(const PRUnichar* aEvent, const PRUnichar* aPhase,
const PRUnichar* aAction, const PRUnichar* aCommand,
const PRUnichar* aKeyCode, const PRUnichar* aCharCode,
const PRUnichar* aModifiers, const PRUnichar* aButton,
const PRUnichar* aClickCount);
// This constructor is used only by XUL key handlers (e.g., <key>)
nsXBLPrototypeHandler(nsIContent* aKeyElement);
@ -106,11 +106,11 @@ protected:
inline PRInt32 GetMatchingKeyCode(const nsAReadableString& aKeyName);
void ConstructPrototype(nsIContent* aKeyElement,
nsAReadableString* aEvent=nsnull, nsAReadableString* aPhase=nsnull,
nsAReadableString* aAction=nsnull, nsAReadableString* aCommand=nsnull,
nsAReadableString* aKeyCode=nsnull, nsAReadableString* aCharCode=nsnull,
nsAReadableString* aModifiers=nsnull, nsAReadableString* aButton=nsnull,
nsAReadableString* aClickCount=nsnull);
const PRUnichar* aEvent=nsnull, const PRUnichar* aPhase=nsnull,
const PRUnichar* aAction=nsnull, const PRUnichar* aCommand=nsnull,
const PRUnichar* aKeyCode=nsnull, const PRUnichar* aCharCode=nsnull,
const PRUnichar* aModifiers=nsnull, const PRUnichar* aButton=nsnull,
const PRUnichar* aClickCount=nsnull);
void GetEventType(nsAWritableString& type);
PRBool ModifiersMatchMask(nsIDOMUIEvent* aEvent);
@ -159,11 +159,11 @@ protected:
};
extern nsresult
NS_NewXBLPrototypeHandler(nsAReadableString* aEvent, nsAReadableString* aPhase,
nsAReadableString* aAction, nsAReadableString* aCommand,
nsAReadableString* aKeyCode, nsAReadableString* aCharCode,
nsAReadableString* aModifiers, nsAReadableString* aButton,
nsAReadableString* aClickCount, nsIXBLPrototypeHandler** aResult);
NS_NewXBLPrototypeHandler(const PRUnichar* aEvent, const PRUnichar* aPhase,
const PRUnichar* aAction, const PRUnichar* aCommand,
const PRUnichar* aKeyCode, const PRUnichar* aCharCode,
const PRUnichar* aModifiers, const PRUnichar* aButton,
const PRUnichar* aClickCount, nsIXBLPrototypeHandler** aResult);
extern nsresult
NS_NewXULKeyHandler(nsIContent* aHandlerElement, nsIXBLPrototypeHandler** aResult);