35519 2010-03-01 03:37:45 -0800 Revert database thread changes that are no longer required 2010-03-02 14:21:48 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jorlow webkit-unassigned commit-queue dimich jochen levin oldest_to_newest 194666 0 jorlow 2010-03-01 03:37:45 -0800 Revert database thread changes that are no longer required 194668 1 49718 jorlow 2010-03-01 03:40:05 -0800 Created attachment 49718 Patch 194669 2 jorlow 2010-03-01 03:41:12 -0800 Jochen, please take a look over this to make sure it seems correct. 194705 3 jorlow 2010-03-01 07:52:40 -0800 Oops...mixed up who made the suggestion. 194706 4 49725 jorlow 2010-03-01 07:52:51 -0800 Created attachment 49725 Patch 194708 5 jochen 2010-03-01 08:05:05 -0800 lgtm 195234 6 49725 commit-queue 2010-03-02 14:21:43 -0800 Comment on attachment 49725 Patch Clearing flags on attachment: 49725 Committed r55429: <http://trac.webkit.org/changeset/55429> 195235 7 commit-queue 2010-03-02 14:21:48 -0800 All reviewed patches have been landed. Closing bug. 49718 2010-03-01 03:40:05 -0800 2010-03-01 07:52:46 -0800 Patch bug-35519-20100301114003.patch text/plain 10316 jorlow SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU1MzY1KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTAtMDMtMDEgIEplcmVteSBP cmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmV2ZXJ0IGRhdGFiYXNlIHRocmVhZCBjaGFuZ2VzIHRoYXQg YXJlIG5vIGxvbmdlciByZXF1aXJlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzU1MTkKKworICAgICAgICBKb2NoZW4gRWlzaW5nZXIgY3JlYXRlZCA1 NTIxNCBhbmQgNTUyNDcgdG8gdHJhY2sgd2hpY2ggZGF0YWJhc2UKKyAgICAgICAgb3ducyB3aGlj aCB0aHJlYWQuICBEYXZlIExldmluIHN1Z2dlc3RlZCB0aGF0IHRoaXMgY291bGQgYWxzbworICAg ICAgICBiZSBkb25lIHZpYSBUTFMsIHRob3VnaC4gIEFmdGVyIGV4cGxvcmluZyB0aGUgb3B0aW9u cywgSm9jaGVuCisgICAgICAgIGNob3NlIHRvIGdvIHRoZSBUTFMgcm91dGUsIHNvIHRoZXNlIHBh dGNoZXMgYXJlIG5vIGxvbmdlciBuZWVkZWQuCisKKyAgICAgICAgKiB3dGYvVGhyZWFkaW5nLmg6 CisgICAgICAgICogd3RmL1RocmVhZGluZ05vbmUuY3BwOgorICAgICAgICAoV1RGOjppc01haW5U aHJlYWQpOgorICAgICAgICAqIHd0Zi9UaHJlYWRpbmdQdGhyZWFkcy5jcHA6CisgICAgICAgIChX VEY6OmlkZW50aWZpZXJCeVB0aHJlYWRIYW5kbGUpOgorICAgICAgICAoV1RGOjplc3RhYmxpc2hJ ZGVudGlmaWVyRm9yUHRocmVhZEhhbmRsZSk6CisgICAgICAgIChXVEY6OnB0aHJlYWRIYW5kbGVG b3JJZGVudGlmaWVyKToKKyAgICAgICAgKFdURjo6Y3JlYXRlVGhyZWFkSW50ZXJuYWwpOgorICAg ICAgICAoV1RGOjpjdXJyZW50VGhyZWFkKToKKyAgICAgICAgKiB3dGYvVGhyZWFkaW5nV2luLmNw cDoKKyAgICAgICAgKFdURjo6dGhyZWFkTWFwKToKKyAgICAgICAgKFdURjo6c3RvcmVUaHJlYWRI YW5kbGVCeUlkZW50aWZpZXIpOgorICAgICAgICAoV1RGOjp0aHJlYWRIYW5kbGVGb3JJZGVudGlm aWVyKToKKyAgICAgICAgKFdURjo6Y3JlYXRlVGhyZWFkSW50ZXJuYWwpOgorCiAyMDEwLTAyLTI2 ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBS dWJiZXIgU3RhbXBlZCBieSBHZW9mZiBHYXJlbi4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9U aHJlYWRpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nLmgJ KHJldmlzaW9uIDU1MzY1KQorKysgSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMjcsNyArMTI3LDYgQEAgVGhyZWFkSWRlbnRpZmllciBjdXJyZW50VGhy ZWFkKCk7CiBib29sIGlzTWFpblRocmVhZCgpOwogaW50IHdhaXRGb3JUaHJlYWRDb21wbGV0aW9u KFRocmVhZElkZW50aWZpZXIsIHZvaWQqKik7CiB2b2lkIGRldGFjaFRocmVhZChUaHJlYWRJZGVu dGlmaWVyKTsKLXZvaWQqIHRocmVhZENvbnRleHQoVGhyZWFkSWRlbnRpZmllcik7CiAKICNpZiBV U0UoUFRIUkVBRFMpCiB0eXBlZGVmIHB0aHJlYWRfbXV0ZXhfdCBQbGF0Zm9ybU11dGV4OwpJbmRl eDogSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ05vbmUuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEph dmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdOb25lLmNwcAkocmV2aXNpb24gNTUzNjUpCisrKyBK YXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nTm9uZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQx LDcgKzQxLDYgQEAgaW50IHdhaXRGb3JUaHJlYWRDb21wbGV0aW9uKFRocmVhZElkZW50aQogdm9p ZCBkZXRhY2hUaHJlYWQoVGhyZWFkSWRlbnRpZmllcikgeyB9CiBUaHJlYWRJZGVudGlmaWVyIGN1 cnJlbnRUaHJlYWQoKSB7IHJldHVybiBUaHJlYWRJZGVudGlmaWVyKCk7IH0KIGJvb2wgaXNNYWlu VGhyZWFkKCkgeyByZXR1cm4gdHJ1ZTsgfQotdm9pZCogdGhyZWFkQ29udGV4dChUaHJlYWRJZGVu dGlmaWVyKSB7IHJldHVybiAwOyB9CiAKIE11dGV4OjpNdXRleCgpIHsgfQogTXV0ZXg6On5NdXRl eCgpIHsgfQpJbmRleDogSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1B0aHJlYWRzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nUHRocmVhZHMuY3BwCShy ZXZpc2lvbiA1NTM2NSkKKysrIEphdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdQdGhyZWFkcy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTUzLDEyICs1Myw3IEBACiAKIG5hbWVzcGFjZSBXVEYgewog Ci10eXBlZGVmIHN0cnVjdCB7Ci0gICAgcHRocmVhZF90IGhhbmRsZTsKLSAgICB2b2lkKiBjb250 ZXh0OwotfSBUaHJlYWRJbmZvOwotCi10eXBlZGVmIEhhc2hNYXA8VGhyZWFkSWRlbnRpZmllciwg VGhyZWFkSW5mbz4gVGhyZWFkTWFwOwordHlwZWRlZiBIYXNoTWFwPFRocmVhZElkZW50aWZpZXIs IHB0aHJlYWRfdD4gVGhyZWFkTWFwOwogCiBzdGF0aWMgTXV0ZXgqIGF0b21pY2FsbHlJbml0aWFs aXplZFN0YXRpY011dGV4OwogCkBAIC0xMTAsMTQgKzEwNSwxNCBAQCBzdGF0aWMgVGhyZWFkSWRl bnRpZmllciBpZGVudGlmaWVyQnlQdGhyCiAKICAgICBUaHJlYWRNYXA6Oml0ZXJhdG9yIGkgPSB0 aHJlYWRNYXAoKS5iZWdpbigpOwogICAgIGZvciAoOyBpICE9IHRocmVhZE1hcCgpLmVuZCgpOyAr K2kpIHsKLSAgICAgICAgaWYgKHB0aHJlYWRfZXF1YWwoaS0+c2Vjb25kLmhhbmRsZSwgcHRocmVh ZEhhbmRsZSkpCisgICAgICAgIGlmIChwdGhyZWFkX2VxdWFsKGktPnNlY29uZCwgcHRocmVhZEhh bmRsZSkpCiAgICAgICAgICAgICByZXR1cm4gaS0+Zmlyc3Q7CiAgICAgfQogCiAgICAgcmV0dXJu IDA7CiB9CiAKLXN0YXRpYyBUaHJlYWRJZGVudGlmaWVyIGVzdGFibGlzaElkZW50aWZpZXJGb3JQ dGhyZWFkSGFuZGxlKGNvbnN0IHB0aHJlYWRfdCYgcHRocmVhZEhhbmRsZSwgdm9pZCogY29udGV4 dCkKK3N0YXRpYyBUaHJlYWRJZGVudGlmaWVyIGVzdGFibGlzaElkZW50aWZpZXJGb3JQdGhyZWFk SGFuZGxlKGNvbnN0IHB0aHJlYWRfdCYgcHRocmVhZEhhbmRsZSkKIHsKICAgICBBU1NFUlQoIWlk ZW50aWZpZXJCeVB0aHJlYWRIYW5kbGUocHRocmVhZEhhbmRsZSkpOwogCkBAIC0xMjUsMTAgKzEy MCw3IEBAIHN0YXRpYyBUaHJlYWRJZGVudGlmaWVyIGVzdGFibGlzaElkZW50aWYKIAogICAgIHN0 YXRpYyBUaHJlYWRJZGVudGlmaWVyIGlkZW50aWZpZXJDb3VudCA9IDE7CiAKLSAgICBUaHJlYWRJ bmZvIGluZm87Ci0gICAgaW5mby5oYW5kbGUgPSBwdGhyZWFkSGFuZGxlOwotICAgIGluZm8uY29u dGV4dCA9IGNvbnRleHQ7Ci0gICAgdGhyZWFkTWFwKCkuYWRkKGlkZW50aWZpZXJDb3VudCwgaW5m byk7CisgICAgdGhyZWFkTWFwKCkuYWRkKGlkZW50aWZpZXJDb3VudCwgcHRocmVhZEhhbmRsZSk7 CiAKICAgICByZXR1cm4gaWRlbnRpZmllckNvdW50Kys7CiB9CkBAIC0xMzcsMTcgKzEyOSw5IEBA IHN0YXRpYyBwdGhyZWFkX3QgcHRocmVhZEhhbmRsZUZvcklkZW50aWYKIHsKICAgICBNdXRleExv Y2tlciBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7CiAKLSAgICByZXR1cm4gdGhyZWFkTWFwKCku Z2V0KGlkKS5oYW5kbGU7Ci19Ci0KLXN0YXRpYyB2b2lkKiBjb250ZXh0Rm9ySWRlbnRpZmllcihU aHJlYWRJZGVudGlmaWVyIGlkKQotewotICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBN dXRleCgpKTsKLQotICAgIHJldHVybiB0aHJlYWRNYXAoKS5nZXQoaWQpLmNvbnRleHQ7CisgICAg cmV0dXJuIHRocmVhZE1hcCgpLmdldChpZCk7CiB9CiAKLQogdm9pZCBjbGVhclB0aHJlYWRIYW5k bGVGb3JJZGVudGlmaWVyKFRocmVhZElkZW50aWZpZXIgaWQpCiB7CiAgICAgTXV0ZXhMb2NrZXIg bG9ja2VyKHRocmVhZE1hcE11dGV4KCkpOwpAQCAtMTkwLDcgKzE3NCw3IEBAIFRocmVhZElkZW50 aWZpZXIgY3JlYXRlVGhyZWFkSW50ZXJuYWwoVGgKICAgICAgICAgZGVsZXRlIHRocmVhZERhdGE7 CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KLSAgICByZXR1cm4gZXN0YWJsaXNoSWRlbnRpZmll ckZvclB0aHJlYWRIYW5kbGUodGhyZWFkSGFuZGxlLCBkYXRhKTsKKyAgICByZXR1cm4gZXN0YWJs aXNoSWRlbnRpZmllckZvclB0aHJlYWRIYW5kbGUodGhyZWFkSGFuZGxlKTsKIH0KICNlbHNlCiBU aHJlYWRJZGVudGlmaWVyIGNyZWF0ZVRocmVhZEludGVybmFsKFRocmVhZEZ1bmN0aW9uIGVudHJ5 UG9pbnQsIHZvaWQqIGRhdGEsIGNvbnN0IGNoYXIqKQpAQCAtMjAxLDcgKzE4NSw3IEBAIFRocmVh ZElkZW50aWZpZXIgY3JlYXRlVGhyZWFkSW50ZXJuYWwoVGgKICAgICAgICAgcmV0dXJuIDA7CiAg ICAgfQogCi0gICAgcmV0dXJuIGVzdGFibGlzaElkZW50aWZpZXJGb3JQdGhyZWFkSGFuZGxlKHRo cmVhZEhhbmRsZSwgZGF0YSk7CisgICAgcmV0dXJuIGVzdGFibGlzaElkZW50aWZpZXJGb3JQdGhy ZWFkSGFuZGxlKHRocmVhZEhhbmRsZSk7CiB9CiAjZW5kaWYKIApAQCAtMjUxLDcgKzIzNSw3IEBA IFRocmVhZElkZW50aWZpZXIgY3VycmVudFRocmVhZCgpCiAgICAgICAgIHJldHVybiBpZDsKIAog ICAgIC8vIE5vdCBhIFdURi1jcmVhdGVkIHRocmVhZCwgVGhyZWFkSWRlbnRpZmllciBpcyBub3Qg ZXN0YWJsaXNoZWQgeWV0LgotICAgIGlkID0gZXN0YWJsaXNoSWRlbnRpZmllckZvclB0aHJlYWRI YW5kbGUocHRocmVhZF9zZWxmKCksIDApOworICAgIGlkID0gZXN0YWJsaXNoSWRlbnRpZmllckZv clB0aHJlYWRIYW5kbGUocHRocmVhZF9zZWxmKCkpOwogICAgIFRocmVhZElkZW50aWZpZXJEYXRh Ojppbml0aWFsaXplKGlkKTsKICAgICByZXR1cm4gaWQ7CiB9CkBAIC0yNjUsMTEgKzI0OSw2IEBA IGJvb2wgaXNNYWluVGhyZWFkKCkKICNlbmRpZgogfQogCi12b2lkKiB0aHJlYWRDb250ZXh0KFRo cmVhZElkZW50aWZpZXIgaWQpCi17Ci0gICAgcmV0dXJuIGNvbnRleHRGb3JJZGVudGlmaWVyKGlk KTsgCi19Ci0KIE11dGV4OjpNdXRleCgpCiB7CiAgICAgcHRocmVhZF9tdXRleF9pbml0KCZtX211 dGV4LCBOVUxMKTsKSW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdXaW4uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdXaW4uY3BwCShyZXZpc2lv biA1NTM2NSkKKysrIEphdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdXaW4uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMTgsMTEgKzExOCw2IEBAIHR5cGVkZWYgc3RydWN0IHRhZ1RIUkVBRE5BTUVf SU5GTyB7CiB9IFRIUkVBRE5BTUVfSU5GTzsKICNwcmFnbWEgcGFjayhwb3ApCiAKLXR5cGVkZWYg c3RydWN0IHsKLSAgICBIQU5ETEUgaGFuZGxlOwotICAgIHZvaWQqIGNvbnRleHQ7Ci19IFRocmVh ZEluZm87Ci0KIHZvaWQgaW5pdGlhbGl6ZUN1cnJlbnRUaHJlYWRJbnRlcm5hbChjb25zdCBjaGFy KiBzelRocmVhZE5hbWUpCiB7CiAgICAgVEhSRUFETkFNRV9JTkZPIGluZm87CkBAIC0xNzAsMzIg KzE2NSwyMyBAQCB2b2lkIGluaXRpYWxpemVUaHJlYWRpbmcoKQogICAgIH0KIH0KIAotc3RhdGlj IEhhc2hNYXA8RFdPUkQsIFRocmVhZEluZm8+JiB0aHJlYWRNYXAoKQorc3RhdGljIEhhc2hNYXA8 RFdPUkQsIEhBTkRMRT4mIHRocmVhZE1hcCgpCiB7Ci0gICAgc3RhdGljIEhhc2hNYXA8RFdPUkQs IFRocmVhZEluZm8+IG1hcDsKKyAgICBzdGF0aWMgSGFzaE1hcDxEV09SRCwgSEFORExFPiBtYXA7 CiAgICAgcmV0dXJuIG1hcDsKIH0KIAotc3RhdGljIHZvaWQgc3RvcmVUaHJlYWRIYW5kbGVCeUlk ZW50aWZpZXIoRFdPUkQgdGhyZWFkSUQsIEhBTkRMRSB0aHJlYWRIYW5kbGUsIHZvaWQqIGNvbnRl eHQpCitzdGF0aWMgdm9pZCBzdG9yZVRocmVhZEhhbmRsZUJ5SWRlbnRpZmllcihEV09SRCB0aHJl YWRJRCwgSEFORExFIHRocmVhZEhhbmRsZSkKIHsKICAgICBNdXRleExvY2tlciBsb2NrZXIodGhy ZWFkTWFwTXV0ZXgoKSk7CiAgICAgQVNTRVJUKCF0aHJlYWRNYXAoKS5jb250YWlucyh0aHJlYWRJ RCkpOwotICAgIFRocmVhZEluZm8gaW5mbzsKLSAgICBpbmZvLmhhbmRsZSA9IHRocmVhZEhhbmRs ZTsKLSAgICBpbmZvLmNvbnRleHQgPSBjb250ZXh0OwotICAgIHRocmVhZE1hcCgpLmFkZCh0aHJl YWRJRCwgaW5mbyk7CisgICAgdGhyZWFkTWFwKCkuYWRkKHRocmVhZElELCB0aHJlYWRIYW5kbGUp OwogfQogCiBzdGF0aWMgSEFORExFIHRocmVhZEhhbmRsZUZvcklkZW50aWZpZXIoVGhyZWFkSWRl bnRpZmllciBpZCkKIHsKICAgICBNdXRleExvY2tlciBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7 Ci0gICAgcmV0dXJuIHRocmVhZE1hcCgpLmdldChpZCkuaGFuZGxlOwotfQotCi1zdGF0aWMgdm9p ZCogY29udGV4dEZvcklkZW50aWZpZXIoVGhyZWFkSWRlbnRpZmllciBpZCkKLXsKLSAgICBNdXRl eExvY2tlciBsb2NrZXIodGhyZWFkTWFwTXV0ZXgoKSk7Ci0gICAgcmV0dXJuIHRocmVhZE1hcCgp LmdldChpZCkuY29udGV4dDsKKyAgICByZXR1cm4gdGhyZWFkTWFwKCkuZ2V0KGlkKTsKIH0KIAog c3RhdGljIHZvaWQgY2xlYXJUaHJlYWRIYW5kbGVGb3JJZGVudGlmaWVyKFRocmVhZElkZW50aWZp ZXIgaWQpCkBAIC0yNTEsNyArMjM3LDcgQEAgVGhyZWFkSWRlbnRpZmllciBjcmVhdGVUaHJlYWRJ bnRlcm5hbChUaAogICAgIH0KIAogICAgIHRocmVhZElEID0gc3RhdGljX2Nhc3Q8VGhyZWFkSWRl bnRpZmllcj4odGhyZWFkSWRlbnRpZmllcik7Ci0gICAgc3RvcmVUaHJlYWRIYW5kbGVCeUlkZW50 aWZpZXIodGhyZWFkSWRlbnRpZmllciwgdGhyZWFkSGFuZGxlLCBkYXRhKTsKKyAgICBzdG9yZVRo cmVhZEhhbmRsZUJ5SWRlbnRpZmllcih0aHJlYWRJZGVudGlmaWVyLCB0aHJlYWRIYW5kbGUpOwog CiAgICAgcmV0dXJuIHRocmVhZElEOwogfQpAQCAtMjk0LDExICsyODAsNiBAQCBib29sIGlzTWFp blRocmVhZCgpCiAgICAgcmV0dXJuIGN1cnJlbnRUaHJlYWQoKSA9PSBtYWluVGhyZWFkSWRlbnRp ZmllcjsKIH0KIAotdm9pZCogdGhyZWFkQ29udGV4dChUaHJlYWRJZGVudGlmaWVyIHRocmVhZElE KQotewotICAgIHJldHVybiBjb250ZXh0Rm9ySWRlbnRpZmllcih0aHJlYWRJRCk7Ci19Ci0KIE11 dGV4OjpNdXRleCgpCiB7CiAgICAgbV9tdXRleC5tX3JlY3Vyc2lvbkNvdW50ID0gMDsKSW5kZXg6 IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZp c2lvbiA1NTM2NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTAtMDMtMDEgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV2ZXJ0 IGRhdGFiYXNlIHRocmVhZCBjaGFuZ2VzIHRoYXQgYXJlIG5vIGxvbmdlciByZXF1aXJlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU1MTkKKworICAg ICAgICBKb2NoZW4gRWlzaW5nZXIgY3JlYXRlZCA1NTIxNCBhbmQgNTUyNDcgdG8gdHJhY2sgd2hp Y2ggZGF0YWJhc2UKKyAgICAgICAgb3ducyB3aGljaCB0aHJlYWQuICBEYXZlIExldmluIHN1Z2dl c3RlZCB0aGF0IHRoaXMgY291bGQgYWxzbworICAgICAgICBiZSBkb25lIHZpYSBUTFMsIHRob3Vn aC4gIEFmdGVyIGV4cGxvcmluZyB0aGUgb3B0aW9ucywgSm9jaGVuCisgICAgICAgIGNob3NlIHRv IGdvIHRoZSBUTFMgcm91dGUsIHNvIHRoZXNlIHBhdGNoZXMgYXJlIG5vIGxvbmdlciBuZWVkZWQu CisKKyAgICAgICAgKiBzdG9yYWdlL0RhdGFiYXNlVGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRhdGFiYXNlVGhyZWFkOjpEYXRhYmFzZVRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpE YXRhYmFzZVRocmVhZDo6ZGF0YWJhc2VUaHJlYWQpOgorICAgICAgICAqIHN0b3JhZ2UvRGF0YWJh c2VUaHJlYWQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVGhyZWFkOjpnZXRUaHJlYWRJ RCk6CisKIDIwMTAtMDItMjcgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpJbmRleDogV2ViQ29yZS9z dG9yYWdlL0RhdGFiYXNlVGhyZWFkLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3JhZ2Uv RGF0YWJhc2VUaHJlYWQuY3BwCShyZXZpc2lvbiA1NTM2NSkKKysrIFdlYkNvcmUvc3RvcmFnZS9E YXRhYmFzZVRocmVhZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDYgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogCiBEYXRhYmFzZVRocmVhZDo6RGF0YWJhc2VUaHJlYWQoKQogICAgIDog bV90aHJlYWRJRCgwKQotICAgICwgbV9kYXRhYmFzZU9mQ3VycmVudFRhc2soMCkKICAgICAsIG1f dHJhbnNhY3Rpb25DbGllbnQobmV3IFNRTFRyYW5zYWN0aW9uQ2xpZW50KCkpCiAgICAgLCBtX3Ry YW5zYWN0aW9uQ29vcmRpbmF0b3IobmV3IFNRTFRyYW5zYWN0aW9uQ29vcmRpbmF0b3IoKSkKICAg ICAsIG1fY2xlYW51cFN5bmMoMCkKQEAgLTk3LDEwICs5Niw3IEBAIHZvaWQqIERhdGFiYXNlVGhy ZWFkOjpkYXRhYmFzZVRocmVhZCgpCiAKICAgICBBdXRvZHJhaW5lZFBvb2wgcG9vbDsKICAgICB3 aGlsZSAoT3duUHRyPERhdGFiYXNlVGFzaz4gdGFzayA9IG1fcXVldWUud2FpdEZvck1lc3NhZ2Uo KSkgewotICAgICAgICBBU1NFUlQoIW1fZGF0YWJhc2VPZkN1cnJlbnRUYXNrKTsKLSAgICAgICAg bV9kYXRhYmFzZU9mQ3VycmVudFRhc2sgPSB0YXNrLT5kYXRhYmFzZSgpOwogICAgICAgICB0YXNr LT5wZXJmb3JtVGFzaygpOwotICAgICAgICBtX2RhdGFiYXNlT2ZDdXJyZW50VGFzayA9IDA7CiAg ICAgICAgIHBvb2wuY3ljbGUoKTsKICAgICB9CiAKSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9EYXRh YmFzZVRocmVhZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRocmVh ZC5oCShyZXZpc2lvbiA1NTM2NSkKKysrIFdlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRocmVhZC5o CSh3b3JraW5nIGNvcHkpCkBAIC02NCw3ICs2NCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlY29y ZERhdGFiYXNlT3BlbihEYXRhYmFzZSopOwogICAgIHZvaWQgcmVjb3JkRGF0YWJhc2VDbG9zZWQo RGF0YWJhc2UqKTsKICAgICBUaHJlYWRJZGVudGlmaWVyIGdldFRocmVhZElEKCkgeyByZXR1cm4g bV90aHJlYWRJRDsgfQotICAgIERhdGFiYXNlKiBnZXREYXRhYmFzZU9mQ3VycmVudFRhc2soKSB7 IHJldHVybiBtX2RhdGFiYXNlT2ZDdXJyZW50VGFzazsgfQogCiAgICAgU1FMVHJhbnNhY3Rpb25D bGllbnQqIHRyYW5zYWN0aW9uQ2xpZW50KCkgeyByZXR1cm4gbV90cmFuc2FjdGlvbkNsaWVudC5n ZXQoKTsgfQogICAgIFNRTFRyYW5zYWN0aW9uQ29vcmRpbmF0b3IqIHRyYW5zYWN0aW9uQ29vcmRp bmF0b3IoKSB7IHJldHVybiBtX3RyYW5zYWN0aW9uQ29vcmRpbmF0b3IuZ2V0KCk7IH0KQEAgLTgx LDggKzgwLDYgQEAgcHJpdmF0ZToKIAogICAgIE1lc3NhZ2VRdWV1ZTxEYXRhYmFzZVRhc2s+IG1f cXVldWU7CiAKLSAgICBEYXRhYmFzZSogbV9kYXRhYmFzZU9mQ3VycmVudFRhc2s7Ci0KICAgICAv LyBUaGlzIHNldCBrZWVwcyB0cmFjayBvZiB0aGUgb3BlbiBkYXRhYmFzZXMgdGhhdCBoYXZlIGJl ZW4gdXNlZCBvbiB0aGlzIHRocmVhZC4KICAgICB0eXBlZGVmIEhhc2hTZXQ8UmVmUHRyPERhdGFi YXNlPiA+IERhdGFiYXNlU2V0OwogICAgIERhdGFiYXNlU2V0IG1fb3BlbkRhdGFiYXNlU2V0Owo= 49725 2010-03-01 07:52:51 -0800 2010-03-02 14:21:43 -0800 Patch bug-35519-20100301155249.patch text/plain 10308 jorlow SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU1MzY1KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTAtMDMtMDEgIEplcmVteSBP cmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmV2ZXJ0IGRhdGFiYXNlIHRocmVhZCBjaGFuZ2VzIHRoYXQg YXJlIG5vIGxvbmdlciByZXF1aXJlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzU1MTkKKworICAgICAgICBKb2NoZW4gRWlzaW5nZXIgY3JlYXRlZCA1 NTIxNCBhbmQgNTUyNDcgdG8gdHJhY2sgd2hpY2ggZGF0YWJhc2UKKyAgICAgICAgb3ducyB3aGlj aCB0aHJlYWQuICBEbWl0cnkgc3VnZ2VzdGVkIHRoYXQgdGhpcyBjb3VsZCBhbHNvCisgICAgICAg IGJlIGRvbmUgdmlhIFRMUywgdGhvdWdoLiAgQWZ0ZXIgZXhwbG9yaW5nIHRoZSBvcHRpb25zLCBK b2NoZW4KKyAgICAgICAgY2hvc2UgdG8gZ28gdGhlIFRMUyByb3V0ZSwgc28gdGhlc2UgcGF0Y2hl cyBhcmUgbm8gbG9uZ2VyIG5lZWRlZC4KKworICAgICAgICAqIHd0Zi9UaHJlYWRpbmcuaDoKKyAg ICAgICAgKiB3dGYvVGhyZWFkaW5nTm9uZS5jcHA6CisgICAgICAgIChXVEY6OmlzTWFpblRocmVh ZCk6CisgICAgICAgICogd3RmL1RocmVhZGluZ1B0aHJlYWRzLmNwcDoKKyAgICAgICAgKFdURjo6 aWRlbnRpZmllckJ5UHRocmVhZEhhbmRsZSk6CisgICAgICAgIChXVEY6OmVzdGFibGlzaElkZW50 aWZpZXJGb3JQdGhyZWFkSGFuZGxlKToKKyAgICAgICAgKFdURjo6cHRocmVhZEhhbmRsZUZvcklk ZW50aWZpZXIpOgorICAgICAgICAoV1RGOjpjcmVhdGVUaHJlYWRJbnRlcm5hbCk6CisgICAgICAg IChXVEY6OmN1cnJlbnRUaHJlYWQpOgorICAgICAgICAqIHd0Zi9UaHJlYWRpbmdXaW4uY3BwOgor ICAgICAgICAoV1RGOjp0aHJlYWRNYXApOgorICAgICAgICAoV1RGOjpzdG9yZVRocmVhZEhhbmRs ZUJ5SWRlbnRpZmllcik6CisgICAgICAgIChXVEY6OnRocmVhZEhhbmRsZUZvcklkZW50aWZpZXIp OgorICAgICAgICAoV1RGOjpjcmVhdGVUaHJlYWRJbnRlcm5hbCk6CisKIDIwMTAtMDItMjYgIEdh dmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJ1YmJl ciBTdGFtcGVkIGJ5IEdlb2ZmIEdhcmVuLgpJbmRleDogSmF2YVNjcmlwdENvcmUvd3RmL1RocmVh ZGluZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmcuaAkocmV2 aXNpb24gNTUzNjUpCisrKyBKYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nLmgJKHdvcmtpbmcg Y29weSkKQEAgLTEyNyw3ICsxMjcsNiBAQCBUaHJlYWRJZGVudGlmaWVyIGN1cnJlbnRUaHJlYWQo KTsKIGJvb2wgaXNNYWluVGhyZWFkKCk7CiBpbnQgd2FpdEZvclRocmVhZENvbXBsZXRpb24oVGhy ZWFkSWRlbnRpZmllciwgdm9pZCoqKTsKIHZvaWQgZGV0YWNoVGhyZWFkKFRocmVhZElkZW50aWZp ZXIpOwotdm9pZCogdGhyZWFkQ29udGV4dChUaHJlYWRJZGVudGlmaWVyKTsKIAogI2lmIFVTRShQ VEhSRUFEUykKIHR5cGVkZWYgcHRocmVhZF9tdXRleF90IFBsYXRmb3JtTXV0ZXg7CkluZGV4OiBK YXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nTm9uZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNj cmlwdENvcmUvd3RmL1RocmVhZGluZ05vbmUuY3BwCShyZXZpc2lvbiA1NTM2NSkKKysrIEphdmFT Y3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdOb25lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyAr NDEsNiBAQCBpbnQgd2FpdEZvclRocmVhZENvbXBsZXRpb24oVGhyZWFkSWRlbnRpCiB2b2lkIGRl dGFjaFRocmVhZChUaHJlYWRJZGVudGlmaWVyKSB7IH0KIFRocmVhZElkZW50aWZpZXIgY3VycmVu dFRocmVhZCgpIHsgcmV0dXJuIFRocmVhZElkZW50aWZpZXIoKTsgfQogYm9vbCBpc01haW5UaHJl YWQoKSB7IHJldHVybiB0cnVlOyB9Ci12b2lkKiB0aHJlYWRDb250ZXh0KFRocmVhZElkZW50aWZp ZXIpIHsgcmV0dXJuIDA7IH0KIAogTXV0ZXg6Ok11dGV4KCkgeyB9CiBNdXRleDo6fk11dGV4KCkg eyB9CkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkaW5nUHRocmVhZHMuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdQdGhyZWFkcy5jcHAJKHJldmlz aW9uIDU1MzY1KQorKysgSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1B0aHJlYWRzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTMsMTIgKzUzLDcgQEAKIAogbmFtZXNwYWNlIFdURiB7CiAKLXR5 cGVkZWYgc3RydWN0IHsKLSAgICBwdGhyZWFkX3QgaGFuZGxlOwotICAgIHZvaWQqIGNvbnRleHQ7 Ci19IFRocmVhZEluZm87Ci0KLXR5cGVkZWYgSGFzaE1hcDxUaHJlYWRJZGVudGlmaWVyLCBUaHJl YWRJbmZvPiBUaHJlYWRNYXA7Cit0eXBlZGVmIEhhc2hNYXA8VGhyZWFkSWRlbnRpZmllciwgcHRo cmVhZF90PiBUaHJlYWRNYXA7CiAKIHN0YXRpYyBNdXRleCogYXRvbWljYWxseUluaXRpYWxpemVk U3RhdGljTXV0ZXg7CiAKQEAgLTExMCwxNCArMTA1LDE0IEBAIHN0YXRpYyBUaHJlYWRJZGVudGlm aWVyIGlkZW50aWZpZXJCeVB0aHIKIAogICAgIFRocmVhZE1hcDo6aXRlcmF0b3IgaSA9IHRocmVh ZE1hcCgpLmJlZ2luKCk7CiAgICAgZm9yICg7IGkgIT0gdGhyZWFkTWFwKCkuZW5kKCk7ICsraSkg ewotICAgICAgICBpZiAocHRocmVhZF9lcXVhbChpLT5zZWNvbmQuaGFuZGxlLCBwdGhyZWFkSGFu ZGxlKSkKKyAgICAgICAgaWYgKHB0aHJlYWRfZXF1YWwoaS0+c2Vjb25kLCBwdGhyZWFkSGFuZGxl KSkKICAgICAgICAgICAgIHJldHVybiBpLT5maXJzdDsKICAgICB9CiAKICAgICByZXR1cm4gMDsK IH0KIAotc3RhdGljIFRocmVhZElkZW50aWZpZXIgZXN0YWJsaXNoSWRlbnRpZmllckZvclB0aHJl YWRIYW5kbGUoY29uc3QgcHRocmVhZF90JiBwdGhyZWFkSGFuZGxlLCB2b2lkKiBjb250ZXh0KQor c3RhdGljIFRocmVhZElkZW50aWZpZXIgZXN0YWJsaXNoSWRlbnRpZmllckZvclB0aHJlYWRIYW5k bGUoY29uc3QgcHRocmVhZF90JiBwdGhyZWFkSGFuZGxlKQogewogICAgIEFTU0VSVCghaWRlbnRp ZmllckJ5UHRocmVhZEhhbmRsZShwdGhyZWFkSGFuZGxlKSk7CiAKQEAgLTEyNSwxMCArMTIwLDcg QEAgc3RhdGljIFRocmVhZElkZW50aWZpZXIgZXN0YWJsaXNoSWRlbnRpZgogCiAgICAgc3RhdGlj IFRocmVhZElkZW50aWZpZXIgaWRlbnRpZmllckNvdW50ID0gMTsKIAotICAgIFRocmVhZEluZm8g aW5mbzsKLSAgICBpbmZvLmhhbmRsZSA9IHB0aHJlYWRIYW5kbGU7Ci0gICAgaW5mby5jb250ZXh0 ID0gY29udGV4dDsKLSAgICB0aHJlYWRNYXAoKS5hZGQoaWRlbnRpZmllckNvdW50LCBpbmZvKTsK KyAgICB0aHJlYWRNYXAoKS5hZGQoaWRlbnRpZmllckNvdW50LCBwdGhyZWFkSGFuZGxlKTsKIAog ICAgIHJldHVybiBpZGVudGlmaWVyQ291bnQrKzsKIH0KQEAgLTEzNywxNyArMTI5LDkgQEAgc3Rh dGljIHB0aHJlYWRfdCBwdGhyZWFkSGFuZGxlRm9ySWRlbnRpZgogewogICAgIE11dGV4TG9ja2Vy IGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKIAotICAgIHJldHVybiB0aHJlYWRNYXAoKS5nZXQo aWQpLmhhbmRsZTsKLX0KLQotc3RhdGljIHZvaWQqIGNvbnRleHRGb3JJZGVudGlmaWVyKFRocmVh ZElkZW50aWZpZXIgaWQpCi17Ci0gICAgTXV0ZXhMb2NrZXIgbG9ja2VyKHRocmVhZE1hcE11dGV4 KCkpOwotCi0gICAgcmV0dXJuIHRocmVhZE1hcCgpLmdldChpZCkuY29udGV4dDsKKyAgICByZXR1 cm4gdGhyZWFkTWFwKCkuZ2V0KGlkKTsKIH0KIAotCiB2b2lkIGNsZWFyUHRocmVhZEhhbmRsZUZv cklkZW50aWZpZXIoVGhyZWFkSWRlbnRpZmllciBpZCkKIHsKICAgICBNdXRleExvY2tlciBsb2Nr ZXIodGhyZWFkTWFwTXV0ZXgoKSk7CkBAIC0xOTAsNyArMTc0LDcgQEAgVGhyZWFkSWRlbnRpZmll ciBjcmVhdGVUaHJlYWRJbnRlcm5hbChUaAogICAgICAgICBkZWxldGUgdGhyZWFkRGF0YTsKICAg ICAgICAgcmV0dXJuIDA7CiAgICAgfQotICAgIHJldHVybiBlc3RhYmxpc2hJZGVudGlmaWVyRm9y UHRocmVhZEhhbmRsZSh0aHJlYWRIYW5kbGUsIGRhdGEpOworICAgIHJldHVybiBlc3RhYmxpc2hJ ZGVudGlmaWVyRm9yUHRocmVhZEhhbmRsZSh0aHJlYWRIYW5kbGUpOwogfQogI2Vsc2UKIFRocmVh ZElkZW50aWZpZXIgY3JlYXRlVGhyZWFkSW50ZXJuYWwoVGhyZWFkRnVuY3Rpb24gZW50cnlQb2lu dCwgdm9pZCogZGF0YSwgY29uc3QgY2hhciopCkBAIC0yMDEsNyArMTg1LDcgQEAgVGhyZWFkSWRl bnRpZmllciBjcmVhdGVUaHJlYWRJbnRlcm5hbChUaAogICAgICAgICByZXR1cm4gMDsKICAgICB9 CiAKLSAgICByZXR1cm4gZXN0YWJsaXNoSWRlbnRpZmllckZvclB0aHJlYWRIYW5kbGUodGhyZWFk SGFuZGxlLCBkYXRhKTsKKyAgICByZXR1cm4gZXN0YWJsaXNoSWRlbnRpZmllckZvclB0aHJlYWRI YW5kbGUodGhyZWFkSGFuZGxlKTsKIH0KICNlbmRpZgogCkBAIC0yNTEsNyArMjM1LDcgQEAgVGhy ZWFkSWRlbnRpZmllciBjdXJyZW50VGhyZWFkKCkKICAgICAgICAgcmV0dXJuIGlkOwogCiAgICAg Ly8gTm90IGEgV1RGLWNyZWF0ZWQgdGhyZWFkLCBUaHJlYWRJZGVudGlmaWVyIGlzIG5vdCBlc3Rh Ymxpc2hlZCB5ZXQuCi0gICAgaWQgPSBlc3RhYmxpc2hJZGVudGlmaWVyRm9yUHRocmVhZEhhbmRs ZShwdGhyZWFkX3NlbGYoKSwgMCk7CisgICAgaWQgPSBlc3RhYmxpc2hJZGVudGlmaWVyRm9yUHRo cmVhZEhhbmRsZShwdGhyZWFkX3NlbGYoKSk7CiAgICAgVGhyZWFkSWRlbnRpZmllckRhdGE6Omlu aXRpYWxpemUoaWQpOwogICAgIHJldHVybiBpZDsKIH0KQEAgLTI2NSwxMSArMjQ5LDYgQEAgYm9v bCBpc01haW5UaHJlYWQoKQogI2VuZGlmCiB9CiAKLXZvaWQqIHRocmVhZENvbnRleHQoVGhyZWFk SWRlbnRpZmllciBpZCkKLXsKLSAgICByZXR1cm4gY29udGV4dEZvcklkZW50aWZpZXIoaWQpOyAK LX0KLQogTXV0ZXg6Ok11dGV4KCkKIHsKICAgICBwdGhyZWFkX211dGV4X2luaXQoJm1fbXV0ZXgs IE5VTEwpOwpJbmRleDogSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1dpbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1dpbi5jcHAJKHJldmlzaW9uIDU1 MzY1KQorKysgSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1dpbi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTExOCwxMSArMTE4LDYgQEAgdHlwZWRlZiBzdHJ1Y3QgdGFnVEhSRUFETkFNRV9JTkZP IHsKIH0gVEhSRUFETkFNRV9JTkZPOwogI3ByYWdtYSBwYWNrKHBvcCkKIAotdHlwZWRlZiBzdHJ1 Y3QgewotICAgIEhBTkRMRSBoYW5kbGU7Ci0gICAgdm9pZCogY29udGV4dDsKLX0gVGhyZWFkSW5m bzsKLQogdm9pZCBpbml0aWFsaXplQ3VycmVudFRocmVhZEludGVybmFsKGNvbnN0IGNoYXIqIHN6 VGhyZWFkTmFtZSkKIHsKICAgICBUSFJFQUROQU1FX0lORk8gaW5mbzsKQEAgLTE3MCwzMiArMTY1 LDIzIEBAIHZvaWQgaW5pdGlhbGl6ZVRocmVhZGluZygpCiAgICAgfQogfQogCi1zdGF0aWMgSGFz aE1hcDxEV09SRCwgVGhyZWFkSW5mbz4mIHRocmVhZE1hcCgpCitzdGF0aWMgSGFzaE1hcDxEV09S RCwgSEFORExFPiYgdGhyZWFkTWFwKCkKIHsKLSAgICBzdGF0aWMgSGFzaE1hcDxEV09SRCwgVGhy ZWFkSW5mbz4gbWFwOworICAgIHN0YXRpYyBIYXNoTWFwPERXT1JELCBIQU5ETEU+IG1hcDsKICAg ICByZXR1cm4gbWFwOwogfQogCi1zdGF0aWMgdm9pZCBzdG9yZVRocmVhZEhhbmRsZUJ5SWRlbnRp ZmllcihEV09SRCB0aHJlYWRJRCwgSEFORExFIHRocmVhZEhhbmRsZSwgdm9pZCogY29udGV4dCkK K3N0YXRpYyB2b2lkIHN0b3JlVGhyZWFkSGFuZGxlQnlJZGVudGlmaWVyKERXT1JEIHRocmVhZElE LCBIQU5ETEUgdGhyZWFkSGFuZGxlKQogewogICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRN YXBNdXRleCgpKTsKICAgICBBU1NFUlQoIXRocmVhZE1hcCgpLmNvbnRhaW5zKHRocmVhZElEKSk7 Ci0gICAgVGhyZWFkSW5mbyBpbmZvOwotICAgIGluZm8uaGFuZGxlID0gdGhyZWFkSGFuZGxlOwot ICAgIGluZm8uY29udGV4dCA9IGNvbnRleHQ7Ci0gICAgdGhyZWFkTWFwKCkuYWRkKHRocmVhZElE LCBpbmZvKTsKKyAgICB0aHJlYWRNYXAoKS5hZGQodGhyZWFkSUQsIHRocmVhZEhhbmRsZSk7CiB9 CiAKIHN0YXRpYyBIQU5ETEUgdGhyZWFkSGFuZGxlRm9ySWRlbnRpZmllcihUaHJlYWRJZGVudGlm aWVyIGlkKQogewogICAgIE11dGV4TG9ja2VyIGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKLSAg ICByZXR1cm4gdGhyZWFkTWFwKCkuZ2V0KGlkKS5oYW5kbGU7Ci19Ci0KLXN0YXRpYyB2b2lkKiBj b250ZXh0Rm9ySWRlbnRpZmllcihUaHJlYWRJZGVudGlmaWVyIGlkKQotewotICAgIE11dGV4TG9j a2VyIGxvY2tlcih0aHJlYWRNYXBNdXRleCgpKTsKLSAgICByZXR1cm4gdGhyZWFkTWFwKCkuZ2V0 KGlkKS5jb250ZXh0OworICAgIHJldHVybiB0aHJlYWRNYXAoKS5nZXQoaWQpOwogfQogCiBzdGF0 aWMgdm9pZCBjbGVhclRocmVhZEhhbmRsZUZvcklkZW50aWZpZXIoVGhyZWFkSWRlbnRpZmllciBp ZCkKQEAgLTI1MSw3ICsyMzcsNyBAQCBUaHJlYWRJZGVudGlmaWVyIGNyZWF0ZVRocmVhZEludGVy bmFsKFRoCiAgICAgfQogCiAgICAgdGhyZWFkSUQgPSBzdGF0aWNfY2FzdDxUaHJlYWRJZGVudGlm aWVyPih0aHJlYWRJZGVudGlmaWVyKTsKLSAgICBzdG9yZVRocmVhZEhhbmRsZUJ5SWRlbnRpZmll cih0aHJlYWRJZGVudGlmaWVyLCB0aHJlYWRIYW5kbGUsIGRhdGEpOworICAgIHN0b3JlVGhyZWFk SGFuZGxlQnlJZGVudGlmaWVyKHRocmVhZElkZW50aWZpZXIsIHRocmVhZEhhbmRsZSk7CiAKICAg ICByZXR1cm4gdGhyZWFkSUQ7CiB9CkBAIC0yOTQsMTEgKzI4MCw2IEBAIGJvb2wgaXNNYWluVGhy ZWFkKCkKICAgICByZXR1cm4gY3VycmVudFRocmVhZCgpID09IG1haW5UaHJlYWRJZGVudGlmaWVy OwogfQogCi12b2lkKiB0aHJlYWRDb250ZXh0KFRocmVhZElkZW50aWZpZXIgdGhyZWFkSUQpCi17 Ci0gICAgcmV0dXJuIGNvbnRleHRGb3JJZGVudGlmaWVyKHRocmVhZElEKTsKLX0KLQogTXV0ZXg6 Ok11dGV4KCkKIHsKICAgICBtX211dGV4Lm1fcmVjdXJzaW9uQ291bnQgPSAwOwpJbmRleDogV2Vi Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9u IDU1MzY1KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwy MSBAQAorMjAxMC0wMy0wMSAgSmVyZW15IE9ybG93ICA8am9ybG93QGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXZlcnQgZGF0 YWJhc2UgdGhyZWFkIGNoYW5nZXMgdGhhdCBhcmUgbm8gbG9uZ2VyIHJlcXVpcmVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTUxOQorCisgICAgICAg IEpvY2hlbiBFaXNpbmdlciBjcmVhdGVkIDU1MjE0IGFuZCA1NTI0NyB0byB0cmFjayB3aGljaCBk YXRhYmFzZQorICAgICAgICBvd25zIHdoaWNoIHRocmVhZC4gIERtaXRyeSBzdWdnZXN0ZWQgdGhh dCB0aGlzIGNvdWxkIGFsc28KKyAgICAgICAgYmUgZG9uZSB2aWEgVExTLCB0aG91Z2guICBBZnRl ciBleHBsb3JpbmcgdGhlIG9wdGlvbnMsIEpvY2hlbgorICAgICAgICBjaG9zZSB0byBnbyB0aGUg VExTIHJvdXRlLCBzbyB0aGVzZSBwYXRjaGVzIGFyZSBubyBsb25nZXIgbmVlZGVkLgorCisgICAg ICAgICogc3RvcmFnZS9EYXRhYmFzZVRocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRh YmFzZVRocmVhZDo6RGF0YWJhc2VUaHJlYWQpOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VU aHJlYWQ6OmRhdGFiYXNlVGhyZWFkKToKKyAgICAgICAgKiBzdG9yYWdlL0RhdGFiYXNlVGhyZWFk Lmg6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRocmVhZDo6Z2V0VGhyZWFkSUQpOgorCiAy MDEwLTAyLTI3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9E YXRhYmFzZVRocmVhZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNl VGhyZWFkLmNwcAkocmV2aXNpb24gNTUzNjUpCisrKyBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VU aHJlYWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw2IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogRGF0YWJhc2VUaHJlYWQ6OkRhdGFiYXNlVGhyZWFkKCkKICAgICA6IG1fdGhyZWFk SUQoMCkKLSAgICAsIG1fZGF0YWJhc2VPZkN1cnJlbnRUYXNrKDApCiAgICAgLCBtX3RyYW5zYWN0 aW9uQ2xpZW50KG5ldyBTUUxUcmFuc2FjdGlvbkNsaWVudCgpKQogICAgICwgbV90cmFuc2FjdGlv bkNvb3JkaW5hdG9yKG5ldyBTUUxUcmFuc2FjdGlvbkNvb3JkaW5hdG9yKCkpCiAgICAgLCBtX2Ns ZWFudXBTeW5jKDApCkBAIC05NywxMCArOTYsNyBAQCB2b2lkKiBEYXRhYmFzZVRocmVhZDo6ZGF0 YWJhc2VUaHJlYWQoKQogCiAgICAgQXV0b2RyYWluZWRQb29sIHBvb2w7CiAgICAgd2hpbGUgKE93 blB0cjxEYXRhYmFzZVRhc2s+IHRhc2sgPSBtX3F1ZXVlLndhaXRGb3JNZXNzYWdlKCkpIHsKLSAg ICAgICAgQVNTRVJUKCFtX2RhdGFiYXNlT2ZDdXJyZW50VGFzayk7Ci0gICAgICAgIG1fZGF0YWJh c2VPZkN1cnJlbnRUYXNrID0gdGFzay0+ZGF0YWJhc2UoKTsKICAgICAgICAgdGFzay0+cGVyZm9y bVRhc2soKTsKLSAgICAgICAgbV9kYXRhYmFzZU9mQ3VycmVudFRhc2sgPSAwOwogICAgICAgICBw b29sLmN5Y2xlKCk7CiAgICAgfQogCkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUaHJl YWQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUaHJlYWQuaAkocmV2 aXNpb24gNTUzNjUpCisrKyBXZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2VUaHJlYWQuaAkod29ya2lu ZyBjb3B5KQpAQCAtNjQsNyArNjQsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCByZWNvcmREYXRhYmFz ZU9wZW4oRGF0YWJhc2UqKTsKICAgICB2b2lkIHJlY29yZERhdGFiYXNlQ2xvc2VkKERhdGFiYXNl Kik7CiAgICAgVGhyZWFkSWRlbnRpZmllciBnZXRUaHJlYWRJRCgpIHsgcmV0dXJuIG1fdGhyZWFk SUQ7IH0KLSAgICBEYXRhYmFzZSogZ2V0RGF0YWJhc2VPZkN1cnJlbnRUYXNrKCkgeyByZXR1cm4g bV9kYXRhYmFzZU9mQ3VycmVudFRhc2s7IH0KIAogICAgIFNRTFRyYW5zYWN0aW9uQ2xpZW50KiB0 cmFuc2FjdGlvbkNsaWVudCgpIHsgcmV0dXJuIG1fdHJhbnNhY3Rpb25DbGllbnQuZ2V0KCk7IH0K ICAgICBTUUxUcmFuc2FjdGlvbkNvb3JkaW5hdG9yKiB0cmFuc2FjdGlvbkNvb3JkaW5hdG9yKCkg eyByZXR1cm4gbV90cmFuc2FjdGlvbkNvb3JkaW5hdG9yLmdldCgpOyB9CkBAIC04MSw4ICs4MCw2 IEBAIHByaXZhdGU6CiAKICAgICBNZXNzYWdlUXVldWU8RGF0YWJhc2VUYXNrPiBtX3F1ZXVlOwog Ci0gICAgRGF0YWJhc2UqIG1fZGF0YWJhc2VPZkN1cnJlbnRUYXNrOwotCiAgICAgLy8gVGhpcyBz ZXQga2VlcHMgdHJhY2sgb2YgdGhlIG9wZW4gZGF0YWJhc2VzIHRoYXQgaGF2ZSBiZWVuIHVzZWQg b24gdGhpcyB0aHJlYWQuCiAgICAgdHlwZWRlZiBIYXNoU2V0PFJlZlB0cjxEYXRhYmFzZT4gPiBE YXRhYmFzZVNldDsKICAgICBEYXRhYmFzZVNldCBtX29wZW5EYXRhYmFzZVNldDsK