44419 2010-08-23 06:37:47 -0700 WebCore/bridge/jni/v8 does not compile 2010-08-23 14:52:34 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 husky webkit-unassigned barraclough commit-queue steveblock oldest_to_newest 267880 0 husky 2010-08-23 06:37:47 -0700 Some API changes were made to JavaScriptCore/runtime/UString.h in http://trac.webkit.org/changeset/65305. The JSC string implementation (in WebCore/bridge/jni/jsc) was updated, but the v8 string implementation was not updated and no longer compiles. The UTF8String() method needs to be renamed to utf8(). 267883 1 65111 husky 2010-08-23 06:58:13 -0700 Created attachment 65111 Patch to make V8 strings compile 267887 2 65111 steveblock 2010-08-23 07:09:04 -0700 Comment on attachment 65111 Patch to make V8 strings compile If you'd like the patch to be reviewed, you should set the r? flag. This will make the patch show up in the review queue and trigger the EWS bots. As a non-committer, you probably want to set cq? too, to request the reviewer to add the patch to the commit-queue once reviewed. 267897 3 65111 steveblock 2010-08-23 07:30:44 -0700 Comment on attachment 65111 Patch to make V8 strings compile WebCore/ChangeLog:5 + Make V8 string wrappers compatible with JavaScriptCore/runtime/UString.h I think this title is a little confusing. We're fixing the JNI bridge for V8. The problem is that the declaration of JavaString has been changed but the V8 implementation was not updated. Maybe 'Update JNI bridge for V8 after renaming of JavaString::utf8()' 267904 4 65118 husky 2010-08-23 07:43:26 -0700 Created attachment 65118 Patch to make V8 strings compile Modified ChangeLog per steveblock's comment 267906 5 65118 steveblock 2010-08-23 07:46:26 -0700 Comment on attachment 65118 Patch to make V8 strings compile r=me 268112 6 65118 commit-queue 2010-08-23 14:52:29 -0700 Comment on attachment 65118 Patch to make V8 strings compile Clearing flags on attachment: 65118 Committed r65833: <http://trac.webkit.org/changeset/65833> 268113 7 commit-queue 2010-08-23 14:52:34 -0700 All reviewed patches have been landed. Closing bug. 65111 2010-08-23 06:58:13 -0700 2010-08-23 07:43:26 -0700 Patch to make V8 strings compile v8_string_patch.txt text/plain 4846 husky SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTgwNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDgtMjMgIElhaW4gTWVycmljayAgPGh1c2t5QGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFr ZSBWOCBzdHJpbmcgd3JhcHBlcnMgY29tcGF0aWJsZSB3aXRoIEphdmFTY3JpcHRDb3JlL3J1bnRp bWUvVVN0cmluZy5oCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NDQxOQorCisgICAgICAgIFRoaXMgZml4ZXMgdGhlIGJ1aWxkIG9uIEFuZHJvaWQuIE5v IG5ldyBmdW5jdGlvbmFsaXR5LCBzbyBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBicmlkZ2Uv am5pL3Y4L0pOSUJyaWRnZVY4LmNwcDoKKyAgICAgICAgKEphdmFGaWVsZDo6SmF2YUZpZWxkKToK KyAgICAgICAgKiBicmlkZ2Uvam5pL3Y4L0pOSUJyaWRnZVY4Lmg6CisgICAgICAgIChKU0M6OkJp bmRpbmdzOjpKYXZhRmllbGQ6OnR5cGUpOgorICAgICAgICAqIGJyaWRnZS9qbmkvdjgvSmF2YUNs YXNzVjguY3BwOgorICAgICAgICAoSmF2YUNsYXNzOjpKYXZhQ2xhc3MpOgorICAgICAgICAqIGJy aWRnZS9qbmkvdjgvSmF2YU5QT2JqZWN0VjguY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6 SmF2YU5QT2JqZWN0R2V0UHJvcGVydHkpOgorICAgICAgICAqIGJyaWRnZS9qbmkvdjgvSmF2YVN0 cmluZ1Y4Lmg6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpKYXZhU3RyaW5nSW1wbDo6dXRmOCk6 CisKIDIwMTAtMDgtMTkgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgU3RldmUgQmxvY2suCkluZGV4OiBXZWJDb3JlL2JyaWRnZS9qbmkv djgvSk5JQnJpZGdlVjguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL2puaS92OC9K TklCcmlkZ2VWOC5jcHAJKHJldmlzaW9uIDY1ODA2KQorKysgV2ViQ29yZS9icmlkZ2Uvam5pL3Y4 L0pOSUJyaWRnZVY4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQsNyArMzQsNyBAQCBKYXZhRmll bGQ6OkphdmFGaWVsZChKTklFbnYqIGVudiwgam9iamVjCiAgICAgam9iamVjdCBmaWVsZFR5cGUg PSBjYWxsSk5JTWV0aG9kPGpvYmplY3Q+KGFGaWVsZCwgImdldFR5cGUiLCAiKClMamF2YS9sYW5n L0NsYXNzOyIpOwogICAgIGpzdHJpbmcgZmllbGRUeXBlTmFtZSA9IHN0YXRpY19jYXN0PGpzdHJp bmc+KGNhbGxKTklNZXRob2Q8am9iamVjdD4oZmllbGRUeXBlLCAiZ2V0TmFtZSIsICIoKUxqYXZh L2xhbmcvU3RyaW5nOyIpKTsKICAgICBtX3R5cGUgPSBKYXZhU3RyaW5nKGVudiwgZmllbGRUeXBl TmFtZSk7Ci0gICAgbV9KTklUeXBlID0gSk5JVHlwZUZyb21DbGFzc05hbWUobV90eXBlLlVURjhT dHJpbmcoKSk7CisgICAgbV9KTklUeXBlID0gSk5JVHlwZUZyb21DbGFzc05hbWUobV90eXBlLnV0 ZjgoKSk7CiAKICAgICAvLyBHZXQgZmllbGQgbmFtZQogICAgIGpzdHJpbmcgZmllbGROYW1lID0g c3RhdGljX2Nhc3Q8anN0cmluZz4oY2FsbEpOSU1ldGhvZDxqb2JqZWN0PihhRmllbGQsICJnZXRO YW1lIiwgIigpTGphdmEvbGFuZy9TdHJpbmc7IikpOwpJbmRleDogV2ViQ29yZS9icmlkZ2Uvam5p L3Y4L0pOSUJyaWRnZVY4LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0pO SUJyaWRnZVY4LmgJKHJldmlzaW9uIDY1ODA2KQorKysgV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0pO SUJyaWRnZVY4LmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDcgKzM4LDcgQEAgcHVibGljOgogICAg IEphdmFGaWVsZChKTklFbnYqLCBqb2JqZWN0IGFGaWVsZCk7CiAKICAgICBjb25zdCBKYXZhU3Ry aW5nJiBuYW1lKCkgY29uc3QgeyByZXR1cm4gbV9uYW1lOyB9Ci0gICAgY29uc3QgY2hhciogdHlw ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZS5VVEY4U3RyaW5nKCk7IH0KKyAgICBjb25zdCBjaGFy KiB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlLnV0ZjgoKTsgfQogCiAgICAgSk5JVHlwZSBn ZXRKTklUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9KTklUeXBlOyB9CiAKSW5kZXg6IFdlYkNvcmUv YnJpZGdlL2puaS92OC9KYXZhQ2xhc3NWOC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlk Z2Uvam5pL3Y4L0phdmFDbGFzc1Y4LmNwcAkocmV2aXNpb24gNjU4MDYpCisrKyBXZWJDb3JlL2Jy aWRnZS9qbmkvdjgvSmF2YUNsYXNzVjguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Myw3ICs1Myw3 IEBAIEphdmFDbGFzczo6SmF2YUNsYXNzKGpvYmplY3QgYW5JbnN0YW5jZSkKICAgICAgICAgam9i amVjdCBhSkZpZWxkID0gZW52LT5HZXRPYmplY3RBcnJheUVsZW1lbnQoc3RhdGljX2Nhc3Q8am9i amVjdEFycmF5PihmaWVsZHMpLCBpKTsKICAgICAgICAgSmF2YUZpZWxkKiBhRmllbGQgPSBuZXcg SmF2YUZpZWxkKGVudiwgYUpGaWVsZCk7IC8vIGRlbGV0ZWQgaW4gdGhlIEphdmFDbGFzcyBkZXN0 cnVjdG9yCiAgICAgICAgIHsKLSAgICAgICAgICAgIG1fZmllbGRzLnNldChhRmllbGQtPm5hbWUo KS5VVEY4U3RyaW5nKCksIGFGaWVsZCk7CisgICAgICAgICAgICBtX2ZpZWxkcy5zZXQoYUZpZWxk LT5uYW1lKCkudXRmOCgpLCBhRmllbGQpOwogICAgICAgICB9CiAgICAgICAgIGVudi0+RGVsZXRl TG9jYWxSZWYoYUpGaWVsZCk7CiAgICAgfQpAQCAtNjYsMTAgKzY2LDEwIEBAIEphdmFDbGFzczo6 SmF2YUNsYXNzKGpvYmplY3QgYW5JbnN0YW5jZSkKICAgICAgICAgSmF2YU1ldGhvZCogYU1ldGhv ZCA9IG5ldyBKYXZhTWV0aG9kKGVudiwgYUpNZXRob2QpOyAvLyBkZWxldGVkIGluIHRoZSBKYXZh Q2xhc3MgZGVzdHJ1Y3RvcgogICAgICAgICBNZXRob2RMaXN0KiBtZXRob2RMaXN0OwogICAgICAg ICB7Ci0gICAgICAgICAgICBtZXRob2RMaXN0ID0gbV9tZXRob2RzLmdldChhTWV0aG9kLT5uYW1l KCkuVVRGOFN0cmluZygpKTsKKyAgICAgICAgICAgIG1ldGhvZExpc3QgPSBtX21ldGhvZHMuZ2V0 KGFNZXRob2QtPm5hbWUoKS51dGY4KCkpOwogICAgICAgICAgICAgaWYgKCFtZXRob2RMaXN0KSB7 CiAgICAgICAgICAgICAgICAgbWV0aG9kTGlzdCA9IG5ldyBNZXRob2RMaXN0KCk7Ci0gICAgICAg ICAgICAgICAgbV9tZXRob2RzLnNldChhTWV0aG9kLT5uYW1lKCkuVVRGOFN0cmluZygpLCBtZXRo b2RMaXN0KTsKKyAgICAgICAgICAgICAgICBtX21ldGhvZHMuc2V0KGFNZXRob2QtPm5hbWUoKS51 dGY4KCksIG1ldGhvZExpc3QpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIG1l dGhvZExpc3QtPmFwcGVuZChhTWV0aG9kKTsKSW5kZXg6IFdlYkNvcmUvYnJpZGdlL2puaS92OC9K YXZhTlBPYmplY3RWOC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0ph dmFOUE9iamVjdFY4LmNwcAkocmV2aXNpb24gNjU4MDYpCisrKyBXZWJDb3JlL2JyaWRnZS9qbmkv djgvSmF2YU5QT2JqZWN0VjguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTUsNyArMTU1LDcgQEAg Ym9vbCBKYXZhTlBPYmplY3RHZXRQcm9wZXJ0eShOUE9iamVjdCogbwogCiAgICAganZhbHVlIHZh bHVlID0gZ2V0Sk5JRmllbGQoaW5zdGFuY2UtPmphdmFJbnN0YW5jZSgpLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGZpZWxkLT5nZXRKTklUeXBlKCksCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZmllbGQtPm5hbWUoKS5VVEY4U3RyaW5nKCksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZmllbGQtPm5hbWUoKS51dGY4KCksCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZmllbGQtPnR5cGUoKSk7CiAKICAgICBjb252ZXJ0SlZhbHVlVG9OUFZh cmlhbnQodmFsdWUsIGZpZWxkLT5nZXRKTklUeXBlKCksIGZpZWxkLT50eXBlKCksIHJlc3VsdCk7 CkluZGV4OiBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YVN0cmluZ1Y4LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0phdmFTdHJpbmdWOC5oCShyZXZpc2lvbiA2NTgwNikK KysrIFdlYkNvcmUvYnJpZGdlL2puaS92OC9KYXZhU3RyaW5nVjguaAkod29ya2luZyBjb3B5KQpA QCAtNDYsNyArNDYsNyBAQCBwdWJsaWM6CiAgICAgICAgIHJlbGVhc2VDaGFyYWN0ZXJzRm9ySlN0 cmluZ0luRW52KGUsIHMsIGNzKTsKICAgICB9CiAKLSAgICBjb25zdCBjaGFyKiBVVEY4U3RyaW5n KCkgY29uc3QgeyByZXR1cm4gbV91dGY4U3RyaW5nLmRhdGEoKTsgfQorICAgIGNvbnN0IGNoYXIq IHV0ZjgoKSBjb25zdCB7IHJldHVybiBtX3V0ZjhTdHJpbmcuZGF0YSgpOyB9CiAgICAgY29uc3Qg amNoYXIqIHVjaGFycygpIGNvbnN0IHsgcmV0dXJuIDA7IH0gLy8gTm90IGltcGxlbWVudGVkCiAg ICAgaW50IGxlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIG1fdXRmOFN0cmluZy5sZW5ndGgoKTsgfQog Cg== 65118 2010-08-23 07:43:26 -0700 2010-08-23 14:52:29 -0700 Patch to make V8 strings compile v8_string_patch2.txt text/plain 4836 husky SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTgwNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDgtMjMgIElhaW4gTWVycmljayAgPGh1c2t5QGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBk YXRlIEpOSSBicmlkZ2UgZm9yIFY4IGFmdGVyIHJlbmFtaW5nIG9mIEphdmFTdHJpbmc6OnV0Zjgo KS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NDE5 CisKKyAgICAgICAgVGhpcyBmaXhlcyB0aGUgYnVpbGQgb24gQW5kcm9pZC4gTm8gbmV3IGZ1bmN0 aW9uYWxpdHksIHNvIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIGJyaWRnZS9qbmkvdjgvSk5J QnJpZGdlVjguY3BwOgorICAgICAgICAoSmF2YUZpZWxkOjpKYXZhRmllbGQpOgorICAgICAgICAq IGJyaWRnZS9qbmkvdjgvSk5JQnJpZGdlVjguaDoKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6Okph dmFGaWVsZDo6dHlwZSk6CisgICAgICAgICogYnJpZGdlL2puaS92OC9KYXZhQ2xhc3NWOC5jcHA6 CisgICAgICAgIChKYXZhQ2xhc3M6OkphdmFDbGFzcyk6CisgICAgICAgICogYnJpZGdlL2puaS92 OC9KYXZhTlBPYmplY3RWOC5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpKYXZhTlBPYmpl Y3RHZXRQcm9wZXJ0eSk6CisgICAgICAgICogYnJpZGdlL2puaS92OC9KYXZhU3RyaW5nVjguaDoK KyAgICAgICAgKEpTQzo6QmluZGluZ3M6OkphdmFTdHJpbmdJbXBsOjp1dGY4KToKKwogMjAxMC0w OC0xOSAgSmVyZW15IE9ybG93ICA8am9ybG93QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBTdGV2ZSBCbG9jay4KSW5kZXg6IFdlYkNvcmUvYnJpZGdlL2puaS92OC9KTklCcmlk Z2VWOC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0pOSUJyaWRnZVY4 LmNwcAkocmV2aXNpb24gNjU4MDYpCisrKyBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JQnJpZGdl VjguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw3ICszNCw3IEBAIEphdmFGaWVsZDo6SmF2YUZp ZWxkKEpOSUVudiogZW52LCBqb2JqZWMKICAgICBqb2JqZWN0IGZpZWxkVHlwZSA9IGNhbGxKTklN ZXRob2Q8am9iamVjdD4oYUZpZWxkLCAiZ2V0VHlwZSIsICIoKUxqYXZhL2xhbmcvQ2xhc3M7Iik7 CiAgICAganN0cmluZyBmaWVsZFR5cGVOYW1lID0gc3RhdGljX2Nhc3Q8anN0cmluZz4oY2FsbEpO SU1ldGhvZDxqb2JqZWN0PihmaWVsZFR5cGUsICJnZXROYW1lIiwgIigpTGphdmEvbGFuZy9TdHJp bmc7IikpOwogICAgIG1fdHlwZSA9IEphdmFTdHJpbmcoZW52LCBmaWVsZFR5cGVOYW1lKTsKLSAg ICBtX0pOSVR5cGUgPSBKTklUeXBlRnJvbUNsYXNzTmFtZShtX3R5cGUuVVRGOFN0cmluZygpKTsK KyAgICBtX0pOSVR5cGUgPSBKTklUeXBlRnJvbUNsYXNzTmFtZShtX3R5cGUudXRmOCgpKTsKIAog ICAgIC8vIEdldCBmaWVsZCBuYW1lCiAgICAganN0cmluZyBmaWVsZE5hbWUgPSBzdGF0aWNfY2Fz dDxqc3RyaW5nPihjYWxsSk5JTWV0aG9kPGpvYmplY3Q+KGFGaWVsZCwgImdldE5hbWUiLCAiKClM amF2YS9sYW5nL1N0cmluZzsiKSk7CkluZGV4OiBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JQnJp ZGdlVjguaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JQnJpZGdlVjgu aAkocmV2aXNpb24gNjU4MDYpCisrKyBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JQnJpZGdlVjgu aAkod29ya2luZyBjb3B5KQpAQCAtMzgsNyArMzgsNyBAQCBwdWJsaWM6CiAgICAgSmF2YUZpZWxk KEpOSUVudiosIGpvYmplY3QgYUZpZWxkKTsKIAogICAgIGNvbnN0IEphdmFTdHJpbmcmIG5hbWUo KSBjb25zdCB7IHJldHVybiBtX25hbWU7IH0KLSAgICBjb25zdCBjaGFyKiB0eXBlKCkgY29uc3Qg eyByZXR1cm4gbV90eXBlLlVURjhTdHJpbmcoKTsgfQorICAgIGNvbnN0IGNoYXIqIHR5cGUoKSBj b25zdCB7IHJldHVybiBtX3R5cGUudXRmOCgpOyB9CiAKICAgICBKTklUeXBlIGdldEpOSVR5cGUo KSBjb25zdCB7IHJldHVybiBtX0pOSVR5cGU7IH0KIApJbmRleDogV2ViQ29yZS9icmlkZ2Uvam5p L3Y4L0phdmFDbGFzc1Y4LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS9qbmkvdjgv SmF2YUNsYXNzVjguY3BwCShyZXZpc2lvbiA2NTgwNikKKysrIFdlYkNvcmUvYnJpZGdlL2puaS92 OC9KYXZhQ2xhc3NWOC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUzLDcgKzUzLDcgQEAgSmF2YUNs YXNzOjpKYXZhQ2xhc3Moam9iamVjdCBhbkluc3RhbmNlKQogICAgICAgICBqb2JqZWN0IGFKRmll bGQgPSBlbnYtPkdldE9iamVjdEFycmF5RWxlbWVudChzdGF0aWNfY2FzdDxqb2JqZWN0QXJyYXk+ KGZpZWxkcyksIGkpOwogICAgICAgICBKYXZhRmllbGQqIGFGaWVsZCA9IG5ldyBKYXZhRmllbGQo ZW52LCBhSkZpZWxkKTsgLy8gZGVsZXRlZCBpbiB0aGUgSmF2YUNsYXNzIGRlc3RydWN0b3IKICAg ICAgICAgewotICAgICAgICAgICAgbV9maWVsZHMuc2V0KGFGaWVsZC0+bmFtZSgpLlVURjhTdHJp bmcoKSwgYUZpZWxkKTsKKyAgICAgICAgICAgIG1fZmllbGRzLnNldChhRmllbGQtPm5hbWUoKS51 dGY4KCksIGFGaWVsZCk7CiAgICAgICAgIH0KICAgICAgICAgZW52LT5EZWxldGVMb2NhbFJlZihh SkZpZWxkKTsKICAgICB9CkBAIC02NiwxMCArNjYsMTAgQEAgSmF2YUNsYXNzOjpKYXZhQ2xhc3Mo am9iamVjdCBhbkluc3RhbmNlKQogICAgICAgICBKYXZhTWV0aG9kKiBhTWV0aG9kID0gbmV3IEph dmFNZXRob2QoZW52LCBhSk1ldGhvZCk7IC8vIGRlbGV0ZWQgaW4gdGhlIEphdmFDbGFzcyBkZXN0 cnVjdG9yCiAgICAgICAgIE1ldGhvZExpc3QqIG1ldGhvZExpc3Q7CiAgICAgICAgIHsKLSAgICAg ICAgICAgIG1ldGhvZExpc3QgPSBtX21ldGhvZHMuZ2V0KGFNZXRob2QtPm5hbWUoKS5VVEY4U3Ry aW5nKCkpOworICAgICAgICAgICAgbWV0aG9kTGlzdCA9IG1fbWV0aG9kcy5nZXQoYU1ldGhvZC0+ bmFtZSgpLnV0ZjgoKSk7CiAgICAgICAgICAgICBpZiAoIW1ldGhvZExpc3QpIHsKICAgICAgICAg ICAgICAgICBtZXRob2RMaXN0ID0gbmV3IE1ldGhvZExpc3QoKTsKLSAgICAgICAgICAgICAgICBt X21ldGhvZHMuc2V0KGFNZXRob2QtPm5hbWUoKS5VVEY4U3RyaW5nKCksIG1ldGhvZExpc3QpOwor ICAgICAgICAgICAgICAgIG1fbWV0aG9kcy5zZXQoYU1ldGhvZC0+bmFtZSgpLnV0ZjgoKSwgbWV0 aG9kTGlzdCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgbWV0aG9kTGlzdC0+ YXBwZW5kKGFNZXRob2QpOwpJbmRleDogV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0phdmFOUE9iamVj dFY4LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YU5QT2JqZWN0 VjguY3BwCShyZXZpc2lvbiA2NTgwNikKKysrIFdlYkNvcmUvYnJpZGdlL2puaS92OC9KYXZhTlBP YmplY3RWOC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1NSw3ICsxNTUsNyBAQCBib29sIEphdmFO UE9iamVjdEdldFByb3BlcnR5KE5QT2JqZWN0KiBvCiAKICAgICBqdmFsdWUgdmFsdWUgPSBnZXRK TklGaWVsZChpbnN0YW5jZS0+amF2YUluc3RhbmNlKCksCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZmllbGQtPmdldEpOSVR5cGUoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBmaWVsZC0+bmFtZSgpLlVURjhTdHJpbmcoKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBmaWVsZC0+bmFtZSgpLnV0ZjgoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBmaWVsZC0+dHlwZSgpKTsKIAogICAgIGNvbnZlcnRKVmFsdWVUb05QVmFyaWFudCh2YWx1 ZSwgZmllbGQtPmdldEpOSVR5cGUoKSwgZmllbGQtPnR5cGUoKSwgcmVzdWx0KTsKSW5kZXg6IFdl YkNvcmUvYnJpZGdlL2puaS92OC9KYXZhU3RyaW5nVjguaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2JyaWRnZS9qbmkvdjgvSmF2YVN0cmluZ1Y4LmgJKHJldmlzaW9uIDY1ODA2KQorKysgV2ViQ29y ZS9icmlkZ2Uvam5pL3Y4L0phdmFTdHJpbmdWOC5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0 Niw3IEBAIHB1YmxpYzoKICAgICAgICAgcmVsZWFzZUNoYXJhY3RlcnNGb3JKU3RyaW5nSW5FbnYo ZSwgcywgY3MpOwogICAgIH0KIAotICAgIGNvbnN0IGNoYXIqIFVURjhTdHJpbmcoKSBjb25zdCB7 IHJldHVybiBtX3V0ZjhTdHJpbmcuZGF0YSgpOyB9CisgICAgY29uc3QgY2hhciogdXRmOCgpIGNv bnN0IHsgcmV0dXJuIG1fdXRmOFN0cmluZy5kYXRhKCk7IH0KICAgICBjb25zdCBqY2hhciogdWNo YXJzKCkgY29uc3QgeyByZXR1cm4gMDsgfSAvLyBOb3QgaW1wbGVtZW50ZWQKICAgICBpbnQgbGVu Z3RoKCkgY29uc3QgeyByZXR1cm4gbV91dGY4U3RyaW5nLmxlbmd0aCgpOyB9CiAK