168379 2017-02-15 10:19:37 -0800 Modernize DragClient::startDrag somewhat 2017-02-15 10:32:42 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca cdumez commit-queue dbates japhet oldest_to_newest 1277251 0 andersca 2017-02-15 10:19:37 -0800 Modernize DragClient::startDrag somewhat 1277253 1 301629 andersca 2017-02-15 10:21:15 -0800 Created attachment 301629 Patch 1277261 2 andersca 2017-02-15 10:32:42 -0800 Committed r212379: <http://trac.webkit.org/changeset/212379> 301629 2017-02-15 10:21:15 -0800 2017-02-15 10:22:22 -0800 Patch bug-168379-20170215101839.patch text/plain 20019 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyMzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjBiNGI5MmEyYjI5MGFk YzYwY2I1YjZmMWFhYzIwMmQzYjU1NjM5NS4uZTc3MjdjOTVjMGMwZWI1YThmNDMyZjgxMDdmODIz Y2FlNGU5MzE4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTAyLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuaXplIERy YWdDbGllbnQ6OnN0YXJ0RHJhZyBzb21ld2hhdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4Mzc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIERyYWdDbGllbnQ6OnN0YXJ0RHJhZyB0byB0YWtl IGEgRHJhZ0ltYWdlIGluc3RlYWQgb2YgYSBEcmFnSW1hZ2VSZWYsIGFuZCB0byBwYXNzIGFsb25n IHRoZSBzb3VyY2UgYWN0aW9uCisgICAgICAgIGluc3RlYWQgb2Ygd2hldGhlciBpdCdzIGEgbGlu ayBvciBub3QuCisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlDbGllbnRzLmNwcDoKKyAgICAgICAg KiBwYWdlL0RyYWdDbGllbnQuaDoKKyAgICAgICAgKiBwYWdlL0RyYWdDb250cm9sbGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRyYWdDb250cm9sbGVyOjpzdGFydERyYWcpOgorICAgICAgICAo V2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6OmRvSW1hZ2VEcmFnKToKKyAgICAgICAgKFdlYkNvcmU6 OkRyYWdDb250cm9sbGVyOjpkb1N5c3RlbURyYWcpOgorICAgICAgICAqIHBhZ2UvRHJhZ0NvbnRy b2xsZXIuaDoKKwogMjAxNy0wMi0xMyAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAK ICAgICAgICAgUmVuYW1lIHByZWZlckxvd1Bvd2VyVG9IaWdoUGVyZm9ybWFuY2UgdG8gcG93ZXJQ cmVmZXJlbmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZmMxNmJhYWUyMWU5NjAxZWMzNjgyNjgxOTA3 Mzc2MWJhZjI1MTI1My4uMzFlOWQzMTllMzZhZDAwYWY2Nzk0MjJmMGE1YmQ2YmVhYWQwNjcwYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTAyLTE1ICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuaXplIERyYWdDbGll bnQ6OnN0YXJ0RHJhZyBzb21ld2hhdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTY4Mzc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXBkYXRlIGZvciBXZWJDb3JlIGNoYW5nZXMuCisKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50Lmg6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv V2ViRHJhZ0NsaWVudC5tbToKKyAgICAgICAgKFdlYkRyYWdDbGllbnQ6OnN0YXJ0RHJhZyk6CisK IDIwMTctMDItMTQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZW1vdmUgYW4gdW51c2VkIGRlbGVnYXRlIG1ldGhvZApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC93aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4 IDU0NjNmODE0MTM3ZGE3ZGI5NjQ5Nzg0YzlhYWYyYjcxODU1ZjhhYjAuLmEzYjE2OTlmMTFjYWZi MWE1NjUzYzI0Y2M4YzA5MmQzMTIwMDYxZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2lu L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxNy0wMi0xNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgor CisgICAgICAgIE1vZGVybml6ZSBEcmFnQ2xpZW50OjpzdGFydERyYWcgc29tZXdoYXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODM3OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBmb3IgV2Vi Q29yZSBjaGFuZ2VzLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRHJhZ0NsaWVudC5j cHA6CisgICAgICAgIChXZWJEcmFnQ2xpZW50OjpzdGFydERyYWcpOgorCiAyMDE3LTAyLTEwICBE YW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBBdHRlbXB0IHRvIGZp eCB0aGUgV2luQ2Fpcm8gNjQtQml0IFJlbGVhc2UgYnVpbGQgZm9sbG93aW5nIDxodHRwczovL3Ry YWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjEyMTczPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDYyNTNjNTdlN2My MDg1Y2U5MTRmYzM5NmRlNTE1ODFkZTAzM2Y4ZGIuLjUyODAyMGU5N2ZlYTEzNTdlOGE2YzkyZTIw OWU5YmNjNDJmN2JlOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNy0wMi0xNSAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIE1vZGVybml6 ZSBEcmFnQ2xpZW50OjpzdGFydERyYWcgc29tZXdoYXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODM3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBmb3IgV2ViQ29yZSBjaGFuZ2VzLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViRHJhZ0NsaWVudDo6c3RhcnREcmFnKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuaDoKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJEcmFnQ2xpZW50TWFjLm1tOgorICAgICAgICAoV2Vi S2l0OjpXZWJEcmFnQ2xpZW50OjpzdGFydERyYWcpOgorCiAyMDE3LTAyLTE0ICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBsb2dnaW5nIGFuZCBk ZWZlbnNpdmUgZml4ZXMgdG8gdHJ5IHRvIGRldGVjdCBwcm9ibGVtcyBjYXVzaW5nIGJsYW5rIHRh YnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5jcHAKaW5kZXggMmY0ZWQyM2NhYTcy MjdhZDQwYzI0YmI1ODk1NDRmNGZhZTlhYmY0OC4uMjVjNDVlMjlkMDc1OTNhYTdjOTg2MjU4Y2E3 YjQ2MDI4YTM2ZjJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xp ZW50cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5jcHAKQEAg LTEzMSw3ICsxMzEsNyBAQCBjbGFzcyBFbXB0eURyYWdDbGllbnQgZmluYWwgOiBwdWJsaWMgRHJh Z0NsaWVudCB7CiAgICAgdm9pZCB3aWxsUGVyZm9ybURyYWdTb3VyY2VBY3Rpb24oRHJhZ1NvdXJj ZUFjdGlvbiwgY29uc3QgSW50UG9pbnQmLCBEYXRhVHJhbnNmZXImKSBmaW5hbCB7IH0KICAgICBE cmFnRGVzdGluYXRpb25BY3Rpb24gYWN0aW9uTWFza0ZvckRyYWcoY29uc3QgRHJhZ0RhdGEmKSBm aW5hbCB7IHJldHVybiBEcmFnRGVzdGluYXRpb25BY3Rpb25Ob25lOyB9CiAgICAgRHJhZ1NvdXJj ZUFjdGlvbiBkcmFnU291cmNlQWN0aW9uTWFza0ZvclBvaW50KGNvbnN0IEludFBvaW50JikgZmlu YWwgeyByZXR1cm4gRHJhZ1NvdXJjZUFjdGlvbk5vbmU7IH0KLSAgICB2b2lkIHN0YXJ0RHJhZyhE cmFnSW1hZ2VSZWYsIGNvbnN0IEludFBvaW50JiwgY29uc3QgSW50UG9pbnQmLCBjb25zdCBGbG9h dFBvaW50JiwgRGF0YVRyYW5zZmVyJiwgRnJhbWUmLCBib29sKSBmaW5hbCB7IH0KKyAgICB2b2lk IHN0YXJ0RHJhZyhEcmFnSW1hZ2UsIGNvbnN0IEludFBvaW50JiwgY29uc3QgSW50UG9pbnQmLCBj b25zdCBGbG9hdFBvaW50JiwgRGF0YVRyYW5zZmVyJiwgRnJhbWUmLCBEcmFnU291cmNlQWN0aW9u KSBmaW5hbCB7IH0KICAgICB2b2lkIGRyYWdDb250cm9sbGVyRGVzdHJveWVkKCkgZmluYWwgeyB9 CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDbGllbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NsaWVudC5oCmluZGV4IDFhYzE5MTZjNGQ4NWRlODg4ODFl NjYwNDhiOWUzNWYzODhmMDI1YTkuLjdjNmEwODg5MWJlZGJlYmM3ZWEzMWQ1NGRkZDFkNDYzZmZh ZTBiOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NsaWVudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NsaWVudC5oCkBAIC00Nyw3ICs0Nyw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIERyYWdEZXN0aW5hdGlvbkFjdGlvbiBhY3Rpb25NYXNrRm9yRHJhZyhj b25zdCBEcmFnRGF0YSYpID0gMDsKICAgICB2aXJ0dWFsIERyYWdTb3VyY2VBY3Rpb24gZHJhZ1Nv dXJjZUFjdGlvbk1hc2tGb3JQb2ludChjb25zdCBJbnRQb2ludCYgcm9vdFZpZXdQb2ludCkgPSAw OwogICAgIAotICAgIHZpcnR1YWwgdm9pZCBzdGFydERyYWcoRHJhZ0ltYWdlUmVmLCBjb25zdCBJ bnRQb2ludCYgZHJhZ0ltYWdlT3JpZ2luLCBjb25zdCBJbnRQb2ludCYgZXZlbnRQb3MsIGNvbnN0 IEZsb2F0UG9pbnQmIGRyYWdJbWFnZUFuY2hvciwgRGF0YVRyYW5zZmVyJiwgRnJhbWUmLCBib29s IGxpbmtEcmFnID0gZmFsc2UpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc3RhcnREcmFnKERyYWdJ bWFnZSwgY29uc3QgSW50UG9pbnQmIGRyYWdJbWFnZU9yaWdpbiwgY29uc3QgSW50UG9pbnQmIGV2 ZW50UG9zLCBjb25zdCBGbG9hdFBvaW50JiBkcmFnSW1hZ2VBbmNob3IsIERhdGFUcmFuc2ZlciYs IEZyYW1lJiwgRHJhZ1NvdXJjZUFjdGlvbikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkcmFnRW5k ZWQoKSB7IH0KIAogI2lmIFBMQVRGT1JNKENPQ09BKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250 cm9sbGVyLmNwcAppbmRleCBiNmI4MTgwNzQ4ZmRmZDcxY2M3NmYyNGMzZWQzNTM4MjllZGE3MDgx Li5jNGViYWMwNzBlOGMxYjg0ODUxZGI1NzE0MGIzYTUyMTdmM2ZmYjU5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcApAQCAtODU3LDcgKzg1Nyw3IEBAIGJvb2wgRHJhZ0Nv bnRyb2xsZXI6OnN0YXJ0RHJhZyhGcmFtZSYgc3JjLCBjb25zdCBEcmFnU3RhdGUmIHN0YXRlLCBE cmFnT3BlcmF0aW9uCiAgICAgICAgIGlmICghZHJhZ0ltYWdlKQogICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgICAgIGRvU3lzdGVtRHJhZyhXVEZNb3ZlKGRyYWdJbWFnZSksIGRyYWdM b2MsIGRyYWdPcmlnaW4sIGRyYWdJbWFnZUJvdW5kcywgZGF0YVRyYW5zZmVyLCBzcmMsIGZhbHNl KTsKKyAgICAgICAgZG9TeXN0ZW1EcmFnKFdURk1vdmUoZHJhZ0ltYWdlKSwgZHJhZ0xvYywgZHJh Z09yaWdpbiwgZHJhZ0ltYWdlQm91bmRzLCBkYXRhVHJhbnNmZXIsIHNyYywgRHJhZ1NvdXJjZUFj dGlvblNlbGVjdGlvbik7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIApAQCAtODg1LDgg Kzg4NSw5IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnN0YXJ0RHJhZyhGcmFtZSYgc3JjLCBjb25z dCBEcmFnU3RhdGUmIHN0YXRlLCBEcmFnT3BlcmF0aW9uCiAgICAgICAgICAgICBkb0ltYWdlRHJh ZyhlbGVtZW50LCBkcmFnT3JpZ2luLCBoaXRUZXN0UmVzdWx0LmltYWdlUmVjdCgpLCBkYXRhVHJh bnNmZXIsIHNyYywgbV9kcmFnT2Zmc2V0KTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IC8vIERIVE1MIGRlZmluZWQgZHJhZyBpbWFnZQotICAgICAgICAgICAgZG9TeXN0ZW1EcmFnKFdU Rk1vdmUoZHJhZ0ltYWdlKSwgZHJhZ0xvYywgZHJhZ09yaWdpbiwgeyB9LCBkYXRhVHJhbnNmZXIs IHNyYywgZmFsc2UpOworICAgICAgICAgICAgZG9TeXN0ZW1EcmFnKFdURk1vdmUoZHJhZ0ltYWdl KSwgZHJhZ0xvYywgZHJhZ09yaWdpbiwgeyB9LCBkYXRhVHJhbnNmZXIsIHNyYywgRHJhZ1NvdXJj ZUFjdGlvbkltYWdlKTsKICAgICAgICAgfQorCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K IApAQCAtOTI0LDcgKzkyNSw3IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnN0YXJ0RHJhZyhGcmFt ZSYgc3JjLCBjb25zdCBEcmFnU3RhdGUmIHN0YXRlLCBEcmFnT3BlcmF0aW9uCiAgICAgICAgICAg ICAvLyBMYXRlciBjb2RlIGV4cGVjdHMgdGhlIGRyYWcgaW1hZ2UgdG8gYmUgc2NhbGVkIGJ5IGRl dmljZSdzIHNjYWxlIGZhY3Rvci4KICAgICAgICAgICAgIGRyYWdJbWFnZSA9IERyYWdJbWFnZSB7 IHNjYWxlRHJhZ0ltYWdlKGRyYWdJbWFnZS5nZXQoKSwgRmxvYXRTaXplKG1fcGFnZS5kZXZpY2VT Y2FsZUZhY3RvcigpLCBtX3BhZ2UuZGV2aWNlU2NhbGVGYWN0b3IoKSkpIH07CiAgICAgICAgIH0K LSAgICAgICAgZG9TeXN0ZW1EcmFnKFdURk1vdmUoZHJhZ0ltYWdlKSwgZHJhZ0xvYywgbW91c2VE cmFnZ2VkUG9pbnQsIHsgfSwgZGF0YVRyYW5zZmVyLCBzcmMsIHRydWUpOworICAgICAgICBkb1N5 c3RlbURyYWcoV1RGTW92ZShkcmFnSW1hZ2UpLCBkcmFnTG9jLCBtb3VzZURyYWdnZWRQb2ludCwg eyB9LCBkYXRhVHJhbnNmZXIsIHNyYywgRHJhZ1NvdXJjZUFjdGlvbkxpbmspOwogCiAgICAgICAg IHJldHVybiB0cnVlOwogICAgIH0KQEAgLTk0NCw3ICs5NDUsNyBAQCBib29sIERyYWdDb250cm9s bGVyOjpzdGFydERyYWcoRnJhbWUmIHNyYywgY29uc3QgRHJhZ1N0YXRlJiBzdGF0ZSwgRHJhZ09w ZXJhdGlvbgogICAgICAgICAgICAgZHJhZ0xvYyA9IGRyYWdMb2NGb3JTZWxlY3Rpb25EcmFnKHNy Yyk7CiAgICAgICAgICAgICBtX2RyYWdPZmZzZXQgPSBJbnRQb2ludChkcmFnT3JpZ2luLngoKSAt IGRyYWdMb2MueCgpLCBkcmFnT3JpZ2luLnkoKSAtIGRyYWdMb2MueSgpKTsKICAgICAgICAgfQot ICAgICAgICBkb1N5c3RlbURyYWcoV1RGTW92ZShkcmFnSW1hZ2UpLCBkcmFnTG9jLCBkcmFnT3Jp Z2luLCB7IH0sIGRhdGFUcmFuc2Zlciwgc3JjLCBmYWxzZSk7CisgICAgICAgIGRvU3lzdGVtRHJh ZyhXVEZNb3ZlKGRyYWdJbWFnZSksIGRyYWdMb2MsIGRyYWdPcmlnaW4sIHsgfSwgZGF0YVRyYW5z ZmVyLCBzcmMsIERyYWdTb3VyY2VBY3Rpb25BdHRhY2htZW50KTsKICAgICAgICAgcmV0dXJuIHRy dWU7CiAgICAgfQogI2VuZGlmCkBAIC05NTIsNyArOTUzLDcgQEAgYm9vbCBEcmFnQ29udHJvbGxl cjo6c3RhcnREcmFnKEZyYW1lJiBzcmMsIGNvbnN0IERyYWdTdGF0ZSYgc3RhdGUsIERyYWdPcGVy YXRpb24KICAgICBpZiAoc3RhdGUudHlwZSA9PSBEcmFnU291cmNlQWN0aW9uREhUTUwgJiYgZHJh Z0ltYWdlKSB7CiAgICAgICAgIEFTU0VSVChtX2RyYWdTb3VyY2VBY3Rpb24gJiBEcmFnU291cmNl QWN0aW9uREhUTUwpOwogICAgICAgICBtX2NsaWVudC53aWxsUGVyZm9ybURyYWdTb3VyY2VBY3Rp b24oRHJhZ1NvdXJjZUFjdGlvbkRIVE1MLCBkcmFnT3JpZ2luLCBkYXRhVHJhbnNmZXIpOwotICAg ICAgICBkb1N5c3RlbURyYWcoV1RGTW92ZShkcmFnSW1hZ2UpLCBkcmFnTG9jLCBkcmFnT3JpZ2lu LCB7IH0sIGRhdGFUcmFuc2Zlciwgc3JjLCBmYWxzZSk7CisgICAgICAgIGRvU3lzdGVtRHJhZyhX VEZNb3ZlKGRyYWdJbWFnZSksIGRyYWdMb2MsIGRyYWdPcmlnaW4sIHsgfSwgZGF0YVRyYW5zZmVy LCBzcmMsIERyYWdTb3VyY2VBY3Rpb25ESFRNTCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAg IH0KIApAQCAtMTAwMiwxMCArMTAwMywxMCBAQCB2b2lkIERyYWdDb250cm9sbGVyOjpkb0ltYWdl RHJhZyhFbGVtZW50JiBlbGVtZW50LCBjb25zdCBJbnRQb2ludCYgZHJhZ09yaWdpbiwgYwogICAg ICAgICByZXR1cm47CiAKICAgICBkcmFnSW1hZ2VPZmZzZXQgPSBtb3VzZURvd25Qb2ludCArIHNj YWxlZE9yaWdpbjsKLSAgICBkb1N5c3RlbURyYWcoV1RGTW92ZShkcmFnSW1hZ2UpLCBkcmFnSW1h Z2VPZmZzZXQsIGRyYWdPcmlnaW4sIGVsZW1lbnQuYm91bmRzSW5Sb290Vmlld1NwYWNlKCksIGRh dGFUcmFuc2ZlciwgZnJhbWUsIGZhbHNlKTsKKyAgICBkb1N5c3RlbURyYWcoV1RGTW92ZShkcmFn SW1hZ2UpLCBkcmFnSW1hZ2VPZmZzZXQsIGRyYWdPcmlnaW4sIGVsZW1lbnQuYm91bmRzSW5Sb290 Vmlld1NwYWNlKCksIGRhdGFUcmFuc2ZlciwgZnJhbWUsIERyYWdTb3VyY2VBY3Rpb25JbWFnZSk7 CiB9CiAKLXZvaWQgRHJhZ0NvbnRyb2xsZXI6OmRvU3lzdGVtRHJhZyhEcmFnSW1hZ2UgaW1hZ2Us IGNvbnN0IEludFBvaW50JiBkcmFnTG9jLCBjb25zdCBJbnRQb2ludCYgZXZlbnRQb3MsIGNvbnN0 IEludFJlY3QmIGRyYWdJbWFnZUJvdW5kcywgRGF0YVRyYW5zZmVyJiBkYXRhVHJhbnNmZXIsIEZy YW1lJiBmcmFtZSwgYm9vbCBmb3JMaW5rKQordm9pZCBEcmFnQ29udHJvbGxlcjo6ZG9TeXN0ZW1E cmFnKERyYWdJbWFnZSBpbWFnZSwgY29uc3QgSW50UG9pbnQmIGRyYWdMb2MsIGNvbnN0IEludFBv aW50JiBldmVudFBvcywgY29uc3QgSW50UmVjdCYgZHJhZ0ltYWdlQm91bmRzLCBEYXRhVHJhbnNm ZXImIGRhdGFUcmFuc2ZlciwgRnJhbWUmIGZyYW1lLCBEcmFnU291cmNlQWN0aW9uIGRyYWdTb3Vy Y2VBY3Rpb24pCiB7CiAgICAgRmxvYXRQb2ludCBkcmFnSW1hZ2VBbmNob3IgPSB7IDAuNSwgMC41 IH07CiAgICAgaWYgKCFkcmFnSW1hZ2VCb3VuZHMuaXNFbXB0eSgpKSB7CkBAIC0xMDE4LDcgKzEw MTksNyBAQCB2b2lkIERyYWdDb250cm9sbGVyOjpkb1N5c3RlbURyYWcoRHJhZ0ltYWdlIGltYWdl LCBjb25zdCBJbnRQb2ludCYgZHJhZ0xvYywgY29ucwogICAgIC8vIFByb3RlY3QgdGhpcyBmcmFt ZSBhbmQgdmlldywgYXMgYSBsb2FkIG1heSBvY2N1ciBtaWQgZHJhZyBhbmQgYXR0ZW1wdCB0byB1 bmxvYWQgdGhpcyBmcmFtZQogICAgIFJlZjxNYWluRnJhbWU+IGZyYW1lUHJvdGVjdG9yKG1fcGFn ZS5tYWluRnJhbWUoKSk7CiAgICAgUmVmUHRyPEZyYW1lVmlldz4gdmlld1Byb3RlY3RvciA9IGZy YW1lUHJvdGVjdG9yLT52aWV3KCk7Ci0gICAgbV9jbGllbnQuc3RhcnREcmFnKGltYWdlLmdldCgp LCB2aWV3UHJvdGVjdG9yLT5yb290Vmlld1RvQ29udGVudHMoZnJhbWUudmlldygpLT5jb250ZW50 c1RvUm9vdFZpZXcoZHJhZ0xvYykpLCB2aWV3UHJvdGVjdG9yLT5yb290Vmlld1RvQ29udGVudHMo ZnJhbWUudmlldygpLT5jb250ZW50c1RvUm9vdFZpZXcoZXZlbnRQb3MpKSwgZHJhZ0ltYWdlQW5j aG9yLCBkYXRhVHJhbnNmZXIsIGZyYW1lUHJvdGVjdG9yLmdldCgpLCBmb3JMaW5rKTsKKyAgICBt X2NsaWVudC5zdGFydERyYWcoV1RGTW92ZShpbWFnZSksIHZpZXdQcm90ZWN0b3ItPnJvb3RWaWV3 VG9Db250ZW50cyhmcmFtZS52aWV3KCktPmNvbnRlbnRzVG9Sb290VmlldyhkcmFnTG9jKSksIHZp ZXdQcm90ZWN0b3ItPnJvb3RWaWV3VG9Db250ZW50cyhmcmFtZS52aWV3KCktPmNvbnRlbnRzVG9S b290VmlldyhldmVudFBvcykpLCBkcmFnSW1hZ2VBbmNob3IsIGRhdGFUcmFuc2ZlciwgZnJhbWVQ cm90ZWN0b3IuZ2V0KCksIGRyYWdTb3VyY2VBY3Rpb24pOwogICAgIC8vIERyYWdDbGllbnQ6OnN0 YXJ0RHJhZyBjYW4gY2F1c2Ugb3VyIFBhZ2UgdG8gZGlzcGVhciwgZGVhbGxvY2F0aW5nIHx0aGlz fC4KICAgICBpZiAoIWZyYW1lUHJvdGVjdG9yLT5wYWdlKCkpCiAgICAgICAgIHJldHVybjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuaAppbmRleCBkNzFmNDI0OTdmODZlMGMyNmY1Y2Iy MGQ0MmEwMDA0ODQ1NDE0MDcyLi5kM2MyMDkxNDk2MDIwZWQ1MjY5YTJjZmRmZWI4ZmIzNTYxMGYz MzIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5oCkBAIC0xMTIsNyArMTEyLDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIG1vdXNlTW92ZWRJbnRvRG9jdW1l bnQoRG9jdW1lbnQqKTsKIAogICAgICAgICB2b2lkIGRvSW1hZ2VEcmFnKEVsZW1lbnQmLCBjb25z dCBJbnRQb2ludCYsIGNvbnN0IEludFJlY3QmLCBEYXRhVHJhbnNmZXImLCBGcmFtZSYsIEludFBv aW50Jik7Ci0gICAgICAgIHZvaWQgZG9TeXN0ZW1EcmFnKERyYWdJbWFnZSwgY29uc3QgSW50UG9p bnQmLCBjb25zdCBJbnRQb2ludCYsIGNvbnN0IEludFJlY3QmIGRyYWdJbWFnZUJvdW5kcywgRGF0 YVRyYW5zZmVyJiwgRnJhbWUmLCBib29sIGZvckxpbmspOworICAgICAgICB2b2lkIGRvU3lzdGVt RHJhZyhEcmFnSW1hZ2UsIGNvbnN0IEludFBvaW50JiwgY29uc3QgSW50UG9pbnQmLCBjb25zdCBJ bnRSZWN0JiBkcmFnSW1hZ2VCb3VuZHMsIERhdGFUcmFuc2ZlciYsIEZyYW1lJiwgRHJhZ1NvdXJj ZUFjdGlvbik7CiAgICAgICAgIHZvaWQgY2xlYW51cEFmdGVyU3lzdGVtRHJhZygpOwogICAgICAg ICB2b2lkIGRlY2xhcmVBbmRXcml0ZURyYWdJbWFnZShEYXRhVHJhbnNmZXImLCBFbGVtZW50Jiwg Y29uc3QgVVJMJiwgY29uc3QgU3RyaW5nJiBsYWJlbCk7CiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRf RUxFTUVOVCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dl YkRyYWdDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdD bGllbnQuaAppbmRleCBiZTZjYmIxZGZlODA0NzBmOGY0MzUyMWU4MWIyZGI1NDdkMDYyNDA2Li5i NmRjODU1MWZiOGU0ZDE3YjcyYjNlYmFmMzhlYWQwZmMzNmRmY2IyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50LmgKKysrIGIvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRHJhZ0NsaWVudC5oCkBAIC0zNyw3ICszNyw3 IEBAIHB1YmxpYzoKICAgICBXZWJDb3JlOjpEcmFnRGVzdGluYXRpb25BY3Rpb24gYWN0aW9uTWFz a0ZvckRyYWcoY29uc3QgV2ViQ29yZTo6RHJhZ0RhdGEmKSBvdmVycmlkZTsKICAgICB2b2lkIGRy YWdDb250cm9sbGVyRGVzdHJveWVkKCkgb3ZlcnJpZGU7CiAgICAgV2ViQ29yZTo6RHJhZ1NvdXJj ZUFjdGlvbiBkcmFnU291cmNlQWN0aW9uTWFza0ZvclBvaW50KGNvbnN0IFdlYkNvcmU6OkludFBv aW50JiB3aW5kb3dQb2ludCkgb3ZlcnJpZGU7Ci0gICAgdm9pZCBzdGFydERyYWcoV2ViQ29yZTo6 RHJhZ0ltYWdlUmVmLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZHJhZ1BvcywgY29uc3QgV2Vi Q29yZTo6SW50UG9pbnQmIGV2ZW50UG9zLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiwgV2Vi Q29yZTo6RGF0YVRyYW5zZmVyJiwgV2ViQ29yZTo6RnJhbWUmLCBib29sIGxpbmtEcmFnKSBvdmVy cmlkZTsKKyAgICB2b2lkIHN0YXJ0RHJhZyhXZWJDb3JlOjpEcmFnSW1hZ2UsIGNvbnN0IFdlYkNv cmU6OkludFBvaW50JiBkcmFnUG9zLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZXZlbnRQb3Ms IGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmLCBXZWJDb3JlOjpEYXRhVHJhbnNmZXImLCBXZWJD b3JlOjpGcmFtZSYsIFdlYkNvcmU6OkRyYWdTb3VyY2VBY3Rpb24pIG92ZXJyaWRlOwogICAgIHZv aWQgZGVjbGFyZUFuZFdyaXRlRHJhZ0ltYWdlKGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUs IFdlYkNvcmU6OkVsZW1lbnQmLCBjb25zdCBXZWJDb3JlOjpVUkwmLCBjb25zdCBTdHJpbmcmLCBX ZWJDb3JlOjpGcmFtZSopIG92ZXJyaWRlOwogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQp CiAgICAgdm9pZCBkZWNsYXJlQW5kV3JpdGVBdHRhY2htZW50KGNvbnN0IFN0cmluZyYgcGFzdGVi b2FyZE5hbWUsIFdlYkNvcmU6OkVsZW1lbnQmLCBjb25zdCBXZWJDb3JlOjpVUkwmLCBjb25zdCBT dHJpbmcmIHBhdGgsIFdlYkNvcmU6OkZyYW1lKikgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50Lm1tIGIvU291cmNlL1dl YktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRHJhZ0NsaWVudC5tbQppbmRleCA0YTg0YmM4ZTUz NjJiOTFlMGM3M2YwNzBjY2JhNzMzZmQwZTc0OWRlLi45NWE2NmNjZDIwMjNiODU4ZWJhODgxMGZk YzIwYTVkY2RhOGI1MWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJEcmFnQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkRyYWdDbGllbnQubW0KQEAgLTk1LDIwICs5NSwyMCBAQCB2b2lkIFdlYkRyYWdDbGll bnQ6OndpbGxQZXJmb3JtRHJhZ1NvdXJjZUFjdGlvbihXZWJDb3JlOjpEcmFnU291cmNlQWN0aW9u IGFjdGlvbgogICAgIFtbbV93ZWJWaWV3IF9VSURlbGVnYXRlRm9yd2FyZGVyXSB3ZWJWaWV3Om1f d2ViVmlldyB3aWxsUGVyZm9ybURyYWdTb3VyY2VBY3Rpb246KFdlYkRyYWdTb3VyY2VBY3Rpb24p YWN0aW9uIGZyb21Qb2ludDptb3VzZURvd25Qb2ludCB3aXRoUGFzdGVib2FyZDpbTlNQYXN0ZWJv YXJkIHBhc3RlYm9hcmRXaXRoTmFtZTpkYXRhVHJhbnNmZXIucGFzdGVib2FyZCgpLm5hbWUoKV1d OwogfQogCi12b2lkIFdlYkRyYWdDbGllbnQ6OnN0YXJ0RHJhZyhEcmFnSW1hZ2VSZWYgZHJhZ0lt YWdlLCBjb25zdCBJbnRQb2ludCYgYXQsIGNvbnN0IEludFBvaW50JiBldmVudFBvcywgY29uc3Qg RmxvYXRQb2ludCYsIERhdGFUcmFuc2ZlciYgZGF0YVRyYW5zZmVyLCBGcmFtZSYgZnJhbWUsIGJv b2wgbGlua0RyYWcpCit2b2lkIFdlYkRyYWdDbGllbnQ6OnN0YXJ0RHJhZyhEcmFnSW1hZ2UgZHJh Z0ltYWdlLCBjb25zdCBJbnRQb2ludCYgYXQsIGNvbnN0IEludFBvaW50JiBldmVudFBvcywgY29u c3QgRmxvYXRQb2ludCYsIERhdGFUcmFuc2ZlciYgZGF0YVRyYW5zZmVyLCBGcmFtZSYgZnJhbWUs IERyYWdTb3VyY2VBY3Rpb24gZHJhZ1NvdXJjZUFjdGlvbikKIHsKICAgICBSZXRhaW5QdHI8V2Vi SFRNTFZpZXc+IGh0bWxWaWV3ID0gKFdlYkhUTUxWaWV3KilbW2tpdCgmZnJhbWUpIGZyYW1lVmll d10gZG9jdW1lbnRWaWV3XTsKICAgICBpZiAoIVtodG1sVmlldy5nZXQoKSBpc0tpbmRPZkNsYXNz OltXZWJIVE1MVmlldyBjbGFzc11dKQogICAgICAgICByZXR1cm47CiAgICAgCi0gICAgTlNFdmVu dCAqZXZlbnQgPSBsaW5rRHJhZyA/IGZyYW1lLmV2ZW50SGFuZGxlcigpLmN1cnJlbnROU0V2ZW50 KCkgOiBbaHRtbFZpZXcuZ2V0KCkgX21vdXNlRG93bkV2ZW50XTsKKyAgICBOU0V2ZW50ICpldmVu dCA9IGRyYWdTb3VyY2VBY3Rpb24gPT0gRHJhZ1NvdXJjZUFjdGlvbkxpbmsgPyBmcmFtZS5ldmVu dEhhbmRsZXIoKS5jdXJyZW50TlNFdmVudCgpIDogW2h0bWxWaWV3LmdldCgpIF9tb3VzZURvd25F dmVudF07CiAgICAgV2ViSFRNTFZpZXcqIHRvcEhUTUxWaWV3ID0gZ2V0VG9wSFRNTFZpZXcoJmZy YW1lKTsKICAgICBSZXRhaW5QdHI8V2ViSFRNTFZpZXc+IHRvcFZpZXdQcm90ZWN0b3IgPSB0b3BI VE1MVmlldzsKICAgICAKICAgICBbdG9wSFRNTFZpZXcgX3N0b3BBdXRvc2Nyb2xsVGltZXJdOwog ICAgIE5TUGFzdGVib2FyZCAqcGFzdGVib2FyZCA9IFtOU1Bhc3RlYm9hcmQgcGFzdGVib2FyZFdp dGhOYW1lOmRhdGFUcmFuc2Zlci5wYXN0ZWJvYXJkKCkubmFtZSgpXTsKIAotICAgIE5TSW1hZ2Ug KmRyYWdOU0ltYWdlID0gZHJhZ0ltYWdlLmdldCgpOworICAgIE5TSW1hZ2UgKmRyYWdOU0ltYWdl ID0gZHJhZ0ltYWdlLmdldCgpLmdldCgpOwogICAgIFdlYkhUTUxWaWV3ICpzb3VyY2VIVE1MVmll dyA9IGh0bWxWaWV3LmdldCgpOwogCiAgICAgSW50U2l6ZSBzaXplKFtkcmFnTlNJbWFnZSBzaXpl XSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJEcmFn Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGll bnQuY3BwCmluZGV4IDM3OTgwYTRkMzg3ZTA0ZjdmYzFmZTZlN2JiNzZhMjJmMDQ2MjczY2IuLjA4 NDc0NjBiNzUzZDkxNWI4MDFmNGQ2MTQ1YmZiY2ZiZGViOWNmYTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuY3BwCkBAIC0xMTAsNyAr MTEwLDcgQEAgdm9pZCBXZWJEcmFnQ2xpZW50Ojp3aWxsUGVyZm9ybURyYWdTb3VyY2VBY3Rpb24o RHJhZ1NvdXJjZUFjdGlvbiBhY3Rpb24sIGNvbnN0IEkKICAgICAgICAgY29uc3RfY2FzdDxQYXN0 ZWJvYXJkJj4oZGF0YVRyYW5zZmVyLnBhc3RlYm9hcmQoKSkuc2V0RXh0ZXJuYWxEYXRhT2JqZWN0 KG5ld0RhdGFPYmplY3QuZ2V0KCkpOwogfQogCi12b2lkIFdlYkRyYWdDbGllbnQ6OnN0YXJ0RHJh ZyhEcmFnSW1hZ2VSZWYgaW1hZ2UsIGNvbnN0IEludFBvaW50JiBpbWFnZU9yaWdpbiwgY29uc3Qg SW50UG9pbnQmIGRyYWdQb2ludCwgY29uc3QgRmxvYXRQb2ludCYsIERhdGFUcmFuc2ZlciYgZGF0 YVRyYW5zZmVyLCBGcmFtZSYgZnJhbWUsIGJvb2wgaXNMaW5rKQordm9pZCBXZWJEcmFnQ2xpZW50 OjpzdGFydERyYWcoRHJhZ0ltYWdlIGltYWdlLCBjb25zdCBJbnRQb2ludCYgaW1hZ2VPcmlnaW4s IGNvbnN0IEludFBvaW50JiBkcmFnUG9pbnQsIGNvbnN0IEZsb2F0UG9pbnQmLCBEYXRhVHJhbnNm ZXImIGRhdGFUcmFuc2ZlciwgRnJhbWUmIGZyYW1lLCBEcmFnU291cmNlQWN0aW9uIGRyYWdTb3Vy Y2VBY3Rpb24pCiB7CiAgICAgLy9GSVhNRTogQWxsb3cgVUlEZWxlZ2F0ZSB0byBvdmVycmlkZSBi ZWhhdmlvdXIgPHJkYXI6Ly9wcm9ibGVtLzUwMTU5NTM+CiAKQEAgLTEyOSw3ICsxMjksNyBAQCB2 b2lkIFdlYkRyYWdDbGllbnQ6OnN0YXJ0RHJhZyhEcmFnSW1hZ2VSZWYgaW1hZ2UsIGNvbnN0IElu dFBvaW50JiBpbWFnZU9yaWdpbiwgYwogICAgICAgICAgICAgaWYoU1VDQ0VFREVEKENvQ3JlYXRl SW5zdGFuY2UoQ0xTSURfRHJhZ0Ryb3BIZWxwZXIsIDAsIENMU0NUWF9JTlBST0NfU0VSVkVSLAog ICAgICAgICAgICAgICAgIElJRF9JRHJhZ1NvdXJjZUhlbHBlciwoTFBWT0lEKikmaGVscGVyKSkp IHsKICAgICAgICAgICAgICAgICBCSVRNQVAgYjsKLSAgICAgICAgICAgICAgICBHZXRPYmplY3Qo aW1hZ2UsIHNpemVvZihCSVRNQVApLCAmYik7CisgICAgICAgICAgICAgICAgR2V0T2JqZWN0KGlt YWdlLmdldCgpLCBzaXplb2YoQklUTUFQKSwgJmIpOwogICAgICAgICAgICAgICAgIFNIRFJBR0lN QUdFIHNkaTsKICAgICAgICAgICAgICAgICBzZGkuc2l6ZURyYWdJbWFnZS5jeCA9IGIuYm1XaWR0 aDsKICAgICAgICAgICAgICAgICBzZGkuc2l6ZURyYWdJbWFnZS5jeSA9IGIuYm1IZWlnaHQ7CkBA IC0xMzcsNyArMTM3LDcgQEAgdm9pZCBXZWJEcmFnQ2xpZW50OjpzdGFydERyYWcoRHJhZ0ltYWdl UmVmIGltYWdlLCBjb25zdCBJbnRQb2ludCYgaW1hZ2VPcmlnaW4sIGMKICAgICAgICAgICAgICAg ICBzZGkuaGJtcERyYWdJbWFnZSA9IGltYWdlOwogICAgICAgICAgICAgICAgIHNkaS5wdE9mZnNl dC54ID0gZHJhZ1BvaW50LngoKSAtIGltYWdlT3JpZ2luLngoKTsKICAgICAgICAgICAgICAgICBz ZGkucHRPZmZzZXQueSA9IGRyYWdQb2ludC55KCkgLSBpbWFnZU9yaWdpbi55KCk7Ci0gICAgICAg ICAgICAgICAgaWYgKGlzTGluaykKKyAgICAgICAgICAgICAgICBpZiAoZHJhZ1NvdXJjZUFjdGlv biA9PSBEcmFnU291cmNlQWN0aW9uTGluaykKICAgICAgICAgICAgICAgICAgICAgc2RpLnB0T2Zm c2V0LnkgPSBiLmJtSGVpZ2h0IC0gc2RpLnB0T2Zmc2V0Lnk7CiAKICAgICAgICAgICAgICAgICBo ZWxwZXItPkluaXRpYWxpemVGcm9tQml0bWFwKCZzZGksIGRhdGFPYmplY3QuZ2V0KCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFn Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi RHJhZ0NsaWVudC5jcHAKaW5kZXggYTA2YjI2Y2Q5NzRkMzI3MzUyMmVkMjM4MjAxNTMwYzRhNWRk NDkwMi4uMGYxNmJlOWE1NzY4MGNmZmIxMGNjZGI1NWRhMzE3MzEyZmM2NWM0OSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRy YWdDbGllbnQuY3BwCkBAIC01Nyw3ICs1Nyw3IEBAIERyYWdTb3VyY2VBY3Rpb24gV2ViRHJhZ0Ns aWVudDo6ZHJhZ1NvdXJjZUFjdGlvbk1hc2tGb3JQb2ludChjb25zdCBJbnRQb2ludCYpCiB9CiAK ICNpZiAhUExBVEZPUk0oQ09DT0EpICYmICFQTEFURk9STShHVEspCi12b2lkIFdlYkRyYWdDbGll bnQ6OnN0YXJ0RHJhZyhEcmFnSW1hZ2VSZWYsIGNvbnN0IEludFBvaW50JiwgY29uc3QgSW50UG9p bnQmLCBjb25zdCBGbG9hdFBvaW50JiwgRGF0YVRyYW5zZmVyJiwgRnJhbWUmLCBib29sKQordm9p ZCBXZWJEcmFnQ2xpZW50OjpzdGFydERyYWcoRHJhZ0ltYWdlLCBjb25zdCBJbnRQb2ludCYsIGNv bnN0IEludFBvaW50JiwgY29uc3QgRmxvYXRQb2ludCYsIERhdGFUcmFuc2ZlciYsIEZyYW1lJiwg RHJhZ1NvdXJjZUFjdGlvbikKIHsKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50LmggYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuaAppbmRleCA1NmRj MTNjYWNhNzVjYjY3NGU2MjAxYjNmMDc4OWU3ZWI5NzhlNzY3Li5hOTZlZTgxNjIwMzYyZTNlYTky MzU1NzI4NzAyZGI2ZDJlMzcwZWVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQuaApAQCAtNDcsNyArNDcsNyBA QCBwcml2YXRlOgogICAgIFdlYkNvcmU6OkRyYWdEZXN0aW5hdGlvbkFjdGlvbiBhY3Rpb25NYXNr Rm9yRHJhZyhjb25zdCBXZWJDb3JlOjpEcmFnRGF0YSYpIG92ZXJyaWRlOwogICAgIFdlYkNvcmU6 OkRyYWdTb3VyY2VBY3Rpb24gZHJhZ1NvdXJjZUFjdGlvbk1hc2tGb3JQb2ludChjb25zdCBXZWJD b3JlOjpJbnRQb2ludCYgd2luZG93UG9pbnQpIG92ZXJyaWRlOwogCi0gICAgdm9pZCBzdGFydERy YWcoV2ViQ29yZTo6RHJhZ0ltYWdlUmVmLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZHJhZ0lt YWdlT3JpZ2luLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZXZlbnRQb3MsIGNvbnN0IFdlYkNv cmU6OkZsb2F0UG9pbnQmIGRyYWdJbWFnZUFuY2hvciwgV2ViQ29yZTo6RGF0YVRyYW5zZmVyJiwg V2ViQ29yZTo6RnJhbWUmLCBib29sIGxpbmtEcmFnID0gZmFsc2UpIG92ZXJyaWRlOworICAgIHZv aWQgc3RhcnREcmFnKFdlYkNvcmU6OkRyYWdJbWFnZSwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQm IGRyYWdJbWFnZU9yaWdpbiwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGV2ZW50UG9zLCBjb25z dCBXZWJDb3JlOjpGbG9hdFBvaW50JiBkcmFnSW1hZ2VBbmNob3IsIFdlYkNvcmU6OkRhdGFUcmFu c2ZlciYsIFdlYkNvcmU6OkZyYW1lJiwgV2ViQ29yZTo6RHJhZ1NvdXJjZUFjdGlvbikgb3ZlcnJp ZGU7CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICB2b2lkIGRlY2xhcmVBbmRXcml0ZURyYWdJ bWFnZShjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lLCBXZWJDb3JlOjpFbGVtZW50JiwgY29u c3QgV2ViQ29yZTo6VVJMJiwgY29uc3QgU3RyaW5nJiwgV2ViQ29yZTo6RnJhbWUqKSBvdmVycmlk ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv bWFjL1dlYkRyYWdDbGllbnRNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L21hYy9XZWJEcmFnQ2xpZW50TWFjLm1tCmluZGV4IGIzYzZkY2FlMzUyMTUxNDdi NDVkMmJhMjVhOWE0MjkyNjc5NzMzZTUuLjI0NTNjOTA1NTdhODFjYmM0NDNhY2QxN2IwMDUwMmZi YTBhOTVlYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvbWFjL1dlYkRyYWdDbGllbnRNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRHJhZ0NsaWVudE1hYy5tbQpAQCAtODIsMTAgKzgy LDEwIEBAIHN0YXRpYyBQYXNzUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gY29udmVydEltYWdlVG9C aXRtYXAoTlNJbWFnZSAqaW1hZ2UsIGNvbnN0IEluCiAgICAgcmV0dXJuIFdURk1vdmUoYml0bWFw KTsKIH0KIAotdm9pZCBXZWJEcmFnQ2xpZW50OjpzdGFydERyYWcoUmV0YWluUHRyPE5TSW1hZ2U+ IGltYWdlLCBjb25zdCBJbnRQb2ludCYgcG9pbnQsIGNvbnN0IEludFBvaW50JiwgY29uc3QgRmxv YXRQb2ludCYsIERhdGFUcmFuc2ZlciYsIEZyYW1lJiBmcmFtZSwgYm9vbCBsaW5rRHJhZykKK3Zv aWQgV2ViRHJhZ0NsaWVudDo6c3RhcnREcmFnKERyYWdJbWFnZSBpbWFnZSwgY29uc3QgSW50UG9p bnQmIHBvaW50LCBjb25zdCBJbnRQb2ludCYsIGNvbnN0IEZsb2F0UG9pbnQmLCBEYXRhVHJhbnNm ZXImLCBGcmFtZSYgZnJhbWUsIERyYWdTb3VyY2VBY3Rpb24gZHJhZ1NvdXJjZUFjdGlvbikKIHsK LSAgICBJbnRTaXplIGJpdG1hcFNpemUoW2ltYWdlIHNpemVdKTsKLSAgICBSZWZQdHI8U2hhcmVh YmxlQml0bWFwPiBiaXRtYXAgPSBjb252ZXJ0SW1hZ2VUb0JpdG1hcChpbWFnZS5nZXQoKSwgYml0 bWFwU2l6ZSwgZnJhbWUpOworICAgIEludFNpemUgYml0bWFwU2l6ZShbaW1hZ2UuZ2V0KCkgc2l6 ZV0pOworICAgIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGJpdG1hcCA9IGNvbnZlcnRJbWFnZVRv Qml0bWFwKGltYWdlLmdldCgpLmdldCgpLCBiaXRtYXBTaXplLCBmcmFtZSk7CiAgICAgU2hhcmVh YmxlQml0bWFwOjpIYW5kbGUgaGFuZGxlOwogICAgIGlmICghYml0bWFwIHx8ICFiaXRtYXAtPmNy ZWF0ZUhhbmRsZShoYW5kbGUpKQogICAgICAgICByZXR1cm47CkBAIC05Myw3ICs5Myw3IEBAIHZv aWQgV2ViRHJhZ0NsaWVudDo6c3RhcnREcmFnKFJldGFpblB0cjxOU0ltYWdlPiBpbWFnZSwgY29u c3QgSW50UG9pbnQmIHBvaW50LCBjCiAgICAgbV9wYWdlLT53aWxsU3RhcnREcmFnKCk7CiAKICAg ICAvLyBGSVhNRTogU2VlbXMgdGhpcyBtZXNzYWdlIHNob3VsZCBiZSBuYW1lZCBTdGFydERyYWcs IG5vdCBTZXREcmFnSW1hZ2UuCi0gICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OlNldERyYWdJbWFnZShmcmFtZS52aWV3KCktPmNvbnRlbnRzVG9XaW5kb3cocG9pbnQpLCBo YW5kbGUsIHsgfSwgbGlua0RyYWcpKTsKKyAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6U2V0RHJhZ0ltYWdlKGZyYW1lLnZpZXcoKS0+Y29udGVudHNUb1dpbmRvdyhwb2lu dCksIGhhbmRsZSwgeyB9LCBkcmFnU291cmNlQWN0aW9uID09IERyYWdTb3VyY2VBY3Rpb25MaW5r KSk7CiB9CiAKIHN0YXRpYyBXZWJDb3JlOjpDYWNoZWRJbWFnZSogY2FjaGVkSW1hZ2UoRWxlbWVu dCYgZWxlbWVudCkK