Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge backout.

Browse Source
This commit is contained in:
Jason Orendorff 2008-06-24 15:56:45 -05:00
commit fde4025474
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accessible/src/base/nsAccessible.cpp
View File

@ -2045,6 +2045,9 @@ nsAccessible::GetAttributes(nsIPersistentProperties **aAttributes)
{
NS_ENSURE_ARG_POINTER(aAttributes); // In/out param. Created if necessary.
if (IsDefunct())
return NS_ERROR_FAILURE;
nsCOMPtr<nsIContent> content = GetRoleContent(mDOMNode);
if (!content) {
return NS_ERROR_FAILURE;

6
js/src/jsinterp.cpp
View File

@ -2566,7 +2566,7 @@ js_Interpret(JSContext *cx)
JSFunction *fun;
JSType type;
#if JS_THREADED_INTERP
register const void * const *jumpTable;
register void * const *jumpTable;
#else
register uint32 switchMask;
uintN switchOp;
@ -2589,14 +2589,14 @@ js_Interpret(JSContext *cx)
#endif
#if JS_THREADED_INTERP
static const void *const normalJumpTable[] = {
static void *const normalJumpTable[] = {
# define OPDEF(op,val,name,token,length,nuses,ndefs,prec,format) \
JS_EXTENSION &&L_##op,
# include "jsopcode.tbl"
# undef OPDEF
};
static const void *const interruptJumpTable[] = {
static void *const interruptJumpTable[] = {
# define OPDEF(op,val,name,token,length,nuses,ndefs,prec,format) \
JS_EXTENSION &&L_JSOP_INTERRUPT,
# include "jsopcode.tbl"