134771 2006-09-28 02:51:51 +0000 instanceof ecma operator does not work on DOM objects 2006-10-14 20:00:26 +0000 1 1 2 Applications konqueror khtml unspecified Compiled Sources Linux RESOLVED FIXED NOR normal --- 1 germain konqueror-bugs-null maksim 0 oldest_to_newest 473359 0 germain 2006-09-28 02:51:51 +0000 Version: (using KDE Devel) Installed from: Compiled sources In Mozilla and Opera browsers, instanceof works on DOM objects, so eg. (document.getElementsByTagName("body")[0] instanceof HTMLElement) or (document instanceof HTMLDocument) would evaluate to true. As long as we did not expose (pseudo-)constructor functions it was not a big deal that we didn't follow this, because script would test e.g. window.HTMLDocument before using instanceof. Now that we expose the constructor, it seems we must also honour instanceof queries, or we are going to have regressions... An example of this is: http://hop.inria.fr => "Demos" tab a sophisticated ajax demo that used to work but now fails because of the above. 473361 1 17948 germain 2006-09-28 03:01:46 +0000 Created attachment 17948 patch for review I just lift implementations of hasInstance/implementsHasInstance from KJS's InternalFunctionImp, as it seems a perfect fit... 473363 2 maksim 2006-09-28 03:15:58 +0000 I suppose that's the best way of doing it, thanks for catching it... 473364 3 germain 2006-09-28 03:30:42 +0000 > I suppose that's the best way of doing it, thanks for catching it... glad to hear that as it was just voodoo programming :) mmh now there is something I don't get at all, document instanceof HTMLDocument is now true, whereas document instanceof Document isn't... At first sight, it doesn't seem to be a flaw in the implementsHasInstance logic as eg. document.getElementsByTagName("body")[0] instanceof Element is OK, and it seems to properly walk the inheritance chain? I feebly tried to follow the macros implementing the pseudo constructors, but all I got is a severe headache... 473365 4 maksim 2006-09-28 03:48:22 +0000 Ugh, the problem is that when we create a prototype with a parent, it doesn't actually setup a prototype link but delegates manually :-( The element case works because we only have a single prototype for the entire hierarchy. 473366 5 maksim 2006-09-28 04:01:59 +0000 .. So basically, to fix this, we would need yet another prototype macro. What ugliness :-(. Might try tomorrow evening... 474114 6 germain 2006-10-01 15:41:53 +0000 SVN commit 591021 by ggarand: commiting partial fix for #134771 to get a working instanceof on most DOM objects the rest of it is completely above my head and in the benevolent hands of Mighty Maksim... CCBUG: 134771 M +22 -0 kjs_binding.cpp M +2 -1 kjs_binding.h --- branches/KDE/3.5/kdelibs/khtml/ecma/kjs_binding.cpp #591020:591021 @@ -92,6 +92,28 @@ return "[object " + className() + "]"; } +Boolean DOMObject::hasInstance(ExecState *exec, const Value &value) +{ + if (value.type() != ObjectType) + return Boolean(false); + + Value prot = get(exec,prototypePropertyName); + if (prot.type() != ObjectType && prot.type() != NullType) { + Object err = Error::create(exec, TypeError, "Invalid prototype encountered " + "in instanceof operation."); + exec->setException(err); + return Boolean(false); + } + + Object v = Object(static_cast<ObjectImp*>(value.imp())); + while ((v = Object::dynamicCast(v.prototype())).imp()) { + if (v.imp() == prot.imp()) + return Boolean(true); + } + return Boolean(false); +} + + Value DOMFunction::get(ExecState *exec, const Identifier &propertyName) const { try { --- branches/KDE/3.5/kdelibs/khtml/ecma/kjs_binding.h #591020:591021 @@ -53,7 +53,8 @@ virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual Value tryGet(ExecState *exec, const Identifier &propertyName) const { return ObjectImp::get(exec, propertyName); } - + virtual bool implementsHasInstance() const { return true; } + virtual Boolean hasInstance(ExecState *exec, const Value &value); virtual void put(ExecState *exec, const Identifier &propertyName, const Value &value, int attr = None); virtual void tryPut(ExecState *exec, const Identifier &propertyName, 476852 7 maksim 2006-10-14 19:58:25 +0000 SVN commit 595530 by orlovich: Backport newer prototype macros, that delegate using the prototype system and not directly. FIxes #134771, and make this closer to trunk BUG:134771 M +4 -4 domparser.cpp M +82 -17 kjs_binding.h M +27 -23 kjs_css.cpp M +26 -25 kjs_dom.cpp M +9 -5 kjs_dom.h M +23 -19 kjs_events.cpp M +11 -9 kjs_html.cpp M +9 -6 kjs_range.cpp M +14 -12 kjs_traversal.cpp M +2 -1 kjs_window.cpp M +5 -4 xmlhttprequest.cpp M +4 -4 xmlserializer.cpp 476853 8 maksim 2006-10-14 20:00:26 +0000 SVN commit 595531 by orlovich: Regression test for #134771, and also shows some of the limitations of our implementation.. CCBUG:134771 A baseline/dom/instanceof_pseudoctor.html-dom AM baseline/dom/instanceof_pseudoctor.html-dump.png A baseline/dom/instanceof_pseudoctor.html-render A tests/dom/instanceof_pseudoctor.html ** trunk/tests/khtmltests/regression/baseline/dom/instanceof_pseudoctor.html-dump.png #property svn:mime-type + image/png 17948 2006-09-28 03:01:46 +0000 2006-09-28 03:01:46 +0000 patch for review instanceof.diff text/plain 1760 germain SW5kZXg6IGVjbWEva2pzX2JpbmRpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBlY21hL2tqc19iaW5kaW5n LmgJKHJldmlzaW9uIDU4ODMxNCkKKysrIGVjbWEva2pzX2JpbmRpbmcuaAkod29ya2luZyBjb3B5 KQpAQCAtNTMsNyArNTMsOCBAQAogICAgIHZpcnR1YWwgVmFsdWUgZ2V0KEV4ZWNTdGF0ZSAqZXhl YywgY29uc3QgSWRlbnRpZmllciAmcHJvcGVydHlOYW1lKSBjb25zdDsKICAgICB2aXJ0dWFsIFZh bHVlIHRyeUdldChFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0IElkZW50aWZpZXIgJnByb3BlcnR5TmFt ZSkgY29uc3QKICAgICAgIHsgcmV0dXJuIE9iamVjdEltcDo6Z2V0KGV4ZWMsIHByb3BlcnR5TmFt ZSk7IH0KLQorICAgIHZpcnR1YWwgYm9vbCBpbXBsZW1lbnRzSGFzSW5zdGFuY2UoKSBjb25zdCB7 IHJldHVybiB0cnVlOyB9CisgICAgdmlydHVhbCBCb29sZWFuIGhhc0luc3RhbmNlKEV4ZWNTdGF0 ZSAqZXhlYywgY29uc3QgVmFsdWUgJnZhbHVlKTsKICAgICB2aXJ0dWFsIHZvaWQgcHV0KEV4ZWNT dGF0ZSAqZXhlYywgY29uc3QgSWRlbnRpZmllciAmcHJvcGVydHlOYW1lLAogICAgICAgICAgICAg ICAgICAgICAgY29uc3QgVmFsdWUgJnZhbHVlLCBpbnQgYXR0ciA9IE5vbmUpOwogICAgIHZpcnR1 YWwgdm9pZCB0cnlQdXQoRXhlY1N0YXRlICpleGVjLCBjb25zdCBJZGVudGlmaWVyICZwcm9wZXJ0 eU5hbWUsCkluZGV4OiBlY21hL2tqc19iaW5kaW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBlY21hL2tq c19iaW5kaW5nLmNwcAkocmV2aXNpb24gNTg4MzE0KQorKysgZWNtYS9ranNfYmluZGluZy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTkyLDYgKzkyLDI4IEBACiAgIHJldHVybiAiW29iamVjdCAiICsg Y2xhc3NOYW1lKCkgKyAiXSI7CiB9CiAKK0Jvb2xlYW4gRE9NT2JqZWN0OjpoYXNJbnN0YW5jZShF eGVjU3RhdGUgKmV4ZWMsIGNvbnN0IFZhbHVlICZ2YWx1ZSkKK3sKKyAgaWYgKHZhbHVlLnR5cGUo KSAhPSBPYmplY3RUeXBlKQorICAgIHJldHVybiBCb29sZWFuKGZhbHNlKTsKKworICBWYWx1ZSBw cm90ID0gZ2V0KGV4ZWMscHJvdG90eXBlUHJvcGVydHlOYW1lKTsKKyAgaWYgKHByb3QudHlwZSgp ICE9IE9iamVjdFR5cGUgJiYgcHJvdC50eXBlKCkgIT0gTnVsbFR5cGUpIHsKKyAgICBPYmplY3Qg ZXJyID0gRXJyb3I6OmNyZWF0ZShleGVjLCBUeXBlRXJyb3IsICJJbnZhbGlkIHByb3RvdHlwZSBl bmNvdW50ZXJlZCAiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImluIGluc3RhbmNl b2Ygb3BlcmF0aW9uLiIpOworICAgIGV4ZWMtPnNldEV4Y2VwdGlvbihlcnIpOworICAgIHJldHVy biBCb29sZWFuKGZhbHNlKTsKKyAgfQorCisgIE9iamVjdCB2ID0gT2JqZWN0KHN0YXRpY19jYXN0 PE9iamVjdEltcCo+KHZhbHVlLmltcCgpKSk7CisgIHdoaWxlICgodiA9IE9iamVjdDo6ZHluYW1p Y0Nhc3Qodi5wcm90b3R5cGUoKSkpLmltcCgpKSB7CisgICAgaWYgKHYuaW1wKCkgPT0gcHJvdC5p bXAoKSkKKyAgICAgIHJldHVybiBCb29sZWFuKHRydWUpOworICB9CisgIHJldHVybiBCb29sZWFu KGZhbHNlKTsKK30KKworCiBWYWx1ZSBET01GdW5jdGlvbjo6Z2V0KEV4ZWNTdGF0ZSAqZXhlYywg Y29uc3QgSWRlbnRpZmllciAmcHJvcGVydHlOYW1lKSBjb25zdAogewogICB0cnkgewo=