205319 2019-12-16 18:25:06 -0800 Change 'delegatesPageScaling' from a Setting to a flag on ScrollView 2019-12-17 23:16:17 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser thorton webkit-bug-importer oldest_to_newest 1599244 0 simon.fraser 2019-12-16 18:25:06 -0800 Change 'delegatesPageScaling' from a Setting to a flag on ScrollView 1599247 1 385843 simon.fraser 2019-12-16 18:27:45 -0800 Created attachment 385843 Patch 1599248 2 385844 simon.fraser 2019-12-16 18:32:12 -0800 Created attachment 385844 Patch 1599698 3 simon.fraser 2019-12-17 23:15:06 -0800 http://trac.webkit.org/r253634 1599699 4 webkit-bug-importer 2019-12-17 23:16:17 -0800 <rdar://problem/58034609> 385843 2019-12-16 18:27:45 -0800 2019-12-16 18:32:10 -0800 Patch bug-205319-20191216182745.patch text/plain 16621 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI5OGEwMzM5MmIyNDRj ZWM1ZmE0NWUzMWY5MDNlZTg3MjQ3M2QwMi4uMDkyMTlmYmZmMGVlYWUwZDk2ZDY1ZjQyYmExMWRh NjczOTFlOGU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTEyLTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENoYW5nZSAnZGVs ZWdhdGVzUGFnZVNjYWxpbmcnIGZyb20gYSBTZXR0aW5nIHRvIGEgZmxhZyBvbiBTY3JvbGxWaWV3 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUzMTkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcg dGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIHBhZ2UvRnJhbWUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWU6OmZyYW1lU2NhbGVGYWN0b3IgY29uc3QpOgorICAgICAgICAqIHBhZ2UvRnJh bWVTbmFwc2hvdHRpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c25hcHNob3RGcmFtZVJlY3RX aXRoQ2xpcCk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVWaWV3Ojp2aXNpYmxlQ29udGVudFNjYWxlRmFjdG9yIGNvbnN0KToKKyAgICAgICAg KiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6c2V0UGFnZVNjYWxlRmFj dG9yKToKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLnlhbWw6CisgICAgICAgICogcGxhdGZvcm0v U2Nyb2xsVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzZXREZWxlZ2F0 ZXNQYWdlU2NhbGluZyk6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6ZGVsZWdhdGVzUGFnZVNjYWxpbmcgY29uc3QpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXAgY29uc3QpOgorCiAy MDE5LTEyLTE2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFRl eHRNYW5pcHVsYXRpb25Db250cm9sbGVyIHNob3VsZCBvYnNlcnZlIG5ld2x5IGluc2VydGVkIG9y IGRpc3BsYXllZCBjb250ZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBjMjA5ZGU4ZWMzMmFhYTM2Nzg1ZmRiODEz NTQ1ODMxODNjYjY1MmQyLi45MDFkMGQ5NTFjNDE5MmI0OTMxZTc0MmNiMGEwNDExYmQ3ZDg4NzNj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTEyLTE2ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENoYW5nZSAnZGVsZWdhdGVzUGFnZVNj YWxpbmcnIGZyb20gYSBTZXR0aW5nIHRvIGEgZmxhZyBvbiBTY3JvbGxWaWV3CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUzMTkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBkZWxlZ2F0ZXNQYWdlU2NhbGlu ZygpIGlzIG5ldmVyIHRvZ2dsZWQgYXQgcnVudGltZSAoZXZlbiBieSB0ZXN0cyksIGFuZCBpdCBz aG91bGQKKyAgICAgICAgYmUgYSBmbGFnIG9uIEZyYW1lVmlldyBqdXN0IGxpa2UgZGVsZWdhdGVz U2Nyb2xsaW5nIChtYXliZSBpbiBmdXR1cmUgdGhlIGZsYWdzIGNhbiBtZXJnZSkuCisKKyAgICAg ICAgU28gcmVtb3ZlIHRoZSBTZXR0aW5nLCBhbmQgaGF2ZSBEcmF3aW5nQXJlYSBjb250cm9sIHdo ZXRoZXIgcGFnZSBzY2FsaW5nIGlzIGRlbGVnYXRlZC4KKyAgICAgICAgCisgICAgICAgIEluIFdl YktpdDEsIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQ YWdlKCkgdHVybnMgb24gZGVsZWdhdGVkCisgICAgICAgIHBhZ2Ugc2NhbGluZyBmb3IgaU9TLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9u VG9Db21taXR0ZWRGb3JOZXdQYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJh d2luZ0FyZWEuaDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWE6OnVzZXNEZWxlZ2F0ZWRQ YWdlU2NhbGluZyBjb25zdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxh eWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5oOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW06 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjpSZW1vdGVMYXll clRyZWVEcmF3aW5nQXJlYSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9GaW5k Q29udHJvbGxlcklPUy5tbToKKyAgICAgICAgKFdlYktpdDo6RmluZEluZGljYXRvck92ZXJsYXlD bGllbnRJT1M6OmRyYXdSZWN0KToKKwogMjAxOS0xMi0xNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICAtW1VJV0tEb2N1bWVudENvbnRleHQgbWFya2Vk VGV4dFJhbmdlXSBpcyB3cm9uZyB3aGVuIHRoZSBjYXJldCBpcyBub3QgYXQgdGhlIHN0YXJ0IG9m IG1hcmtlZCB0ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKaW5kZXggMTY4MTY3ZTI4ZTE1 YTZjZTExMWU0NjYyOGVlOTliNDIxMjVlYjBhZC4uMGFiMzNjMmJhZTVjNGZjZmE0MDQzOTg1MGNh NGQ3MTBhN2JhZjUxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDE5LTEyLTE2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIENoYW5nZSAnZGVsZWdhdGVzUGFnZVNjYWxpbmcnIGZyb20gYSBTZXR0aW5nIHRv IGEgZmxhZyBvbiBTY3JvbGxWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDUzMTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBkZWxlZ2F0ZXNQYWdlU2NhbGluZygpIGlzIG5ldmVyIHRvZ2dsZWQgYXQg cnVudGltZSAoZXZlbiBieSB0ZXN0cyksIGFuZCBpdCBzaG91bGQKKyAgICAgICAgYmUgYSBmbGFn IG9uIEZyYW1lVmlldyBqdXN0IGxpa2UgZGVsZWdhdGVzU2Nyb2xsaW5nIChtYXliZSBpbiBmdXR1 cmUgdGhlIGZsYWdzIGNhbiBtZXJnZSkuCisKKyAgICAgICAgU28gcmVtb3ZlIHRoZSBTZXR0aW5n LCBhbmQgaGF2ZSBEcmF3aW5nQXJlYSBjb250cm9sIHdoZXRoZXIgcGFnZSBzY2FsaW5nIGlzIGRl bGVnYXRlZC4KKyAgICAgICAgCisgICAgICAgIEluIFdlYktpdDEsIFdlYkZyYW1lTG9hZGVyQ2xp ZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkgdHVybnMgb24gZGVsZWdhdGVk CisgICAgICAgIHBhZ2Ugc2NhbGluZyBmb3IgaU9TLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVu dDo6dHJhbnNpdGlvblRvQ29tbWl0dGVkRm9yTmV3UGFnZSk6CisgICAgICAgICogV2ViVmlldy9X ZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5nZWQ6XSk6CisK IDIwMTktMTItMTYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAg IFJlbW92ZSBkaXNwbGF5OmNvbnRlbnRzIGZlYXR1cmUgZmxhZwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcApp bmRleCBlMDgzM2RjMDgzM2Y1OWE5ZWIyNjM1MDYxMzFjZGJiOTdjOWY5MjExLi42ZjQzNGQ5NTgz MmUyNTI3YWEyMDU5ZTU5MDcxNTRiZGY2NGJlZjYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcApAQCAt OTE5LDkgKzkxOSwxNCBAQCBmbG9hdCBGcmFtZTo6ZnJhbWVTY2FsZUZhY3RvcigpIGNvbnN0CiAg ICAgUGFnZSogcGFnZSA9IHRoaXMtPnBhZ2UoKTsKIAogICAgIC8vIE1haW4gZnJhbWUgaXMgc2Nh bGVkIHdpdGggcmVzcGVjdCB0byBoZSBjb250YWluZXIgYnV0IGlubmVyIGZyYW1lcyBhcmUgbm90 IHNjYWxlZCB3aXRoIHJlc3BlY3QgdG8gdGhlIG1haW4gZnJhbWUuCi0gICAgaWYgKCFwYWdlIHx8 ICZwYWdlLT5tYWluRnJhbWUoKSAhPSB0aGlzIHx8IHNldHRpbmdzKCkuZGVsZWdhdGVzUGFnZVNj YWxpbmcoKSkKKyAgICBpZiAoIXBhZ2UgfHwgIWlzTWFpbkZyYW1lKCkpCiAgICAgICAgIHJldHVy biAxOwogCisgICAgaWYgKEZyYW1lVmlldyogdmlldyA9IHRoaXMtPnZpZXcoKSkgeworICAgICAg ICBpZiAodmlldy0+ZGVsZWdhdGVzUGFnZVNjYWxpbmcoKSkKKyAgICAgICAgICAgIHJldHVybiAx OworICAgIH0KKwogICAgIHJldHVybiBwYWdlLT5wYWdlU2NhbGVGYWN0b3IoKTsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVNuYXBzaG90dGluZy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNob3R0aW5nLmNwcAppbmRleCBlMjdjNDFhODQ0Y2M4 ODI4MjI2MTVkYzUzNGRkMGY2YmQyYmFkYjkxLi4wYTQ0YzJmYTFhMDk0OTdjZmRmNTU4ODgzMmZm ZGZmMTAyMzMzMGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNo b3R0aW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNob3R0aW5nLmNw cApAQCAtMTA1LDcgKzEwNSw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxJbWFnZUJ1ZmZlcj4gc25hcHNo b3RGcmFtZVJlY3RXaXRoQ2xpcChGcmFtZSYgZnJhbWUsIGNvbnN0IEludFJlCiAKICAgICBmbG9h dCBzY2FsZUZhY3RvciA9IGZyYW1lLnBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKIAotICAg IGlmIChmcmFtZS5zZXR0aW5ncygpLmRlbGVnYXRlc1BhZ2VTY2FsaW5nKCkpCisgICAgaWYgKGZy YW1lLnZpZXcoKS0+ZGVsZWdhdGVzUGFnZVNjYWxpbmcoKSkKICAgICAgICAgc2NhbGVGYWN0b3Ig Kj0gZnJhbWUucGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKTsKIAogICAgIGlmIChvcHRpb25zICYg U25hcHNob3RPcHRpb25zUGFpbnRXaXRoSW50ZWdyYWxTY2FsZUZhY3RvcikKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcAppbmRleCAwNDAxMmY5ZWZmNjRmYjlhNDEyMTg3ZDA0NmUyMjVjNDk1ZTk0 ZGRiLi5lYTc1MTFiMzMxMjZiY2VmOTM0OWVmOTQzYzNhNjljMGMwNjM3OTdjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0zNzA5LDcgKzM3MDksOCBAQCB2b2lkIEZyYW1lVmlldzo6 aW52YWxpZGF0ZVNjcm9sbGJhclJlY3QoU2Nyb2xsYmFyJiBzY3JvbGxiYXIsIGNvbnN0IEludFJl Y3QmIHJlYwogCiBmbG9hdCBGcmFtZVZpZXc6OnZpc2libGVDb250ZW50U2NhbGVGYWN0b3IoKSBj b25zdAogewotICAgIGlmICghZnJhbWUoKS5pc01haW5GcmFtZSgpIHx8ICFmcmFtZSgpLnNldHRp bmdzKCkuZGVsZWdhdGVzUGFnZVNjYWxpbmcoKSkKKyAgICAvLyBGSVhNRTogVGhpcyAhZGVsZWdh dGVzUGFnZVNjYWxpbmcoKSBpcyBjb25mdXNpbmcuIFRoaXMgZnVuY3Rpb24gc2hvdWxkIHByb2Jh Ymx5IGJlIHJlbmFtZWQgdG8gZGVsZWdhdGVkUGFnZVNjYWxlRmFjdG9yKCkuCisgICAgaWYgKCFm cmFtZSgpLmlzTWFpbkZyYW1lKCkgfHwgIWRlbGVnYXRlc1BhZ2VTY2FsaW5nKCkpCiAgICAgICAg IHJldHVybiAxOwogCiAgICAgUGFnZSogcGFnZSA9IGZyYW1lKCkucGFnZSgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn ZS5jcHAKaW5kZXggNTY1NWRjMmMyOWM3MTYxZTEyYzRjYTAyNzkwODhlYjNmNDNiZWI1Ny4uYmY0 M2E4N2ViNTNlODUxZTBlNTkxYWJjNmZkNTdlZDdiYzQ3MWFkNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw CkBAIC0xMDMxLDExICsxMDMxLDExIEBAIHZvaWQgUGFnZTo6c2V0UGFnZVNjYWxlRmFjdG9yKGZs b2F0IHNjYWxlLCBjb25zdCBJbnRQb2ludCYgb3JpZ2luLCBib29sIGluU3RhYmxlCiAgICAgTE9H KFZpZXdwb3J0cywgIlBhZ2U6OnNldFBhZ2VTY2FsZUZhY3RvciAlLjJmIC0gaW5TdGFibGVTdGF0 ZSAlZCIsIHNjYWxlLCBpblN0YWJsZVN0YXRlKTsKIAogICAgIERvY3VtZW50KiBkb2N1bWVudCA9 IG1haW5GcmFtZSgpLmRvY3VtZW50KCk7Ci0gICAgRnJhbWVWaWV3KiB2aWV3ID0gZG9jdW1lbnQt PnZpZXcoKTsKKyAgICBSZWZQdHI8RnJhbWVWaWV3PiB2aWV3ID0gZG9jdW1lbnQtPnZpZXcoKTsK IAogICAgIGlmIChzY2FsZSA9PSBtX3BhZ2VTY2FsZUZhY3RvcikgewogICAgICAgICBpZiAodmll dyAmJiB2aWV3LT5zY3JvbGxQb3NpdGlvbigpICE9IG9yaWdpbikgewotICAgICAgICAgICAgaWYg KCFtX3NldHRpbmdzLT5kZWxlZ2F0ZXNQYWdlU2NhbGluZygpKQorICAgICAgICAgICAgaWYgKCF2 aWV3LT5kZWxlZ2F0ZXNQYWdlU2NhbGluZygpKQogICAgICAgICAgICAgICAgIGRvY3VtZW50LT51 cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKIAogICAgICAgICAgICAgaWYg KCF2aWV3LT5kZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKQEAgLTEwNTksNyArMTA1OSw3IEBAIHZvaWQg UGFnZTo6c2V0UGFnZVNjYWxlRmFjdG9yKGZsb2F0IHNjYWxlLCBjb25zdCBJbnRQb2ludCYgb3Jp Z2luLCBib29sIGluU3RhYmxlCiAKICAgICBtX3BhZ2VTY2FsZUZhY3RvciA9IHNjYWxlOwogCi0g ICAgaWYgKCFtX3NldHRpbmdzLT5kZWxlZ2F0ZXNQYWdlU2NhbGluZygpKSB7CisgICAgaWYgKCF2 aWV3LT5kZWxlZ2F0ZXNQYWdlU2NhbGluZygpKSB7CiAgICAgICAgIHZpZXctPnNldE5lZWRzTGF5 b3V0QWZ0ZXJWaWV3Q29uZmlndXJhdGlvbkNoYW5nZSgpOwogICAgICAgICB2aWV3LT5zZXROZWVk c0NvbXBvc2l0aW5nR2VvbWV0cnlVcGRhdGUoKTsKIApAQCAtMTA3NSw3ICsxMDc1LDcgQEAgdm9p ZCBQYWdlOjpzZXRQYWdlU2NhbGVGYWN0b3IoZmxvYXQgc2NhbGUsIGNvbnN0IEludFBvaW50JiBv cmlnaW4sIGJvb2wgaW5TdGFibGUKICAgICAgICAgdmlldy0+c2V0Vmlld3BvcnRDb25zdHJhaW5l ZE9iamVjdHNOZWVkTGF5b3V0KCk7CiAKICAgICBpZiAodmlldyAmJiB2aWV3LT5zY3JvbGxQb3Np dGlvbigpICE9IG9yaWdpbikgewotICAgICAgICBpZiAoIW1fc2V0dGluZ3MtPmRlbGVnYXRlc1Bh Z2VTY2FsaW5nKCkgJiYgZG9jdW1lbnQtPnJlbmRlclZpZXcoKSAmJiBkb2N1bWVudC0+cmVuZGVy VmlldygpLT5uZWVkc0xheW91dCgpICYmIHZpZXctPmRpZEZpcnN0TGF5b3V0KCkpCisgICAgICAg IGlmICghdmlldy0+ZGVsZWdhdGVzUGFnZVNjYWxpbmcoKSAmJiBkb2N1bWVudC0+cmVuZGVyVmll dygpICYmIGRvY3VtZW50LT5yZW5kZXJWaWV3KCktPm5lZWRzTGF5b3V0KCkgJiYgdmlldy0+ZGlk Rmlyc3RMYXlvdXQoKSkKICAgICAgICAgICAgIHZpZXctPmxheW91dENvbnRleHQoKS5sYXlvdXQo KTsKIAogICAgICAgICBpZiAoIXZpZXctPmRlbGVnYXRlc1Njcm9sbGluZygpKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9TZXR0aW5ncy55YW1sCmluZGV4IGIzMjlmMTI0NzkzZDkxNjE4YjRiYWZiM2E5MjE4ZmUxZDE4 MGU5NDcuLmE5MmYzMDMwYTBiYzllYjY3ZDA1MzBhZjcyODFlNjkzNWMxYzI5YjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFtbAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzLnlhbWwKQEAgLTM3OSw5ICszNzksNiBAQCB3aW5kb3dGb2N1c1Jlc3Ry aWN0ZWQ6CiBkaWFnbm9zdGljTG9nZ2luZ0VuYWJsZWQ6CiAgIGluaXRpYWw6IGZhbHNlCiAKLWRl bGVnYXRlc1BhZ2VTY2FsaW5nOgotICBpbml0aWFsOiBmYWxzZQotCiBwbHVnSW5TbmFwc2hvdHRp bmdFbmFibGVkOgogICBpbml0aWFsOiBmYWxzZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bFZpZXcuY3BwCmluZGV4IGIxMjZhOWMyYjcwNmExMTczNDZjNTc0MDc4NTFlMzg1NTgyY2M5Njgu LjdkMmQyZTEyM2Q1YjE0MTk1ZGVmNmZhYmEwMmMwNmRmYzU2N2Q1ODEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCkBAIC0xOTcsNiArMTk3LDExIEBAIHZvaWQgU2Nyb2xs Vmlldzo6c2V0RGVsZWdhdGVzU2Nyb2xsaW5nKGJvb2wgZGVsZWdhdGVzU2Nyb2xsaW5nKQogICAg IGRlbGVnYXRlc1Njcm9sbGluZ0RpZENoYW5nZSgpOwogfQogCit2b2lkIFNjcm9sbFZpZXc6OnNl dERlbGVnYXRlc1BhZ2VTY2FsaW5nKGJvb2wgZGVsZWdhdGVzUGFnZVNjYWxpbmcpCit7CisgICAg bV9kZWxlZ2F0ZXNQYWdlU2NhbGluZyA9IGRlbGVnYXRlc1BhZ2VTY2FsaW5nOworfQorCiBJbnRQ b2ludCBTY3JvbGxWaWV3Ojpjb250ZW50c1Njcm9sbFBvc2l0aW9uKCkgY29uc3QKIHsKICNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCmluZGV4 IDQzMDE2MGQ2YWUyZmRkZjc1MGQwOWRiYTVkNDBhNWU3ZjcwN2U1ZDQuLjJmZjI2ZDc0MjhhMmMy OTFjYmVkNDQzNDgzYzVlMmI2ZGRjZTRmZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbFZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxW aWV3LmgKQEAgLTEzNyw2ICsxMzcsOSBAQCBwdWJsaWM6CiAgICAgYm9vbCBkZWxlZ2F0ZXNTY3Jv bGxpbmcoKSBjb25zdCB7IHJldHVybiBtX2RlbGVnYXRlc1Njcm9sbGluZzsgfQogICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgc2V0RGVsZWdhdGVzU2Nyb2xsaW5nKGJvb2wpOwogCisgICAgYm9vbCBk ZWxlZ2F0ZXNQYWdlU2NhbGluZygpIGNvbnN0IHsgcmV0dXJuIG1fZGVsZWdhdGVzUGFnZVNjYWxp bmc7IH0KKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldERlbGVnYXRlc1BhZ2VTY2FsaW5nKGJv b2wpOworCiAgICAgLy8gT3ZlcnJpZGRlbiBieSBGcmFtZVZpZXcgdG8gY3JlYXRlIGN1c3RvbSBD U1Mgc2Nyb2xsYmFycyBpZiBhcHBsaWNhYmxlLgogICAgIHZpcnR1YWwgUmVmPFNjcm9sbGJhcj4g Y3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uKTsKIApAQCAtNTI5LDYgKzUzMiw4 IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1fcGFpbnRzRW50aXJlQ29udGVudHMgeyBmYWxzZSB9 OwogICAgIGJvb2wgbV9kZWxlZ2F0ZXNTY3JvbGxpbmcgeyBmYWxzZSB9OworICAgIGJvb2wgbV9k ZWxlZ2F0ZXNQYWdlU2NhbGluZyB7IGZhbHNlIH07CisKIH07IC8vIGNsYXNzIFNjcm9sbFZpZXcK IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA5MjMyNjFiNDVkZTJhZTgzNDcyYWQz ZTk0Mjk0NTExNmFlNmFlNGRmLi40ZDNhNTZkZTg5NmEzZTlhZjA3M2Y4ZjJjZjRjYWE4OWYyOWU2 MjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcApAQCAtMTkwNyw4ICsxOTA3LDkgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmFkZFRvT3ZlcmxhcE1hcChMYXllck92ZXJsYXBNYXAmIG92ZXJsYXBNYXAsIGNvbnN0IFIK IAogICAgIGF1dG8gY2xpcHBlZEJvdW5kcyA9IGV4dGVudC5ib3VuZHM7CiAgICAgaWYgKCFjbGlw UmVjdC5pc0luZmluaXRlKCkpIHsKLSAgICAgICAgLy8gT24gaU9TLCBwYWdlU2NhbGVGYWN0b3Io KSBpcyBub3QgYXBwbGllZCBieSBSZW5kZXJWaWV3LCBzbyB3ZSBzaG91bGQgbm90IHNjYWxlIGhl cmUuCi0gICAgICAgIGlmICghbV9yZW5kZXJWaWV3LnNldHRpbmdzKCkuZGVsZWdhdGVzUGFnZVNj YWxpbmcoKSkKKyAgICAgICAgLy8gV2l0aCBkZWxlZ2F0ZWQgcGFnZSBzY2FsaW5nLCBwYWdlU2Nh bGVGYWN0b3IoKSBpcyBub3QgYXBwbGllZCBieSBSZW5kZXJWaWV3LCBzbyB3ZSBzaG91bGQgbm90 IHNjYWxlIGhlcmUuCisgICAgICAgIGF1dG8mIGZyYW1lVmlldyA9IG1fcmVuZGVyVmlldy5mcmFt ZVZpZXcoKTsKKyAgICAgICAgaWYgKCFmcmFtZVZpZXcuZGVsZWdhdGVzUGFnZVNjYWxpbmcoKSkK ICAgICAgICAgICAgIGNsaXBSZWN0LnNjYWxlKHBhZ2VTY2FsZUZhY3RvcigpKTsKIAogICAgICAg ICBjbGlwcGVkQm91bmRzLmludGVyc2VjdChjbGlwUmVjdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3Bw IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmNwcAppbmRleCAwM2EzMmQzNjgyNTllZjY0Yjg4Y2NlNjUwMDViZDM2NTE3ZTRlNDQy Li5hZDFiODUzOWU3NTY5ZmUwYzE4NjVjN2NkYmZjYWJhOGYxZTlkODNlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTE1MTcsOCArMTUxNywxMCBAQCB2b2lkIFdlYkZyYW1l TG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKICNpZiBQTEFU Rk9STShDT0NPQSkKICAgICBhdXRvKiBkcmF3aW5nQXJlYSA9IHdlYlBhZ2UtPmRyYXdpbmdBcmVh KCk7CiAgICAgdmlldy0+c2V0Vmlld0V4cG9zZWRSZWN0KGRyYXdpbmdBcmVhLT52aWV3RXhwb3Nl ZFJlY3QoKSk7Ci0gICAgaWYgKGlzTWFpbkZyYW1lKQorICAgIGlmIChpc01haW5GcmFtZSkgewog ICAgICAgICB2aWV3LT5zZXREZWxlZ2F0ZXNTY3JvbGxpbmcoZHJhd2luZ0FyZWEtPnVzZXNEZWxl Z2F0ZWRTY3JvbGxpbmcoKSk7CisgICAgICAgIHZpZXctPnNldERlbGVnYXRlc1BhZ2VTY2FsaW5n KGRyYXdpbmdBcmVhLT51c2VzRGVsZWdhdGVkUGFnZVNjYWxpbmcoKSk7CisgICAgfQogI2VuZGlm CiAKICAgICBpZiAod2ViUGFnZS0+c2Nyb2xsUGlubmluZ0JlaGF2aW9yKCkgIT0gRG9Ob3RQaW4p CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJl YS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaAppbmRl eCA1OWQ3OGFlNjc1MGFlY2NhNjIyZTc0MDkyNWI2NDU1NDZjN2Y5MmY5Li4xNmQwOWJmZWYwZDQy N2NkZGIyMmQ1YmIwM2VlNmFjYTU1NDNlNmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKQEAgLTEwNyw2ICsxMDcsNyBAQCBwdWJsaWM6CiAK ICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNBc3luY1Njcm9sbGluZygpIGNvbnN0IHsgcmV0dXJu IGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIHVzZXNEZWxlZ2F0ZWRTY3JvbGxpbmcoKSBjb25z dCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9vbCB1c2VzRGVsZWdhdGVkUGFnZVNj YWxpbmcoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgdmlydHVhbCBib29sIHNob3Vs ZFVzZVRpbGVkQmFja2luZ0ZvckZyYW1lVmlldyhjb25zdCBXZWJDb3JlOjpGcmFtZVZpZXcmKSBj b25zdCB7IHJldHVybiBmYWxzZTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEu aCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1v dGVMYXllclRyZWVEcmF3aW5nQXJlYS5oCmluZGV4IDhiNjkwYzFiM2M1NmFmYjdiMGU1OTljZTUx ZTU1NmQ2YjRhMjVmYTkuLmNjZDk2M2ZlY2NiMWQwZjA2NjhhNWFkNmIzYWZjZGEwMjA2ZjE2NTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVy VHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJl YS5oCkBAIC04MCw2ICs4MCw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIHN1cHBvcnRzQXN5bmNT Y3JvbGxpbmcoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAgICAgYm9vbCB1c2Vz RGVsZWdhdGVkU2Nyb2xsaW5nKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQorICAg IGJvb2wgdXNlc0RlbGVnYXRlZFBhZ2VTY2FsaW5nKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4g dHJ1ZTsgfQogCiAgICAgdm9pZCBzZXRMYXllclRyZWVTdGF0ZUlzRnJvemVuKGJvb2wpIG92ZXJy aWRlOwogICAgIGJvb2wgbGF5ZXJUcmVlU3RhdGVJc0Zyb3plbigpIGNvbnN0IG92ZXJyaWRlIHsg cmV0dXJuIG1faXNGbHVzaGluZ1N1c3BlbmRlZDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdp bmdBcmVhLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJU cmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tCmluZGV4IGM4N2YwMGNlNDZkOGI5N2I0 ZjQwYjAyZjFkZDcxZmNjNmFhY2VlODcuLmM4MGFmNWQ1NDlmNTIyNjdhNmRmYjU0OWQxYzk1MzIz NTQwMTUxMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1Jl bW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVl RHJhd2luZ0FyZWEubW0KQEAgLTYzLDkgKzYzLDYgQEAgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWE6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhKFdlYlBhZ2UmIHdlYlBhZ2UsIGNvbnN0IFcK ICAgICAsIG1fbGF5ZXJGbHVzaFRpbWVyKCp0aGlzLCAmUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWE6OmZsdXNoTGF5ZXJzKQogewogICAgIHdlYlBhZ2UuY29yZVBhZ2UoKS0+c2V0dGluZ3MoKS5z ZXRGb3JjZUNvbXBvc2l0aW5nTW9kZSh0cnVlKTsKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQot ICAgIHdlYlBhZ2UuY29yZVBhZ2UoKS0+c2V0dGluZ3MoKS5zZXREZWxlZ2F0ZXNQYWdlU2NhbGlu Zyh0cnVlKTsKLSNlbmRpZgogICAgIG1fcm9vdExheWVyLT5zZXROYW1lKCJkcmF3aW5nIGFyZWEg cm9vdCIpOwogCiAgICAgbV9jb21taXRRdWV1ZSA9IGRpc3BhdGNoX3F1ZXVlX2NyZWF0ZSgiY29t LmFwcGxlLldlYktpdC5XZWJDb250ZW50LlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLkNvbW1p dFF1ZXVlIiwgbnVsbHB0cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9pb3MvRmluZENvbnRyb2xsZXJJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9pb3MvRmluZENvbnRyb2xsZXJJT1MubW0KaW5kZXggNWZhMWI5ODAwZTFhNThk M2YyNGMxNTVlMDg5ZDFkYWJiMmM0MDI3OC4uZWIxNGE4NmRjN2I4ZDdmMWYxODgzMjU3MGZhMzcz YjRlNmEwYWE0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv aW9zL0ZpbmRDb250cm9sbGVySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL2lvcy9GaW5kQ29udHJvbGxlcklPUy5tbQpAQCAtNjIsNyArNjIsNyBAQCB2b2lkIEZp bmRJbmRpY2F0b3JPdmVybGF5Q2xpZW50SU9TOjpkcmF3UmVjdChQYWdlT3ZlcmxheSYgb3Zlcmxh eSwgR3JhcGhpY3NDb250ZQogewogICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gbV9mcmFtZS5wYWdl KCktPmRldmljZVNjYWxlRmFjdG9yKCk7CiAKLSAgICBpZiAobV9mcmFtZS5zZXR0aW5ncygpLmRl bGVnYXRlc1BhZ2VTY2FsaW5nKCkpCisgICAgaWYgKG1fZnJhbWUudmlldygpICYmIG1fZnJhbWUu dmlldygpLT5kZWxlZ2F0ZXNQYWdlU2NhbGluZygpKQogICAgICAgICBzY2FsZUZhY3RvciAqPSBt X2ZyYW1lLnBhZ2UoKS0+cGFnZVNjYWxlRmFjdG9yKCk7CiAKICAgICAvLyBJZiB0aGUgcGFnZSBz Y2FsZSBjaGFuZ2VkLCB3ZSBuZWVkIHRvIHBhaW50IGEgbmV3IFRleHRJbmRpY2F0b3IuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxv YWRlckNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50Lm1tCmluZGV4IGYxNDhhZWIzODFkZWUyNTIwMDk2ZGZhYTkwODgx MTNkNmI1NWQyMmQuLjI5NjJmZTBjNTE3MjMxZmVkMjc5MDdkNWRjZjJkOTNhMTAzYTMzNDMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCkBAIC0xNDczLDYgKzE0NzMsNyBAQCB2b2lkIFdl YkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKICAg ICBpZiAoaXNNYWluRnJhbWUpIHsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgICAgICBj b3JlVmlldy0+c2V0RGVsZWdhdGVzU2Nyb2xsaW5nKHRydWUpOworICAgICAgICBjb3JlVmlldy0+ c2V0RGVsZWdhdGVzUGFnZVNjYWxpbmcodHJ1ZSk7CiAjZW5kaWYKICAgICAgICAgY29yZVZpZXct PnNldFBhcmVudFZpc2libGUodHJ1ZSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv V2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IDI5NDU1MTY1NjZkNDAxZWQxZTRkNzZjMDNkMzc2NTYx OWJhMTlhMjEuLmMyZjE0Y2UxYzBmY2JmYTcyMTI0OWE0MzUwOWFkZDE2NDJkNmFmZjAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTMwNDQsNyArMzA0 NCw2IEBAIC0gKHZvaWQpX3ByZWZlcmVuY2VzQ2hhbmdlZDooV2ViUHJlZmVyZW5jZXMgKilwcmVm ZXJlbmNlcwogICAgIHNldHRpbmdzLnNldFBhc3N3b3JkRWNob0R1cmF0aW9uSW5TZWNvbmRzKFtw cmVmZXJlbmNlcyBfcGFzc3dvcmRFY2hvRHVyYXRpb25dKTsKIAogICAgIEFTU0VSVF9XSVRIX01F U1NBR0Uoc2V0dGluZ3MuYmFja0ZvcndhcmRDYWNoZVN1cHBvcnRzUGx1Z2lucygpLCAiQmFja0Zv cndhcmRDYWNoZVN1cHBvcnRzUGx1Z2lucyBzaG91bGQgYmUgZW5hYmxlZCBvbiBpT1MuIik7Ci0g ICAgc2V0dGluZ3Muc2V0RGVsZWdhdGVzUGFnZVNjYWxpbmcodHJ1ZSk7CiAKICNpZiBFTkFCTEUo VEVYVF9BVVRPU0laSU5HKQogICAgIHNldHRpbmdzLnNldE1pbmltdW1ab29tRm9udFNpemUoW3By ZWZlcmVuY2VzIF9taW5pbXVtWm9vbUZvbnRTaXplXSk7Cg== 385844 2019-12-16 18:32:12 -0800 2019-12-16 20:11:53 -0800 Patch bug-205319-20191216183211.patch text/plain 16977 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI5OGEwMzM5MmIyNDRj ZWM1ZmE0NWUzMWY5MDNlZTg3MjQ3M2QwMi4uOWJiNDg0YzQ3Y2ZjMzkzYTMxMDRiMzg2YWU5NGI5 MDIyNzIwMWJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTEyLTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENoYW5nZSAnZGVs ZWdhdGVzUGFnZVNjYWxpbmcnIGZyb20gYSBTZXR0aW5nIHRvIGEgZmxhZyBvbiBTY3JvbGxWaWV3 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUzMTkK KworICAgICAgICBkZWxlZ2F0ZXNQYWdlU2NhbGluZygpIGlzIG5ldmVyIHRvZ2dsZWQgYXQgcnVu dGltZSAoZXZlbiBieSB0ZXN0cyksIGFuZCBpdCBzaG91bGQKKyAgICAgICAgYmUgYSBmbGFnIG9u IEZyYW1lVmlldyBqdXN0IGxpa2UgZGVsZWdhdGVzU2Nyb2xsaW5nIChtYXliZSBpbiBmdXR1cmUg dGhlIGZsYWdzIGNhbiBtZXJnZSkuCisKKyAgICAgICAgU28gcmVtb3ZlIHRoZSBTZXR0aW5nLCBh bmQgaGF2ZSBEcmF3aW5nQXJlYSBjb250cm9sIHdoZXRoZXIgcGFnZSBzY2FsaW5nIGlzIGRlbGVn YXRlZC4KKyAgICAgICAgCisgICAgICAgIEluIFdlYktpdDEsIFdlYkZyYW1lTG9hZGVyQ2xpZW50 Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkgdHVybnMgb24gZGVsZWdhdGVkCisg ICAgICAgIHBhZ2Ugc2NhbGluZyBmb3IgaU9TLgorCisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6ZnJhbWVTY2FsZUZhY3RvciBjb25zdCk6CisgICAg ICAgICogcGFnZS9GcmFtZVNuYXBzaG90dGluZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzbmFw c2hvdEZyYW1lUmVjdFdpdGhDbGlwKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnZpc2libGVDb250ZW50U2NhbGVGYWN0b3IgY29u c3QpOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpz ZXRQYWdlU2NhbGVGYWN0b3IpOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MueWFtbDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZp ZXc6OnNldERlbGVnYXRlc1BhZ2VTY2FsaW5nKToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxW aWV3Lmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpkZWxlZ2F0ZXNQYWdlU2NhbGlu ZyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3ZlcmxhcE1h cCBjb25zdCk6CisKIDIwMTktMTItMTYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIgc2hvdWxkIG9ic2VydmUgbmV3 bHkgaW5zZXJ0ZWQgb3IgZGlzcGxheWVkIGNvbnRlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGMyMDlkZThlYzMy YWFhMzY3ODVmZGI4MTM1NDU4MzE4M2NiNjUyZDIuLjkwMWQwZDk1MWM0MTkyYjQ5MzFlNzQyY2Iw YTA0MTFiZDdkODg3M2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMTItMTYgIFNp bW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhbmdlICdk ZWxlZ2F0ZXNQYWdlU2NhbGluZycgZnJvbSBhIFNldHRpbmcgdG8gYSBmbGFnIG9uIFNjcm9sbFZp ZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTMx OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGRlbGVn YXRlc1BhZ2VTY2FsaW5nKCkgaXMgbmV2ZXIgdG9nZ2xlZCBhdCBydW50aW1lIChldmVuIGJ5IHRl c3RzKSwgYW5kIGl0IHNob3VsZAorICAgICAgICBiZSBhIGZsYWcgb24gRnJhbWVWaWV3IGp1c3Qg bGlrZSBkZWxlZ2F0ZXNTY3JvbGxpbmcgKG1heWJlIGluIGZ1dHVyZSB0aGUgZmxhZ3MgY2FuIG1l cmdlKS4KKworICAgICAgICBTbyByZW1vdmUgdGhlIFNldHRpbmcsIGFuZCBoYXZlIERyYXdpbmdB cmVhIGNvbnRyb2wgd2hldGhlciBwYWdlIHNjYWxpbmcgaXMgZGVsZWdhdGVkLgorICAgICAgICAK KyAgICAgICAgSW4gV2ViS2l0MSwgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0Nv bW1pdHRlZEZvck5ld1BhZ2UoKSB0dXJucyBvbiBkZWxlZ2F0ZWQKKyAgICAgICAgcGFnZSBzY2Fs aW5nIGZvciBpT1MuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGll bnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UpOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYTo6 dXNlc0RlbGVnYXRlZFBhZ2VTY2FsaW5nIGNvbnN0KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLmg6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVE cmF3aW5nQXJlYS5tbToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWE6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvaW9zL0ZpbmRDb250cm9sbGVySU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpGaW5kSW5k aWNhdG9yT3ZlcmxheUNsaWVudElPUzo6ZHJhd1JlY3QpOgorCiAyMDE5LTEyLTE2ICBXZW5zb24g SHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIC1bVUlXS0RvY3VtZW50 Q29udGV4dCBtYXJrZWRUZXh0UmFuZ2VdIGlzIHdyb25nIHdoZW4gdGhlIGNhcmV0IGlzIG5vdCBh dCB0aGUgc3RhcnQgb2YgbWFya2VkIHRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdh Y3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwppbmRl eCAxNjgxNjdlMjhlMTVhNmNlMTExZTQ2NjI4ZWU5OWI0MjEyNWViMGFkLi4wYWIzM2MyYmFlNWM0 ZmNmYTQwNDM5ODUwY2E0ZDcxMGE3YmFmNTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVn YWN5L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjMgQEAKKzIwMTktMTItMTYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhbmdlICdkZWxlZ2F0ZXNQYWdlU2NhbGluZycgZnJv bSBhIFNldHRpbmcgdG8gYSBmbGFnIG9uIFNjcm9sbFZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTMxOQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGRlbGVnYXRlc1BhZ2VTY2FsaW5nKCkgaXMgbmV2 ZXIgdG9nZ2xlZCBhdCBydW50aW1lIChldmVuIGJ5IHRlc3RzKSwgYW5kIGl0IHNob3VsZAorICAg ICAgICBiZSBhIGZsYWcgb24gRnJhbWVWaWV3IGp1c3QgbGlrZSBkZWxlZ2F0ZXNTY3JvbGxpbmcg KG1heWJlIGluIGZ1dHVyZSB0aGUgZmxhZ3MgY2FuIG1lcmdlKS4KKworICAgICAgICBTbyByZW1v dmUgdGhlIFNldHRpbmcsIGFuZCBoYXZlIERyYXdpbmdBcmVhIGNvbnRyb2wgd2hldGhlciBwYWdl IHNjYWxpbmcgaXMgZGVsZWdhdGVkLgorICAgICAgICAKKyAgICAgICAgSW4gV2ViS2l0MSwgV2Vi RnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKSB0dXJu cyBvbiBkZWxlZ2F0ZWQKKyAgICAgICAgcGFnZSBzY2FsaW5nIGZvciBpT1MuCisKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbToKKyAgICAgICAgKFdlYkZy YW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKToKKyAgICAg ICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX3ByZWZlcmVuY2Vz Q2hhbmdlZDpdKToKKwogMjAxOS0xMi0xNiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5j b20+CiAKICAgICAgICAgUmVtb3ZlIGRpc3BsYXk6Y29udGVudHMgZmVhdHVyZSBmbGFnCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWUuY3BwCmluZGV4IGUwODMzZGMwODMzZjU5YTllYjI2MzUwNjEzMWNkYmI5N2M5Zjky MTEuLjZmNDM0ZDk1ODMyZTI1MjdhYTIwNTllNTkwNzE1NGJkZjY0YmVmNjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWUuY3BwCkBAIC05MTksOSArOTE5LDE0IEBAIGZsb2F0IEZyYW1lOjpmcmFtZVNjYWxlRmFj dG9yKCkgY29uc3QKICAgICBQYWdlKiBwYWdlID0gdGhpcy0+cGFnZSgpOwogCiAgICAgLy8gTWFp biBmcmFtZSBpcyBzY2FsZWQgd2l0aCByZXNwZWN0IHRvIGhlIGNvbnRhaW5lciBidXQgaW5uZXIg ZnJhbWVzIGFyZSBub3Qgc2NhbGVkIHdpdGggcmVzcGVjdCB0byB0aGUgbWFpbiBmcmFtZS4KLSAg ICBpZiAoIXBhZ2UgfHwgJnBhZ2UtPm1haW5GcmFtZSgpICE9IHRoaXMgfHwgc2V0dGluZ3MoKS5k ZWxlZ2F0ZXNQYWdlU2NhbGluZygpKQorICAgIGlmICghcGFnZSB8fCAhaXNNYWluRnJhbWUoKSkK ICAgICAgICAgcmV0dXJuIDE7CiAKKyAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gdGhpcy0+dmll dygpKSB7CisgICAgICAgIGlmICh2aWV3LT5kZWxlZ2F0ZXNQYWdlU2NhbGluZygpKQorICAgICAg ICAgICAgcmV0dXJuIDE7CisgICAgfQorCiAgICAgcmV0dXJuIHBhZ2UtPnBhZ2VTY2FsZUZhY3Rv cigpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNob3R0 aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuY3BwCmluZGV4 IGUyN2M0MWE4NDRjYzg4MjgyMjYxNWRjNTM0ZGQwZjZiZDJiYWRiOTEuLjBhNDRjMmZhMWEwOTQ5 N2NmZGY1NTg4ODMyZmZkZmYxMDIzMzMwZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVTbmFwc2hvdHRpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVT bmFwc2hvdHRpbmcuY3BwCkBAIC0xMDUsNyArMTA1LDcgQEAgc3RkOjp1bmlxdWVfcHRyPEltYWdl QnVmZmVyPiBzbmFwc2hvdEZyYW1lUmVjdFdpdGhDbGlwKEZyYW1lJiBmcmFtZSwgY29uc3QgSW50 UmUKIAogICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gZnJhbWUucGFnZSgpLT5kZXZpY2VTY2FsZUZh Y3RvcigpOwogCi0gICAgaWYgKGZyYW1lLnNldHRpbmdzKCkuZGVsZWdhdGVzUGFnZVNjYWxpbmco KSkKKyAgICBpZiAoZnJhbWUudmlldygpLT5kZWxlZ2F0ZXNQYWdlU2NhbGluZygpKQogICAgICAg ICBzY2FsZUZhY3RvciAqPSBmcmFtZS5wYWdlKCktPnBhZ2VTY2FsZUZhY3RvcigpOwogCiAgICAg aWYgKG9wdGlvbnMgJiBTbmFwc2hvdE9wdGlvbnNQYWludFdpdGhJbnRlZ3JhbFNjYWxlRmFjdG9y KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDA0MDEyZjllZmY2NGZiOWE0MTIxODdk MDQ2ZTIyNWM0OTVlOTRkZGIuLmVhNzUxMWIzMzEyNmJjZWY5MzQ5ZWY5NDNjM2E2OWMwYzA2Mzc5 N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTM3MDksNyArMzcwOSw4IEBAIHZv aWQgRnJhbWVWaWV3OjppbnZhbGlkYXRlU2Nyb2xsYmFyUmVjdChTY3JvbGxiYXImIHNjcm9sbGJh ciwgY29uc3QgSW50UmVjdCYgcmVjCiAKIGZsb2F0IEZyYW1lVmlldzo6dmlzaWJsZUNvbnRlbnRT Y2FsZUZhY3RvcigpIGNvbnN0CiB7Ci0gICAgaWYgKCFmcmFtZSgpLmlzTWFpbkZyYW1lKCkgfHwg IWZyYW1lKCkuc2V0dGluZ3MoKS5kZWxlZ2F0ZXNQYWdlU2NhbGluZygpKQorICAgIC8vIEZJWE1F OiBUaGlzICFkZWxlZ2F0ZXNQYWdlU2NhbGluZygpIGlzIGNvbmZ1c2luZy4gVGhpcyBmdW5jdGlv biBzaG91bGQgcHJvYmFibHkgYmUgcmVuYW1lZCB0byBkZWxlZ2F0ZWRQYWdlU2NhbGVGYWN0b3Io KS4KKyAgICBpZiAoIWZyYW1lKCkuaXNNYWluRnJhbWUoKSB8fCAhZGVsZWdhdGVzUGFnZVNjYWxp bmcoKSkKICAgICAgICAgcmV0dXJuIDE7CiAKICAgICBQYWdlKiBwYWdlID0gZnJhbWUoKS5wYWdl KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCA1NjU1ZGMyYzI5YzcxNjFlMTJjNGNhMDI3OTA4OGVi M2Y0M2JlYjU3Li5iZjQzYTg3ZWI1M2U4NTFlMGU1OTFhYmM2ZmQ1N2VkN2JjNDcxYWQ2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvUGFnZS5jcHAKQEAgLTEwMzEsMTEgKzEwMzEsMTEgQEAgdm9pZCBQYWdlOjpzZXRQYWdl U2NhbGVGYWN0b3IoZmxvYXQgc2NhbGUsIGNvbnN0IEludFBvaW50JiBvcmlnaW4sIGJvb2wgaW5T dGFibGUKICAgICBMT0coVmlld3BvcnRzLCAiUGFnZTo6c2V0UGFnZVNjYWxlRmFjdG9yICUuMmYg LSBpblN0YWJsZVN0YXRlICVkIiwgc2NhbGUsIGluU3RhYmxlU3RhdGUpOwogCiAgICAgRG9jdW1l bnQqIGRvY3VtZW50ID0gbWFpbkZyYW1lKCkuZG9jdW1lbnQoKTsKLSAgICBGcmFtZVZpZXcqIHZp ZXcgPSBkb2N1bWVudC0+dmlldygpOworICAgIFJlZlB0cjxGcmFtZVZpZXc+IHZpZXcgPSBkb2N1 bWVudC0+dmlldygpOwogCiAgICAgaWYgKHNjYWxlID09IG1fcGFnZVNjYWxlRmFjdG9yKSB7CiAg ICAgICAgIGlmICh2aWV3ICYmIHZpZXctPnNjcm9sbFBvc2l0aW9uKCkgIT0gb3JpZ2luKSB7Ci0g ICAgICAgICAgICBpZiAoIW1fc2V0dGluZ3MtPmRlbGVnYXRlc1BhZ2VTY2FsaW5nKCkpCisgICAg ICAgICAgICBpZiAoIXZpZXctPmRlbGVnYXRlc1BhZ2VTY2FsaW5nKCkpCiAgICAgICAgICAgICAg ICAgZG9jdW1lbnQtPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwogCiAg ICAgICAgICAgICBpZiAoIXZpZXctPmRlbGVnYXRlc1Njcm9sbGluZygpKQpAQCAtMTA1OSw3ICsx MDU5LDcgQEAgdm9pZCBQYWdlOjpzZXRQYWdlU2NhbGVGYWN0b3IoZmxvYXQgc2NhbGUsIGNvbnN0 IEludFBvaW50JiBvcmlnaW4sIGJvb2wgaW5TdGFibGUKIAogICAgIG1fcGFnZVNjYWxlRmFjdG9y ID0gc2NhbGU7CiAKLSAgICBpZiAoIW1fc2V0dGluZ3MtPmRlbGVnYXRlc1BhZ2VTY2FsaW5nKCkp IHsKKyAgICBpZiAoIXZpZXctPmRlbGVnYXRlc1BhZ2VTY2FsaW5nKCkpIHsKICAgICAgICAgdmll dy0+c2V0TmVlZHNMYXlvdXRBZnRlclZpZXdDb25maWd1cmF0aW9uQ2hhbmdlKCk7CiAgICAgICAg IHZpZXctPnNldE5lZWRzQ29tcG9zaXRpbmdHZW9tZXRyeVVwZGF0ZSgpOwogCkBAIC0xMDc1LDcg KzEwNzUsNyBAQCB2b2lkIFBhZ2U6OnNldFBhZ2VTY2FsZUZhY3RvcihmbG9hdCBzY2FsZSwgY29u c3QgSW50UG9pbnQmIG9yaWdpbiwgYm9vbCBpblN0YWJsZQogICAgICAgICB2aWV3LT5zZXRWaWV3 cG9ydENvbnN0cmFpbmVkT2JqZWN0c05lZWRMYXlvdXQoKTsKIAogICAgIGlmICh2aWV3ICYmIHZp ZXctPnNjcm9sbFBvc2l0aW9uKCkgIT0gb3JpZ2luKSB7Ci0gICAgICAgIGlmICghbV9zZXR0aW5n cy0+ZGVsZWdhdGVzUGFnZVNjYWxpbmcoKSAmJiBkb2N1bWVudC0+cmVuZGVyVmlldygpICYmIGRv Y3VtZW50LT5yZW5kZXJWaWV3KCktPm5lZWRzTGF5b3V0KCkgJiYgdmlldy0+ZGlkRmlyc3RMYXlv dXQoKSkKKyAgICAgICAgaWYgKCF2aWV3LT5kZWxlZ2F0ZXNQYWdlU2NhbGluZygpICYmIGRvY3Vt ZW50LT5yZW5kZXJWaWV3KCkgJiYgZG9jdW1lbnQtPnJlbmRlclZpZXcoKS0+bmVlZHNMYXlvdXQo KSAmJiB2aWV3LT5kaWRGaXJzdExheW91dCgpKQogICAgICAgICAgICAgdmlldy0+bGF5b3V0Q29u dGV4dCgpLmxheW91dCgpOwogCiAgICAgICAgIGlmICghdmlldy0+ZGVsZWdhdGVzU2Nyb2xsaW5n KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwKaW5kZXggYjMyOWYxMjQ3OTNkOTE2MThiNGJh ZmIzYTkyMThmZTFkMTgwZTk0Ny4uYTkyZjMwMzBhMGJjOWViNjdkMDUzMGFmNzI4MWU2OTM1YzFj MjliNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFtbApAQCAtMzc5LDkgKzM3OSw2IEBAIHdp bmRvd0ZvY3VzUmVzdHJpY3RlZDoKIGRpYWdub3N0aWNMb2dnaW5nRW5hYmxlZDoKICAgaW5pdGlh bDogZmFsc2UKIAotZGVsZWdhdGVzUGFnZVNjYWxpbmc6Ci0gIGluaXRpYWw6IGZhbHNlCi0KIHBs dWdJblNuYXBzaG90dGluZ0VuYWJsZWQ6CiAgIGluaXRpYWw6IGZhbHNlCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKaW5kZXggYjEyNmE5YzJiNzA2YTExNzM0NmM1NzQwNzg1 MWUzODU1ODJjYzk2OC4uN2QyZDJlMTIzZDViMTQxOTVkZWY2ZmFiYTAyYzA2ZGZjNTY3ZDU4MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKQEAgLTE5Nyw2ICsxOTcsMTEg QEAgdm9pZCBTY3JvbGxWaWV3OjpzZXREZWxlZ2F0ZXNTY3JvbGxpbmcoYm9vbCBkZWxlZ2F0ZXNT Y3JvbGxpbmcpCiAgICAgZGVsZWdhdGVzU2Nyb2xsaW5nRGlkQ2hhbmdlKCk7CiB9CiAKK3ZvaWQg U2Nyb2xsVmlldzo6c2V0RGVsZWdhdGVzUGFnZVNjYWxpbmcoYm9vbCBkZWxlZ2F0ZXNQYWdlU2Nh bGluZykKK3sKKyAgICBtX2RlbGVnYXRlc1BhZ2VTY2FsaW5nID0gZGVsZWdhdGVzUGFnZVNjYWxp bmc7Cit9CisKIEludFBvaW50IFNjcm9sbFZpZXc6OmNvbnRlbnRzU2Nyb2xsUG9zaXRpb24oKSBj b25zdAogewogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxWaWV3LmgKaW5kZXggNDMwMTYwZDZhZTJmZGRmNzUwZDA5ZGJhNWQ0MGE1ZTdmNzA3ZTVkNC4u MmZmMjZkNzQyOGEyYzI5MWNiZWQ0NDM0ODNjNWUyYjZkZGNlNGZkNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbFZpZXcuaApAQCAtMTM3LDYgKzEzNyw5IEBAIHB1YmxpYzoKICAgICBib29s IGRlbGVnYXRlc1Njcm9sbGluZygpIGNvbnN0IHsgcmV0dXJuIG1fZGVsZWdhdGVzU2Nyb2xsaW5n OyB9CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXREZWxlZ2F0ZXNTY3JvbGxpbmcoYm9vbCk7 CiAKKyAgICBib29sIGRlbGVnYXRlc1BhZ2VTY2FsaW5nKCkgY29uc3QgeyByZXR1cm4gbV9kZWxl Z2F0ZXNQYWdlU2NhbGluZzsgfQorICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0RGVsZWdhdGVz UGFnZVNjYWxpbmcoYm9vbCk7CisKICAgICAvLyBPdmVycmlkZGVuIGJ5IEZyYW1lVmlldyB0byBj cmVhdGUgY3VzdG9tIENTUyBzY3JvbGxiYXJzIGlmIGFwcGxpY2FibGUuCiAgICAgdmlydHVhbCBS ZWY8U2Nyb2xsYmFyPiBjcmVhdGVTY3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50YXRpb24pOwogCkBA IC01MjksNiArNTMyLDggQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgbV9wYWludHNFbnRpcmVDb250 ZW50cyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2RlbGVnYXRlc1Njcm9sbGluZyB7IGZhbHNlIH07 CisgICAgYm9vbCBtX2RlbGVnYXRlc1BhZ2VTY2FsaW5nIHsgZmFsc2UgfTsKKwogfTsgLy8gY2xh c3MgU2Nyb2xsVmlldwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDkyMzI2MWI0 NWRlMmFlODM0NzJhZDNlOTQyOTQ1MTE2YWU2YWU0ZGYuLjRkM2E1NmRlODk2YTNlOWFmMDczZjhm MmNmNGNhYTg5ZjI5ZTYyMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0xOTA3LDggKzE5MDcsOSBAQCB2b2lkIFJlbmRl ckxheWVyQ29tcG9zaXRvcjo6YWRkVG9PdmVybGFwTWFwKExheWVyT3ZlcmxhcE1hcCYgb3Zlcmxh cE1hcCwgY29uc3QgUgogCiAgICAgYXV0byBjbGlwcGVkQm91bmRzID0gZXh0ZW50LmJvdW5kczsK ICAgICBpZiAoIWNsaXBSZWN0LmlzSW5maW5pdGUoKSkgewotICAgICAgICAvLyBPbiBpT1MsIHBh Z2VTY2FsZUZhY3RvcigpIGlzIG5vdCBhcHBsaWVkIGJ5IFJlbmRlclZpZXcsIHNvIHdlIHNob3Vs ZCBub3Qgc2NhbGUgaGVyZS4KLSAgICAgICAgaWYgKCFtX3JlbmRlclZpZXcuc2V0dGluZ3MoKS5k ZWxlZ2F0ZXNQYWdlU2NhbGluZygpKQorICAgICAgICAvLyBXaXRoIGRlbGVnYXRlZCBwYWdlIHNj YWxpbmcsIHBhZ2VTY2FsZUZhY3RvcigpIGlzIG5vdCBhcHBsaWVkIGJ5IFJlbmRlclZpZXcsIHNv IHdlIHNob3VsZCBub3Qgc2NhbGUgaGVyZS4KKyAgICAgICAgYXV0byYgZnJhbWVWaWV3ID0gbV9y ZW5kZXJWaWV3LmZyYW1lVmlldygpOworICAgICAgICBpZiAoIWZyYW1lVmlldy5kZWxlZ2F0ZXNQ YWdlU2NhbGluZygpKQogICAgICAgICAgICAgY2xpcFJlY3Quc2NhbGUocGFnZVNjYWxlRmFjdG9y KCkpOwogCiAgICAgICAgIGNsaXBwZWRCb3VuZHMuaW50ZXJzZWN0KGNsaXBSZWN0KTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxv YWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IDAzYTMyZDM2ODI1OWVmNjRiODhjY2U2NTAw NWJkMzY1MTdlNGU0NDIuLmFkMWI4NTM5ZTc1NjlmZTBjMTg2NWM3Y2RiZmNhYmE4ZjFlOWQ4M2Ug MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcApAQCAtMTUxNyw4ICsxNTE3LDEwIEBA IHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1Bh Z2UoKQogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGF1dG8qIGRyYXdpbmdBcmVhID0gd2ViUGFn ZS0+ZHJhd2luZ0FyZWEoKTsKICAgICB2aWV3LT5zZXRWaWV3RXhwb3NlZFJlY3QoZHJhd2luZ0Fy ZWEtPnZpZXdFeHBvc2VkUmVjdCgpKTsKLSAgICBpZiAoaXNNYWluRnJhbWUpCisgICAgaWYgKGlz TWFpbkZyYW1lKSB7CiAgICAgICAgIHZpZXctPnNldERlbGVnYXRlc1Njcm9sbGluZyhkcmF3aW5n QXJlYS0+dXNlc0RlbGVnYXRlZFNjcm9sbGluZygpKTsKKyAgICAgICAgdmlldy0+c2V0RGVsZWdh dGVzUGFnZVNjYWxpbmcoZHJhd2luZ0FyZWEtPnVzZXNEZWxlZ2F0ZWRQYWdlU2NhbGluZygpKTsK KyAgICB9CiAjZW5kaWYKIAogICAgIGlmICh3ZWJQYWdlLT5zY3JvbGxQaW5uaW5nQmVoYXZpb3Io KSAhPSBEb05vdFBpbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL0RyYXdpbmdBcmVhLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3 aW5nQXJlYS5oCmluZGV4IDU5ZDc4YWU2NzUwYWVjY2E2MjJlNzQwOTI1YjY0NTU0NmM3ZjkyZjku LjE2ZDA5YmZlZjBkNDI3Y2RkYjIyZDViYjAzZWU2YWNhNTU0M2U2ZDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKKysrIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaApAQCAtMTA3LDYgKzEwNyw3 IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0FzeW5jU2Nyb2xsaW5nKCkg Y29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgdXNlc0RlbGVnYXRlZFNj cm9sbGluZygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIHVzZXNE ZWxlZ2F0ZWRQYWdlU2NhbGluZygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKICAgICB2aXJ0 dWFsIGJvb2wgc2hvdWxkVXNlVGlsZWRCYWNraW5nRm9yRnJhbWVWaWV3KGNvbnN0IFdlYkNvcmU6 OkZyYW1lVmlldyYpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3Rl TGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLmgKaW5kZXggOGI2OTBjMWIzYzU2 YWZiN2IwZTU5OWNlNTFlNTU2ZDZiNGEyNWZhOS4uY2NkOTYzZmVjY2IxZDBmMDY2OGE1YWQ2YjNh ZmNkYTAyMDZmMTY1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLmgKKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVy VHJlZURyYXdpbmdBcmVhLmgKQEAgLTgwLDYgKzgwLDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wg c3VwcG9ydHNBc3luY1Njcm9sbGluZygpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0K ICAgICBib29sIHVzZXNEZWxlZ2F0ZWRTY3JvbGxpbmcoKSBjb25zdCBvdmVycmlkZSB7IHJldHVy biB0cnVlOyB9CisgICAgYm9vbCB1c2VzRGVsZWdhdGVkUGFnZVNjYWxpbmcoKSBjb25zdCBvdmVy cmlkZSB7IHJldHVybiB0cnVlOyB9CiAKICAgICB2b2lkIHNldExheWVyVHJlZVN0YXRlSXNGcm96 ZW4oYm9vbCkgb3ZlcnJpZGU7CiAgICAgYm9vbCBsYXllclRyZWVTdGF0ZUlzRnJvemVuKCkgY29u c3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9pc0ZsdXNoaW5nU3VzcGVuZGVkOyB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0KaW5kZXggYzg3 ZjAwY2U0NmQ4Yjk3YjRmNDBiMDJmMWRkNzFmY2M2YWFjZWU4Ny4uYzgwYWY1ZDU0OWY1MjI2N2E2 ZGZiNTQ5ZDFjOTUzMjM1NDAxNTEwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9S ZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbQpAQCAtNjMsOSArNjMsNiBAQCBSZW1vdGVMYXll clRyZWVEcmF3aW5nQXJlYTo6UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEoV2ViUGFnZSYgd2Vi UGFnZSwgY29uc3QgVwogICAgICwgbV9sYXllckZsdXNoVGltZXIoKnRoaXMsICZSZW1vdGVMYXll clRyZWVEcmF3aW5nQXJlYTo6Zmx1c2hMYXllcnMpCiB7CiAgICAgd2ViUGFnZS5jb3JlUGFnZSgp LT5zZXR0aW5ncygpLnNldEZvcmNlQ29tcG9zaXRpbmdNb2RlKHRydWUpOwotI2lmIFBMQVRGT1JN KElPU19GQU1JTFkpCi0gICAgd2ViUGFnZS5jb3JlUGFnZSgpLT5zZXR0aW5ncygpLnNldERlbGVn YXRlc1BhZ2VTY2FsaW5nKHRydWUpOwotI2VuZGlmCiAgICAgbV9yb290TGF5ZXItPnNldE5hbWUo ImRyYXdpbmcgYXJlYSByb290Iik7CiAKICAgICBtX2NvbW1pdFF1ZXVlID0gZGlzcGF0Y2hfcXVl dWVfY3JlYXRlKCJjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQuUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWEuQ29tbWl0UXVldWUiLCBudWxscHRyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9GaW5kQ29udHJvbGxlcklPUy5tbSBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9GaW5kQ29udHJvbGxlcklPUy5tbQppbmRleCA1 ZmExYjk4MDBlMWE1OGQzZjI0YzE1NWUwODlkMWRhYmIyYzQwMjc4Li5lYjE0YTg2ZGM3YjhkN2Yx ZjE4ODMyNTcwZmEzNzNiNGU2YTBhYTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvRmluZENvbnRyb2xsZXJJT1MubW0KKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL0ZpbmRDb250cm9sbGVySU9TLm1tCkBAIC02Miw3ICs2 Miw3IEBAIHZvaWQgRmluZEluZGljYXRvck92ZXJsYXlDbGllbnRJT1M6OmRyYXdSZWN0KFBhZ2VP dmVybGF5JiBvdmVybGF5LCBHcmFwaGljc0NvbnRlCiB7CiAgICAgZmxvYXQgc2NhbGVGYWN0b3Ig PSBtX2ZyYW1lLnBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKIAotICAgIGlmIChtX2ZyYW1l LnNldHRpbmdzKCkuZGVsZWdhdGVzUGFnZVNjYWxpbmcoKSkKKyAgICBpZiAobV9mcmFtZS52aWV3 KCkgJiYgbV9mcmFtZS52aWV3KCktPmRlbGVnYXRlc1BhZ2VTY2FsaW5nKCkpCiAgICAgICAgIHNj YWxlRmFjdG9yICo9IG1fZnJhbWUucGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKTsKIAogICAgIC8v IElmIHRoZSBwYWdlIHNjYWxlIGNoYW5nZWQsIHdlIG5lZWQgdG8gcGFpbnQgYSBuZXcgVGV4dElu ZGljYXRvci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KaW5kZXggZjE0OGFlYjM4MWRlZTI1 MjAwOTZkZmFhOTA4ODExM2Q2YjU1ZDIyZC4uMjk2MmZlMGM1MTcyMzFmZWQyNzkwN2Q1ZGNmMmQ5 M2ExMDNhMzM0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KQEAgLTE0NzMsNiArMTQ3 Myw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZv ck5ld1BhZ2UoKQogICAgIGlmIChpc01haW5GcmFtZSkgewogI2lmIFBMQVRGT1JNKElPU19GQU1J TFkpCiAgICAgICAgIGNvcmVWaWV3LT5zZXREZWxlZ2F0ZXNTY3JvbGxpbmcodHJ1ZSk7CisgICAg ICAgIGNvcmVWaWV3LT5zZXREZWxlZ2F0ZXNQYWdlU2NhbGluZyh0cnVlKTsKICNlbmRpZgogICAg ICAgICBjb3JlVmlldy0+c2V0UGFyZW50VmlzaWJsZSh0cnVlKTsKICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggMjk0NTUxNjU2NmQ0MDFlZDFl NGQ3NmMwM2QzNzY1NjE5YmExOWEyMS4uYzJmMTRjZTFjMGZjYmZhNzIxMjQ5YTQzNTA5YWRkMTY0 MmQ2YWZmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJW aWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpA QCAtMzA0NCw3ICszMDQ0LDYgQEAgLSAodm9pZClfcHJlZmVyZW5jZXNDaGFuZ2VkOihXZWJQcmVm ZXJlbmNlcyAqKXByZWZlcmVuY2VzCiAgICAgc2V0dGluZ3Muc2V0UGFzc3dvcmRFY2hvRHVyYXRp b25JblNlY29uZHMoW3ByZWZlcmVuY2VzIF9wYXNzd29yZEVjaG9EdXJhdGlvbl0pOwogCiAgICAg QVNTRVJUX1dJVEhfTUVTU0FHRShzZXR0aW5ncy5iYWNrRm9yd2FyZENhY2hlU3VwcG9ydHNQbHVn aW5zKCksICJCYWNrRm9yd2FyZENhY2hlU3VwcG9ydHNQbHVnaW5zIHNob3VsZCBiZSBlbmFibGVk IG9uIGlPUy4iKTsKLSAgICBzZXR0aW5ncy5zZXREZWxlZ2F0ZXNQYWdlU2NhbGluZyh0cnVlKTsK IAogI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCiAgICAgc2V0dGluZ3Muc2V0TWluaW11bVpv b21Gb250U2l6ZShbcHJlZmVyZW5jZXMgX21pbmltdW1ab29tRm9udFNpemVdKTsK