83119 2012-04-03 22:36:47 -0700 Replace further usage of int with CSSPropertyID. 2012-04-04 18:42:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson kling macpherson menard simon.fraser webkit.review.bot oldest_to_newest 595258 0 macpherson 2012-04-03 22:36:47 -0700 Replace further usage of int with CSSPropertyID. 595259 1 135516 macpherson 2012-04-03 22:38:42 -0700 Created attachment 135516 Patch 595261 2 macpherson 2012-04-03 22:42:16 -0700 This was a git rebase of my own CSSPropertyID removal, which coincidentally I was working on at the same time as Alexis. There were a few more cases I fixed which you can find in this patch. Also, it re-adds some variable names which were removed by Alexis' recent patches (because those variable names add useful meaning to int / bool etc.). 595490 3 menard 2012-04-04 06:38:17 -0700 (In reply to comment #2) > This was a git rebase of my own CSSPropertyID removal, which coincidentally I was working on at the same time as Alexis. There were a few more cases I fixed which you can find in this patch. > > Also, it re-adds some variable names which were removed by Alexis' recent patches (because those variable names add useful meaning to int / bool etc.). https://bugs.webkit.org/show_bug.cgi?id=83151 added them back all like before. Would you mind uploading again your patch with the CSSPropertyID changes only. Thanks. 595497 4 135516 menard 2012-04-04 06:46:45 -0700 Comment on attachment 135516 Patch AnimationBase has also some HashMap that could be changed (e.g. animatableShorthandsAffectingProperty). (when https://bugs.webkit.org/show_bug.cgi?id=83050 will land). StylePropertySet::removePropertiesInSet could be changed. KeyFrameList also could be changed. HashSet<int> m_pendingImageProperties; // Hash of CSSPropertyIDs in CSSStyleSelector can also be ported. 595506 5 135516 menard 2012-04-04 06:54:09 -0700 Comment on attachment 135516 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135516&action=review > Source/WebCore/css/makeprop.pl:199 > +inline CSSPropertyID convertToCSSPropertyID(int value) This can be remove after https://bugs.webkit.org/show_bug.cgi?id=83050. 595997 6 menard 2012-04-04 15:07:31 -0700 You may want to check you this https://bugs.webkit.org/show_bug.cgi?id=83224 596018 7 macpherson 2012-04-04 15:23:22 -0700 (In reply to comment #3) > (In reply to comment #2) > > This was a git rebase of my own CSSPropertyID removal, which coincidentally I was working on at the same time as Alexis. There were a few more cases I fixed which you can find in this patch. > > > > Also, it re-adds some variable names which were removed by Alexis' recent patches (because those variable names add useful meaning to int / bool etc.). > > https://bugs.webkit.org/show_bug.cgi?id=83151 added them back all like before. Would you mind uploading again your patch with the CSSPropertyID changes only. > > Thanks. Great. I figured that part of the patch would go away with a rebase. Thanks for adding them back. 596088 8 135718 macpherson 2012-04-04 16:34:57 -0700 Created attachment 135718 Patch 596203 9 135718 webkit.review.bot 2012-04-04 18:42:24 -0700 Comment on attachment 135718 Patch Clearing flags on attachment: 135718 Committed r113273: <http://trac.webkit.org/changeset/113273> 596204 10 webkit.review.bot 2012-04-04 18:42:30 -0700 All reviewed patches have been landed. Closing bug. 135516 2012-04-03 22:38:42 -0700 2012-04-04 16:34:49 -0700 Patch bug-83119-20120404153840.patch text/plain 18781 macpherson U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWZhMWI3YzVjMTg3NTEx MGJmMDdiMDc5N2M2YmI5MzhhOTI4NjI0Ny4uZDcwMWJiMzcxMzJhNWFiM2U3ODNlNDRkNTE1MDZh MjQ1NWE3ZDdkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA0LTAzICBMdWtl IE1hY3BoZXJzb24gIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXBsYWNl IGZ1cnRoZXIgdXNhZ2Ugb2YgaW50IHdpdGggQ1NTUHJvcGVydHlJRC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMTE5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC8gbm8gZnVuY3Rp b25hbGl0eSBjaGFuZ2VkLgorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2dVbmltcGxlbWVudGVkUHJvcGVydHlJRCk6 CisgICAgICAgIChXZWJDb3JlOjpDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmdldFByb3Bl cnR5Q1NTVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NHcmFtbWFyLnk6CisgICAgICAgICogY3Nz L0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OkNTU1BhcnNlcik6 CisgICAgICAgICogY3NzL0NTU1BhcnNlci5oOgorICAgICAgICAoQ1NTUGFyc2VyKToKKyAgICAg ICAgKFdlYkNvcmU6OlNob3J0aGFuZFNjb3BlOjp+U2hvcnRoYW5kU2NvcGUpOgorICAgICAgICAq IGNzcy9DU1NQcm9wZXJ0eS5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHk6OkNTU1By b3BlcnR5KToKKyAgICAgICAgKiBjc3MvU1ZHQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0U1ZH UHJvcGVydHlDU1NWYWx1ZSk6CisgICAgICAgICogY3NzL1N0eWxlUHJvcGVydHlTZXQuaDoKKyAg ICAgICAgKFN0eWxlUHJvcGVydHlTZXQpOgorICAgICAgICAqIGNzcy9tYWtlcHJvcC5wbDoKKyAg ICAgICAgKiBkb20vU3R5bGVkRWxlbWVudC5oOgorICAgICAgICAoU3R5bGVkRWxlbWVudCk6Cisg ICAgICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUuaDoKKyAgICAgICAgKEVkaXRpbmdTdHlsZSk6 CisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudC5oOgorICAgICAgICAoSFRNTEVsZW1lbnQpOgor CiAyMDEyLTA0LTAzICBLZW5pY2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBbQ2hyb21pdW1dIE91dC1vZi1wcm9jZXNzIGZvbnQgbG9hZGluZyBnYXJibGVzIHRl eHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFy YXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlv bi5jcHAKaW5kZXggYWEzOWYzYTBlZjhjNjk1ZmM2ZWVjOTIzYjBiNGYyMDg3YmQ1ZmUxNS4uODM0 ZGYxYzRhNTI2OTRkN2EzODEzNWRkNmJhMGMzMGIzYTU3N2E4OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTEyNDcsNyAr MTI0Nyw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPENTU1ZhbHVlPiBjb3VudGVyVG9DU1NWYWx1ZShj b25zdCBSZW5kZXJTdHlsZSogc3R5bGUsIENTU1Byb3BlCiAKIHN0YXRpYyB2b2lkIGxvZ1VuaW1w bGVtZW50ZWRQcm9wZXJ0eUlEKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkKIHsKLSAgICBERUZJ TkVfU1RBVElDX0xPQ0FMKEhhc2hTZXQ8aW50PiwgcHJvcGVydHlJRFNldCwgKCkpOworICAgIERF RklORV9TVEFUSUNfTE9DQUwoSGFzaFNldDxDU1NQcm9wZXJ0eUlEPiwgcHJvcGVydHlJRFNldCwg KCkpOwogICAgIGlmICghcHJvcGVydHlJRFNldC5hZGQocHJvcGVydHlJRCkuaXNOZXdFbnRyeSkK ICAgICAgICAgcmV0dXJuOwogCkBAIC0yMjgwLDE0ICsyMjgwLDE0IEBAIFBhc3NSZWZQdHI8Q1NT VmFsdWU+IENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1ZShD U1NQcm9wZXJ0CiAgICAgICAgICAgICBjb25zdCBBbmltYXRpb25MaXN0KiB0ID0gc3R5bGUtPnRy YW5zaXRpb25zKCk7CiAgICAgICAgICAgICBpZiAodCkgewogICAgICAgICAgICAgICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgdC0+c2l6ZSgpOyArK2kpIHsKLSAgICAgICAgICAgICAgICAgICAg aW50IHByb3AgPSB0LT5hbmltYXRpb24oaSktPnByb3BlcnR5KCk7CisgICAgICAgICAgICAgICAg ICAgIENTU1Byb3BlcnR5SUQgcHJvcCA9IGNvbnZlcnRUb0NTU1Byb3BlcnR5SUQodC0+YW5pbWF0 aW9uKGkpLT5wcm9wZXJ0eSgpKTsKICAgICAgICAgICAgICAgICAgICAgUmVmUHRyPENTU1ZhbHVl PiBwcm9wZXJ0eVZhbHVlOwogICAgICAgICAgICAgICAgICAgICBpZiAocHJvcCA9PSBjQW5pbWF0 ZU5vbmUpCiAgICAgICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0eVZhbHVlID0gY3NzVmFsdWVQ b29sLT5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb25lKTsKICAgICAgICAgICAgICAg ICAgICAgZWxzZSBpZiAocHJvcCA9PSBjQW5pbWF0ZUFsbCkKICAgICAgICAgICAgICAgICAgICAg ICAgIHByb3BlcnR5VmFsdWUgPSBjc3NWYWx1ZVBvb2wtPmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShD U1NWYWx1ZUFsbCk7CiAgICAgICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAg ICAgICAgIHByb3BlcnR5VmFsdWUgPSBjc3NWYWx1ZVBvb2wtPmNyZWF0ZVZhbHVlKGdldFByb3Bl cnR5TmFtZShzdGF0aWNfY2FzdDxDU1NQcm9wZXJ0eUlEPihwcm9wKSksIENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NfU1RSSU5HKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHByb3BlcnR5VmFsdWUg PSBjc3NWYWx1ZVBvb2wtPmNyZWF0ZVZhbHVlKGdldFByb3BlcnR5TmFtZShwcm9wKSwgQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19TVFJJTkcpOwogICAgICAgICAgICAgICAgICAgICBsaXN0LT5hcHBl bmQocHJvcGVydHlWYWx1ZSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55IGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU0dyYW1tYXIueQppbmRleCAwZWNmZDg3ZThmNThhNDI5ZjUzMGYwMmMyNzAw YmE5OGI4YzhiMDhmLi40ZDIxYWJjZDQwZGVhOTg5MjM1YzhmNDBmMzAxOGZiOGNiODMzOWU3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55CisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnkKQEAgLTg0LDYgKzg0LDcgQEAgdXNpbmcgbmFtZXNwYWNl IEhUTUxOYW1lczsKICAgICBTdHlsZUtleWZyYW1lKiBrZXlmcmFtZTsKICAgICBTdHlsZVJ1bGVL ZXlmcmFtZXMqIGtleWZyYW1lc1J1bGU7CiAgICAgZmxvYXQgdmFsOworICAgIENTU1Byb3BlcnR5 SUQgaWQ7CiB9CiAKICV7CkBAIC0yNTAsNyArMjUxLDcgQEAgc3RhdGljIGludCBjc3N5eWxleChZ WVNUWVBFKiB5eWx2YWwsIHZvaWQqIHBhcnNlcikKICV0eXBlIDx2YWx1ZUxpc3Q+IGtleV9saXN0 CiAldHlwZSA8dmFsdWU+IGtleQogCi0ldHlwZSA8aW50ZWdlcj4gcHJvcGVydHkKKyV0eXBlIDxp ZD4gcHJvcGVydHkKIAogJXR5cGUgPHNlbGVjdG9yPiBzcGVjaWZpZXIKICV0eXBlIDxzZWxlY3Rv cj4gc3BlY2lmaWVyX2xpc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJz ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKaW5kZXggZGFkYjhkNWVm YzcwZWYwNjI3OTRjNzMyMTE3NDk1MGQ4OGY0ZGQwYi4uZmMyNTg0OTY3MmM1YWFlZTI4NTM1OGRk Zjg2MmNjODhlYjVhNjJhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKQEAgLTE4Niw3ICsx ODYsNyBAQCBDU1NQYXJzZXI6OkNTU1BhcnNlcihDU1NQYXJzZXJNb2RlIGNzc1BhcnNlck1vZGUp CiAgICAgLCBtX2lkKENTU1Byb3BlcnR5SW52YWxpZCkKICAgICAsIG1fc3R5bGVTaGVldCgwKQog ICAgICwgbV9pblBhcnNlU2hvcnRoYW5kKDApCi0gICAgLCBtX2N1cnJlbnRTaG9ydGhhbmQoMCkK KyAgICAsIG1fY3VycmVudFNob3J0aGFuZChDU1NQcm9wZXJ0eUludmFsaWQpCiAgICAgLCBtX2lt cGxpY2l0U2hvcnRoYW5kKGZhbHNlKQogICAgICwgbV9oYXNGb250RmFjZU9ubHlWYWx1ZXMoZmFs c2UpCiAgICAgLCBtX2hhZFN5bnRhY3RpY2FsbHlWYWxpZENTU1J1bGUoZmFsc2UpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUGFyc2VyLmgKaW5kZXggZjVjZTFmNWEyOWY4N2VlZjAxZmE5NzcyODBhZGQxODZlOWJkYzJh OS4uNTY0YzRjYzcwNjU2N2VmY2QxOGIxZTdjODYxZjA0NjRmYWJhNzI5MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NQYXJzZXIuaApAQCAtNzUsMTEgKzc1LDExIEBAIHB1YmxpYzoKICAgICB2b2lkIHBhcnNlU2hl ZXQoQ1NTU3R5bGVTaGVldCosIGNvbnN0IFN0cmluZyYsIGludCBzdGFydExpbmVOdW1iZXIgPSAw LCBTdHlsZVJ1bGVSYW5nZU1hcCogcnVsZVJhbmdlTWFwID0gMCk7CiAgICAgUGFzc1JlZlB0cjxT dHlsZVJ1bGVCYXNlPiBwYXJzZVJ1bGUoQ1NTU3R5bGVTaGVldCosIGNvbnN0IFN0cmluZyYpOwog ICAgIFBhc3NSZWZQdHI8U3R5bGVLZXlmcmFtZT4gcGFyc2VLZXlmcmFtZVJ1bGUoQ1NTU3R5bGVT aGVldCosIGNvbnN0IFN0cmluZyYpOwotICAgIHN0YXRpYyBib29sIHBhcnNlVmFsdWUoU3R5bGVQ cm9wZXJ0eVNldCosIENTU1Byb3BlcnR5SUQsIGNvbnN0IFN0cmluZyYsIGJvb2wsIENTU1BhcnNl ck1vZGUsIENTU1N0eWxlU2hlZXQqKTsKKyAgICBzdGF0aWMgYm9vbCBwYXJzZVZhbHVlKFN0eWxl UHJvcGVydHlTZXQqLCBDU1NQcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmLCBib29sIGltcG9ydGFu dCwgQ1NTUGFyc2VyTW9kZSwgQ1NTU3R5bGVTaGVldCopOwogICAgIHN0YXRpYyBib29sIHBhcnNl Q29sb3IoUkdCQTMyJiBjb2xvciwgY29uc3QgU3RyaW5nJiwgYm9vbCBzdHJpY3QgPSBmYWxzZSk7 CiAgICAgc3RhdGljIGJvb2wgcGFyc2VTeXN0ZW1Db2xvcihSR0JBMzImIGNvbG9yLCBjb25zdCBT dHJpbmcmLCBEb2N1bWVudCopOwogICAgIHN0YXRpYyBQYXNzUmVmUHRyPENTU1ZhbHVlTGlzdD4g cGFyc2VGb250RmFjZVZhbHVlKGNvbnN0IEF0b21pY1N0cmluZyYsIENTU1N0eWxlU2hlZXQqIGNv bnRleHRTdHlsZVNoZWV0KTsKLSAgICBQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBwYXJz ZVZhbGlkUHJpbWl0aXZlKGludCwgQ1NTUGFyc2VyVmFsdWUqKTsKKyAgICBQYXNzUmVmUHRyPENT U1ByaW1pdGl2ZVZhbHVlPiBwYXJzZVZhbGlkUHJpbWl0aXZlKGludCBpZGVudCwgQ1NTUGFyc2Vy VmFsdWUqKTsKICAgICBib29sIHBhcnNlRGVjbGFyYXRpb24oU3R5bGVQcm9wZXJ0eVNldCosIGNv bnN0IFN0cmluZyYsIFJlZlB0cjxDU1NTdHlsZVNvdXJjZURhdGE+KiwgQ1NTU3R5bGVTaGVldCog Y29udGV4dFN0eWxlU2hlZXQpOwogICAgIFBhc3NPd25QdHI8TWVkaWFRdWVyeT4gcGFyc2VNZWRp YVF1ZXJ5KGNvbnN0IFN0cmluZyYpOwogCkBAIC04NywxNSArODcsMTUgQEAgcHVibGljOgogCiAg ICAgQ1NTVmFsdWVQb29sKiBjc3NWYWx1ZVBvb2woKSBjb25zdCB7IHJldHVybiBtX2Nzc1ZhbHVl UG9vbC5nZXQoKTsgfQogCi0gICAgdm9pZCBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBQYXNz UmVmUHRyPENTU1ZhbHVlPiwgYm9vbCwgYm9vbCBpbXBsaWNpdCA9IGZhbHNlKTsKKyAgICB2b2lk IGFkZFByb3BlcnR5KENTU1Byb3BlcnR5SUQsIFBhc3NSZWZQdHI8Q1NTVmFsdWU+LCBib29sIGlt cG9ydGFudCwgYm9vbCBpbXBsaWNpdCA9IGZhbHNlKTsKICAgICB2b2lkIHJvbGxiYWNrTGFzdFBy b3BlcnRpZXMoaW50IG51bSk7CiAgICAgYm9vbCBoYXNQcm9wZXJ0aWVzKCkgY29uc3QgeyByZXR1 cm4gIW1fcGFyc2VkUHJvcGVydGllcy5pc0VtcHR5KCk7IH0KIAotICAgIGJvb2wgcGFyc2VWYWx1 ZShDU1NQcm9wZXJ0eUlELCBib29sKTsKKyAgICBib29sIHBhcnNlVmFsdWUoQ1NTUHJvcGVydHlJ RCwgYm9vbCBpbXBvcnRhbnQpOwogICAgIGJvb2wgcGFyc2VTaG9ydGhhbmQoQ1NTUHJvcGVydHlJ RCwgY29uc3QgU3R5bGVQcm9wZXJ0eVNob3J0aGFuZCYsIGJvb2wpOwotICAgIGJvb2wgcGFyc2U0 VmFsdWVzKENTU1Byb3BlcnR5SUQsIGNvbnN0IENTU1Byb3BlcnR5SUQqLCBib29sKTsKLSAgICBi b29sIHBhcnNlQ29udGVudChDU1NQcm9wZXJ0eUlELCBib29sKTsKLSAgICBib29sIHBhcnNlUXVv dGVzKENTU1Byb3BlcnR5SUQsIGJvb2wpOworICAgIGJvb2wgcGFyc2U0VmFsdWVzKENTU1Byb3Bl cnR5SUQsIGNvbnN0IENTU1Byb3BlcnR5SUQqIHByb3BlcnRpZXMsIGJvb2wgaW1wb3J0YW50KTsK KyAgICBib29sIHBhcnNlQ29udGVudChDU1NQcm9wZXJ0eUlELCBib29sIGltcG9ydGFudCk7Cisg ICAgYm9vbCBwYXJzZVF1b3RlcyhDU1NQcm9wZXJ0eUlELCBib29sIGltcG9ydGFudCk7CiAKICAg ICBQYXNzUmVmUHRyPENTU1ZhbHVlPiBwYXJzZUF0dHIoQ1NTUGFyc2VyVmFsdWVMaXN0KiBhcmdz KTsKIApAQCAtMTEwLDEwICsxMTAsMTAgQEAgcHVibGljOgogICAgIHZvaWQgcGFyc2VGaWxsUG9z aXRpb24oQ1NTUGFyc2VyVmFsdWVMaXN0KiwgUmVmUHRyPENTU1ZhbHVlPiYsIFJlZlB0cjxDU1NW YWx1ZT4mKTsKIAogICAgIHZvaWQgcGFyc2VGaWxsUmVwZWF0KFJlZlB0cjxDU1NWYWx1ZT4mLCBS ZWZQdHI8Q1NTVmFsdWU+Jik7Ci0gICAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gcGFyc2VGaWxsU2l6 ZShDU1NQcm9wZXJ0eUlEIHByb3BJZCwgYm9vbCAmYWxsb3dDb21tYSk7CisgICAgUGFzc1JlZlB0 cjxDU1NWYWx1ZT4gcGFyc2VGaWxsU2l6ZShDU1NQcm9wZXJ0eUlELCBib29sICZhbGxvd0NvbW1h KTsKIAotICAgIGJvb2wgcGFyc2VGaWxsUHJvcGVydHkoQ1NTUHJvcGVydHlJRCwgQ1NTUHJvcGVy dHlJRCYsIENTU1Byb3BlcnR5SUQmLCBSZWZQdHI8Q1NTVmFsdWU+JiwgUmVmUHRyPENTU1ZhbHVl PiYpOwotICAgIGJvb2wgcGFyc2VGaWxsU2hvcnRoYW5kKENTU1Byb3BlcnR5SUQsIGNvbnN0IENT U1Byb3BlcnR5SUQqLCBpbnQsIGJvb2wpOworICAgIGJvb2wgcGFyc2VGaWxsUHJvcGVydHkoQ1NT UHJvcGVydHlJRCBwcm9wSWQsIENTU1Byb3BlcnR5SUQmIHByb3BJZDEsIENTU1Byb3BlcnR5SUQm IHByb3BJZDIsIFJlZlB0cjxDU1NWYWx1ZT4mLCBSZWZQdHI8Q1NTVmFsdWU+Jik7CisgICAgYm9v bCBwYXJzZUZpbGxTaG9ydGhhbmQoQ1NTUHJvcGVydHlJRCBwcm9wSWQsIGNvbnN0IENTU1Byb3Bl cnR5SUQqIHByb3BlcnRpZXMsIGludCBudW1Qcm9wZXJ0aWVzLCBib29sIGltcG9ydGFudCk7CiAK ICAgICB2b2lkIGFkZEZpbGxWYWx1ZShSZWZQdHI8Q1NTVmFsdWU+JiBsdmFsLCBQYXNzUmVmUHRy PENTU1ZhbHVlPiBydmFsKTsKIApAQCAtMTMxLDE3ICsxMzEsMTcgQEAgcHVibGljOgogCiAgICAg Ym9vbCBwYXJzZVRyYW5zZm9ybU9yaWdpblNob3J0aGFuZChSZWZQdHI8Q1NTVmFsdWU+JiwgUmVm UHRyPENTU1ZhbHVlPiYsIFJlZlB0cjxDU1NWYWx1ZT4mKTsKICAgICBib29sIHBhcnNlQ3ViaWNC ZXppZXJUaW1pbmdGdW5jdGlvblZhbHVlKENTU1BhcnNlclZhbHVlTGlzdComIGFyZ3MsIGRvdWJs ZSYgcmVzdWx0KTsKLSAgICBib29sIHBhcnNlQW5pbWF0aW9uUHJvcGVydHkoQ1NTUHJvcGVydHlJ RCBwcm9wSWQsIFJlZlB0cjxDU1NWYWx1ZT4mKTsKKyAgICBib29sIHBhcnNlQW5pbWF0aW9uUHJv cGVydHkoQ1NTUHJvcGVydHlJRCwgUmVmUHRyPENTU1ZhbHVlPiYpOwogICAgIGJvb2wgcGFyc2VU cmFuc2l0aW9uU2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KTsKICAgICBib29sIHBhcnNlQW5pbWF0 aW9uU2hvcnRoYW5kKGJvb2wgaW1wb3J0YW50KTsKIAogI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlP VVQpCi0gICAgYm9vbCBwYXJzZUdyaWRUcmFja0xpc3QoQ1NTUHJvcGVydHlJRCwgYm9vbCk7Cisg ICAgYm9vbCBwYXJzZUdyaWRUcmFja0xpc3QoQ1NTUHJvcGVydHlJRCwgYm9vbCBpbXBvcnRhbnQp OwogI2VuZGlmCiAKLSAgICBib29sIHBhcnNlRGFzaGJvYXJkUmVnaW9ucyhDU1NQcm9wZXJ0eUlE LCBib29sKTsKKyAgICBib29sIHBhcnNlRGFzaGJvYXJkUmVnaW9ucyhDU1NQcm9wZXJ0eUlELCBi b29sIGltcG9ydGFudCk7CiAKLSAgICBib29sIHBhcnNlQ2xpcFNoYXBlKENTU1Byb3BlcnR5SUQs IGJvb2wpOworICAgIGJvb2wgcGFyc2VDbGlwU2hhcGUoQ1NTUHJvcGVydHlJRCwgYm9vbCBpbXBv cnRhbnQpOwogCiAgICAgYm9vbCBwYXJzZUV4Y2x1c2lvblNoYXBlKGJvb2wgc2hhcGVJbnNpZGUs IGJvb2wgaW1wb3J0YW50KTsKICAgICBQYXNzUmVmUHRyPENTU1dyYXBTaGFwZT4gcGFyc2VFeGNs dXNpb25TaGFwZVJlY3QoQ1NTUGFyc2VyVmFsdWVMaXN0KiBhcmdzKTsKQEAgLTE1Miw3ICsxNTIs NyBAQCBwdWJsaWM6CiAgICAgYm9vbCBwYXJzZUZvbnQoYm9vbCBpbXBvcnRhbnQpOwogICAgIFBh c3NSZWZQdHI8Q1NTVmFsdWVMaXN0PiBwYXJzZUZvbnRGYW1pbHkoKTsKIAotICAgIGJvb2wgcGFy c2VDb3VudGVyKENTU1Byb3BlcnR5SUQsIGludCwgYm9vbCk7CisgICAgYm9vbCBwYXJzZUNvdW50 ZXIoQ1NTUHJvcGVydHlJRCwgaW50IGRlZmF1bHRWYWx1ZSwgYm9vbCBpbXBvcnRhbnQpOwogICAg IFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHBhcnNlQ291bnRlckNvbnRlbnQoQ1NTUGFyc2VyVmFsdWVM aXN0KiBhcmdzLCBib29sIGNvdW50ZXJzKTsKIAogICAgIGJvb2wgcGFyc2VDb2xvclBhcmFtZXRl cnMoQ1NTUGFyc2VyVmFsdWUqLCBpbnQqIGNvbG9yVmFsdWVzLCBib29sIHBhcnNlQWxwaGEpOwpA QCAtMTgyLDcgKzE4Miw3IEBAIHB1YmxpYzoKICAgICBib29sIHBhcnNlQm9yZGVySW1hZ2VTbGlj ZShDU1NQcm9wZXJ0eUlELCBSZWZQdHI8Q1NTQm9yZGVySW1hZ2VTbGljZVZhbHVlPiYpOwogICAg IGJvb2wgcGFyc2VCb3JkZXJJbWFnZVdpZHRoKFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4mKTsK ICAgICBib29sIHBhcnNlQm9yZGVySW1hZ2VPdXRzZXQoUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVl PiYpOwotICAgIGJvb2wgcGFyc2VCb3JkZXJSYWRpdXMoQ1NTUHJvcGVydHlJRCwgYm9vbCk7Cisg ICAgYm9vbCBwYXJzZUJvcmRlclJhZGl1cyhDU1NQcm9wZXJ0eUlELCBib29sIGltcG9ydGFudCk7 CiAKICAgICBib29sIHBhcnNlQXNwZWN0UmF0aW8oYm9vbCBpbXBvcnRhbnQpOwogCkBAIC0yMjYs OCArMjI2LDggQEAgcHVibGljOgogCiAgICAgYm9vbCBjc3NSZWdpb25zRW5hYmxlZCgpIGNvbnN0 OwogICAgIGJvb2wgcGFyc2VGbG93VGhyZWFkKGNvbnN0IFN0cmluZyYgZmxvd05hbWUsIERvY3Vt ZW50Kik7Ci0gICAgYm9vbCBwYXJzZUZsb3dUaHJlYWQoQ1NTUHJvcGVydHlJRCwgYm9vbCk7Ci0g ICAgYm9vbCBwYXJzZVJlZ2lvblRocmVhZChDU1NQcm9wZXJ0eUlELCBib29sKTsKKyAgICBib29s IHBhcnNlRmxvd1RocmVhZChDU1NQcm9wZXJ0eUlELCBib29sIGltcG9ydGFudCk7CisgICAgYm9v bCBwYXJzZVJlZ2lvblRocmVhZChDU1NQcm9wZXJ0eUlELCBib29sIGltcG9ydGFudCk7CiAKICAg ICBib29sIHBhcnNlRm9udFZhcmlhbnRMaWdhdHVyZXMoYm9vbCBpbXBvcnRhbnQpOwogCkBAIC0z MDIsNyArMzAyLDcgQEAgcHVibGljOgogICAgIHVuc2lnbmVkIG1fbnVtUGFyc2VkUHJvcGVydGll c0JlZm9yZU1hcmdpbkJveDsKIAogICAgIGludCBtX2luUGFyc2VTaG9ydGhhbmQ7Ci0gICAgaW50 IG1fY3VycmVudFNob3J0aGFuZDsKKyAgICBDU1NQcm9wZXJ0eUlEIG1fY3VycmVudFNob3J0aGFu ZDsKICAgICBib29sIG1faW1wbGljaXRTaG9ydGhhbmQ7CiAKICAgICBib29sIG1faGFzRm9udEZh Y2VPbmx5VmFsdWVzOwpAQCAtNDgzLDcgKzQ4Myw3IEBAIHB1YmxpYzoKICAgICB+U2hvcnRoYW5k U2NvcGUoKQogICAgIHsKICAgICAgICAgaWYgKCEoLS1tX3BhcnNlci0+bV9pblBhcnNlU2hvcnRo YW5kKSkKLSAgICAgICAgICAgIG1fcGFyc2VyLT5tX2N1cnJlbnRTaG9ydGhhbmQgPSAwOworICAg ICAgICAgICAgbV9wYXJzZXItPm1fY3VycmVudFNob3J0aGFuZCA9IENTU1Byb3BlcnR5SW52YWxp ZDsKICAgICB9CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UHJvcGVydHkuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eS5oCmluZGV4IDEyMjBk MTcyNzIwZjMxZDg4NWU0YjAwM2I1NDk5ZjgwZjVkOGRmOTEuLjBmOTllNjc3ZmI4YWE4MzNkNTQ3 MDAwZDZhNTY1M2RmMjg2ZGQ1OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ cm9wZXJ0eS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eS5oCkBAIC0zMiw3 ICszMiw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgQ1NTUHJvcGVydHkgewogcHVi bGljOgotICAgIENTU1Byb3BlcnR5KENTU1Byb3BlcnR5SUQgcHJvcElELCBQYXNzUmVmUHRyPENT U1ZhbHVlPiB2YWx1ZSwgYm9vbCBpbXBvcnRhbnQgPSBmYWxzZSwgaW50IHNob3J0aGFuZElEID0g MCwgYm9vbCBpbXBsaWNpdCA9IGZhbHNlKQorICAgIENTU1Byb3BlcnR5KENTU1Byb3BlcnR5SUQg cHJvcElELCBQYXNzUmVmUHRyPENTU1ZhbHVlPiB2YWx1ZSwgYm9vbCBpbXBvcnRhbnQgPSBmYWxz ZSwgQ1NTUHJvcGVydHlJRCBzaG9ydGhhbmRJRCA9IENTU1Byb3BlcnR5SW52YWxpZCwgYm9vbCBp bXBsaWNpdCA9IGZhbHNlKQogICAgICAgICA6IG1faWQocHJvcElEKQogICAgICAgICAsIG1fc2hv cnRoYW5kSUQoc2hvcnRoYW5kSUQpCiAgICAgICAgICwgbV9pbXBvcnRhbnQoaW1wb3J0YW50KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1NWR0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU1ZHQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0 aW9uLmNwcAppbmRleCBkNjBiZGYyNTFmZWI0ZGE2MmJlN2Y1ODNmOGY0MGVkM2YyYjg1NWJmLi41 ZTNhYTg4MDc3MTU2NmViMGNlMDMzODE4NzZjNWJjMDA0NWNkOTQ0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU1ZHQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvU1ZHQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAt ODYsNyArODYsNyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjbGFy YXRpb246OmdldFNWR1Byb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcAogICAgIGlmICghc3ZnU3R5bGUp CiAgICAgICAgIHJldHVybiAwOwogCi0gICAgc3dpdGNoIChzdGF0aWNfY2FzdDxDU1NQcm9wZXJ0 eUlEPihwcm9wZXJ0eUlEKSkgeworICAgIHN3aXRjaCAocHJvcGVydHlJRCkgewogICAgICAgICBj YXNlIENTU1Byb3BlcnR5Q2xpcFJ1bGU6CiAgICAgICAgICAgICByZXR1cm4gQ1NTUHJpbWl0aXZl VmFsdWU6OmNyZWF0ZShzdmdTdHlsZS0+Y2xpcFJ1bGUoKSk7CiAgICAgICAgIGNhc2UgQ1NTUHJv cGVydHlGbG9vZE9wYWNpdHk6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQ cm9wZXJ0eVNldC5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuaAppbmRl eCA5MDhhYjI5MjUxODIwZDhkYjk3ZTcxNzY2YWQxYzE5Mjk2YjczZjMyLi40NGZhMTY0ODczM2Uy Y2Y2ZjBlNDg0MjY4ODhjOTgwYmY3MzFjODJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVQcm9wZXJ0eVNldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3Bl cnR5U2V0LmgKQEAgLTY4LDExICs2OCwxMSBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1Byb3BlcnR5 SW1wbGljaXQoQ1NTUHJvcGVydHlJRCkgY29uc3Q7CiAKICAgICAvLyBUaGVzZSBleHBhbmQgc2hv cnRoYW5kIHByb3BlcnRpZXMgaW50byBtdWx0aXBsZSBwcm9wZXJ0aWVzLgotICAgIGJvb2wgc2V0 UHJvcGVydHkoQ1NTUHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiwgYm9vbCBpbXBvcnRhbnQgPSBm YWxzZSwgQ1NTU3R5bGVTaGVldCogY29udGV4dFN0eWxlU2hlZXQgPSAwKTsKKyAgICBib29sIHNl dFByb3BlcnR5KENTU1Byb3BlcnR5SUQsIGNvbnN0IFN0cmluZyYgdmFsdWUsIGJvb2wgaW1wb3J0 YW50ID0gZmFsc2UsIENTU1N0eWxlU2hlZXQqIGNvbnRleHRTdHlsZVNoZWV0ID0gMCk7CiAgICAg dm9pZCBzZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBQYXNzUmVmUHRyPENTU1ZhbHVlPiwgYm9v bCBpbXBvcnRhbnQgPSBmYWxzZSk7CiAKICAgICAvLyBUaGVzZSBkbyBub3QuIEZJWE1FOiBUaGlz IGlzIHRvbyBtZXNzeSwgd2UgY2FuIGRvIGJldHRlci4KLSAgICBib29sIHNldFByb3BlcnR5KENT U1Byb3BlcnR5SUQsIGludCwgYm9vbCBpbXBvcnRhbnQgPSBmYWxzZSwgQ1NTU3R5bGVTaGVldCog Y29udGV4dFN0eWxlU2hlZXQgPSAwKTsKKyAgICBib29sIHNldFByb3BlcnR5KENTU1Byb3BlcnR5 SUQsIGludCB2YWx1ZSwgYm9vbCBpbXBvcnRhbnQgPSBmYWxzZSwgQ1NTU3R5bGVTaGVldCogY29u dGV4dFN0eWxlU2hlZXQgPSAwKTsKICAgICB2b2lkIHNldFByb3BlcnR5KGNvbnN0IENTU1Byb3Bl cnR5JiwgQ1NTUHJvcGVydHkqIHNsb3QgPSAwKTsKICAgICAKICAgICBib29sIHJlbW92ZVByb3Bl cnR5KENTU1Byb3BlcnR5SUQsIFN0cmluZyogcmV0dXJuVGV4dCA9IDApOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsIGIvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vw cm9wLnBsCmluZGV4IDZkZTdiN2Q1NjJmZmNjOThkMGI3MjNmZjhjNmJkYTUzMTgwMDQ2OGUuLjQw MDRiNmFkNjIzODQ4MWVkZDA0Zjg1Njg4YzAyMDNkOGFlOWNkMjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXBy b3AucGwKQEAgLTE1MSw2ICsxNTEsOCBAQCBwcmludCBIRUFERVIgPDwgIkVPRiI7CiAjZGVmaW5l IENTU1Byb3BlcnR5TmFtZXNfaAogCiAjaW5jbHVkZSA8c3RyaW5nLmg+CisjaW5jbHVkZSA8d3Rm L0hhc2hGdW5jdGlvbnMuaD4KKyNpbmNsdWRlIDx3dGYvSGFzaFRyYWl0cy5oPgogCiBuYW1lc3Bh Y2UgV1RGIHsKIGNsYXNzIFN0cmluZzsKQEAgLTE3NSwxMCArMTc3LDEyIEBAIGZvcmVhY2ggbXkg JG5hbWUgKEBuYW1lcykgewogICB9CiB9CiBteSAkbnVtID0gJGkgLSAkZmlyc3Q7CitteSAkbGFz dCA9ICRpIC0gMTsKIAogcHJpbnQgSEVBREVSICJ9O1xuXG4iOwogcHJpbnQgSEVBREVSICJjb25z dCBpbnQgZmlyc3RDU1NQcm9wZXJ0eSA9ICRmaXJzdDtcbiI7CiBwcmludCBIRUFERVIgImNvbnN0 IGludCBudW1DU1NQcm9wZXJ0aWVzID0gJG51bTtcbiI7CitwcmludCBIRUFERVIgImNvbnN0IGlu dCBsYXN0Q1NTUHJvcGVydHkgPSAkbGFzdDtcbiI7CiBwcmludCBIRUFERVIgImNvbnN0IHNpemVf dCBtYXhDU1NQcm9wZXJ0eU5hbWVMZW5ndGggPSAkbWF4TGVuO1xuIjsKIAogcHJpbnQgSEVBREVS ICJjb25zdCBjaGFyKiBjb25zdCBwcm9wZXJ0eU5hbWVTdHJpbmdzWyRudW1dID0ge1xuIjsKQEAg LTE5Miw4ICsxOTYsMjQgQEAgcHJpbnQgSEVBREVSIDw8ICJFT0YiOwogY29uc3QgY2hhciogZ2V0 UHJvcGVydHlOYW1lKENTU1Byb3BlcnR5SUQpOwogV1RGOjpTdHJpbmcgZ2V0SlNQcm9wZXJ0eU5h bWUoQ1NTUHJvcGVydHlJRCk7CiAKK2lubGluZSBDU1NQcm9wZXJ0eUlEIGNvbnZlcnRUb0NTU1By b3BlcnR5SUQoaW50IHZhbHVlKQoreworICAgIEFTU0VSVCgodmFsdWUgPj0gZmlyc3RDU1NQcm9w ZXJ0eSAmJiB2YWx1ZSA8PSBsYXN0Q1NTUHJvcGVydHkpIHx8IHZhbHVlID09IENTU1Byb3BlcnR5 SW52YWxpZCk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PENTU1Byb3BlcnR5SUQ+KHZhbHVlKTsK K30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCituYW1lc3BhY2UgV1RGIHsKK3RlbXBsYXRl PD4gc3RydWN0IERlZmF1bHRIYXNoPFdlYkNvcmU6OkNTU1Byb3BlcnR5SUQ+IHsgdHlwZWRlZiBJ bnRIYXNoPHVuc2lnbmVkPiBIYXNoOyB9OwordGVtcGxhdGU8PiBzdHJ1Y3QgSGFzaFRyYWl0czxX ZWJDb3JlOjpDU1NQcm9wZXJ0eUlEPiA6IEdlbmVyaWNIYXNoVHJhaXRzPFdlYkNvcmU6OkNTU1By b3BlcnR5SUQ+IHsKKyAgICBzdGF0aWMgY29uc3QgYm9vbCBlbXB0eVZhbHVlSXNaZXJvID0gdHJ1 ZTsKKyAgICBzdGF0aWMgY29uc3QgYm9vbCBuZWVkc0Rlc3RydWN0aW9uID0gZmFsc2U7CisgICAg c3RhdGljIHZvaWQgY29uc3RydWN0RGVsZXRlZFZhbHVlKFdlYkNvcmU6OkNTU1Byb3BlcnR5SUQm IHNsb3QpIHsgc2xvdCA9IHN0YXRpY19jYXN0PFdlYkNvcmU6OkNTU1Byb3BlcnR5SUQ+KFdlYkNv cmU6Omxhc3RDU1NQcm9wZXJ0eSArIDEpOyB9CisgICAgc3RhdGljIGJvb2wgaXNEZWxldGVkVmFs dWUoV2ViQ29yZTo6Q1NTUHJvcGVydHlJRCB2YWx1ZSkgeyByZXR1cm4gdmFsdWUgPT0gKFdlYkNv cmU6Omxhc3RDU1NQcm9wZXJ0eSArIDEpOyB9Cit9OworfQorCiAjZW5kaWYgLy8gQ1NTUHJvcGVy dHlOYW1lc19oCiAKIEVPRgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1N0eWxlZEVs ZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmgKaW5kZXggZDFkMjA4 ZmMzZmRmNjliMmY1YzIxZjllM2QyMDg2NzMzOGQ1OWM3YS4uODIwODNiZTZkMWYzODczYmNiYzFj M2U3NzBmMTY0NGU1M2VkMTZhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1N0eWxl ZEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU3R5bGVkRWxlbWVudC5oCkBAIC00 NCw5ICs0NCw5IEBAIHB1YmxpYzoKICAgICBjb25zdCBTdHlsZVByb3BlcnR5U2V0KiBlbnN1cmVJ bmxpbmVTdHlsZSgpIHsgcmV0dXJuIGVuc3VyZUF0dHJpYnV0ZURhdGEoKS0+ZW5zdXJlSW5saW5l U3R5bGUodGhpcyk7IH0KICAgICAKICAgICAvLyBVbmxpa2UgU3R5bGVQcm9wZXJ0eVNldCBzZXR0 ZXJzLCB0aGVzZSBpbXBsZW1lbnQgaW52YWxpZGF0aW9uLgotICAgIGJvb2wgc2V0SW5saW5lU3R5 bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBpbnQsIGJvb2wgaW1wb3J0YW50ID0gZmFsc2UpOwot ICAgIGJvb2wgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBkb3VibGUsIENT U1ByaW1pdGl2ZVZhbHVlOjpVbml0VHlwZXMsIGJvb2wgaW1wb3J0YW50ID0gZmFsc2UpOwotICAg IGJvb2wgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcm LCBib29sIGltcG9ydGFudCA9IGZhbHNlKTsKKyAgICBib29sIHNldElubGluZVN0eWxlUHJvcGVy dHkoQ1NTUHJvcGVydHlJRCwgaW50IGlkZW50aWZpZXIsIGJvb2wgaW1wb3J0YW50ID0gZmFsc2Up OworICAgIGJvb2wgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBkb3VibGUg dmFsdWUsIENTU1ByaW1pdGl2ZVZhbHVlOjpVbml0VHlwZXMsIGJvb2wgaW1wb3J0YW50ID0gZmFs c2UpOworICAgIGJvb2wgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBjb25z dCBTdHJpbmcmIHZhbHVlLCBib29sIGltcG9ydGFudCA9IGZhbHNlKTsKICAgICBib29sIHJlbW92 ZUlubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlJRCk7CiAgICAgCiAgICAgdmlydHVhbCBD U1NTdHlsZURlY2xhcmF0aW9uKiBzdHlsZSgpIE9WRVJSSURFOwpAQCAtNjksOSArNjksOSBAQCBw cm90ZWN0ZWQ6CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNQcmVzZW50YXRpb25BdHRyaWJ1dGUoY29u c3QgUXVhbGlmaWVkTmFtZSYpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKLSAgICB2b2lkIGFk ZFByb3BlcnR5VG9BdHRyaWJ1dGVTdHlsZShTdHlsZVByb3BlcnR5U2V0KiwgQ1NTUHJvcGVydHlJ RCwgaW50KTsKLSAgICB2b2lkIGFkZFByb3BlcnR5VG9BdHRyaWJ1dGVTdHlsZShTdHlsZVByb3Bl cnR5U2V0KiwgQ1NTUHJvcGVydHlJRCwgZG91YmxlLCBDU1NQcmltaXRpdmVWYWx1ZTo6VW5pdFR5 cGVzKTsKLSAgICB2b2lkIGFkZFByb3BlcnR5VG9BdHRyaWJ1dGVTdHlsZShTdHlsZVByb3BlcnR5 U2V0KiwgQ1NTUHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJik7CisgICAgdm9pZCBhZGRQcm9wZXJ0 eVRvQXR0cmlidXRlU3R5bGUoU3R5bGVQcm9wZXJ0eVNldCosIENTU1Byb3BlcnR5SUQsIGludCBp ZGVudGlmaWVyKTsKKyAgICB2b2lkIGFkZFByb3BlcnR5VG9BdHRyaWJ1dGVTdHlsZShTdHlsZVBy b3BlcnR5U2V0KiwgQ1NTUHJvcGVydHlJRCwgZG91YmxlIHZhbHVlLCBDU1NQcmltaXRpdmVWYWx1 ZTo6VW5pdFR5cGVzKTsKKyAgICB2b2lkIGFkZFByb3BlcnR5VG9BdHRyaWJ1dGVTdHlsZShTdHls ZVByb3BlcnR5U2V0KiwgQ1NTUHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAKICAg ICB2aXJ0dWFsIHZvaWQgYWRkU3VicmVzb3VyY2VBdHRyaWJ1dGVVUkxzKExpc3RIYXNoU2V0PEtV Ukw+JikgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGlu Z1N0eWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5oCmluZGV4IGQ2 ZGY1MTg3NTUxM2Y4NzJlNTlkMjgyNzliM2Q4MjlkM2RmNGZkMDAuLjE3N2MyYTAwNzE2NzY1MTg4 Y2JiZTg0Njg5ZGZmZjlkOWEzZmVlNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRWRpdGluZ1N0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5 bGUuaApAQCAtMTUyLDEwICsxNTIsMTAgQEAgcHJpdmF0ZToKICAgICBFZGl0aW5nU3R5bGUoY29u c3QgUG9zaXRpb24mLCBQcm9wZXJ0aWVzVG9JbmNsdWRlKTsKICAgICBFZGl0aW5nU3R5bGUoY29u c3QgU3R5bGVQcm9wZXJ0eVNldCopOwogICAgIEVkaXRpbmdTdHlsZShjb25zdCBDU1NTdHlsZURl Y2xhcmF0aW9uKik7Ci0gICAgRWRpdGluZ1N0eWxlKENTU1Byb3BlcnR5SUQsIGNvbnN0IFN0cmlu ZyYpOworICAgIEVkaXRpbmdTdHlsZShDU1NQcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmIHZhbHVl KTsKICAgICB2b2lkIGluaXQoTm9kZSosIFByb3BlcnRpZXNUb0luY2x1ZGUpOwogICAgIHZvaWQg cmVtb3ZlVGV4dEZpbGxBbmRTdHJva2VDb2xvcnNJZk5lZWRlZChSZW5kZXJTdHlsZSopOwotICAg IHZvaWQgc2V0UHJvcGVydHkoQ1NTUHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiwgYm9vbCBpbXBv cnRhbnQgPSBmYWxzZSk7CisgICAgdm9pZCBzZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBjb25z dCBTdHJpbmcmIHZhbHVlLCBib29sIGltcG9ydGFudCA9IGZhbHNlKTsKICAgICB2b2lkIHJlcGxh Y2VGb250U2l6ZUJ5S2V5d29yZElmUG9zc2libGUoUmVuZGVyU3R5bGUqLCBDU1NDb21wdXRlZFN0 eWxlRGVjbGFyYXRpb24qKTsKICAgICB2b2lkIGV4dHJhY3RGb250U2l6ZURlbHRhKCk7CiAgICAg VHJpU3RhdGUgdHJpU3RhdGVPZlN0eWxlKENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlVG9Db21w YXJlLCBTaG91bGRJZ25vcmVUZXh0T25seVByb3BlcnRpZXMpIGNvbnN0OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MRWxlbWVudC5oCmluZGV4IGRhNDJhY2I4ZGFiMzE1NThlOGQ1ODE0YzdiMGE3NWIxNTQ0OWYx ZTEuLjhiNmFlZjQ1MmIyMTIxYzRlMmQ4MDk4NDY3NDQ4YWY0MGEyMzZkNGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxFbGVtZW50LmgKQEAgLTEwOCw4ICsxMDgsOCBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6 CiAgICAgSFRNTEVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQq KTsKIAotICAgIHZvaWQgYWRkSFRNTExlbmd0aFRvU3R5bGUoU3R5bGVQcm9wZXJ0eVNldCosIENT U1Byb3BlcnR5SUQsIGNvbnN0IFN0cmluZyYpOwotICAgIHZvaWQgYWRkSFRNTENvbG9yVG9TdHls ZShTdHlsZVByb3BlcnR5U2V0KiwgQ1NTUHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJik7CisgICAg dm9pZCBhZGRIVE1MTGVuZ3RoVG9TdHlsZShTdHlsZVByb3BlcnR5U2V0KiwgQ1NTUHJvcGVydHlJ RCwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CisgICAgdm9pZCBhZGRIVE1MQ29sb3JUb1N0eWxlKFN0 eWxlUHJvcGVydHlTZXQqLCBDU1NQcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmIGNvbG9yKTsKIAog ICAgIHZvaWQgYXBwbHlBbGlnbm1lbnRBdHRyaWJ1dGVUb1N0eWxlKEF0dHJpYnV0ZSosIFN0eWxl UHJvcGVydHlTZXQqKTsKICAgICB2b2lkIGFwcGx5Qm9yZGVyQXR0cmlidXRlVG9TdHlsZShBdHRy aWJ1dGUqLCBTdHlsZVByb3BlcnR5U2V0Kik7Cg== 135718 2012-04-04 16:34:57 -0700 2012-04-04 18:42:24 -0700 Patch bug-83119-20120405093455.patch text/plain 10054 macpherson U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMjQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzgwYzEwMjhmMzVmZDEz NzQ5NDJhNzcxOTZmNmZjYjU5MzQ3MGVhOC4uZmJiMDAwZjJkODhiYzUyM2I0NTVlMjNkNGE2NzMy ZmRiNDA1NDQwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA0LTAzICBMdWtl IE1hY3BoZXJzb24gIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXBsYWNl IGZ1cnRoZXIgdXNhZ2Ugb2YgaW50IHdpdGggQ1NTUHJvcGVydHlJRC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMTE5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC8gbm8gZnVuY3Rp b25hbGl0eSBjaGFuZ2VkLgorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsb2dVbmltcGxlbWVudGVkUHJvcGVydHlJRCk6 CisgICAgICAgIChXZWJDb3JlOjpDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmdldFByb3Bl cnR5Q1NTVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NHcmFtbWFyLnk6CisgICAgICAgICogY3Nz L0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OkNTU1BhcnNlcik6 CisgICAgICAgICogY3NzL0NTU1BhcnNlci5oOgorICAgICAgICAoQ1NTUGFyc2VyKToKKyAgICAg ICAgKFdlYkNvcmU6OlNob3J0aGFuZFNjb3BlOjp+U2hvcnRoYW5kU2NvcGUpOgorICAgICAgICAq IGNzcy9DU1NQcm9wZXJ0eS5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHk6OkNTU1By b3BlcnR5KToKKyAgICAgICAgKiBjc3MvU1ZHQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0U1ZH UHJvcGVydHlDU1NWYWx1ZSk6CisgICAgICAgICogY3NzL1N0eWxlUHJvcGVydHlTZXQuaDoKKyAg ICAgICAgKFN0eWxlUHJvcGVydHlTZXQpOgorICAgICAgICAqIGNzcy9tYWtlcHJvcC5wbDoKKyAg ICAgICAgKiBkb20vU3R5bGVkRWxlbWVudC5oOgorICAgICAgICAoU3R5bGVkRWxlbWVudCk6Cisg ICAgICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUuaDoKKyAgICAgICAgKEVkaXRpbmdTdHlsZSk6 CisgICAgICAgICogaHRtbC9IVE1MRWxlbWVudC5oOgorICAgICAgICAoSFRNTEVsZW1lbnQpOgor CiAyMDEyLTA0LTA0ICBNaW4gUWluICA8cWlubWluQGdvb2dsZS5jb20+CiAKICAgICAgICAgRGlz YWJsZSBmYW5jeSB1cHNhbXBsaW5nIGFuZCBkaXRoZXJpbmcgZm9yIGRlY29kaW5nIGpwZWcgb24g YW5kcm9pZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVE ZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xh cmF0aW9uLmNwcAppbmRleCBlOWFkNGJlMmRlZTY3ODEwNzc2M2RkNDAwNTE1ZGU5NzczNTFjZWFj Li40ODA1MDYyMDA0ZDI3NzJkMjYxNzRiMjY5NDFhNWYyZjc3MGIwYjlhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMTI0 Nyw3ICsxMjQ3LDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IGNvdW50ZXJUb0NTU1Zh bHVlKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwgQ1NTUHJvcGUKIAogc3RhdGljIHZvaWQgbG9n VW5pbXBsZW1lbnRlZFByb3BlcnR5SUQoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlEKQogewotICAg IERFRklORV9TVEFUSUNfTE9DQUwoSGFzaFNldDxpbnQ+LCBwcm9wZXJ0eUlEU2V0LCAoKSk7Cisg ICAgREVGSU5FX1NUQVRJQ19MT0NBTChIYXNoU2V0PENTU1Byb3BlcnR5SUQ+LCBwcm9wZXJ0eUlE U2V0LCAoKSk7CiAgICAgaWYgKCFwcm9wZXJ0eUlEU2V0LmFkZChwcm9wZXJ0eUlEKS5pc05ld0Vu dHJ5KQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NHcmFtbWFyLnkgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55CmluZGV4IDBlY2Zk ODdlOGY1OGE0MjlmNTMwZjAyYzI3MDBiYTk4YjhjOGIwOGYuLjRkMjFhYmNkNDBkZWE5ODkyMzVj OGY0MGYzMDE4ZmI4Y2I4MzM5ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NH cmFtbWFyLnkKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyYW1tYXIueQpAQCAtODQsNiAr ODQsNyBAQCB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogICAgIFN0eWxlS2V5ZnJhbWUqIGtl eWZyYW1lOwogICAgIFN0eWxlUnVsZUtleWZyYW1lcyoga2V5ZnJhbWVzUnVsZTsKICAgICBmbG9h dCB2YWw7CisgICAgQ1NTUHJvcGVydHlJRCBpZDsKIH0KIAogJXsKQEAgLTI1MCw3ICsyNTEsNyBA QCBzdGF0aWMgaW50IGNzc3l5bGV4KFlZU1RZUEUqIHl5bHZhbCwgdm9pZCogcGFyc2VyKQogJXR5 cGUgPHZhbHVlTGlzdD4ga2V5X2xpc3QKICV0eXBlIDx2YWx1ZT4ga2V5CiAKLSV0eXBlIDxpbnRl Z2VyPiBwcm9wZXJ0eQorJXR5cGUgPGlkPiBwcm9wZXJ0eQogCiAldHlwZSA8c2VsZWN0b3I+IHNw ZWNpZmllcgogJXR5cGUgPHNlbGVjdG9yPiBzcGVjaWZpZXJfbGlzdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFy c2VyLmNwcAppbmRleCBjZmFlM2U1ODA2NGNlODE2NzNhMDI2ZjdhNWQ1ODYzMDY0YWVhMzg5Li5m NmUxOGFkOGJjZjBmNDhhMjBhNTZlMDY3N2Y3ZjAwNWZjYTJhNjFkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UGFyc2VyLmNwcApAQCAtMTg1LDcgKzE4NSw3IEBAIENTU1BhcnNlcjo6Q1NTUGFyc2VyKENTU1Bh cnNlck1vZGUgY3NzUGFyc2VyTW9kZSkKICAgICAsIG1faWQoQ1NTUHJvcGVydHlJbnZhbGlkKQog ICAgICwgbV9zdHlsZVNoZWV0KDApCiAgICAgLCBtX2luUGFyc2VTaG9ydGhhbmQoMCkKLSAgICAs IG1fY3VycmVudFNob3J0aGFuZCgwKQorICAgICwgbV9jdXJyZW50U2hvcnRoYW5kKENTU1Byb3Bl cnR5SW52YWxpZCkKICAgICAsIG1faW1wbGljaXRTaG9ydGhhbmQoZmFsc2UpCiAgICAgLCBtX2hh c0ZvbnRGYWNlT25seVZhbHVlcyhmYWxzZSkKICAgICAsIG1faGFkU3ludGFjdGljYWxseVZhbGlk Q1NTUnVsZShmYWxzZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIu aCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaAppbmRleCBhYzUyN2ViNTdhN2MxZmYw MDdhMmNiYzRiMDhkN2JiNTdkOTBlZWMxLi5hY2RiMmRmMzVmMTU4NmE1ZTRlNDA4ZjM3NWNiMjk4 ZjlmYjBkYjE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5oCkBAIC0xMDksNyArMTA5LDcgQEAgcHVi bGljOgogICAgIHZvaWQgcGFyc2VGaWxsUG9zaXRpb24oQ1NTUGFyc2VyVmFsdWVMaXN0KiwgUmVm UHRyPENTU1ZhbHVlPiYsIFJlZlB0cjxDU1NWYWx1ZT4mKTsKIAogICAgIHZvaWQgcGFyc2VGaWxs UmVwZWF0KFJlZlB0cjxDU1NWYWx1ZT4mLCBSZWZQdHI8Q1NTVmFsdWU+Jik7Ci0gICAgUGFzc1Jl ZlB0cjxDU1NWYWx1ZT4gcGFyc2VGaWxsU2l6ZShDU1NQcm9wZXJ0eUlEIHByb3BJZCwgYm9vbCAm YWxsb3dDb21tYSk7CisgICAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gcGFyc2VGaWxsU2l6ZShDU1NQ cm9wZXJ0eUlELCBib29sICZhbGxvd0NvbW1hKTsKIAogICAgIGJvb2wgcGFyc2VGaWxsUHJvcGVy dHkoQ1NTUHJvcGVydHlJRCBwcm9wSWQsIENTU1Byb3BlcnR5SUQmIHByb3BJZDEsIENTU1Byb3Bl cnR5SUQmIHByb3BJZDIsIFJlZlB0cjxDU1NWYWx1ZT4mLCBSZWZQdHI8Q1NTVmFsdWU+Jik7CiAg ICAgYm9vbCBwYXJzZUZpbGxTaG9ydGhhbmQoQ1NTUHJvcGVydHlJRCwgY29uc3QgQ1NTUHJvcGVy dHlJRCogcHJvcGVydGllcywgaW50IG51bVByb3BlcnRpZXMsIGJvb2wgaW1wb3J0YW50KTsKQEAg LTEzMCw3ICsxMzAsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIHBhcnNlVHJhbnNmb3JtT3JpZ2lu U2hvcnRoYW5kKFJlZlB0cjxDU1NWYWx1ZT4mLCBSZWZQdHI8Q1NTVmFsdWU+JiwgUmVmUHRyPENT U1ZhbHVlPiYpOwogICAgIGJvb2wgcGFyc2VDdWJpY0JlemllclRpbWluZ0Z1bmN0aW9uVmFsdWUo Q1NTUGFyc2VyVmFsdWVMaXN0KiYgYXJncywgZG91YmxlJiByZXN1bHQpOwotICAgIGJvb2wgcGFy c2VBbmltYXRpb25Qcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3BJZCwgUmVmUHRyPENTU1ZhbHVl PiYpOworICAgIGJvb2wgcGFyc2VBbmltYXRpb25Qcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBSZWZQ dHI8Q1NTVmFsdWU+Jik7CiAgICAgYm9vbCBwYXJzZVRyYW5zaXRpb25TaG9ydGhhbmQoYm9vbCBp bXBvcnRhbnQpOwogICAgIGJvb2wgcGFyc2VBbmltYXRpb25TaG9ydGhhbmQoYm9vbCBpbXBvcnRh bnQpOwogCkBAIC0xODEsNyArMTgxLDcgQEAgcHVibGljOgogICAgIGJvb2wgcGFyc2VCb3JkZXJJ bWFnZVNsaWNlKENTU1Byb3BlcnR5SUQsIFJlZlB0cjxDU1NCb3JkZXJJbWFnZVNsaWNlVmFsdWU+ Jik7CiAgICAgYm9vbCBwYXJzZUJvcmRlckltYWdlV2lkdGgoUmVmUHRyPENTU1ByaW1pdGl2ZVZh bHVlPiYpOwogICAgIGJvb2wgcGFyc2VCb3JkZXJJbWFnZU91dHNldChSZWZQdHI8Q1NTUHJpbWl0 aXZlVmFsdWU+Jik7Ci0gICAgYm9vbCBwYXJzZUJvcmRlclJhZGl1cyhDU1NQcm9wZXJ0eUlELCBi b29sKTsKKyAgICBib29sIHBhcnNlQm9yZGVyUmFkaXVzKENTU1Byb3BlcnR5SUQsIGJvb2wgaW1w b3J0YW50KTsKIAogICAgIGJvb2wgcGFyc2VBc3BlY3RSYXRpbyhib29sIGltcG9ydGFudCk7CiAK QEAgLTMwMSw3ICszMDEsNyBAQCBwdWJsaWM6CiAgICAgdW5zaWduZWQgbV9udW1QYXJzZWRQcm9w ZXJ0aWVzQmVmb3JlTWFyZ2luQm94OwogCiAgICAgaW50IG1faW5QYXJzZVNob3J0aGFuZDsKLSAg ICBpbnQgbV9jdXJyZW50U2hvcnRoYW5kOworICAgIENTU1Byb3BlcnR5SUQgbV9jdXJyZW50U2hv cnRoYW5kOwogICAgIGJvb2wgbV9pbXBsaWNpdFNob3J0aGFuZDsKIAogICAgIGJvb2wgbV9oYXNG b250RmFjZU9ubHlWYWx1ZXM7CkBAIC00ODIsNyArNDgyLDcgQEAgcHVibGljOgogICAgIH5TaG9y dGhhbmRTY29wZSgpCiAgICAgewogICAgICAgICBpZiAoISgtLW1fcGFyc2VyLT5tX2luUGFyc2VT aG9ydGhhbmQpKQotICAgICAgICAgICAgbV9wYXJzZXItPm1fY3VycmVudFNob3J0aGFuZCA9IDA7 CisgICAgICAgICAgICBtX3BhcnNlci0+bV9jdXJyZW50U2hvcnRoYW5kID0gQ1NTUHJvcGVydHlJ bnZhbGlkOwogICAgIH0KIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQcm9wZXJ0eS5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5LmgKaW5kZXgg MTIyMGQxNzI3MjBmMzFkODg1ZTRiMDAzYjU0OTlmODBmNWQ4ZGY5MS4uMGY5OWU2NzdmYjhhYTgz M2Q1NDcwMDBkNmE1NjUzZGYyODZkZDU5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nz L0NTU1Byb3BlcnR5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5LmgKQEAg LTMyLDcgKzMyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBDU1NQcm9wZXJ0eSB7 CiBwdWJsaWM6Ci0gICAgQ1NTUHJvcGVydHkoQ1NTUHJvcGVydHlJRCBwcm9wSUQsIFBhc3NSZWZQ dHI8Q1NTVmFsdWU+IHZhbHVlLCBib29sIGltcG9ydGFudCA9IGZhbHNlLCBpbnQgc2hvcnRoYW5k SUQgPSAwLCBib29sIGltcGxpY2l0ID0gZmFsc2UpCisgICAgQ1NTUHJvcGVydHkoQ1NTUHJvcGVy dHlJRCBwcm9wSUQsIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlLCBib29sIGltcG9ydGFudCA9 IGZhbHNlLCBDU1NQcm9wZXJ0eUlEIHNob3J0aGFuZElEID0gQ1NTUHJvcGVydHlJbnZhbGlkLCBi b29sIGltcGxpY2l0ID0gZmFsc2UpCiAgICAgICAgIDogbV9pZChwcm9wSUQpCiAgICAgICAgICwg bV9zaG9ydGhhbmRJRChzaG9ydGhhbmRJRCkKICAgICAgICAgLCBtX2ltcG9ydGFudChpbXBvcnRh bnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU1ZHQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TVkdDU1NDb21wdXRlZFN0eWxlRGVj bGFyYXRpb24uY3BwCmluZGV4IGQ2MGJkZjI1MWZlYjRkYTYyYmU3ZjU4M2Y4ZjQwZWQzZjJiODU1 YmYuLjVlM2FhODgwNzcxNTY2ZWIwY2UwMzM4MTg3NmM1YmMwMDQ1Y2Q5NDQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TVkdDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TVkdDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3Bw CkBAIC04Niw3ICs4Niw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENTU0NvbXB1dGVkU3R5bGVE ZWNsYXJhdGlvbjo6Z2V0U1ZHUHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wCiAgICAgaWYgKCFzdmdT dHlsZSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBzd2l0Y2ggKHN0YXRpY19jYXN0PENTU1By b3BlcnR5SUQ+KHByb3BlcnR5SUQpKSB7CisgICAgc3dpdGNoIChwcm9wZXJ0eUlEKSB7CiAgICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlDbGlwUnVsZToKICAgICAgICAgICAgIHJldHVybiBDU1NQcmlt aXRpdmVWYWx1ZTo6Y3JlYXRlKHN2Z1N0eWxlLT5jbGlwUnVsZSgpKTsKICAgICAgICAgY2FzZSBD U1NQcm9wZXJ0eUZsb29kT3BhY2l0eToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZVByb3BlcnR5U2V0LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5o CmluZGV4IDdkZWQyOWY1ODVkYTQ0YTNkMTk0YTE5OGRlZDQyMzk1YjI1ZmI0MzUuLjU4ODc5YThj ZTVlNmViOGU3ZDY3MGViOGUzMjQ5YmZkNWIxZjlkNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZVByb3BlcnR5U2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl UHJvcGVydHlTZXQuaApAQCAtNjgsMTEgKzY4LDExIEBAIHB1YmxpYzoKICAgICBib29sIGlzUHJv cGVydHlJbXBsaWNpdChDU1NQcm9wZXJ0eUlEKSBjb25zdDsKIAogICAgIC8vIFRoZXNlIGV4cGFu ZCBzaG9ydGhhbmQgcHJvcGVydGllcyBpbnRvIG11bHRpcGxlIHByb3BlcnRpZXMuCi0gICAgYm9v bCBzZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmLCBib29sIGltcG9ydGFu dCA9IGZhbHNlLCBDU1NTdHlsZVNoZWV0KiBjb250ZXh0U3R5bGVTaGVldCA9IDApOworICAgIGJv b2wgc2V0UHJvcGVydHkoQ1NTUHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgYm9vbCBp bXBvcnRhbnQgPSBmYWxzZSwgQ1NTU3R5bGVTaGVldCogY29udGV4dFN0eWxlU2hlZXQgPSAwKTsK ICAgICB2b2lkIHNldFByb3BlcnR5KENTU1Byb3BlcnR5SUQsIFBhc3NSZWZQdHI8Q1NTVmFsdWU+ LCBib29sIGltcG9ydGFudCA9IGZhbHNlKTsKIAogICAgIC8vIFRoZXNlIGRvIG5vdC4gRklYTUU6 IFRoaXMgaXMgdG9vIG1lc3N5LCB3ZSBjYW4gZG8gYmV0dGVyLgotICAgIGJvb2wgc2V0UHJvcGVy dHkoQ1NTUHJvcGVydHlJRCwgaW50LCBib29sIGltcG9ydGFudCA9IGZhbHNlLCBDU1NTdHlsZVNo ZWV0KiBjb250ZXh0U3R5bGVTaGVldCA9IDApOworICAgIGJvb2wgc2V0UHJvcGVydHkoQ1NTUHJv cGVydHlJRCwgaW50IHZhbHVlLCBib29sIGltcG9ydGFudCA9IGZhbHNlLCBDU1NTdHlsZVNoZWV0 KiBjb250ZXh0U3R5bGVTaGVldCA9IDApOwogICAgIHZvaWQgc2V0UHJvcGVydHkoY29uc3QgQ1NT UHJvcGVydHkmLCBDU1NQcm9wZXJ0eSogc2xvdCA9IDApOwogICAgIAogICAgIGJvb2wgcmVtb3Zl UHJvcGVydHkoQ1NTUHJvcGVydHlJRCwgU3RyaW5nKiByZXR1cm5UZXh0ID0gMCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv bWFrZXByb3AucGwKaW5kZXggNmRlN2I3ZDU2MmZmY2M5OGQwYjcyM2ZmOGM2YmRhNTMxODAwNDY4 ZS4uNDAwNGI2YWQ2MjM4NDgxZWRkMDRmODU2ODhjMDIwM2Q4YWU5Y2QyOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9t YWtlcHJvcC5wbApAQCAtMTUxLDYgKzE1MSw4IEBAIHByaW50IEhFQURFUiA8PCAiRU9GIjsKICNk ZWZpbmUgQ1NTUHJvcGVydHlOYW1lc19oCiAKICNpbmNsdWRlIDxzdHJpbmcuaD4KKyNpbmNsdWRl IDx3dGYvSGFzaEZ1bmN0aW9ucy5oPgorI2luY2x1ZGUgPHd0Zi9IYXNoVHJhaXRzLmg+CiAKIG5h bWVzcGFjZSBXVEYgewogY2xhc3MgU3RyaW5nOwpAQCAtMTc1LDEwICsxNzcsMTIgQEAgZm9yZWFj aCBteSAkbmFtZSAoQG5hbWVzKSB7CiAgIH0KIH0KIG15ICRudW0gPSAkaSAtICRmaXJzdDsKK215 ICRsYXN0ID0gJGkgLSAxOwogCiBwcmludCBIRUFERVIgIn07XG5cbiI7CiBwcmludCBIRUFERVIg ImNvbnN0IGludCBmaXJzdENTU1Byb3BlcnR5ID0gJGZpcnN0O1xuIjsKIHByaW50IEhFQURFUiAi Y29uc3QgaW50IG51bUNTU1Byb3BlcnRpZXMgPSAkbnVtO1xuIjsKK3ByaW50IEhFQURFUiAiY29u c3QgaW50IGxhc3RDU1NQcm9wZXJ0eSA9ICRsYXN0O1xuIjsKIHByaW50IEhFQURFUiAiY29uc3Qg c2l6ZV90IG1heENTU1Byb3BlcnR5TmFtZUxlbmd0aCA9ICRtYXhMZW47XG4iOwogCiBwcmludCBI RUFERVIgImNvbnN0IGNoYXIqIGNvbnN0IHByb3BlcnR5TmFtZVN0cmluZ3NbJG51bV0gPSB7XG4i OwpAQCAtMTkyLDggKzE5NiwyNCBAQCBwcmludCBIRUFERVIgPDwgIkVPRiI7CiBjb25zdCBjaGFy KiBnZXRQcm9wZXJ0eU5hbWUoQ1NTUHJvcGVydHlJRCk7CiBXVEY6OlN0cmluZyBnZXRKU1Byb3Bl cnR5TmFtZShDU1NQcm9wZXJ0eUlEKTsKIAoraW5saW5lIENTU1Byb3BlcnR5SUQgY29udmVydFRv Q1NTUHJvcGVydHlJRChpbnQgdmFsdWUpCit7CisgICAgQVNTRVJUKCh2YWx1ZSA+PSBmaXJzdENT U1Byb3BlcnR5ICYmIHZhbHVlIDw9IGxhc3RDU1NQcm9wZXJ0eSkgfHwgdmFsdWUgPT0gQ1NTUHJv cGVydHlJbnZhbGlkKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Q1NTUHJvcGVydHlJRD4odmFs dWUpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKK25hbWVzcGFjZSBXVEYgewordGVt cGxhdGU8PiBzdHJ1Y3QgRGVmYXVsdEhhc2g8V2ViQ29yZTo6Q1NTUHJvcGVydHlJRD4geyB0eXBl ZGVmIEludEhhc2g8dW5zaWduZWQ+IEhhc2g7IH07Cit0ZW1wbGF0ZTw+IHN0cnVjdCBIYXNoVHJh aXRzPFdlYkNvcmU6OkNTU1Byb3BlcnR5SUQ+IDogR2VuZXJpY0hhc2hUcmFpdHM8V2ViQ29yZTo6 Q1NTUHJvcGVydHlJRD4geworICAgIHN0YXRpYyBjb25zdCBib29sIGVtcHR5VmFsdWVJc1plcm8g PSB0cnVlOworICAgIHN0YXRpYyBjb25zdCBib29sIG5lZWRzRGVzdHJ1Y3Rpb24gPSBmYWxzZTsK KyAgICBzdGF0aWMgdm9pZCBjb25zdHJ1Y3REZWxldGVkVmFsdWUoV2ViQ29yZTo6Q1NTUHJvcGVy dHlJRCYgc2xvdCkgeyBzbG90ID0gc3RhdGljX2Nhc3Q8V2ViQ29yZTo6Q1NTUHJvcGVydHlJRD4o V2ViQ29yZTo6bGFzdENTU1Byb3BlcnR5ICsgMSk7IH0KKyAgICBzdGF0aWMgYm9vbCBpc0RlbGV0 ZWRWYWx1ZShXZWJDb3JlOjpDU1NQcm9wZXJ0eUlEIHZhbHVlKSB7IHJldHVybiB2YWx1ZSA9PSAo V2ViQ29yZTo6bGFzdENTU1Byb3BlcnR5ICsgMSk7IH0KK307Cit9CisKICNlbmRpZiAvLyBDU1NQ cm9wZXJ0eU5hbWVzX2gKIAogRU9GCg==