216482 2020-09-14 09:11:16 -0700 Rename the GTK Display type to XDisplay to avoid conflict with the WebCore::Display namespace 2020-09-14 11:02:32 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED LATER P2 Normal --- 216466 1 simon.fraser simon.fraser bugs-noreply simon.fraser oldest_to_newest 1688259 0 simon.fraser 2020-09-14 09:11:16 -0700 Rename the GTK Display type to XDisplay to avoid conflict with the WebCore::Display namespace 1688261 1 408709 simon.fraser 2020-09-14 09:11:51 -0700 Created attachment 408709 Patch 1688313 2 simon.fraser 2020-09-14 11:02:32 -0700 Ended up not needing this. 408709 2020-09-14 09:11:51 -0700 2020-09-14 11:02:19 -0700 Patch bug-216482-20200914091150.patch text/plain 13732 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzMwZmM3ZWQ3OWFhMjM5 NDg2YmU2MDZjYzk5YjJlZTdhYTUyYjU5NS4uNzZhYjUzYTQ0MTEwYWM3YjE0ZjE0YjdlYzBjODUx NTlkMjMyNGI0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIwLTA5LTE0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSB0aGUg R1RLIERpc3BsYXkgdHlwZSB0byBYRGlzcGxheSB0byBhdm9pZCBjb25mbGljdCB3aXRoIHRoZSBX ZWJDb3JlOjpEaXNwbGF5IG5hbWVzcGFjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NDgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRGlzcGxheSAtPiBYRGlzcGxheQorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTFgxMS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpH TENvbnRleHRFR0w6OmNyZWF0ZVBpeG1hcENvbnRleHQpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2dseC9HTENvbnRleHRHTFguY3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFzU0dJU3dh cENvbnRyb2xFeHRlbnNpb24pOgorICAgICAgICAoV2ViQ29yZTo6aGFzR0xYQVJCQ3JlYXRlQ29u dGV4dEV4dGVuc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVHTFhBUkJDb250ZXh0KToK KyAgICAgICAgKFdlYkNvcmU6OkdMQ29udGV4dEdMWDo6Y3JlYXRlV2luZG93Q29udGV4dCk6Cisg ICAgICAgIChXZWJDb3JlOjpHTENvbnRleHRHTFg6OmNyZWF0ZVBidWZmZXJDb250ZXh0KToKKyAg ICAgICAgKFdlYkNvcmU6OkdMQ29udGV4dEdMWDo6Y3JlYXRlUGl4bWFwQ29udGV4dCk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ2x4L0dMQ29udGV4dEdMWC5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UGxhdGZvcm1EaXNwbGF5WDExOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6UGxh dGZvcm1EaXNwbGF5WDExOjpQbGF0Zm9ybURpc3BsYXlYMTEpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy94MTEvWEVycm9yVHJhcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjp4RXJyb3JU cmFwcGVyc01hcCk6CisgICAgICAgIChXZWJDb3JlOjpYRXJyb3JUcmFwcGVyOjpYRXJyb3JUcmFw cGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy94MTEvWEVycm9yVHJhcHBlci5oOgor ICAgICAgICAoV2ViQ29yZTo6WEVycm9yVHJhcHBlcjo6WEVycm9yVHJhcHBlcik6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MveDExL1hVbmlxdWVQdHIuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy94MTEvWFVuaXF1ZVJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNo YXJlZERpc3BsYXkpOgorCiAyMDIwLTA5LTEwICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhA YXBwbGUuY29tPgogCiAgICAgICAgIEFkZHJlc3MgYSBwb3N0LWNvbW1pdCByZXZpZXcgY29tbWVu dCBhZnRlciByMjY2ODg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9lZ2wvR0xDb250ZXh0RUdMWDExLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2VnbC9HTENvbnRleHRFR0xYMTEuY3BwCmluZGV4IDY3YThlMGI1OTYxMWM1NWU0MzM2 ZjJiMTMyNDhmMjAzODczMTE4YTUuLjZmMjE4Njc1ZTU1ODVjMzVmMmUzYmEwZDkxODkxOGJiNmJj ODAzOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VnbC9H TENvbnRleHRFR0xYMTEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2VnbC9HTENvbnRleHRFR0xYMTEuY3BwCkBAIC01OSw3ICs1OSw3IEBAIHN0ZDo6dW5pcXVlX3B0 cjxHTENvbnRleHRFR0w+IEdMQ29udGV4dEVHTDo6Y3JlYXRlUGl4bWFwQ29udGV4dChQbGF0Zm9y bURpc3BsYXkmCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAotICAgIERpc3BsYXkq IHgxMURpc3BsYXkgPSBkb3duY2FzdDxQbGF0Zm9ybURpc3BsYXlYMTE+KHBsYXRmb3JtRGlzcGxh eSkubmF0aXZlKCk7CisgICAgWERpc3BsYXkqIHgxMURpc3BsYXkgPSBkb3duY2FzdDxQbGF0Zm9y bURpc3BsYXlYMTE+KHBsYXRmb3JtRGlzcGxheSkubmF0aXZlKCk7CiAKICAgICBYVmlzdWFsSW5m byB2aXN1YWxJbmZvOwogICAgIHZpc3VhbEluZm8udmlzdWFsaWQgPSB2aXN1YWxJZDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dseC9HTENvbnRleHRHTFgu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ2x4L0dMQ29udGV4dEdMWC5j cHAKaW5kZXggODE1NTc3MTBiMmNmNDYzZWVmYWUwNmM3MzIzNDkxNTEwNzJiNzUxNS4uNjcxOGQ4 N2YxZDhkMTBiOWJmZjQ0N2I0YzcyNGU4NjRjOThmMDAxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ2x4L0dMQ29udGV4dEdMWC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ2x4L0dMQ29udGV4dEdMWC5jcHAKQEAgLTM2LDEz ICszNiwxMyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiB0eXBlZGVmIGludCAoKlBGTkdMWFNXQVBJ TlRFUlZBTFNHSVBST0MpIChpbnQpOwogI2VuZGlmCiAjaWYgIWRlZmluZWQoUEZOR0xYQ1JFQVRF Q09OVEVYVEFUVFJJQlNBUkJQUk9DKQotdHlwZWRlZiBHTFhDb250ZXh0ICgqUEZOR0xYQ1JFQVRF Q09OVEVYVEFUVFJJQlNBUkJQUk9DKSAoRGlzcGxheSAqZHB5LCBHTFhGQkNvbmZpZyBjb25maWcs IEdMWENvbnRleHQgc2hhcmVfY29udGV4dCwgQm9vbCBkaXJlY3QsIGNvbnN0IGludCAqYXR0cmli X2xpc3QpOwordHlwZWRlZiBHTFhDb250ZXh0ICgqUEZOR0xYQ1JFQVRFQ09OVEVYVEFUVFJJQlNB UkJQUk9DKSAoWERpc3BsYXkgKmRweSwgR0xYRkJDb25maWcgY29uZmlnLCBHTFhDb250ZXh0IHNo YXJlX2NvbnRleHQsIEJvb2wgZGlyZWN0LCBjb25zdCBpbnQgKmF0dHJpYl9saXN0KTsKICNlbmRp ZgogCiBzdGF0aWMgUEZOR0xYU1dBUElOVEVSVkFMU0dJUFJPQyBnbFhTd2FwSW50ZXJ2YWxTR0k7 CiBzdGF0aWMgUEZOR0xYQ1JFQVRFQ09OVEVYVEFUVFJJQlNBUkJQUk9DIGdsWENyZWF0ZUNvbnRl eHRBdHRyaWJzQVJCOwogCi1zdGF0aWMgYm9vbCBoYXNTR0lTd2FwQ29udHJvbEV4dGVuc2lvbihE aXNwbGF5KiBkaXNwbGF5KQorc3RhdGljIGJvb2wgaGFzU0dJU3dhcENvbnRyb2xFeHRlbnNpb24o WERpc3BsYXkqIGRpc3BsYXkpCiB7CiAgICAgc3RhdGljIGJvb2wgaW5pdGlhbGl6ZWQgPSBmYWxz ZTsKICAgICBpZiAoaW5pdGlhbGl6ZWQpCkBAIC01Niw3ICs1Niw3IEBAIHN0YXRpYyBib29sIGhh c1NHSVN3YXBDb250cm9sRXh0ZW5zaW9uKERpc3BsYXkqIGRpc3BsYXkpCiAgICAgcmV0dXJuICEh Z2xYU3dhcEludGVydmFsU0dJOwogfQogCi1zdGF0aWMgYm9vbCBoYXNHTFhBUkJDcmVhdGVDb250 ZXh0RXh0ZW5zaW9uKERpc3BsYXkqIGRpc3BsYXkpCitzdGF0aWMgYm9vbCBoYXNHTFhBUkJDcmVh dGVDb250ZXh0RXh0ZW5zaW9uKFhEaXNwbGF5KiBkaXNwbGF5KQogewogICAgIHN0YXRpYyBib29s IGluaXRpYWxpemVkID0gZmFsc2U7CiAgICAgaWYgKGluaXRpYWxpemVkKQpAQCAtNzAsNyArNzAs NyBAQCBzdGF0aWMgYm9vbCBoYXNHTFhBUkJDcmVhdGVDb250ZXh0RXh0ZW5zaW9uKERpc3BsYXkq IGRpc3BsYXkpCiAgICAgcmV0dXJuICEhZ2xYQ3JlYXRlQ29udGV4dEF0dHJpYnNBUkI7CiB9CiAK LXN0YXRpYyBHTFhDb250ZXh0IGNyZWF0ZUdMWEFSQkNvbnRleHQoRGlzcGxheSogZGlzcGxheSwg R0xYRkJDb25maWcgY29uZmlnLCBHTFhDb250ZXh0IHNoYXJpbmdDb250ZXh0KQorc3RhdGljIEdM WENvbnRleHQgY3JlYXRlR0xYQVJCQ29udGV4dChYRGlzcGxheSogZGlzcGxheSwgR0xYRkJDb25m aWcgY29uZmlnLCBHTFhDb250ZXh0IHNoYXJpbmdDb250ZXh0KQogewogICAgIC8vIFdlIHdhbnQg dG8gY3JlYXRlIGEgY29udGV4dCB3aXRoIHZlcnNpb24gPj0gMy4yIGNvcmUgcHJvZmlsZSwgY2F1 c2UgdGhhdCBlbnN1cmVzIHRoYXQgdGhlIGk5NjUgZHJpdmVyIHdvbid0CiAgICAgLy8gdXNlIHRo ZSBzb2Z0d2FyZSByZW5kZXJlci4gSWYgdGhhdCBkb2Vzbid0IHdvcmssIHdlIHdpbGwgdXNlIHdo YXRldmVyIHZlcnNpb24gYXZhaWxhYmxlLiBVbmZvcnR1bmF0ZWx5LApAQCAtMTMxLDcgKzEzMSw3 IEBAIHN0ZDo6dW5pcXVlX3B0cjxHTENvbnRleHRHTFg+IEdMQ29udGV4dEdMWDo6Y3JlYXRlV2lu ZG93Q29udGV4dChHTE5hdGl2ZVdpbmRvd1R5CiAgICAgLy8gYWxsIHRoZSBHTFhGQkNvbmZpZ3Mg dGhhdCBoYXZlIHRoZSBmZWF0dXJlcyB3ZSBuZWVkIGFuZCBjb21wYXJlIHRoZWlyIFhWaXN1YWxJ bmZvIHRvIGNoZWNrIHdoZXRoZXIKICAgICAvLyB0aGV5IGFyZSBjb21wYXRpYmxlIHdpdGggdGhl IHdpbmRvdyBvbmUuIFRoZW4gd2UgdHJ5IHRvIGNyZWF0ZSB0aGUgR0xDb250ZXh0IHdpdGggZWFj aCBvZiB0aG9zZQogICAgIC8vIGNvbmZpZ3MgdW50aWwgd2Ugc3VjY2VlZCwgYW5kIGZpbmFsbHkg ZmFsbGJhY2sgdG8gdGhlIHdpbmRvdyBjb25maWcgaWYgbm90aGluZyBlbHNlIHdvcmtzLgotICAg IERpc3BsYXkqIGRpc3BsYXkgPSBkb3duY2FzdDxQbGF0Zm9ybURpc3BsYXlYMTE+KHBsYXRmb3Jt RGlzcGxheSkubmF0aXZlKCk7CisgICAgWERpc3BsYXkqIGRpc3BsYXkgPSBkb3duY2FzdDxQbGF0 Zm9ybURpc3BsYXlYMTE+KHBsYXRmb3JtRGlzcGxheSkubmF0aXZlKCk7CiAgICAgWFdpbmRvd0F0 dHJpYnV0ZXMgYXR0cmlidXRlczsKICAgICBpZiAoIVhHZXRXaW5kb3dBdHRyaWJ1dGVzKGRpc3Bs YXksIHN0YXRpY19jYXN0PFdpbmRvdz4od2luZG93KSwgJmF0dHJpYnV0ZXMpKQogICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKQEAgLTIyMiw3ICsyMjIsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8R0xDb250 ZXh0R0xYPiBHTENvbnRleHRHTFg6OmNyZWF0ZVBidWZmZXJDb250ZXh0KFBsYXRmb3JtRGlzcGxh eQogICAgIH07CiAKICAgICBpbnQgcmV0dXJuZWRFbGVtZW50czsKLSAgICBEaXNwbGF5KiBkaXNw bGF5ID0gZG93bmNhc3Q8UGxhdGZvcm1EaXNwbGF5WDExPihwbGF0Zm9ybURpc3BsYXkpLm5hdGl2 ZSgpOworICAgIFhEaXNwbGF5KiBkaXNwbGF5ID0gZG93bmNhc3Q8UGxhdGZvcm1EaXNwbGF5WDEx PihwbGF0Zm9ybURpc3BsYXkpLm5hdGl2ZSgpOwogICAgIFhVbmlxdWVQdHI8R0xYRkJDb25maWc+ IGNvbmZpZ3MoZ2xYQ2hvb3NlRkJDb25maWcoZGlzcGxheSwgMCwgZmJDb25maWdBdHRyaWJ1dGVz LCAmcmV0dXJuZWRFbGVtZW50cykpOwogICAgIGlmICghcmV0dXJuZWRFbGVtZW50cykKICAgICAg ICAgcmV0dXJuIG51bGxwdHI7CkBAIC0yNTgsNyArMjU4LDcgQEAgc3RkOjp1bmlxdWVfcHRyPEdM Q29udGV4dEdMWD4gR0xDb250ZXh0R0xYOjpjcmVhdGVQaXhtYXBDb250ZXh0KFBsYXRmb3JtRGlz cGxheSYKICAgICAgICAgMAogICAgIH07CiAKLSAgICBEaXNwbGF5KiBkaXNwbGF5ID0gZG93bmNh c3Q8UGxhdGZvcm1EaXNwbGF5WDExPihwbGF0Zm9ybURpc3BsYXkpLm5hdGl2ZSgpOworICAgIFhE aXNwbGF5KiBkaXNwbGF5ID0gZG93bmNhc3Q8UGxhdGZvcm1EaXNwbGF5WDExPihwbGF0Zm9ybURp c3BsYXkpLm5hdGl2ZSgpOwogICAgIFhVbmlxdWVQdHI8WFZpc3VhbEluZm8+IHZpc3VhbEluZm8o Z2xYQ2hvb3NlVmlzdWFsKGRpc3BsYXksIERlZmF1bHRTY3JlZW4oZGlzcGxheSksIHZpc3VhbEF0 dHJpYnV0ZXMpKTsKICAgICBpZiAoIXZpc3VhbEluZm8pCiAgICAgICAgIHJldHVybiBudWxscHRy OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ2x4L0dMQ29u dGV4dEdMWC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ2x4L0dMQ29udGV4 dEdMWC5oCmluZGV4IDRjNzJhODM4YTczZWU0MDc3YzIzMGMyZjY5NzcyOTc5Njk2ODM4YzcuLjRj OGI2Y2U0MzM4ZTc4OTY2YWJhNzg5NzI0ZmU1ZGFlMWFjOTMwMDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dseC9HTENvbnRleHRHTFguaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nbHgvR0xDb250ZXh0R0xYLmgKQEAgLTI4LDcg KzI4LDcgQEAKIHR5cGVkZWYgdW5zaWduZWQgY2hhciBHTHVieXRlOwogdHlwZWRlZiB1bnNpZ25l ZCBsb25nIFdpbmRvdzsKIHR5cGVkZWYgdm9pZCogQ29udGV4dEtleVR5cGU7Ci10eXBlZGVmIHN0 cnVjdCBfWERpc3BsYXkgRGlzcGxheTsKK3R5cGVkZWYgc3RydWN0IF9YRGlzcGxheSBYRGlzcGxh eTsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC02Miw3ICs2Miw3IEBAIHByaXZhdGU6CiAg ICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxHTENvbnRleHRHTFg+IGNyZWF0ZVBidWZmZXJDb250 ZXh0KFBsYXRmb3JtRGlzcGxheSYsIEdMWENvbnRleHQgc2hhcmluZ0NvbnRleHQgPSBudWxscHRy KTsKICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPEdMQ29udGV4dEdMWD4gY3JlYXRlUGl4bWFw Q29udGV4dChQbGF0Zm9ybURpc3BsYXkmLCBHTFhDb250ZXh0IHNoYXJpbmdDb250ZXh0ID0gbnVs bHB0cik7CiAKLSAgICBEaXNwbGF5KiBtX3gxMURpc3BsYXkgeyBudWxscHRyIH07CisgICAgWERp c3BsYXkqIG1feDExRGlzcGxheSB7IG51bGxwdHIgfTsKICAgICBYVW5pcXVlR0xYQ29udGV4dCBt X2NvbnRleHQ7CiAgICAgV2luZG93IG1fd2luZG93IHsgMCB9OwogICAgIFhVbmlxdWVHTFhQYnVm ZmVyIG1fcGJ1ZmZlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MveDExL1BsYXRmb3JtRGlzcGxheVgxMS5jcHAKaW5kZXggOGZlM2QzZTkyYzg4NmQw ZDgzMWZiNzdiMWNkOWIwZTQwNDA5MTY2My4uNWFmYzFiNGE3ZWFhZTQxMDY3ZTIyMDc1MzUxNDEy NzBlYTJiYzJkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv eDExL1BsYXRmb3JtRGlzcGxheVgxMS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MveDExL1BsYXRmb3JtRGlzcGxheVgxMS5jcHAKQEAgLTQ0LDE5ICs0NCwxOSBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybURpc3BsYXk+IFBs YXRmb3JtRGlzcGxheVgxMTo6Y3JlYXRlKCkKIHsKLSAgICBEaXNwbGF5KiBkaXNwbGF5ID0gWE9w ZW5EaXNwbGF5KGdldGVudigiRElTUExBWSIpKTsKKyAgICBYRGlzcGxheSogZGlzcGxheSA9IFhP cGVuRGlzcGxheShnZXRlbnYoIkRJU1BMQVkiKSk7CiAgICAgaWYgKCFkaXNwbGF5KQogICAgICAg ICByZXR1cm4gbnVsbHB0cjsKIAogICAgIHJldHVybiBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1E aXNwbGF5WDExPihuZXcgUGxhdGZvcm1EaXNwbGF5WDExKGRpc3BsYXksIE5hdGl2ZURpc3BsYXlP d25lZDo6WWVzKSk7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybURpc3BsYXk+IFBsYXRm b3JtRGlzcGxheVgxMTo6Y3JlYXRlKERpc3BsYXkqIGRpc3BsYXkpCitzdGQ6OnVuaXF1ZV9wdHI8 UGxhdGZvcm1EaXNwbGF5PiBQbGF0Zm9ybURpc3BsYXlYMTE6OmNyZWF0ZShYRGlzcGxheSogZGlz cGxheSkKIHsKICAgICByZXR1cm4gc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtRGlzcGxheVgxMT4o bmV3IFBsYXRmb3JtRGlzcGxheVgxMShkaXNwbGF5LCBOYXRpdmVEaXNwbGF5T3duZWQ6Ok5vKSk7 CiB9CiAKLVBsYXRmb3JtRGlzcGxheVgxMTo6UGxhdGZvcm1EaXNwbGF5WDExKERpc3BsYXkqIGRp c3BsYXksIE5hdGl2ZURpc3BsYXlPd25lZCBkaXNwbGF5T3duZWQpCitQbGF0Zm9ybURpc3BsYXlY MTE6OlBsYXRmb3JtRGlzcGxheVgxMShYRGlzcGxheSogZGlzcGxheSwgTmF0aXZlRGlzcGxheU93 bmVkIGRpc3BsYXlPd25lZCkKICAgICA6IFBsYXRmb3JtRGlzcGxheShkaXNwbGF5T3duZWQpCiAg ICAgLCBtX2Rpc3BsYXkoZGlzcGxheSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuaAppbmRleCBmNGFmMTVj NzU2OTE4NWQ2ODVkODE3OGYxNGZkOTNjNDkxZGE0NmQyLi5jYWM4ZGQ2MTcwMjQ4MWI2NDgxODQ0 ODFkYjBiZjQ3MTMxMTdmYzZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy94MTEvUGxhdGZvcm1EaXNwbGF5WDExLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MveDExL1BsYXRmb3JtRGlzcGxheVgxMS5oCkBAIC0zMCw3ICszMCw3IEBA CiAjaW5jbHVkZSAiUGxhdGZvcm1EaXNwbGF5LmgiCiAjaW5jbHVkZSA8d3RmL09wdGlvbmFsLmg+ CiAKLXR5cGVkZWYgc3RydWN0IF9YRGlzcGxheSBEaXNwbGF5OwordHlwZWRlZiBzdHJ1Y3QgX1hE aXNwbGF5IFhEaXNwbGF5OwogCiAvLyBJdCdzIG5vdCBwb3NzaWJsZSB0byBmb3J3YXJkIGRlY2xh cmUgVmlzdWFsLCBhbmQgaW5jbHVkaW5nIHhsaWIgaW4gaGVhZGVycyBpcyBwcm9ibGVtYXRpYywK IC8vIHNvIHdlIHVzZSB2b2lkKiBmb3IgVmlzdWFsIGFuZCBwcm92aWRlIHRoaXMgbWFjcm8gdG8g Z2V0IHRoZSB2aXN1YWwgZWFzaWx5LgpAQCAtNDEsMTcgKzQxLDE3IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKIGNsYXNzIFBsYXRmb3JtRGlzcGxheVgxMSBmaW5hbCA6IHB1YmxpYyBQbGF0Zm9ybURp c3BsYXkgewogcHVibGljOgogICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1EaXNw bGF5PiBjcmVhdGUoKTsKLSAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtRGlzcGxh eT4gY3JlYXRlKERpc3BsYXkqKTsKKyAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3Jt RGlzcGxheT4gY3JlYXRlKFhEaXNwbGF5Kik7CiAKICAgICB2aXJ0dWFsIH5QbGF0Zm9ybURpc3Bs YXlYMTEoKTsKIAotICAgIERpc3BsYXkqIG5hdGl2ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZGlzcGxh eTsgfQorICAgIFhEaXNwbGF5KiBuYXRpdmUoKSBjb25zdCB7IHJldHVybiBtX2Rpc3BsYXk7IH0K ICAgICB2b2lkKiB2aXN1YWwoKSBjb25zdDsKICAgICBib29sIHN1cHBvcnRzWENvbXBvc2l0ZSgp IGNvbnN0OwogICAgIGJvb2wgc3VwcG9ydHNYRGFtYWdlKE9wdGlvbmFsPGludD4mIGRhbWFnZUV2 ZW50QmFzZSwgT3B0aW9uYWw8aW50PiYgZGFtYWdlRXJyb3JCYXNlKSBjb25zdDsKIAogcHJpdmF0 ZToKLSAgICBQbGF0Zm9ybURpc3BsYXlYMTEoRGlzcGxheSosIE5hdGl2ZURpc3BsYXlPd25lZCk7 CisgICAgUGxhdGZvcm1EaXNwbGF5WDExKFhEaXNwbGF5KiwgTmF0aXZlRGlzcGxheU93bmVkKTsK IAogICAgIFR5cGUgdHlwZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIFBsYXRmb3JtRGlzcGxh eTo6VHlwZTo6WDExOyB9CiAKQEAgLTU5LDcgKzU5LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGlu aXRpYWxpemVFR0xEaXNwbGF5KCkgb3ZlcnJpZGU7CiAjZW5kaWYKIAotICAgIERpc3BsYXkqIG1f ZGlzcGxheSB7IG51bGxwdHIgfTsKKyAgICBYRGlzcGxheSogbV9kaXNwbGF5IHsgbnVsbHB0ciB9 OwogICAgIG11dGFibGUgT3B0aW9uYWw8Ym9vbD4gbV9zdXBwb3J0c1hDb21wb3NpdGU7CiAgICAg bXV0YWJsZSBPcHRpb25hbDxib29sPiBtX3N1cHBvcnRzWERhbWFnZTsKICAgICBtdXRhYmxlIE9w dGlvbmFsPGludD4gbV9kYW1hZ2VFdmVudEJhc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy94MTEvWEVycm9yVHJhcHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy94MTEvWEVycm9yVHJhcHBlci5jcHAKaW5kZXggNmZkNGQ0OWRm ZTM2YjhhNTExNjdkZDRlYTRmZmIxZjIyNTc2ZGYxNS4uZDMyODM2ODZkMjM3NzY0OGJlZjI0NmRk ZmMxZDYzN2RhODE0NWM3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MveDExL1hFcnJvclRyYXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3gxMS9YRXJyb3JUcmFwcGVyLmNwcApAQCAtMzQsMTkgKzM0LDE5IEBACiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIEhhc2hNYXA8RGlzcGxheSosIFZlY3RvcjxYRXJy b3JUcmFwcGVyKj4+JiB4RXJyb3JUcmFwcGVyc01hcCgpCitzdGF0aWMgSGFzaE1hcDxYRGlzcGxh eSosIFZlY3RvcjxYRXJyb3JUcmFwcGVyKj4+JiB4RXJyb3JUcmFwcGVyc01hcCgpCiB7Ci0gICAg c3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hNYXA8RGlzcGxheSosIFZlY3RvcjxYRXJyb3JUcmFw cGVyKj4+PiB0cmFwcGVyc01hcDsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8SGFzaE1hcDxY RGlzcGxheSosIFZlY3RvcjxYRXJyb3JUcmFwcGVyKj4+PiB0cmFwcGVyc01hcDsKICAgICByZXR1 cm4gdHJhcHBlcnNNYXA7CiB9CiAKLVhFcnJvclRyYXBwZXI6OlhFcnJvclRyYXBwZXIoRGlzcGxh eSogZGlzcGxheSwgUG9saWN5IHBvbGljeSwgVmVjdG9yPHVuc2lnbmVkIGNoYXI+JiYgZXhwZWN0 ZWRFcnJvcnMpCitYRXJyb3JUcmFwcGVyOjpYRXJyb3JUcmFwcGVyKFhEaXNwbGF5KiBkaXNwbGF5 LCBQb2xpY3kgcG9saWN5LCBWZWN0b3I8dW5zaWduZWQgY2hhcj4mJiBleHBlY3RlZEVycm9ycykK ICAgICA6IG1fZGlzcGxheShkaXNwbGF5KQogICAgICwgbV9wb2xpY3kocG9saWN5KQogICAgICwg bV9leHBlY3RlZEVycm9ycyhXVEZNb3ZlKGV4cGVjdGVkRXJyb3JzKSkKIHsKICAgICB4RXJyb3JU cmFwcGVyc01hcCgpLmFkZChtX2Rpc3BsYXksIFZlY3RvcjxYRXJyb3JUcmFwcGVyKj4oKSkuaXRl cmF0b3ItPnZhbHVlLmFwcGVuZCh0aGlzKTsKLSAgICBtX3ByZXZpb3VzRXJyb3JIYW5kbGVyID0g WFNldEVycm9ySGFuZGxlcihbXShEaXNwbGF5KiBkaXNwbGF5LCBYRXJyb3JFdmVudCogZXZlbnQp IC0+IGludCB7CisgICAgbV9wcmV2aW91c0Vycm9ySGFuZGxlciA9IFhTZXRFcnJvckhhbmRsZXIo W10oWERpc3BsYXkqIGRpc3BsYXksIFhFcnJvckV2ZW50KiBldmVudCkgLT4gaW50IHsKICAgICAg ICAgYXV0byBpdGVyYXRvciA9IHhFcnJvclRyYXBwZXJzTWFwKCkuZmluZChkaXNwbGF5KTsKICAg ICAgICAgaWYgKGl0ZXJhdG9yID09IHhFcnJvclRyYXBwZXJzTWFwKCkuZW5kKCkpCiAgICAgICAg ICAgICByZXR1cm4gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3gxMS9YRXJyb3JUcmFwcGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy94MTEvWEVycm9yVHJhcHBlci5oCmluZGV4IDYxYmFhYmU3YWQ5MWYwMjBjMjVjZTk5YjFmNzRl MWU0NzQ2M2M0N2QuLjJlMmU2ZWU5ZDlhODczM2M2YjNkN2EwYTFiNDE5YzFmNzJhZDViNjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3gxMS9YRXJyb3JUcmFw cGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MveDExL1hFcnJvclRy YXBwZXIuaApAQCAtMzUsNyArMzUsNyBAQCBjbGFzcyBYRXJyb3JUcmFwcGVyIHsKICAgICBXVEZf TUFLRV9OT05DT1BZQUJMRShYRXJyb3JUcmFwcGVyKTsKIHB1YmxpYzoKICAgICBlbnVtIGNsYXNz IFBvbGljeSB7IElnbm9yZSwgV2FybiwgQ3Jhc2ggfTsKLSAgICBYRXJyb3JUcmFwcGVyKERpc3Bs YXkqLCBQb2xpY3kgPSBQb2xpY3k6Oklnbm9yZSwgVmVjdG9yPHVuc2lnbmVkIGNoYXI+JiYgZXhw ZWN0ZWRFcnJvcnMgPSB7IH0pOworICAgIFhFcnJvclRyYXBwZXIoWERpc3BsYXkqLCBQb2xpY3kg PSBQb2xpY3k6Oklnbm9yZSwgVmVjdG9yPHVuc2lnbmVkIGNoYXI+JiYgZXhwZWN0ZWRFcnJvcnMg PSB7IH0pOwogICAgIH5YRXJyb3JUcmFwcGVyKCk7CiAKICAgICB1bnNpZ25lZCBjaGFyIGVycm9y Q29kZSgpIGNvbnN0OwpAQCAtNDMsNyArNDMsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZv aWQgZXJyb3JFdmVudChYRXJyb3JFdmVudCopOwogCi0gICAgRGlzcGxheSogbV9kaXNwbGF5IHsg bnVsbHB0ciB9OworICAgIFhEaXNwbGF5KiBtX2Rpc3BsYXkgeyBudWxscHRyIH07CiAgICAgUG9s aWN5IG1fcG9saWN5IHsgUG9saWN5OjpJZ25vcmUgfTsKICAgICBWZWN0b3I8dW5zaWduZWQgY2hh cj4gbV9leHBlY3RlZEVycm9yczsKICAgICBYRXJyb3JIYW5kbGVyIG1fcHJldmlvdXNFcnJvckhh bmRsZXIgeyBudWxscHRyIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy94MTEvWFVuaXF1ZVB0ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MveDExL1hVbmlxdWVQdHIuaAppbmRleCAzN2ExOGMyOWQ1ZWIwNThkOWFkNzY5MTM5ZWY3NjI1 YmMyYzA3ZjczLi43NWM2N2VhMjg2YWIzMWY0NTc2ODRlZjc5MjA3NGUyYWU1ZWQyZDc0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy94MTEvWFVuaXF1ZVB0ci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3gxMS9YVW5pcXVlUHRyLmgK QEAgLTMyLDcgKzMyLDcgQEAKIAogI2lmIFVTRShHTFgpCiB0eXBlZGVmIHN0cnVjdCBfX0dMWGNv bnRleHRSZWMqIEdMWENvbnRleHQ7Ci1leHRlcm4gIkMiIHZvaWQgZ2xYRGVzdHJveUNvbnRleHQo RGlzcGxheSosIEdMWENvbnRleHQpOworZXh0ZXJuICJDIiB2b2lkIGdsWERlc3Ryb3lDb250ZXh0 KFhEaXNwbGF5KiwgR0xYQ29udGV4dCk7CiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MveDExL1hVbmlxdWVS ZXNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy94MTEvWFVuaXF1 ZVJlc291cmNlLmNwcAppbmRleCBmMzAwZWU0ZjU5NDExYzNmOTUwZGU2NTljOGExY2NjZWI3ODc1 N2Y1Li4zZDZkMDBhNzM2ZDg3OTg3OWU3MGY1ZWQ1OGNhNjBhZGRhYjE4YjUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy94MTEvWFVuaXF1ZVJlc291cmNlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy94MTEvWFVuaXF1ZVJlc291 cmNlLmNwcApAQCAtNDEsNyArNDEsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRp YyBpbmxpbmUgRGlzcGxheSogc2hhcmVkRGlzcGxheSgpCitzdGF0aWMgaW5saW5lIFhEaXNwbGF5 KiBzaGFyZWREaXNwbGF5KCkKIHsKICAgICByZXR1cm4gZG93bmNhc3Q8UGxhdGZvcm1EaXNwbGF5 WDExPihQbGF0Zm9ybURpc3BsYXk6OnNoYXJlZERpc3BsYXkoKSkubmF0aXZlKCk7CiB9Cg==