41939 2010-07-09 00:58:44 -0700 Move more mode handling into functions for later re-use 2010-07-09 01:02:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 eric eric abarth oldest_to_newest 248806 0 eric 2010-07-09 00:58:44 -0700 Move more mode handling into functions for later re-use 248808 1 61011 eric 2010-07-09 00:59:36 -0700 Created attachment 61011 Patch 248809 2 61011 abarth 2010-07-09 01:00:37 -0700 Comment on attachment 61011 Patch ok 248810 3 eric 2010-07-09 01:02:29 -0700 Committed r62911: <http://trac.webkit.org/changeset/62911> 61011 2010-07-09 00:59:36 -0700 2010-07-09 01:01:41 -0700 Patch bug-41939-20100709005935.patch text/plain 10463 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWQ3NDA5YWQzZTMwMzA0YWQ5MTcyYThiNTUxOGZhOWNkNGY2ZGE1ZS4uYmEyZjUzZDUyNmIwZDc0 Y2IzMTgzNzRmNWUxYjEyYjFlODZjZjA1NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMSBAQAogMjAxMC0wNy0wOSAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTW92ZSBtb3JlIG1vZGUgaGFuZGxpbmcgaW50byBmdW5jdGlv bnMgZm9yIGxhdGVyIHJlLXVzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDE5MzkKKworICAgICAgICBObyBmdW5jdGlvbmFsIGNoYW5nZXMsIHRodXMg bm8gdGVzdHMuCisKKyAgICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWdGb3JJblRhYmxlQm9keSk6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWdGb3JJblJv dyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWdGb3JJ bkNlbGwpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFn KToKKyAgICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRlci5oOgorCisyMDEwLTA3LTA5ICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJh cnRoLgogCiAgICAgICAgIEFkZCBuZXcgcG9wVW50aWxQb3BwZWQgZnVuY3Rpb25zIHRvIGNsZWFu IHVwIGNvZGUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwIGIv V2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKaW5kZXggMzUzMWU2YzZjN2MzYTE0ZmIy NTc1OWIzNzgyYjdkOGIwMzVkYTA1MS4uYzk2MTk2OGE5MWUxYjZkM2QyNmFiZDM0YzZiYmU2ZTA0 NmQxNzYyNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKKysr IGIvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKQEAgLTE1MTMsNiArMTUxMywxMTkg QEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnJlc2V0SW5zZXJ0aW9uTW9kZUFwcHJvcHJpYXRlbHko KQogICAgIH0KIH0KIAordm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWdGb3JJblRh YmxlQm9keShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQoreworICAgIEFTU0VSVCh0b2tlbi50eXBl KCkgPT0gSFRNTFRva2VuOjpFbmRUYWcpOworICAgIGlmIChpc1RhYmxlQm9keUNvbnRleHRUYWco dG9rZW4ubmFtZSgpKSkgeworICAgICAgICBpZiAoIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5U YWJsZVNjb3BlKHRva2VuLm5hbWUoKSkpIHsKKyAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4p OworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIG1fdHJlZS5vcGVuRWxl bWVudHMoKS0+cG9wVW50aWxUYWJsZUJvZHlTY29wZU1hcmtlcigpOworICAgICAgICBtX3RyZWUu b3BlbkVsZW1lbnRzKCktPnBvcCgpOworICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBJblRhYmxl TW9kZTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBpZiAodG9rZW4ubmFtZSgpID09IHRh YmxlVGFnKSB7CisgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIHNsb3cuCisgICAgICAgIGlmICgh bV90cmVlLm9wZW5FbGVtZW50cygpLT5pblRhYmxlU2NvcGUodGJvZHlUYWcubG9jYWxOYW1lKCkp ICYmICFtX3RyZWUub3BlbkVsZW1lbnRzKCktPmluVGFibGVTY29wZSh0aGVhZFRhZy5sb2NhbE5h bWUoKSkgJiYgIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5UYWJsZVNjb3BlKHRmb290VGFnLmxv Y2FsTmFtZSgpKSkgeworICAgICAgICAgICAgQVNTRVJUKG1faXNQYXJzaW5nRnJhZ21lbnQpOwor ICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KKyAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3BVbnRpbFRhYmxlQm9keVNj b3BlTWFya2VyKCk7CisgICAgICAgIEFTU0VSVChpc1RhYmxlQm9keUNvbnRleHRUYWcobV90cmVl LmN1cnJlbnRFbGVtZW50KCktPmxvY2FsTmFtZSgpKSk7CisgICAgICAgIHByb2Nlc3NGYWtlRW5k VGFnKG1fdHJlZS5jdXJyZW50RWxlbWVudCgpLT50YWdRTmFtZSgpKTsKKyAgICAgICAgcHJvY2Vz c0VuZFRhZyh0b2tlbik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKHRva2VuLm5h bWUoKSA9PSBib2R5VGFnCisgICAgICAgIHx8IGlzQ2FwdGlvbkNvbE9yQ29sZ3JvdXBUYWcodG9r ZW4ubmFtZSgpKQorICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gaHRtbFRhZworICAgICAgICB8 fCBpc1RhYmxlQ2VsbENvbnRleHRUYWcodG9rZW4ubmFtZSgpKQorICAgICAgICB8fCB0b2tlbi5u YW1lKCkgPT0gdHJUYWcpIHsKKyAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgcHJvY2Vzc0VuZFRhZ0ZvckluVGFibGUodG9rZW4pOworfQorCit2 b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZ0ZvckluUm93KEF0b21pY0hUTUxUb2tl biYgdG9rZW4pCit7CisgICAgQVNTRVJUKHRva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW46OkVuZFRh Zyk7CisgICAgaWYgKHRva2VuLm5hbWUoKSA9PSB0clRhZykgeworICAgICAgICBwcm9jZXNzVHJF bmRUYWdGb3JJblJvdygpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIGlmICh0b2tlbi5u YW1lKCkgPT0gdGFibGVUYWcpIHsKKyAgICAgICAgaWYgKCFwcm9jZXNzVHJFbmRUYWdGb3JJblJv dygpKSB7CisgICAgICAgICAgICBBU1NFUlQobV9pc1BhcnNpbmdGcmFnbWVudCk7CisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9 PSBJblRhYmxlQm9keU1vZGUpOworICAgICAgICBwcm9jZXNzRW5kVGFnKHRva2VuKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKyAgICBpZiAoaXNUYWJsZUJvZHlDb250ZXh0VGFnKHRva2VuLm5h bWUoKSkpIHsKKyAgICAgICAgaWYgKCFtX3RyZWUub3BlbkVsZW1lbnRzKCktPmluVGFibGVTY29w ZSh0b2tlbi5uYW1lKCkpKSB7CisgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBwcm9jZXNzRmFrZUVuZFRhZyh0clRh Zyk7CisgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gSW5UYWJsZUJvZHlNb2RlKTsK KyAgICAgICAgcHJvY2Vzc0VuZFRhZyh0b2tlbik7CisgICAgICAgIHJldHVybjsKKyAgICB9Cisg ICAgaWYgKHRva2VuLm5hbWUoKSA9PSBib2R5VGFnCisgICAgICAgIHx8IGlzQ2FwdGlvbkNvbE9y Q29sZ3JvdXBUYWcodG9rZW4ubmFtZSgpKQorICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gaHRt bFRhZworICAgICAgICB8fCBpc1RhYmxlQ2VsbENvbnRleHRUYWcodG9rZW4ubmFtZSgpKSkgewor ICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBw cm9jZXNzRW5kVGFnRm9ySW5UYWJsZSh0b2tlbik7Cit9CisKK3ZvaWQgSFRNTFRyZWVCdWlsZGVy Ojpwcm9jZXNzRW5kVGFnRm9ySW5DZWxsKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCit7CisgICAg QVNTRVJUKHRva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW46OkVuZFRhZyk7CisgICAgaWYgKGlzVGFi bGVDZWxsQ29udGV4dFRhZyh0b2tlbi5uYW1lKCkpKSB7CisgICAgICAgIGlmICghbV90cmVlLm9w ZW5FbGVtZW50cygpLT5pblRhYmxlU2NvcGUodG9rZW4ubmFtZSgpKSkgeworICAgICAgICAgICAg cGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAg ICAgbV90cmVlLmdlbmVyYXRlSW1wbGllZEVuZFRhZ3MoKTsKKyAgICAgICAgaWYgKCFtX3RyZWUu Y3VycmVudEVsZW1lbnQoKS0+aGFzTG9jYWxOYW1lKHRva2VuLm5hbWUoKSkpCisgICAgICAgICAg ICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgbV90cmVlLm9wZW5FbGVtZW50cygpLT5wb3BV bnRpbFBvcHBlZCh0b2tlbi5uYW1lKCkpOworICAgICAgICBtX3RyZWUuYWN0aXZlRm9ybWF0dGlu Z0VsZW1lbnRzKCktPmNsZWFyVG9MYXN0TWFya2VyKCk7CisgICAgICAgIG1faW5zZXJ0aW9uTW9k ZSA9IEluUm93TW9kZTsKKyAgICAgICAgQVNTRVJUKG1fdHJlZS5jdXJyZW50RWxlbWVudCgpLT5o YXNUYWdOYW1lKHRyVGFnKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKHRva2Vu Lm5hbWUoKSA9PSBib2R5VGFnCisgICAgICAgIHx8IGlzQ2FwdGlvbkNvbE9yQ29sZ3JvdXBUYWco dG9rZW4ubmFtZSgpKQorICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gaHRtbFRhZykgeworICAg ICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBpZiAo dG9rZW4ubmFtZSgpID09IHRhYmxlVGFnCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSB0clRh ZworICAgICAgICB8fCBpc1RhYmxlQm9keUNvbnRleHRUYWcodG9rZW4ubmFtZSgpKSkgeworICAg ICAgICBpZiAoIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5UYWJsZVNjb3BlKHRva2VuLm5hbWUo KSkpIHsKKyAgICAgICAgICAgIEFTU0VSVChtX2lzUGFyc2luZ0ZyYWdtZW50KTsKKyAgICAgICAg ICAgIC8vIEZJWE1FOiBJdCBpcyB1bmNsZWFyIHdoYXQgdGhlIGV4YWN0IEFTU0VSVCBzaG91bGQg YmUuCisgICAgICAgICAgICAvLyBodHRwOi8vd3d3LnczLm9yZy9CdWdzL1B1YmxpYy9zaG93X2J1 Zy5jZ2k/aWQ9MTAwOTgKKyAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOworICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGNsb3NlVGhlQ2VsbCgpOworICAgICAgICBw cm9jZXNzRW5kVGFnKHRva2VuKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBwcm9jZXNz RW5kVGFnRm9ySW5Cb2R5KHRva2VuKTsKK30KKwogdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nl c3NFbmRUYWdGb3JJbkJvZHkoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKIHsKICAgICBBU1NFUlQo dG9rZW4udHlwZSgpID09IEhUTUxUb2tlbjo6RW5kVGFnKTsKQEAgLTE4MDcsMTEwICsxOTIwLDE1 IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFnKEF0b21pY0hUTUxUb2tlbiYg dG9rZW4pCiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgSW5Sb3dNb2RlOgogICAgICAgICBBU1NF UlQoaW5zZXJ0aW9uTW9kZSgpID09IEluUm93TW9kZSk7Ci0gICAgICAgIGlmICh0b2tlbi5uYW1l KCkgPT0gdHJUYWcpIHsKLSAgICAgICAgICAgIHByb2Nlc3NUckVuZFRhZ0ZvckluUm93KCk7Ci0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9 PSB0YWJsZVRhZykgewotICAgICAgICAgICAgaWYgKCFwcm9jZXNzVHJFbmRUYWdGb3JJblJvdygp KSB7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKG1faXNQYXJzaW5nRnJhZ21lbnQpOwotICAgICAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIEFTU0VSVChpbnNl cnRpb25Nb2RlKCkgPT0gSW5UYWJsZUJvZHlNb2RlKTsKLSAgICAgICAgICAgIHByb2Nlc3NFbmRU YWcodG9rZW4pOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIGlmIChp c1RhYmxlQm9keUNvbnRleHRUYWcodG9rZW4ubmFtZSgpKSkgewotICAgICAgICAgICAgaWYgKCFt X3RyZWUub3BlbkVsZW1lbnRzKCktPmluVGFibGVTY29wZSh0b2tlbi5uYW1lKCkpKSB7Ci0gICAg ICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICAgICAgfQotICAgICAgICAgICAgcHJvY2Vzc0Zha2VFbmRUYWcodHJUYWcpOwotICAg ICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJblRhYmxlQm9keU1vZGUpOwotICAg ICAgICAgICAgcHJvY2Vzc0VuZFRhZyh0b2tlbik7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIH0KLSAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBib2R5VGFnCi0gICAgICAgICAgICB8 fCBpc0NhcHRpb25Db2xPckNvbGdyb3VwVGFnKHRva2VuLm5hbWUoKSkKLSAgICAgICAgICAgIHx8 IHRva2VuLm5hbWUoKSA9PSBodG1sVGFnCi0gICAgICAgICAgICB8fCBpc1RhYmxlQ2VsbENvbnRl eHRUYWcodG9rZW4ubmFtZSgpKSkgewotICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7Ci0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgcHJvY2Vzc0VuZFRhZ0Zvcklu VGFibGUodG9rZW4pOworICAgICAgICBwcm9jZXNzRW5kVGFnRm9ySW5Sb3codG9rZW4pOwogICAg ICAgICBicmVhazsKICAgICBjYXNlIEluQ2VsbE1vZGU6CiAgICAgICAgIEFTU0VSVChpbnNlcnRp b25Nb2RlKCkgPT0gSW5DZWxsTW9kZSk7Ci0gICAgICAgIGlmIChpc1RhYmxlQ2VsbENvbnRleHRU YWcodG9rZW4ubmFtZSgpKSkgewotICAgICAgICAgICAgaWYgKCFtX3RyZWUub3BlbkVsZW1lbnRz KCktPmluVGFibGVTY29wZSh0b2tlbi5uYW1lKCkpKSB7Ci0gICAgICAgICAgICAgICAgcGFyc2VF cnJvcih0b2tlbik7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQotICAg ICAgICAgICAgbV90cmVlLmdlbmVyYXRlSW1wbGllZEVuZFRhZ3MoKTsKLSAgICAgICAgICAgIGlm ICghbV90cmVlLmN1cnJlbnRFbGVtZW50KCktPmhhc0xvY2FsTmFtZSh0b2tlbi5uYW1lKCkpKQot ICAgICAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwotICAgICAgICAgICAgbV90cmVlLm9w ZW5FbGVtZW50cygpLT5wb3BVbnRpbFBvcHBlZCh0b2tlbi5uYW1lKCkpOwotICAgICAgICAgICAg bV90cmVlLmFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpLT5jbGVhclRvTGFzdE1hcmtlcigpOwot ICAgICAgICAgICAgbV9pbnNlcnRpb25Nb2RlID0gSW5Sb3dNb2RlOwotICAgICAgICAgICAgQVNT RVJUKG1fdHJlZS5jdXJyZW50RWxlbWVudCgpLT5oYXNUYWdOYW1lKHRyVGFnKSk7Ci0gICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBib2R5 VGFnCi0gICAgICAgICAgICB8fCBpc0NhcHRpb25Db2xPckNvbGdyb3VwVGFnKHRva2VuLm5hbWUo KSkKLSAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBodG1sVGFnKSB7Ci0gICAgICAgICAg ICBwYXJzZUVycm9yKHRva2VuKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAg ICAgICBpZiAodG9rZW4ubmFtZSgpID09IHRhYmxlVGFnCi0gICAgICAgICAgICB8fCB0b2tlbi5u YW1lKCkgPT0gdHJUYWcKLSAgICAgICAgICAgIHx8IGlzVGFibGVCb2R5Q29udGV4dFRhZyh0b2tl bi5uYW1lKCkpKSB7Ci0gICAgICAgICAgICBpZiAoIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5U YWJsZVNjb3BlKHRva2VuLm5hbWUoKSkpIHsKLSAgICAgICAgICAgICAgICBBU1NFUlQobV9pc1Bh cnNpbmdGcmFnbWVudCk7Ci0gICAgICAgICAgICAgICAgLy8gRklYTUU6IEl0IGlzIHVuY2xlYXIg d2hhdCB0aGUgZXhhY3QgQVNTRVJUIHNob3VsZCBiZS4KLSAgICAgICAgICAgICAgICAvLyBodHRw Oi8vd3d3LnczLm9yZy9CdWdzL1B1YmxpYy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTgKLSAgICAgICAg ICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgICAgICB9Ci0gICAgICAgICAgICBjbG9zZVRoZUNlbGwoKTsKLSAgICAgICAgICAgIHByb2Nl c3NFbmRUYWcodG9rZW4pOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAg IHByb2Nlc3NFbmRUYWdGb3JJbkJvZHkodG9rZW4pOworICAgICAgICBwcm9jZXNzRW5kVGFnRm9y SW5DZWxsKHRva2VuKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBJblRhYmxlQm9keU1vZGU6 CiAgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gSW5UYWJsZUJvZHlNb2RlKTsKLSAg ICAgICAgaWYgKGlzVGFibGVCb2R5Q29udGV4dFRhZyh0b2tlbi5uYW1lKCkpKSB7Ci0gICAgICAg ICAgICBpZiAoIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5UYWJsZVNjb3BlKHRva2VuLm5hbWUo KSkpIHsKLSAgICAgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKLSAgICAgICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBtX3RyZWUub3BlbkVsZW1lbnRz KCktPnBvcFVudGlsVGFibGVCb2R5U2NvcGVNYXJrZXIoKTsKLSAgICAgICAgICAgIG1fdHJlZS5v cGVuRWxlbWVudHMoKS0+cG9wKCk7Ci0gICAgICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBJblRh YmxlTW9kZTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBpZiAodG9r ZW4ubmFtZSgpID09IHRhYmxlVGFnKSB7Ci0gICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyBz bG93LgotICAgICAgICAgICAgaWYgKCFtX3RyZWUub3BlbkVsZW1lbnRzKCktPmluVGFibGVTY29w ZSh0Ym9keVRhZy5sb2NhbE5hbWUoKSkgJiYgIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5UYWJs ZVNjb3BlKHRoZWFkVGFnLmxvY2FsTmFtZSgpKSAmJiAhbV90cmVlLm9wZW5FbGVtZW50cygpLT5p blRhYmxlU2NvcGUodGZvb3RUYWcubG9jYWxOYW1lKCkpKSB7Ci0gICAgICAgICAgICAgICAgQVNT RVJUKG1faXNQYXJzaW5nRnJhZ21lbnQpOwotICAgICAgICAgICAgICAgIHBhcnNlRXJyb3IodG9r ZW4pOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAg IG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+cG9wVW50aWxUYWJsZUJvZHlTY29wZU1hcmtlcigpOwot ICAgICAgICAgICAgQVNTRVJUKGlzVGFibGVCb2R5Q29udGV4dFRhZyhtX3RyZWUuY3VycmVudEVs ZW1lbnQoKS0+bG9jYWxOYW1lKCkpKTsKLSAgICAgICAgICAgIHByb2Nlc3NGYWtlRW5kVGFnKG1f dHJlZS5jdXJyZW50RWxlbWVudCgpLT50YWdRTmFtZSgpKTsKLSAgICAgICAgICAgIHByb2Nlc3NF bmRUYWcodG9rZW4pOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIGlm ICh0b2tlbi5uYW1lKCkgPT0gYm9keVRhZwotICAgICAgICAgICAgfHwgaXNDYXB0aW9uQ29sT3JD b2xncm91cFRhZyh0b2tlbi5uYW1lKCkpCi0gICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0g aHRtbFRhZwotICAgICAgICAgICAgfHwgaXNUYWJsZUNlbGxDb250ZXh0VGFnKHRva2VuLm5hbWUo KSkKLSAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSB0clRhZykgewotICAgICAgICAgICAg cGFyc2VFcnJvcih0b2tlbik7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAg ICAgcHJvY2Vzc0VuZFRhZ0ZvckluVGFibGUodG9rZW4pOworICAgICAgICBwcm9jZXNzRW5kVGFn Rm9ySW5UYWJsZUJvZHkodG9rZW4pOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEFmdGVyQm9k eU1vZGU6CiAgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gQWZ0ZXJCb2R5TW9kZSk7 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmggYi9XZWJDb3JlL2h0 bWwvSFRNTFRyZWVCdWlsZGVyLmgKaW5kZXggMjU3NGI1ZjZkMTViZmRlMzJjMDZkMTUzNDZmZTE5 MWUzZTBiYzU2YS4uNjdkMmFhZTFiNmJhNzJlYjc1NjAxZTI0M2Q5OWRhNmI3YjQ0Yzc2ZiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oCisrKyBiL1dlYkNvcmUvaHRt bC9IVE1MVHJlZUJ1aWxkZXIuaApAQCAtMTE5LDYgKzExOSw5IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBwcm9jZXNzU3RhcnRUYWdGb3JJblRhYmxlKEF0b21pY0hUTUxUb2tlbiYpOwogICAgIHZvaWQg cHJvY2Vzc0VuZFRhZ0ZvckluQm9keShBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lkIHByb2Nl c3NFbmRUYWdGb3JJblRhYmxlKEF0b21pY0hUTUxUb2tlbiYpOworICAgIHZvaWQgcHJvY2Vzc0Vu ZFRhZ0ZvckluVGFibGVCb2R5KEF0b21pY0hUTUxUb2tlbiYpOworICAgIHZvaWQgcHJvY2Vzc0Vu ZFRhZ0ZvckluUm93KEF0b21pY0hUTUxUb2tlbiYpOworICAgIHZvaWQgcHJvY2Vzc0VuZFRhZ0Zv ckluQ2VsbChBdG9taWNIVE1MVG9rZW4mKTsKIAogICAgIHZvaWQgcHJvY2Vzc0lzaW5kZXhTdGFy dFRhZ0ZvckluQm9keShBdG9taWNIVE1MVG9rZW4mKTsKICAgICBib29sIHByb2Nlc3NCb2R5RW5k VGFnRm9ySW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYpOwo=