6737 2006-01-23 10:00:14 -0800 KJS_DEFINE_PROTOTYPE should work outside of the KJS namespace 2006-01-24 09:21:09 -0800 1 1 1 Unclassified WebKit JavaScriptCore 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 5975 1 andersca andersca oldest_to_newest 29596 0 andersca 2006-01-23 10:00:14 -0800 Currently, KJS_DEFINE_PROTOTYPE assumes that the current namespace is KJS (or that it's been included). Since KJS_DEFINE_PROTOTYPE is meant to be used in headers that aren't part of the KJS namespace, it needs to have all KJS types prefixed with KJS:: 29613 1 5885 andersca 2006-01-23 13:42:48 -0800 Created attachment 5885 Patch 5885 2006-01-23 13:42:48 -0800 2006-01-23 18:14:38 -0800 Patch kjs-define-prototype.txt text/plain 7485 andersca SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEyMzE3 KQorKysgQ2hhbmdlTG9nCShhcmJldHNrb3BpYSkKQEAgLTEsMyArMSwxNiBAQAorMjAwNi0wMS0y MyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAbWFjLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIGZpeCBodHRwOi8vYnVnemlsbGEub3Bl bmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTY3MzcKKyAgICAgICAgS0pTX0RFRklORV9QUk9U T1RZUEUgc2hvdWxkIHdvcmsgb3V0c2lkZSBvZiB0aGUgS0pTIG5hbWVzcGFjZQorICAgICAgICAK KyAgICAgICAgKiBranMvbG9va3VwLmg6CisgICAgICAgIFByZWZpeCBhbGwgS0pTIHR5cGVzIHdp dGggS0pTOjogaW4gS0pTX0RFRklORV9QUk9UT1RZUEUuCisgICAgICAgIAorICAgICAgICAoY2Fj aGVHbG9iYWxPYmplY3QpOgorICAgICAgICBNb3ZlIHRoaXMgb3V0IG9mIHRoZSBLSlMgbmFtZXNw YWNlOworCiAyMDA2LTAxLTIzICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhhdGNoZXIuCkluZGV4OiBranMvbG9va3VwLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0ga2pzL2xvb2t1cC5oCShyZXZpc2lvbiAxMjMxNykKKysrIGtqcy9sb29rdXAu aAkoYXJiZXRza29waWEpCkBAIC0yNDgsNTQgKzI0OCw2MiBAQCBuYW1lc3BhY2UgS0pTIHsKICAg ICAgIHRoaXNPYmotPnB1dFZhbHVlUHJvcGVydHkoZXhlYywgZW50cnktPnZhbHVlLCB2YWx1ZSwg YXR0cik7CiAgIH0KICAgCi0gIC8qKgotICAgKiBUaGlzIHRlbXBsYXRlIG1ldGhvZCByZXRyaWV2 ZXMgb3IgY3JlYXRlIGFuIG9iamVjdCB0aGF0IGlzIHVuaXF1ZQotICAgKiAoZm9yIGEgZ2l2ZW4g aW50ZXJwcmV0ZXIpIFRoZSBmaXJzdCB0aW1lIHRoaXMgaXMgY2FsbGVkIChmb3IgYSBnaXZlbgot ICAgKiBwcm9wZXJ0eSBuYW1lKSwgdGhlIE9iamVjdCB3aWxsIGJlIGNvbnN0cnVjdGVkLCBhbmQg c2V0IGFzIGEgcHJvcGVydHkKLSAgICogb2YgdGhlIGludGVycHJldGVyJ3MgZ2xvYmFsIG9iamVj dC4gTGF0ZXIgY2FsbHMgd2lsbCBzaW1wbHkgcmV0cmlldmUKLSAgICogdGhhdCBjYWNoZWQgb2Jq ZWN0LiBOb3RlIHRoYXQgdGhlIG9iamVjdCBjb25zdHJ1Y3RvciBtdXN0IHRha2UgMSBhcmd1bWVu dCwgZXhlYy4KLSAgICovCi0gIHRlbXBsYXRlIDxjbGFzcyBDbGFzc0N0b3I+Ci0gIGlubGluZSBK U09iamVjdCAqY2FjaGVHbG9iYWxPYmplY3QoRXhlY1N0YXRlICpleGVjLCBjb25zdCBJZGVudGlm aWVyICZwcm9wZXJ0eU5hbWUpCi0gIHsKLSAgICBKU09iamVjdCAqZ2xvYmFsT2JqZWN0ID0gc3Rh dGljX2Nhc3Q8SlNPYmplY3QgKj4oZXhlYy0+bGV4aWNhbEludGVycHJldGVyKCktPmdsb2JhbE9i amVjdCgpKTsKLSAgICBKU1ZhbHVlICpvYmogPSBnbG9iYWxPYmplY3QtPmdldERpcmVjdChwcm9w ZXJ0eU5hbWUpOwotICAgIGlmIChvYmopIHsKLSAgICAgIGFzc2VydChvYmotPmlzT2JqZWN0KCkp OwotICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEpTT2JqZWN0ICo+KG9iaik7Ci0gICAgfQotICAg IEpTT2JqZWN0ICpuZXdPYmplY3QgPSBuZXcgQ2xhc3NDdG9yKGV4ZWMpOwotICAgIGdsb2JhbE9i amVjdC0+cHV0KGV4ZWMsIHByb3BlcnR5TmFtZSwgbmV3T2JqZWN0LCBJbnRlcm5hbCk7Ci0gICAg cmV0dXJuIG5ld09iamVjdDsKLSAgfQorfSAvLyBuYW1lc3BhY2UKIAotICAvKioKLSAgICogSGVs cGVycyB0byBkZWZpbmUgcHJvdG90eXBlIG9iamVjdHMgKGVhY2ggb2Ygd2hpY2ggc2ltcGx5IGlt cGxlbWVudHMKLSAgICogdGhlIGZ1bmN0aW9ucyBmb3IgYSB0eXBlIG9mIG9iamVjdHMpLgotICAg KiBTb3JyeSBmb3IgdGhpcyBub3QgYmVpbmcgdmVyeSByZWFkYWJsZSwgYnV0IGl0IGFjdHVhbGx5 IHNhdmVzIG11Y2ggY29weS1uLXBhc3RlLgotICAgKiBQYXJlbnRQcm90byBpcyBub3Qgb3VyIGJh c2UgY2xhc3MsIGl0J3MgdGhlIG9iamVjdCB3ZSB1c2UgYXMgZmFsbGJhY2suCi0gICAqIFRoZSBy ZWFzb24gZm9yIHRoaXMgaXMgdGhhdCB0aGVyZSBzaG91bGQgb25seSBiZSBPTkUgRE9NTm9kZS5o YXNBdHRyaWJ1dGVzIChlLmcuKSwKLSAgICogbm90IG9uZSBpbiBlYWNoIGRlcml2ZWQgY2xhc3Mu IFNvIHdlIGxpbmsgdGhlICh1bmlxdWUpIHByb3RvdHlwZXMgYmV0d2VlbiB0aGVtLgotICAgKgot ICAgKiBVc2luZyB0aG9zZSBtYWNyb3MgaXMgdmVyeSBzaW1wbGU6IGRlZmluZSB0aGUgaGFzaHRh YmxlIChlLmcuICJET01Ob2RlUHJvdG9UYWJsZSIpLCB0aGVuCi0gICAqIEtKU19ERUZJTkVfUFJP VE9UWVBFKERPTU5vZGVQcm90bykKLSAgICogS0pTX0lNUExFTUVOVF9QUk9UT0ZVTkMoRE9NTm9k ZVByb3RvRnVuYykKLSAgICogS0pTX0lNUExFTUVOVF9QUk9UT1RZUEUoIkRPTU5vZGUiLCBET01O b2RlUHJvdG8sRE9NTm9kZVByb3RvRnVuYykKLSAgICogYW5kIHVzZSBET01Ob2RlUHJvdG86OnNl bGYoZXhlYykgYXMgcHJvdG90eXBlIGluIHRoZSBET01Ob2RlIGNvbnN0cnVjdG9yLgotICAgKiBJ ZiB0aGUgcHJvdG90eXBlIGhhcyBhICJwYXJlbnQgcHJvdG90eXBlIiwgZS5nLiBET01FbGVtZW50 UHJvdG8gZmFsbHMgYmFjayBvbiBET01Ob2RlUHJvdG8sCi0gICAqIHRoZW4gdGhlIGxhc3QgbGlu ZSB3aWxsIHVzZSBJTVBMRU1FTlRfUFJPVE9UWVBFX1dJVEhfUEFSRU5ULCB3aXRoIERPTU5vZGVQ cm90byBhcyBsYXN0IGFyZ3VtZW50LgotICAgKi8KKy8qCisgKiBUaGUgdGVtcGxhdGUgbWV0aG9k IGJlbG93IGNhbid0IGJlIGluIHRoZSBLSlMgbmFtZXNwYWNlIGJlY2F1c2UgaXQncyB1c2VkIGlu IAorICogS0pTX0RFRklORV9QUk9QRVJUWSB3aGljaCBjYW4gYmUgdXNlZCBvdXRzaWRlIG9mIHRo ZSBLSlMgbmFtZXNwYWNlLiBJdCBjYW4gYmUgbW92ZWQgYmFjaworICogd2hlbiBhIGdjYyB3aXRo IGh0dHA6Ly9nY2MuZ251Lm9yZy9idWd6aWxsYS9zaG93X2J1Zy5jZ2k/aWQ9ODM1NSBpcyBtYWlu c3RyZWFtIGVub3VnaC4KKyAqLworIAorLyoqCisgKiBUaGlzIHRlbXBsYXRlIG1ldGhvZCByZXRy aWV2ZXMgb3IgY3JlYXRlIGFuIG9iamVjdCB0aGF0IGlzIHVuaXF1ZQorICogKGZvciBhIGdpdmVu IGludGVycHJldGVyKSBUaGUgZmlyc3QgdGltZSB0aGlzIGlzIGNhbGxlZCAoZm9yIGEgZ2l2ZW4K KyAqIHByb3BlcnR5IG5hbWUpLCB0aGUgT2JqZWN0IHdpbGwgYmUgY29uc3RydWN0ZWQsIGFuZCBz ZXQgYXMgYSBwcm9wZXJ0eQorICogb2YgdGhlIGludGVycHJldGVyJ3MgZ2xvYmFsIG9iamVjdC4g TGF0ZXIgY2FsbHMgd2lsbCBzaW1wbHkgcmV0cmlldmUKKyAqIHRoYXQgY2FjaGVkIG9iamVjdC4g Tm90ZSB0aGF0IHRoZSBvYmplY3QgY29uc3RydWN0b3IgbXVzdCB0YWtlIDEgYXJndW1lbnQsIGV4 ZWMuCisgKi8KK3RlbXBsYXRlIDxjbGFzcyBDbGFzc0N0b3I+CitpbmxpbmUgS0pTOjpKU09iamVj dCAqY2FjaGVHbG9iYWxPYmplY3QoS0pTOjpFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0IEtKUzo6SWRl bnRpZmllciAmcHJvcGVydHlOYW1lKQoreworICBLSlM6OkpTT2JqZWN0ICpnbG9iYWxPYmplY3Qg PSBzdGF0aWNfY2FzdDxLSlM6OkpTT2JqZWN0ICo+KGV4ZWMtPmxleGljYWxJbnRlcnByZXRlcigp LT5nbG9iYWxPYmplY3QoKSk7CisgIEtKUzo6SlNWYWx1ZSAqb2JqID0gZ2xvYmFsT2JqZWN0LT5n ZXREaXJlY3QocHJvcGVydHlOYW1lKTsKKyAgaWYgKG9iaikgeworICAgIGFzc2VydChvYmotPmlz T2JqZWN0KCkpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxLSlM6OkpTT2JqZWN0ICo+KG9iaik7 CisgIH0KKyAgS0pTOjpKU09iamVjdCAqbmV3T2JqZWN0ID0gbmV3IENsYXNzQ3RvcihleGVjKTsK KyAgZ2xvYmFsT2JqZWN0LT5wdXQoZXhlYywgcHJvcGVydHlOYW1lLCBuZXdPYmplY3QsIEtKUzo6 SW50ZXJuYWwpOworICByZXR1cm4gbmV3T2JqZWN0OworfQorCisvKioKKyAqIEhlbHBlcnMgdG8g ZGVmaW5lIHByb3RvdHlwZSBvYmplY3RzIChlYWNoIG9mIHdoaWNoIHNpbXBseSBpbXBsZW1lbnRz CisgKiB0aGUgZnVuY3Rpb25zIGZvciBhIHR5cGUgb2Ygb2JqZWN0cykuCisgKiBTb3JyeSBmb3Ig dGhpcyBub3QgYmVpbmcgdmVyeSByZWFkYWJsZSwgYnV0IGl0IGFjdHVhbGx5IHNhdmVzIG11Y2gg Y29weS1uLXBhc3RlLgorICogUGFyZW50UHJvdG8gaXMgbm90IG91ciBiYXNlIGNsYXNzLCBpdCdz IHRoZSBvYmplY3Qgd2UgdXNlIGFzIGZhbGxiYWNrLgorICogVGhlIHJlYXNvbiBmb3IgdGhpcyBp cyB0aGF0IHRoZXJlIHNob3VsZCBvbmx5IGJlIE9ORSBET01Ob2RlLmhhc0F0dHJpYnV0ZXMgKGUu Zy4pLAorICogbm90IG9uZSBpbiBlYWNoIGRlcml2ZWQgY2xhc3MuIFNvIHdlIGxpbmsgdGhlICh1 bmlxdWUpIHByb3RvdHlwZXMgYmV0d2VlbiB0aGVtLgorICoKKyAqIFVzaW5nIHRob3NlIG1hY3Jv cyBpcyB2ZXJ5IHNpbXBsZTogZGVmaW5lIHRoZSBoYXNodGFibGUgKGUuZy4gIkRPTU5vZGVQcm90 b1RhYmxlIiksIHRoZW4KKyAqIEtKU19ERUZJTkVfUFJPVE9UWVBFKERPTU5vZGVQcm90bykKKyAq IEtKU19JTVBMRU1FTlRfUFJPVE9GVU5DKERPTU5vZGVQcm90b0Z1bmMpCisgKiBLSlNfSU1QTEVN RU5UX1BST1RPVFlQRSgiRE9NTm9kZSIsIERPTU5vZGVQcm90byxET01Ob2RlUHJvdG9GdW5jKQor ICogYW5kIHVzZSBET01Ob2RlUHJvdG86OnNlbGYoZXhlYykgYXMgcHJvdG90eXBlIGluIHRoZSBE T01Ob2RlIGNvbnN0cnVjdG9yLgorICogSWYgdGhlIHByb3RvdHlwZSBoYXMgYSAicGFyZW50IHBy b3RvdHlwZSIsIGUuZy4gRE9NRWxlbWVudFByb3RvIGZhbGxzIGJhY2sgb24gRE9NTm9kZVByb3Rv LAorICogdGhlbiB0aGUgbGFzdCBsaW5lIHdpbGwgdXNlIElNUExFTUVOVF9QUk9UT1RZUEVfV0lU SF9QQVJFTlQsIHdpdGggRE9NTm9kZVByb3RvIGFzIGxhc3QgYXJndW1lbnQuCisgKi8KICNkZWZp bmUgS0pTX0RFRklORV9QUk9UT1RZUEUoQ2xhc3NQcm90bykgXAotICBjbGFzcyBDbGFzc1Byb3Rv IDogcHVibGljIEpTT2JqZWN0IHsgXAotICAgIGZyaWVuZCBKU09iamVjdCAqY2FjaGVHbG9iYWxP YmplY3Q8Q2xhc3NQcm90bz4oRXhlY1N0YXRlICpleGVjLCBjb25zdCBJZGVudGlmaWVyICZwcm9w ZXJ0eU5hbWUpOyBcCisgIGNsYXNzIENsYXNzUHJvdG8gOiBwdWJsaWMgS0pTOjpKU09iamVjdCB7 IFwKKyAgICBmcmllbmQgS0pTOjpKU09iamVjdCAqY2FjaGVHbG9iYWxPYmplY3Q8Q2xhc3NQcm90 bz4oS0pTOjpFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0IEtKUzo6SWRlbnRpZmllciAmcHJvcGVydHlO YW1lKTsgXAogICBwdWJsaWM6IFwKLSAgICBzdGF0aWMgSlNPYmplY3QgKkNsYXNzUHJvdG86OnNl bGYoRXhlY1N0YXRlICpleGVjKTsgXAotICAgIHZpcnR1YWwgY29uc3QgQ2xhc3NJbmZvICpjbGFz c0luZm8oKSBjb25zdCB7IHJldHVybiAmaW5mbzsgfSBcCi0gICAgc3RhdGljIGNvbnN0IENsYXNz SW5mbyBpbmZvOyBcCi0gICAgYm9vbCBnZXRPd25Qcm9wZXJ0eVNsb3QoRXhlY1N0YXRlICosIGNv bnN0IElkZW50aWZpZXImLCBQcm9wZXJ0eVNsb3QmKTsgXAorICAgIHN0YXRpYyBLSlM6OkpTT2Jq ZWN0ICpDbGFzc1Byb3RvOjpzZWxmKEtKUzo6RXhlY1N0YXRlICpleGVjKTsgXAorICAgIHZpcnR1 YWwgY29uc3QgS0pTOjpDbGFzc0luZm8gKmNsYXNzSW5mbygpIGNvbnN0IHsgcmV0dXJuICZpbmZv OyB9IFwKKyAgICBzdGF0aWMgY29uc3QgS0pTOjpDbGFzc0luZm8gaW5mbzsgXAorICAgIGJvb2wg Z2V0T3duUHJvcGVydHlTbG90KEtKUzo6RXhlY1N0YXRlICosIGNvbnN0IEtKUzo6SWRlbnRpZmll ciYsIEtKUzo6UHJvcGVydHlTbG90Jik7IFwKICAgcHJvdGVjdGVkOiBcCi0gICAgQ2xhc3NQcm90 byggRXhlY1N0YXRlICpleGVjICkgXAotICAgICAgOiBKU09iamVjdCggZXhlYy0+bGV4aWNhbElu dGVycHJldGVyKCktPmJ1aWx0aW5PYmplY3RQcm90b3R5cGUoKSApIHt9IFwKKyAgICBDbGFzc1By b3RvKEtKUzo6RXhlY1N0YXRlICpleGVjKSBcCisgICAgICA6IEpTT2JqZWN0KGV4ZWMtPmxleGlj YWxJbnRlcnByZXRlcigpLT5idWlsdGluT2JqZWN0UHJvdG90eXBlKCkpIHsgfSBcCiAgICAgXAog ICB9OwogCkBAIC0zMzYsMTggKzM0NCwxOCBAQCBuYW1lc3BhY2UgS0pTIHsKICAgICBpbnQgaWQ7 IFwKICAgfTsKIAotICAvKgotICAgKiBMaXN0IG9mIHRoaW5ncyB0byBkbyB3aGVuIHBvcnRpbmcg YW4gb2JqZWN0aW1wIHRvIHRoZSAnc3RhdGljIGhhc2h0YWJsZScgbWVjaGFuaXNtOgotICAgKiAt IHdyaXRlIHRoZSBoYXNodGFibGUgc291cmNlLCBiZXR3ZWVuIEBiZWdpbiBhbmQgQGVuZAotICAg KiAtIGFkZCBhIHJ1bGUgdG8gYnVpbGQgdGhlIC5sdXQuaAotICAgKiAtIGluY2x1ZGUgdGhlIC5s dXQuaAotICAgKiAtIG1lbnRpb24gdGhlIHRhYmxlIGluIHRoZSBjbGFzc2luZm8gKGFkZCBhIGNs YXNzaW5mbyBpZiBuZWNlc3NhcnkpCi0gICAqIC0gd3JpdGUvdXBkYXRlIHRoZSBjbGFzcyBlbnVt IChmb3IgdGhlIHRva2VucykKLSAgICogLSB0dXJuIGdldCgpIGludG8gZ2V0VmFsdWVQcm9wZXJ0 eSgpLCBwdXQoKSBpbnRvIHB1dFZhbHVlUHJvcGVydHkoKSwgdXNpbmcgYSBzd2l0Y2ggYW5kIHJl bW92aW5nIGZ1bmNzCi0gICAqIC0gd3JpdGUgZ2V0KCkgYW5kL29yIHB1dCgpIHVzaW5nIGEgdGVt cGxhdGUgbWV0aG9kCi0gICAqIC0gY2xlYW51cCBvbGQgc3R1ZmYgKGUuZy4gaGFzUHJvcGVydHkp Ci0gICAqIC0gY29tcGlsZSwgdGVzdCwgY29tbWl0IDspCi0gICAqLwotfSAvLyBuYW1lc3BhY2UK Ky8qCisgKiBMaXN0IG9mIHRoaW5ncyB0byBkbyB3aGVuIHBvcnRpbmcgYW4gb2JqZWN0aW1wIHRv IHRoZSAnc3RhdGljIGhhc2h0YWJsZScgbWVjaGFuaXNtOgorICogLSB3cml0ZSB0aGUgaGFzaHRh YmxlIHNvdXJjZSwgYmV0d2VlbiBAYmVnaW4gYW5kIEBlbmQKKyAqIC0gYWRkIGEgcnVsZSB0byBi dWlsZCB0aGUgLmx1dC5oCisgKiAtIGluY2x1ZGUgdGhlIC5sdXQuaAorICogLSBtZW50aW9uIHRo ZSB0YWJsZSBpbiB0aGUgY2xhc3NpbmZvIChhZGQgYSBjbGFzc2luZm8gaWYgbmVjZXNzYXJ5KQor ICogLSB3cml0ZS91cGRhdGUgdGhlIGNsYXNzIGVudW0gKGZvciB0aGUgdG9rZW5zKQorICogLSB0 dXJuIGdldCgpIGludG8gZ2V0VmFsdWVQcm9wZXJ0eSgpLCBwdXQoKSBpbnRvIHB1dFZhbHVlUHJv cGVydHkoKSwgdXNpbmcgYSBzd2l0Y2ggYW5kIHJlbW92aW5nIGZ1bmNzCisgKiAtIHdyaXRlIGdl dCgpIGFuZC9vciBwdXQoKSB1c2luZyBhIHRlbXBsYXRlIG1ldGhvZAorICogLSBjbGVhbnVwIG9s ZCBzdHVmZiAoZS5nLiBoYXNQcm9wZXJ0eSkKKyAqIC0gY29tcGlsZSwgdGVzdCwgY29tbWl0IDsp CisgKi8KKwogCiAjZW5kaWYK