34161 2010-01-26 04:40:48 -0800 Local scope is shown as With scope in scope chain pane 2010-01-28 02:46:40 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys commit-queue oliver pfeldman timothy oldest_to_newest 184558 0 yurys 2010-01-26 04:40:48 -0800 When debugger is paused on a breakpoint Local scope is displayed as With scope and 'this' variable is missing in it. This is a regression after http://trac.webkit.org/changeset/53766 184667 1 oliver 2010-01-26 12:17:15 -0800 Any word on this? 184672 2 oliver 2010-01-26 12:25:20 -0800 This only happens if the global object has a property with the same name of a variable in the scope chain :-/ 185106 3 47538 yurys 2010-01-27 08:23:24 -0800 Created attachment 47538 patch 185113 4 47539 yurys 2010-01-27 08:34:33 -0800 Created attachment 47539 patch Added ChangeLog entry. 185114 5 47539 oliver 2010-01-27 08:36:05 -0800 Comment on attachment 47539 patch r=me 185160 6 47539 yurys 2010-01-27 11:30:51 -0800 Comment on attachment 47539 patch Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/bindings/js/JSInjectedScriptHostCustom.cpp M WebCore/inspector/InjectedScriptHost.idl M WebCore/inspector/front-end/InjectedScript.js A WebCore/manual-tests/inspector/debugger-scopes-inspection.html Committed r53945 185191 7 47539 darin 2010-01-27 12:48:35 -0800 Comment on attachment 47539 patch > +JSValue JSInjectedScriptHost::isActivation(ExecState* exec, const ArgList& args) > +{ > + if (args.size() < 1) > + return jsUndefined(); > + > + JSValue value = args.at(0); > + if (!value.isObject()) > + return jsBoolean(false); > + > + JSObject* object = value.toObject(exec); > + return jsBoolean(object->isActivationObject()); This is unnecessarily inefficient. There is no need to check args.size() at all, since args.at(0) already does. And the toObject function is not needed for a value already known to be an object. The function could be this: JSObject* object = args.at(0).getObject(); return jsBoolean(object && object->isActivationObject()); 185379 8 47598 yurys 2010-01-28 01:06:16 -0800 Created attachment 47598 patch isActivation code is simplified according to Darin's suggestion. 185380 9 yurys 2010-01-28 01:06:58 -0800 I'd like to improve the code. 185401 10 47598 commit-queue 2010-01-28 02:46:33 -0800 Comment on attachment 47598 patch Clearing flags on attachment: 47598 Committed r53993: <http://trac.webkit.org/changeset/53993> 185402 11 commit-queue 2010-01-28 02:46:40 -0800 All reviewed patches have been landed. Closing bug. 47538 2010-01-27 08:23:24 -0800 2010-01-28 01:06:16 -0800 patch local-scope.patch text/plain 3472 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdEhvc3RDdXN0 b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0luamVjdGVkU2NyaXB0SG9zdEN1c3RvbS5j cHAKaW5kZXggYTc4MzZiMC4uOWNmOWJmMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0luamVjdGVkU2NyaXB0SG9zdEN1c3RvbS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0luamVjdGVkU2NyaXB0SG9zdEN1c3RvbS5jcHAKQEAgLTEyNiw2ICsxMjYsMTkgQEAgSlNW YWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6Y3VycmVudENhbGxGcmFtZShFeGVjU3RhdGUqIGV4 ZWMsIGNvbnN0IEFyZ0xpc3QmKQogICAgIHJldHVybiB0b0pTKGV4ZWMsIGNhbGxGcmFtZSk7CiB9 CiAKK0pTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OmlzQWN0aXZhdGlvbihFeGVjU3RhdGUq IGV4ZWMsIGNvbnN0IEFyZ0xpc3QmIGFyZ3MpCit7CisgICAgaWYgKGFyZ3Muc2l6ZSgpIDwgMSkK KyAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CisKKyAgICBKU1ZhbHVlIHZhbHVlID0gYXJn cy5hdCgwKTsKKyAgICBpZiAoIXZhbHVlLmlzT2JqZWN0KCkpCisgICAgICAgIHJldHVybiBqc0Jv b2xlYW4oZmFsc2UpOworCisgICAgSlNPYmplY3QqIG9iamVjdCA9IHZhbHVlLnRvT2JqZWN0KGV4 ZWMpOworICAgIHJldHVybiBqc0Jvb2xlYW4ob2JqZWN0LT5pc0FjdGl2YXRpb25PYmplY3QoKSk7 Cit9CisKICNlbmRpZgogCiBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0Ojpub2RlRm9ySWQo RXhlY1N0YXRlKiBleGVjLCBjb25zdCBBcmdMaXN0JiBhcmdzKQpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmlkbCBiL1dlYkNvcmUvaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0SG9zdC5pZGwKaW5kZXggZjlhYmFkNy4uZDIyNGQxYSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmlkbAorKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbmplY3RlZFNjcmlwdEhvc3QuaWRsCkBAIC00Myw2ICs0Myw3IEBAIG1vZHVsZSBj b3JlIHsKIAogI2lmIGRlZmluZWQoRU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVIpICYmIEVOQUJM RV9KQVZBU0NSSVBUX0RFQlVHR0VSCiAgICAgICAgIFtDdXN0b21dIERPTU9iamVjdCBjdXJyZW50 Q2FsbEZyYW1lKCk7CisgICAgICAgIFtDdXN0b21dIGJvb2xlYW4gaXNBY3RpdmF0aW9uKGluIERP TU9iamVjdCBvYmplY3QpOwogI2VuZGlmCiAKICNpZiBkZWZpbmVkKEVOQUJMRV9EQVRBQkFTRSkg JiYgRU5BQkxFX0RBVEFCQVNFCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSW5qZWN0ZWRTY3JpcHQuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0 ZWRTY3JpcHQuanMKaW5kZXggMGIzNGI5Yy4uOTM4OTExNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcwpAQCAtMTE4Miw3ICsxMTgyLDcgQEAgSW5q ZWN0ZWRTY3JpcHQuQ2FsbEZyYW1lUHJveHkucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFy IHNjb3BlT2JqZWN0ID0gc2NvcGVDaGFpbltpXTsKICAgICAgICAgICAgIHZhciBzY29wZU9iamVj dFByb3h5ID0gSW5qZWN0ZWRTY3JpcHQuY3JlYXRlUHJveHlPYmplY3Qoc2NvcGVPYmplY3QsIHsg Y2FsbEZyYW1lOiB0aGlzLmlkLCBjaGFpbkluZGV4OiBpIH0sIHRydWUpOwogCi0gICAgICAgICAg ICBpZiAoT2JqZWN0LnByb3RvdHlwZS50b1N0cmluZy5jYWxsKHNjb3BlT2JqZWN0KSA9PT0gIltv YmplY3QgSlNBY3RpdmF0aW9uXSIpIHsKKyAgICAgICAgICAgIGlmIChJbmplY3RlZFNjcmlwdEhv c3QuaXNBY3RpdmF0aW9uKHNjb3BlT2JqZWN0KSkgewogICAgICAgICAgICAgICAgIGlmICghZm91 bmRMb2NhbFNjb3BlKQogICAgICAgICAgICAgICAgICAgICBzY29wZU9iamVjdFByb3h5LnRoaXNP YmplY3QgPSBJbmplY3RlZFNjcmlwdC5jcmVhdGVQcm94eU9iamVjdChjYWxsRnJhbWUudGhpc09i amVjdCwgeyBjYWxsRnJhbWU6IHRoaXMuaWQsIHRoaXNPYmplY3Q6IHRydWUgfSwgdHJ1ZSk7CiAg ICAgICAgICAgICAgICAgZWxzZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9tYW51YWwtdGVzdHMvaW5z cGVjdG9yL2RlYnVnZ2VyLXNjb3Blcy1pbnNwZWN0aW9uLmh0bWwgYi9XZWJDb3JlL21hbnVhbC10 ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItc2NvcGVzLWluc3BlY3Rpb24uaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mMDZiM2U3Ci0tLSAvZGV2L251bGwKKysrIGIvV2Vi Q29yZS9tYW51YWwtdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXNjb3Blcy1pbnNwZWN0aW9uLmh0 bWwKQEAgLTAsMCArMSwzNSBAQAorPHNjcmlwdD4KKwordmFyIG9iaiA9IHsKKyAgb2JqRmllbGQ6 IDMwCit9OworCitmdW5jdGlvbiBoYW5kbGVMb2FkKGUpIHsKKyAgbmV3IEMoKS5tKCk7Cit9CisK K2Z1bmN0aW9uIEMoKSB7CisgIHRoaXMuYSA9IDEwOworICB0aGlzLnRpbWVzdGFtcCA9IERhdGUu bm93KCk7Cit9CisKK0MucHJvdG90eXBlLm0gPSBmdW5jdGlvbigpIHsKKyAgdGhpcy50aW1lc3Rh bXAgPSBEYXRlLm5vdygpOworICB3aXRoIChvYmopIHsKKyAgICBkZWJ1Z2dlcjsKKyAgICBvYmpG aWVsZCsrOworICB9CisgIHZhciBzZWxmID0gdGhpczsKKyAgc2V0VGltZW91dChmdW5jdGlvbigp IHsKKyAgICAgICBzZWxmLm0oKTsKKyAgICAgfSwgMTAwMCk7Cit9OworCisKKzwvc2NyaXB0Pgor PGJvZHkgb25sb2FkPSJoYW5kbGVMb2FkKGV2ZW50KSI+CisKKzxwPlRlc3QgZm9yIDxhIGhyZWY9 Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2MSI+IEJ1ZyAzNDE2 MSAtICBMb2NhbCBzY29wZSBpcyBzaG93biBhcyBXaXRoIHNjb3BlIGluIHNjb3BlIGNoYWluIHBh bmUgPC9hPi48L3A+Cis8cD5UbyB0ZXN0LCBvcGVuIHRoZSBJbnNwZWN0b3IgYW5kIHN0YXJ0IGEg ZGVidWdnaW5nIHNlc3Npb24uIEluIGEgc2Vjb25kIGRlYnVnZ2VyIHdpbGwgcGF1c2UuIFdoaWxl IHBhdXNlZCBsb29rIGF0IHNjb3BlIGNoYWluIHBhbmUuIFRoZXJlIHNob3VsZCBiZSB0aHJlZSBz Y29wZXM6ICdXaXRoIHNjb3BlJyBjb250YWluaW5nIG9iakZpZWxkIHZhcmlhYmxlLCAnTG9jYWwg c2NvcGUnIHdpdGggdGhpcyBhbmQgc2VsZiB2YXJpYWJsZXMgYW5kICdHbG9iYWwgc2NvcGUnLiBB bGwgc2NvcGVzIGJ1dCAnR2xvYmFsJyBzaG91bGQgYmUgZXhwYW5jZWQuICdHbG9iYWwnIHNjb3Bl IHNob3VsZCBiZSBjb2xsYXBzZWQoaXQgdGFrZXMgdG9vIGxvbmcgdG8gZXhwYW5kIERPTVdpbmRv dyBzbyB3ZSBwcmVmZXIgdG8gZG8gaXQgb24gZGVtYW5kKS4gPC9wPgorPC9ib2R5PgorCg== 47539 2010-01-27 08:34:33 -0800 2010-01-28 01:06:28 -0800 patch local-scope2.patch text/plain 4565 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzJhYjc1OC4uMzcyMjNhNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wMS0yNyAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHJlbHlpbmcgb24gT2JqZWN0LnByb3RvdHlw ZS50b1N0cmluZyByZXN1bHQgdXNlIEpTT2JqZWN0Ojppc0FjdGl2YXRpb25PYmplY3QKKyAgICAg ICAgdG8gY2hlY2sgaWYgYSBzY29wZSBub2RlIGlzIGEgSlNBY3RpdmF0aW9uLiBPYmplY3QucHJv dG90eXBlLnRvU3RyaW5nIGZvciBKU0FjdGl2YXRpb24KKyAgICAgICAgd2lsbCBjYWxsIEpTQWN0 aXZhdGlvbjo6dG9UaGlzT2JqZWN0IHdob3NlIHJlc3VsdCBkZXBlbmRzIG9uIHRoZSBjdXJyZW50 IGNhbGwgc3RhY2suCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM0MTYxCisKKyAgICAgICAgVGVzdDogV2ViQ29yZS9tYW51YWwtdGVzdHMvaW5zcGVj dG9yL2RlYnVnZ2VyLXNjb3Blcy1pbnNwZWN0aW9uLmh0bWwKKworICAgICAgICAqIGJpbmRpbmdz L2pzL0pTSW5qZWN0ZWRTY3JpcHRIb3N0Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpT SW5qZWN0ZWRTY3JpcHRIb3N0Ojppc0FjdGl2YXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9J bmplY3RlZFNjcmlwdEhvc3QuaWRsOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSW5q ZWN0ZWRTY3JpcHQuanM6CisgICAgICAgIChpbmplY3RlZFNjcmlwdENvbnN0cnVjdG9yLik6Cisg ICAgICAgICogbWFudWFsLXRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1zY29wZXMtaW5zcGVjdGlv bi5odG1sOiBBZGRlZC4KKwogMjAxMC0wMS0yNyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVz bWFubkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJp c3RpYW5zZW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW5qZWN0ZWRTY3Jp cHRIb3N0Q3VzdG9tLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdEhv c3RDdXN0b20uY3BwCmluZGV4IGE3ODM2YjAuLjljZjliZjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv YmluZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUv YmluZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20uY3BwCkBAIC0xMjYsNiArMTI2 LDE5IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OmN1cnJlbnRDYWxsRnJhbWUoRXhl Y1N0YXRlKiBleGVjLCBjb25zdCBBcmdMaXN0JikKICAgICByZXR1cm4gdG9KUyhleGVjLCBjYWxs RnJhbWUpOwogfQogCitKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0Ojppc0FjdGl2YXRpb24o RXhlY1N0YXRlKiBleGVjLCBjb25zdCBBcmdMaXN0JiBhcmdzKQoreworICAgIGlmIChhcmdzLnNp emUoKSA8IDEpCisgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOworCisgICAgSlNWYWx1ZSB2 YWx1ZSA9IGFyZ3MuYXQoMCk7CisgICAgaWYgKCF2YWx1ZS5pc09iamVjdCgpKQorICAgICAgICBy ZXR1cm4ganNCb29sZWFuKGZhbHNlKTsKKworICAgIEpTT2JqZWN0KiBvYmplY3QgPSB2YWx1ZS50 b09iamVjdChleGVjKTsKKyAgICByZXR1cm4ganNCb29sZWFuKG9iamVjdC0+aXNBY3RpdmF0aW9u T2JqZWN0KCkpOworfQorCiAjZW5kaWYKIAogSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6 bm9kZUZvcklkKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJnTGlzdCYgYXJncykKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5pZGwgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbmplY3RlZFNjcmlwdEhvc3QuaWRsCmluZGV4IGY5YWJhZDcuLmQyMjRkMWEgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5pZGwKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmlkbApAQCAtNDMsNiArNDMsNyBA QCBtb2R1bGUgY29yZSB7CiAKICNpZiBkZWZpbmVkKEVOQUJMRV9KQVZBU0NSSVBUX0RFQlVHR0VS KSAmJiBFTkFCTEVfSkFWQVNDUklQVF9ERUJVR0dFUgogICAgICAgICBbQ3VzdG9tXSBET01PYmpl Y3QgY3VycmVudENhbGxGcmFtZSgpOworICAgICAgICBbQ3VzdG9tXSBib29sZWFuIGlzQWN0aXZh dGlvbihpbiBET01PYmplY3Qgb2JqZWN0KTsKICNlbmRpZgogCiAjaWYgZGVmaW5lZChFTkFCTEVf REFUQUJBU0UpICYmIEVOQUJMRV9EQVRBQkFTRQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0luamVjdGVkU2NyaXB0LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0luamVjdGVkU2NyaXB0LmpzCmluZGV4IDBiMzRiOWMuLjkzODkxMTcgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmplY3RlZFNjcmlwdC5qcworKysgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRTY3JpcHQuanMKQEAgLTExODIsNyArMTE4 Miw3IEBAIEluamVjdGVkU2NyaXB0LkNhbGxGcmFtZVByb3h5LnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHZhciBzY29wZU9iamVjdCA9IHNjb3BlQ2hhaW5baV07CiAgICAgICAgICAgICB2YXIg c2NvcGVPYmplY3RQcm94eSA9IEluamVjdGVkU2NyaXB0LmNyZWF0ZVByb3h5T2JqZWN0KHNjb3Bl T2JqZWN0LCB7IGNhbGxGcmFtZTogdGhpcy5pZCwgY2hhaW5JbmRleDogaSB9LCB0cnVlKTsKIAot ICAgICAgICAgICAgaWYgKE9iamVjdC5wcm90b3R5cGUudG9TdHJpbmcuY2FsbChzY29wZU9iamVj dCkgPT09ICJbb2JqZWN0IEpTQWN0aXZhdGlvbl0iKSB7CisgICAgICAgICAgICBpZiAoSW5qZWN0 ZWRTY3JpcHRIb3N0LmlzQWN0aXZhdGlvbihzY29wZU9iamVjdCkpIHsKICAgICAgICAgICAgICAg ICBpZiAoIWZvdW5kTG9jYWxTY29wZSkKICAgICAgICAgICAgICAgICAgICAgc2NvcGVPYmplY3RQ cm94eS50aGlzT2JqZWN0ID0gSW5qZWN0ZWRTY3JpcHQuY3JlYXRlUHJveHlPYmplY3QoY2FsbEZy YW1lLnRoaXNPYmplY3QsIHsgY2FsbEZyYW1lOiB0aGlzLmlkLCB0aGlzT2JqZWN0OiB0cnVlIH0s IHRydWUpOwogICAgICAgICAgICAgICAgIGVsc2UKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbWFudWFs LXRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1zY29wZXMtaW5zcGVjdGlvbi5odG1sIGIvV2ViQ29y ZS9tYW51YWwtdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXNjb3Blcy1pbnNwZWN0aW9uLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjA2YjNlNwotLS0gL2Rldi9udWxs CisrKyBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1zY29wZXMtaW5z cGVjdGlvbi5odG1sCkBAIC0wLDAgKzEsMzUgQEAKKzxzY3JpcHQ+CisKK3ZhciBvYmogPSB7Cisg IG9iakZpZWxkOiAzMAorfTsKKworZnVuY3Rpb24gaGFuZGxlTG9hZChlKSB7CisgIG5ldyBDKCku bSgpOworfQorCitmdW5jdGlvbiBDKCkgeworICB0aGlzLmEgPSAxMDsKKyAgdGhpcy50aW1lc3Rh bXAgPSBEYXRlLm5vdygpOworfQorCitDLnByb3RvdHlwZS5tID0gZnVuY3Rpb24oKSB7CisgIHRo aXMudGltZXN0YW1wID0gRGF0ZS5ub3coKTsKKyAgd2l0aCAob2JqKSB7CisgICAgZGVidWdnZXI7 CisgICAgb2JqRmllbGQrKzsKKyAgfQorICB2YXIgc2VsZiA9IHRoaXM7CisgIHNldFRpbWVvdXQo ZnVuY3Rpb24oKSB7CisgICAgICAgc2VsZi5tKCk7CisgICAgIH0sIDEwMDApOworfTsKKworCis8 L3NjcmlwdD4KKzxib2R5IG9ubG9hZD0iaGFuZGxlTG9hZChldmVudCkiPgorCis8cD5UZXN0IGZv ciA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQxNjEi PiBCdWcgMzQxNjEgLSAgTG9jYWwgc2NvcGUgaXMgc2hvd24gYXMgV2l0aCBzY29wZSBpbiBzY29w ZSBjaGFpbiBwYW5lIDwvYT4uPC9wPgorPHA+VG8gdGVzdCwgb3BlbiB0aGUgSW5zcGVjdG9yIGFu ZCBzdGFydCBhIGRlYnVnZ2luZyBzZXNzaW9uLiBJbiBhIHNlY29uZCBkZWJ1Z2dlciB3aWxsIHBh dXNlLiBXaGlsZSBwYXVzZWQgbG9vayBhdCBzY29wZSBjaGFpbiBwYW5lLiBUaGVyZSBzaG91bGQg YmUgdGhyZWUgc2NvcGVzOiAnV2l0aCBzY29wZScgY29udGFpbmluZyBvYmpGaWVsZCB2YXJpYWJs ZSwgJ0xvY2FsIHNjb3BlJyB3aXRoIHRoaXMgYW5kIHNlbGYgdmFyaWFibGVzIGFuZCAnR2xvYmFs IHNjb3BlJy4gQWxsIHNjb3BlcyBidXQgJ0dsb2JhbCcgc2hvdWxkIGJlIGV4cGFuY2VkLiAnR2xv YmFsJyBzY29wZSBzaG91bGQgYmUgY29sbGFwc2VkKGl0IHRha2VzIHRvbyBsb25nIHRvIGV4cGFu ZCBET01XaW5kb3cgc28gd2UgcHJlZmVyIHRvIGRvIGl0IG9uIGRlbWFuZCkuIDwvcD4KKzwvYm9k eT4KKwo= 47598 2010-01-28 01:06:16 -0800 2010-01-28 02:46:33 -0800 patch local-scope3.patch text/plain 1557 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjM2ZTk0YS4uNzg5YWFkNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wMS0yOCAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTaW1wbGlmeSBpc0FjdGl2YXRpb24gbWV0aG9kLgorCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2MQorCisgICAg ICAgIFRlc3Q6IFdlYkNvcmUvbWFudWFsLXRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci1zY29wZXMt aW5zcGVjdGlvbi5odG1sCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0luamVjdGVkU2NyaXB0 SG9zdEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0luamVjdGVkU2NyaXB0SG9zdDo6 aXNBY3RpdmF0aW9uKToKKwogMjAxMC0wMS0yNyAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW5qZWN0ZWRTY3JpcHRIb3N0Q3VzdG9tLmNwcCBiL1dlYkNv cmUvYmluZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20uY3BwCmluZGV4IDljZjli ZjAuLmQzOGQ4ZWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbmplY3RlZFNj cmlwdEhvc3RDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbmplY3RlZFNj cmlwdEhvc3RDdXN0b20uY3BwCkBAIC0xMjYsMTcgKzEyNiwxMCBAQCBKU1ZhbHVlIEpTSW5qZWN0 ZWRTY3JpcHRIb3N0OjpjdXJyZW50Q2FsbEZyYW1lKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgQXJn TGlzdCYpCiAgICAgcmV0dXJuIHRvSlMoZXhlYywgY2FsbEZyYW1lKTsKIH0KIAotSlNWYWx1ZSBK U0luamVjdGVkU2NyaXB0SG9zdDo6aXNBY3RpdmF0aW9uKEV4ZWNTdGF0ZSogZXhlYywgY29uc3Qg QXJnTGlzdCYgYXJncykKK0pTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OmlzQWN0aXZhdGlv bihFeGVjU3RhdGUqLCBjb25zdCBBcmdMaXN0JiBhcmdzKQogewotICAgIGlmIChhcmdzLnNpemUo KSA8IDEpCi0gICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwotCi0gICAgSlNWYWx1ZSB2YWx1 ZSA9IGFyZ3MuYXQoMCk7Ci0gICAgaWYgKCF2YWx1ZS5pc09iamVjdCgpKQotICAgICAgICByZXR1 cm4ganNCb29sZWFuKGZhbHNlKTsKLQotICAgIEpTT2JqZWN0KiBvYmplY3QgPSB2YWx1ZS50b09i amVjdChleGVjKTsKLSAgICByZXR1cm4ganNCb29sZWFuKG9iamVjdC0+aXNBY3RpdmF0aW9uT2Jq ZWN0KCkpOworICAgIEpTT2JqZWN0KiBvYmplY3QgPSBhcmdzLmF0KDApLmdldE9iamVjdCgpOwor ICAgIHJldHVybiBqc0Jvb2xlYW4ob2JqZWN0ICYmIG9iamVjdC0+aXNBY3RpdmF0aW9uT2JqZWN0 KCkpOwogfQogCiAjZW5kaWYK