Commit dd4cc915 authored by darin's avatar darin

- another atomic identifier scrub pass; make the conversion to Identifier explicit

        * khtml/ecma/kjs_html.cpp:
        (KJS::HTMLCollection::tryCall): Add explicit Identifier() conversion.
        (KJS::HTMLCollectionProtoFunc::tryCall): Ditto.
        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): And again.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2771 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a70560aa
2002-11-19 Darin Adler <darin@apple.com>
- another atomic identifier scrub pass; make the conversion to Identifier explicit
* khtml/ecma/kjs_html.cpp:
(KJS::HTMLCollection::tryCall): Add explicit Identifier() conversion.
(KJS::HTMLCollectionProtoFunc::tryCall): Ditto.
* khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): And again.
2002-11-19 David Hyatt <hyatt@apple.com>
Fix for 3049663. Table cells don't grow to accommodate block
......
2002-11-19 Darin Adler <darin@apple.com>
- another atomic identifier scrub pass; make the conversion to Identifier explicit
* khtml/ecma/kjs_html.cpp:
(KJS::HTMLCollection::tryCall): Add explicit Identifier() conversion.
(KJS::HTMLCollectionProtoFunc::tryCall): Ditto.
* khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): And again.
2002-11-19 David Hyatt <hyatt@apple.com>
Fix for 3049663. Table cells don't grow to accommodate block
......
2002-11-19 Darin Adler <darin@apple.com>
- another atomic identifier scrub pass; make the conversion to Identifier explicit
* khtml/ecma/kjs_html.cpp:
(KJS::HTMLCollection::tryCall): Add explicit Identifier() conversion.
(KJS::HTMLCollectionProtoFunc::tryCall): Ditto.
* khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): And again.
2002-11-19 David Hyatt <hyatt@apple.com>
Fix for 3049663. Table cells don't grow to accommodate block
......
......@@ -2735,7 +2735,7 @@ Value KJS::HTMLCollection::tryCall(ExecState *exec, Object &, const List &args)
return getDOMNode(exec,element);
}
// support for document.images('<name>') etc.
return getNamedItems(exec,s);
return getNamedItems(exec, Identifier(s));
}
else if (args.size() >= 1) // the second arg, if set, is the index of the item we want
{
......@@ -2829,7 +2829,7 @@ Value KJS::HTMLCollectionProtoFunc::tryCall(ExecState *exec, Object &thisObj, co
return getDOMNodeList(exec, list);
}
case KJS::HTMLCollection::NamedItem:
return static_cast<HTMLCollection *>(thisObj.imp())->getNamedItems(exec, args[0].toString(exec));
return static_cast<HTMLCollection *>(thisObj.imp())->getNamedItems(exec, Identifier(args[0].toString(exec)));
default:
return Undefined();
}
......
......@@ -1278,7 +1278,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
case Window::SetTimeout:
if (args.size() == 2 && v.isA(StringType)) {
int i = args[1].toInt32(exec);
int r = (const_cast<Window*>(window))->installTimeout(s, i, true /*single shot*/);
int r = (const_cast<Window*>(window))->installTimeout(Identifier(s), i, true /*single shot*/);
return Number(r);
}
else if (args.size() >= 2 && v.isA(ObjectType) && Object::dynamicCast(v).implementsCall()) {
......@@ -1290,7 +1290,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
funcArgs->removeFirst(); // all args after 2 go to the function
funcArgs->removeFirst();
#endif
int r = (const_cast<Window*>(window))->installTimeout(s, i, true /*single shot*/);
int r = (const_cast<Window*>(window))->installTimeout(Identifier(s), i, true /*single shot*/);
return Number(r);
}
else
......@@ -1298,7 +1298,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
case Window::SetInterval:
if (args.size() >= 2 && v.isA(StringType)) {
int i = args[1].toInt32(exec);
int r = (const_cast<Window*>(window))->installTimeout(s, i, false);
int r = (const_cast<Window*>(window))->installTimeout(Identifier(s), i, false);
return Number(r);
}
else if (args.size() >= 2 && !Object::dynamicCast(v).isNull() &&
......@@ -1311,7 +1311,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
funcArgs->removeFirst(); // all args after 2 go to the function
funcArgs->removeFirst();
#endif
int r = (const_cast<Window*>(window))->installTimeout(s, i, false);
int r = (const_cast<Window*>(window))->installTimeout(Identifier(s), i, false);
return Number(r);
}
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment