215056 2020-08-01 01:11:31 -0700 Rename WidthIterator::m_currentCharacter to WidthIterator::m_currentCharacterIndex 2020-08-07 23:23:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 206208 1 mmaxfield mmaxfield darin dino jonlee simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1677103 0 mmaxfield 2020-08-01 01:11:31 -0700 Rename WidthIterator::m_currentCharacter to WidthIterator::m_currentCharacterIndex 1677104 1 405778 mmaxfield 2020-08-01 01:12:26 -0700 Created attachment 405778 Patch 1677105 2 405779 mmaxfield 2020-08-01 01:13:34 -0700 Created attachment 405779 Patch 1677447 3 ews-feeder 2020-08-03 15:22:20 -0700 Tools/Scripts/svn-apply failed to apply attachment 405779 to trunk. Please resolve the conflicts and upload a new patch. 1677563 4 mmaxfield 2020-08-03 21:32:40 -0700 Committed r265240: <https://trac.webkit.org/changeset/265240> 1677564 5 webkit-bug-importer 2020-08-03 21:33:19 -0700 <rdar://problem/66506991> 405778 2020-08-01 01:12:26 -0700 2020-08-01 01:13:33 -0700 Patch bug-215056-20200801011226.patch text/plain 5647 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQzMzUzZmU1ZThjOTRh NWQ1ZmNkOTgzNTc4YWNmOTQzYTIzM2M5Mi4uYWUwMWQwMWQ3NjlkMGQ1MGI5OTA0MDE1NzBkOTM1 NWFmNmQ3M2EyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA4LTAxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIFdp ZHRoSXRlcmF0b3I6Om1fY3VycmVudENoYXJhY3RlciB0byBXaWR0aEl0ZXJhdG9yOjptX2N1cnJl bnRDaGFyYWN0ZXJJbmRleAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE1MDU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSXQgcmVwcmVzZW50cyBhbiBpbmRleCwgbm90IGEgY2hhcmFjdGVyLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKwor ICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE0NzY5CisgICAgICAgIGFuZCBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MjA4LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2NhZGU6Om9mZnNl dEZvclBvc2l0aW9uRm9yU2ltcGxlVGV4dCBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvV2lkdGhJdGVyYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9y OjphZHZhbmNlSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6V2lkdGhJdGVyYXRvcjo6YWR2 YW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9yOjphZHZhbmNlT25lQ2hhcmFj dGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmg6CisgICAg ICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9yOjpjdXJyZW50Q2hhcmFjdGVySW5kZXggY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6V2lkdGhJdGVyYXRvcjo6Y3VycmVudENoYXJhY3RlciBjb25z dCk6IERlbGV0ZWQuCisKIDIwMjAtMDctMzEgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxk QGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVhbiB1cCB0ZXh0IGxheW91dCBjb2RlIGEgYml0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKaW5k ZXggNjg4MDcyNjAzYzAxMzFmMmI2YmU1MGNmZTA3ZjMzMjY3N2VjODg0YS4uYmFlZDk0YThkNDk4 YWJlN2ZjODhjYjI1MDc5NTAzZTgyMTdkMWVjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcApAQCAtMTU5NCw3ICsxNTk0LDcgQEAgaW50 IEZvbnRDYXNjYWRlOjpvZmZzZXRGb3JQb3NpdGlvbkZvclNpbXBsZVRleHQoY29uc3QgVGV4dFJ1 biYgcnVuLCBmbG9hdCB4LCBib28KICAgICBpZiAocnVuLnJ0bCgpKSB7CiAgICAgICAgIGRlbHRh IC09IGZsb2F0V2lkdGhGb3JTaW1wbGVUZXh0KHJ1bik7CiAgICAgICAgIHdoaWxlICgxKSB7Ci0g ICAgICAgICAgICBvZmZzZXQgPSBpdC5jdXJyZW50Q2hhcmFjdGVyKCk7CisgICAgICAgICAgICBv ZmZzZXQgPSBpdC5jdXJyZW50Q2hhcmFjdGVySW5kZXgoKTsKICAgICAgICAgICAgIGZsb2F0IHc7 CiAgICAgICAgICAgICBpZiAoIWl0LmFkdmFuY2VPbmVDaGFyYWN0ZXIodywgbG9jYWxHbHlwaEJ1 ZmZlcikpCiAgICAgICAgICAgICAgICAgYnJlYWs7CkBAIC0xNjA5LDcgKzE2MDksNyBAQCBpbnQg Rm9udENhc2NhZGU6Om9mZnNldEZvclBvc2l0aW9uRm9yU2ltcGxlVGV4dChjb25zdCBUZXh0UnVu JiBydW4sIGZsb2F0IHgsIGJvbwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgd2hp bGUgKDEpIHsKLSAgICAgICAgICAgIG9mZnNldCA9IGl0LmN1cnJlbnRDaGFyYWN0ZXIoKTsKKyAg ICAgICAgICAgIG9mZnNldCA9IGl0LmN1cnJlbnRDaGFyYWN0ZXJJbmRleCgpOwogICAgICAgICAg ICAgZmxvYXQgdzsKICAgICAgICAgICAgIGlmICghaXQuYWR2YW5jZU9uZUNoYXJhY3Rlcih3LCBs b2NhbEdseXBoQnVmZmVyKSkKICAgICAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKaW5kZXggYjNjMmZm NmExMzk5MGE2NmZlZTZhZWU5ZTBlNTk2Y2RkODdkNjJmNy4uZmFjNmFhM2RjZTJhYTA1MTE1M2U1 ZmRlNjdmZDU3ZWU5NjY5NTA4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKQEAgLTM2Niw4ICszNjYsOCBAQCBpbmxpbmUgdW5z aWduZWQgV2lkdGhJdGVyYXRvcjo6YWR2YW5jZUludGVybmFsKFRleHRJdGVyYXRvciYgdGV4dEl0 ZXJhdG9yLCBHbHlwaAogICAgICAgICAgICAgZ2x5cGhCdWZmZXItPnNocmluayhsYXN0R2x5cGhD b3VudCk7CiAgICAgfQogCi0gICAgdW5zaWduZWQgY29uc3VtZWRDaGFyYWN0ZXJzID0gdGV4dEl0 ZXJhdG9yLmN1cnJlbnRJbmRleCgpIC0gbV9jdXJyZW50Q2hhcmFjdGVyOwotICAgIG1fY3VycmVu dENoYXJhY3RlciA9IHRleHRJdGVyYXRvci5jdXJyZW50SW5kZXgoKTsKKyAgICB1bnNpZ25lZCBj b25zdW1lZENoYXJhY3RlcnMgPSB0ZXh0SXRlcmF0b3IuY3VycmVudEluZGV4KCkgLSBtX2N1cnJl bnRDaGFyYWN0ZXJJbmRleDsKKyAgICBtX2N1cnJlbnRDaGFyYWN0ZXJJbmRleCA9IHRleHRJdGVy YXRvci5jdXJyZW50SW5kZXgoKTsKICAgICBtX3J1bldpZHRoU29GYXIgKz0gd2lkdGhTaW5jZUxh c3RSb3VuZGluZzsKICAgICBtX2ZpbmFsUm91bmRpbmdXaWR0aCA9IGxhc3RSb3VuZGluZ1dpZHRo OwogICAgIHJldHVybiBjb25zdW1lZENoYXJhY3RlcnM7CkBAIC0zODAsMjIgKzM4MCwyMiBAQCB1 bnNpZ25lZCBXaWR0aEl0ZXJhdG9yOjphZHZhbmNlKHVuc2lnbmVkIG9mZnNldCwgR2x5cGhCdWZm ZXIqIGdseXBoQnVmZmVyKQogICAgIGlmIChvZmZzZXQgPiBsZW5ndGgpCiAgICAgICAgIG9mZnNl dCA9IGxlbmd0aDsKIAotICAgIGlmIChtX2N1cnJlbnRDaGFyYWN0ZXIgPj0gb2Zmc2V0KQorICAg IGlmIChtX2N1cnJlbnRDaGFyYWN0ZXJJbmRleCA+PSBvZmZzZXQpCiAgICAgICAgIHJldHVybiAw OwogCiAgICAgaWYgKG1fcnVuLmlzOEJpdCgpKSB7Ci0gICAgICAgIExhdGluMVRleHRJdGVyYXRv ciB0ZXh0SXRlcmF0b3IobV9ydW4uZGF0YTgobV9jdXJyZW50Q2hhcmFjdGVyKSwgbV9jdXJyZW50 Q2hhcmFjdGVyLCBvZmZzZXQsIGxlbmd0aCk7CisgICAgICAgIExhdGluMVRleHRJdGVyYXRvciB0 ZXh0SXRlcmF0b3IobV9ydW4uZGF0YTgobV9jdXJyZW50Q2hhcmFjdGVySW5kZXgpLCBtX2N1cnJl bnRDaGFyYWN0ZXJJbmRleCwgb2Zmc2V0LCBsZW5ndGgpOwogICAgICAgICByZXR1cm4gYWR2YW5j ZUludGVybmFsKHRleHRJdGVyYXRvciwgZ2x5cGhCdWZmZXIpOwogICAgIH0KIAotICAgIFN1cnJv Z2F0ZVBhaXJBd2FyZVRleHRJdGVyYXRvciB0ZXh0SXRlcmF0b3IobV9ydW4uZGF0YTE2KG1fY3Vy cmVudENoYXJhY3RlciksIG1fY3VycmVudENoYXJhY3Rlciwgb2Zmc2V0LCBsZW5ndGgpOworICAg IFN1cnJvZ2F0ZVBhaXJBd2FyZVRleHRJdGVyYXRvciB0ZXh0SXRlcmF0b3IobV9ydW4uZGF0YTE2 KG1fY3VycmVudENoYXJhY3RlckluZGV4KSwgbV9jdXJyZW50Q2hhcmFjdGVyLCBvZmZzZXQsIGxl bmd0aCk7CiAgICAgcmV0dXJuIGFkdmFuY2VJbnRlcm5hbCh0ZXh0SXRlcmF0b3IsIGdseXBoQnVm ZmVyKTsKIH0KIAogYm9vbCBXaWR0aEl0ZXJhdG9yOjphZHZhbmNlT25lQ2hhcmFjdGVyKGZsb2F0 JiB3aWR0aCwgR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyKQogewogICAgIHVuc2lnbmVkIG9sZFNp emUgPSBnbHlwaEJ1ZmZlci5zaXplKCk7Ci0gICAgYWR2YW5jZShtX2N1cnJlbnRDaGFyYWN0ZXIg KyAxLCAmZ2x5cGhCdWZmZXIpOworICAgIGFkdmFuY2UobV9jdXJyZW50Q2hhcmFjdGVySW5kZXgg KyAxLCAmZ2x5cGhCdWZmZXIpOwogICAgIGZsb2F0IHcgPSAwOwogICAgIGZvciAodW5zaWduZWQg aSA9IG9sZFNpemU7IGkgPCBnbHlwaEJ1ZmZlci5zaXplKCk7ICsraSkKICAgICAgICAgdyArPSBn bHlwaEJ1ZmZlci5hZHZhbmNlQXQoaSkud2lkdGgoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuaAppbmRleCBjZDBkMmZjODc0ZjU0OWY2YWY5 NTJkMjQyNzcxZDliMGQwZmVhMDlhLi5iODI2NDk3NzNhMTczZmI4NzE5OTZkOWY2N2Y2OTE5OWM3 ZjdkZjM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0 aEl0ZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJ dGVyYXRvci5oCkBAIC01Myw3ICs1Myw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBUZXh0UnVuJiBy dW4oKSBjb25zdCB7IHJldHVybiBtX3J1bjsgfQogICAgIGZsb2F0IHJ1bldpZHRoU29GYXIoKSBj b25zdCB7IHJldHVybiBtX3J1bldpZHRoU29GYXI7IH0KICAgICBmbG9hdCBmaW5hbFJvdW5kaW5n V2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2ZpbmFsUm91bmRpbmdXaWR0aDsgfQotICAgIHVuc2ln bmVkIGN1cnJlbnRDaGFyYWN0ZXIoKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRDaGFyYWN0ZXI7 IH0KKyAgICB1bnNpZ25lZCBjdXJyZW50Q2hhcmFjdGVySW5kZXgoKSBjb25zdCB7IHJldHVybiBt X2N1cnJlbnRDaGFyYWN0ZXJJbmRleDsgfQogCiBwcml2YXRlOgogICAgIEdseXBoRGF0YSBnbHlw aERhdGFGb3JDaGFyYWN0ZXIoVUNoYXIzMiwgYm9vbCBtaXJyb3IpOwpAQCAtNjgsNyArNjgsNyBA QCBwcml2YXRlOgogICAgIGNvbnN0IFRleHRSdW4mIG1fcnVuOwogICAgIEhhc2hTZXQ8Y29uc3Qg Rm9udCo+KiBtX2ZhbGxiYWNrRm9udHMgeyBudWxscHRyIH07CiAKLSAgICB1bnNpZ25lZCBtX2N1 cnJlbnRDaGFyYWN0ZXIgeyAwIH07CisgICAgdW5zaWduZWQgbV9jdXJyZW50Q2hhcmFjdGVySW5k ZXggeyAwIH07CiAgICAgZmxvYXQgbV9ydW5XaWR0aFNvRmFyIHsgMCB9OwogICAgIGZsb2F0IG1f ZXhwYW5zaW9uIHsgMCB9OwogICAgIGZsb2F0IG1fZXhwYW5zaW9uUGVyT3Bwb3J0dW5pdHkgeyAw IH07Cg== 405779 2020-08-01 01:13:34 -0700 2020-08-03 15:22:21 -0700 Patch bug-215056-20200801011334.patch text/plain 5652 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQzMzUzZmU1ZThjOTRh NWQ1ZmNkOTgzNTc4YWNmOTQzYTIzM2M5Mi4uYWUwMWQwMWQ3NjlkMGQ1MGI5OTA0MDE1NzBkOTM1 NWFmNmQ3M2EyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA4LTAxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIFdp ZHRoSXRlcmF0b3I6Om1fY3VycmVudENoYXJhY3RlciB0byBXaWR0aEl0ZXJhdG9yOjptX2N1cnJl bnRDaGFyYWN0ZXJJbmRleAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE1MDU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSXQgcmVwcmVzZW50cyBhbiBpbmRleCwgbm90IGEgY2hhcmFjdGVyLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKwor ICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE0NzY5CisgICAgICAgIGFuZCBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MjA4LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2NhZGU6Om9mZnNl dEZvclBvc2l0aW9uRm9yU2ltcGxlVGV4dCBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvV2lkdGhJdGVyYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9y OjphZHZhbmNlSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6V2lkdGhJdGVyYXRvcjo6YWR2 YW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9yOjphZHZhbmNlT25lQ2hhcmFj dGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmg6CisgICAg ICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9yOjpjdXJyZW50Q2hhcmFjdGVySW5kZXggY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6V2lkdGhJdGVyYXRvcjo6Y3VycmVudENoYXJhY3RlciBjb25z dCk6IERlbGV0ZWQuCisKIDIwMjAtMDctMzEgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxk QGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVhbiB1cCB0ZXh0IGxheW91dCBjb2RlIGEgYml0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKaW5k ZXggNjg4MDcyNjAzYzAxMzFmMmI2YmU1MGNmZTA3ZjMzMjY3N2VjODg0YS4uYmFlZDk0YThkNDk4 YWJlN2ZjODhjYjI1MDc5NTAzZTgyMTdkMWVjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcApAQCAtMTU5NCw3ICsxNTk0LDcgQEAgaW50 IEZvbnRDYXNjYWRlOjpvZmZzZXRGb3JQb3NpdGlvbkZvclNpbXBsZVRleHQoY29uc3QgVGV4dFJ1 biYgcnVuLCBmbG9hdCB4LCBib28KICAgICBpZiAocnVuLnJ0bCgpKSB7CiAgICAgICAgIGRlbHRh IC09IGZsb2F0V2lkdGhGb3JTaW1wbGVUZXh0KHJ1bik7CiAgICAgICAgIHdoaWxlICgxKSB7Ci0g ICAgICAgICAgICBvZmZzZXQgPSBpdC5jdXJyZW50Q2hhcmFjdGVyKCk7CisgICAgICAgICAgICBv ZmZzZXQgPSBpdC5jdXJyZW50Q2hhcmFjdGVySW5kZXgoKTsKICAgICAgICAgICAgIGZsb2F0IHc7 CiAgICAgICAgICAgICBpZiAoIWl0LmFkdmFuY2VPbmVDaGFyYWN0ZXIodywgbG9jYWxHbHlwaEJ1 ZmZlcikpCiAgICAgICAgICAgICAgICAgYnJlYWs7CkBAIC0xNjA5LDcgKzE2MDksNyBAQCBpbnQg Rm9udENhc2NhZGU6Om9mZnNldEZvclBvc2l0aW9uRm9yU2ltcGxlVGV4dChjb25zdCBUZXh0UnVu JiBydW4sIGZsb2F0IHgsIGJvbwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgd2hp bGUgKDEpIHsKLSAgICAgICAgICAgIG9mZnNldCA9IGl0LmN1cnJlbnRDaGFyYWN0ZXIoKTsKKyAg ICAgICAgICAgIG9mZnNldCA9IGl0LmN1cnJlbnRDaGFyYWN0ZXJJbmRleCgpOwogICAgICAgICAg ICAgZmxvYXQgdzsKICAgICAgICAgICAgIGlmICghaXQuYWR2YW5jZU9uZUNoYXJhY3Rlcih3LCBs b2NhbEdseXBoQnVmZmVyKSkKICAgICAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKaW5kZXggYjNjMmZm NmExMzk5MGE2NmZlZTZhZWU5ZTBlNTk2Y2RkODdkNjJmNy4uMmM3N2Y4YWRiMzVjYmMzYTQzNjJi OWI1NDBhOThiNzgwZDdjMTgwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKQEAgLTM2Niw4ICszNjYsOCBAQCBpbmxpbmUgdW5z aWduZWQgV2lkdGhJdGVyYXRvcjo6YWR2YW5jZUludGVybmFsKFRleHRJdGVyYXRvciYgdGV4dEl0 ZXJhdG9yLCBHbHlwaAogICAgICAgICAgICAgZ2x5cGhCdWZmZXItPnNocmluayhsYXN0R2x5cGhD b3VudCk7CiAgICAgfQogCi0gICAgdW5zaWduZWQgY29uc3VtZWRDaGFyYWN0ZXJzID0gdGV4dEl0 ZXJhdG9yLmN1cnJlbnRJbmRleCgpIC0gbV9jdXJyZW50Q2hhcmFjdGVyOwotICAgIG1fY3VycmVu dENoYXJhY3RlciA9IHRleHRJdGVyYXRvci5jdXJyZW50SW5kZXgoKTsKKyAgICB1bnNpZ25lZCBj b25zdW1lZENoYXJhY3RlcnMgPSB0ZXh0SXRlcmF0b3IuY3VycmVudEluZGV4KCkgLSBtX2N1cnJl bnRDaGFyYWN0ZXJJbmRleDsKKyAgICBtX2N1cnJlbnRDaGFyYWN0ZXJJbmRleCA9IHRleHRJdGVy YXRvci5jdXJyZW50SW5kZXgoKTsKICAgICBtX3J1bldpZHRoU29GYXIgKz0gd2lkdGhTaW5jZUxh c3RSb3VuZGluZzsKICAgICBtX2ZpbmFsUm91bmRpbmdXaWR0aCA9IGxhc3RSb3VuZGluZ1dpZHRo OwogICAgIHJldHVybiBjb25zdW1lZENoYXJhY3RlcnM7CkBAIC0zODAsMjIgKzM4MCwyMiBAQCB1 bnNpZ25lZCBXaWR0aEl0ZXJhdG9yOjphZHZhbmNlKHVuc2lnbmVkIG9mZnNldCwgR2x5cGhCdWZm ZXIqIGdseXBoQnVmZmVyKQogICAgIGlmIChvZmZzZXQgPiBsZW5ndGgpCiAgICAgICAgIG9mZnNl dCA9IGxlbmd0aDsKIAotICAgIGlmIChtX2N1cnJlbnRDaGFyYWN0ZXIgPj0gb2Zmc2V0KQorICAg IGlmIChtX2N1cnJlbnRDaGFyYWN0ZXJJbmRleCA+PSBvZmZzZXQpCiAgICAgICAgIHJldHVybiAw OwogCiAgICAgaWYgKG1fcnVuLmlzOEJpdCgpKSB7Ci0gICAgICAgIExhdGluMVRleHRJdGVyYXRv ciB0ZXh0SXRlcmF0b3IobV9ydW4uZGF0YTgobV9jdXJyZW50Q2hhcmFjdGVyKSwgbV9jdXJyZW50 Q2hhcmFjdGVyLCBvZmZzZXQsIGxlbmd0aCk7CisgICAgICAgIExhdGluMVRleHRJdGVyYXRvciB0 ZXh0SXRlcmF0b3IobV9ydW4uZGF0YTgobV9jdXJyZW50Q2hhcmFjdGVySW5kZXgpLCBtX2N1cnJl bnRDaGFyYWN0ZXJJbmRleCwgb2Zmc2V0LCBsZW5ndGgpOwogICAgICAgICByZXR1cm4gYWR2YW5j ZUludGVybmFsKHRleHRJdGVyYXRvciwgZ2x5cGhCdWZmZXIpOwogICAgIH0KIAotICAgIFN1cnJv Z2F0ZVBhaXJBd2FyZVRleHRJdGVyYXRvciB0ZXh0SXRlcmF0b3IobV9ydW4uZGF0YTE2KG1fY3Vy cmVudENoYXJhY3RlciksIG1fY3VycmVudENoYXJhY3Rlciwgb2Zmc2V0LCBsZW5ndGgpOworICAg IFN1cnJvZ2F0ZVBhaXJBd2FyZVRleHRJdGVyYXRvciB0ZXh0SXRlcmF0b3IobV9ydW4uZGF0YTE2 KG1fY3VycmVudENoYXJhY3RlckluZGV4KSwgbV9jdXJyZW50Q2hhcmFjdGVySW5kZXgsIG9mZnNl dCwgbGVuZ3RoKTsKICAgICByZXR1cm4gYWR2YW5jZUludGVybmFsKHRleHRJdGVyYXRvciwgZ2x5 cGhCdWZmZXIpOwogfQogCiBib29sIFdpZHRoSXRlcmF0b3I6OmFkdmFuY2VPbmVDaGFyYWN0ZXIo ZmxvYXQmIHdpZHRoLCBHbHlwaEJ1ZmZlciYgZ2x5cGhCdWZmZXIpCiB7CiAgICAgdW5zaWduZWQg b2xkU2l6ZSA9IGdseXBoQnVmZmVyLnNpemUoKTsKLSAgICBhZHZhbmNlKG1fY3VycmVudENoYXJh Y3RlciArIDEsICZnbHlwaEJ1ZmZlcik7CisgICAgYWR2YW5jZShtX2N1cnJlbnRDaGFyYWN0ZXJJ bmRleCArIDEsICZnbHlwaEJ1ZmZlcik7CiAgICAgZmxvYXQgdyA9IDA7CiAgICAgZm9yICh1bnNp Z25lZCBpID0gb2xkU2l6ZTsgaSA8IGdseXBoQnVmZmVyLnNpemUoKTsgKytpKQogICAgICAgICB3 ICs9IGdseXBoQnVmZmVyLmFkdmFuY2VBdChpKS53aWR0aCgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5oCmluZGV4IGNkMGQyZmM4NzRmNTQ5 ZjZhZjk1MmQyNDI3NzFkOWIwZDBmZWEwOWEuLmI4MjY0OTc3M2ExNzNmYjg3MTk5NmQ5ZjY3ZjY5 MTk5YzdmN2RmMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L1dpZHRoSXRlcmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9X aWR0aEl0ZXJhdG9yLmgKQEAgLTUzLDcgKzUzLDcgQEAgcHVibGljOgogICAgIGNvbnN0IFRleHRS dW4mIHJ1bigpIGNvbnN0IHsgcmV0dXJuIG1fcnVuOyB9CiAgICAgZmxvYXQgcnVuV2lkdGhTb0Zh cigpIGNvbnN0IHsgcmV0dXJuIG1fcnVuV2lkdGhTb0ZhcjsgfQogICAgIGZsb2F0IGZpbmFsUm91 bmRpbmdXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fZmluYWxSb3VuZGluZ1dpZHRoOyB9Ci0gICAg dW5zaWduZWQgY3VycmVudENoYXJhY3RlcigpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudENoYXJh Y3RlcjsgfQorICAgIHVuc2lnbmVkIGN1cnJlbnRDaGFyYWN0ZXJJbmRleCgpIGNvbnN0IHsgcmV0 dXJuIG1fY3VycmVudENoYXJhY3RlckluZGV4OyB9CiAKIHByaXZhdGU6CiAgICAgR2x5cGhEYXRh IGdseXBoRGF0YUZvckNoYXJhY3RlcihVQ2hhcjMyLCBib29sIG1pcnJvcik7CkBAIC02OCw3ICs2 OCw3IEBAIHByaXZhdGU6CiAgICAgY29uc3QgVGV4dFJ1biYgbV9ydW47CiAgICAgSGFzaFNldDxj b25zdCBGb250Kj4qIG1fZmFsbGJhY2tGb250cyB7IG51bGxwdHIgfTsKIAotICAgIHVuc2lnbmVk IG1fY3VycmVudENoYXJhY3RlciB7IDAgfTsKKyAgICB1bnNpZ25lZCBtX2N1cnJlbnRDaGFyYWN0 ZXJJbmRleCB7IDAgfTsKICAgICBmbG9hdCBtX3J1bldpZHRoU29GYXIgeyAwIH07CiAgICAgZmxv YXQgbV9leHBhbnNpb24geyAwIH07CiAgICAgZmxvYXQgbV9leHBhbnNpb25QZXJPcHBvcnR1bml0 eSB7IDAgfTsK