220438 2021-01-07 14:49:43 -0800 Web Inspector: Remove experimental setting and enable Font details sidebar 2021-01-12 12:17:21 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 pangle pangle bburg ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1718094 0 pangle 2021-01-07 14:49:43 -0800 . 1718403 1 webkit-bug-importer 2021-01-08 12:46:17 -0800 <rdar://problem/72940577> 1719011 2 417460 pangle 2021-01-12 09:03:02 -0800 Created attachment 417460 Patch v1.0 1719012 3 417460 bburg 2021-01-12 09:09:50 -0800 Comment on attachment 417460 Patch v1.0 LGTM, but please rebase. 1719068 4 417473 pangle 2021-01-12 11:10:42 -0800 Created attachment 417473 Patch v1.1 - Rebase 1719079 5 417473 hi 2021-01-12 11:58:55 -0800 Comment on attachment 417473 Patch v1.1 - Rebase rs=me 1719083 6 ews-feeder 2021-01-12 12:17:19 -0800 Committed r271410: <https://trac.webkit.org/changeset/271410> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417473. 417460 2021-01-12 09:03:02 -0800 2021-01-12 11:10:40 -0800 Patch v1.0 bug-220438-20210112120301.patch text/plain 6283 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA4 NDE0ZTMwZWE3N2ZkYWE0ZTg0OGI2ZTgzMjk0OTYzYjRiNmUxOGI2Li5lMjk0NmNmY2YyMTBlNjcw YjU0ZWJmYWY0ZTU1MDNjYTJhMGZhODY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMS0wMS0xMiAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIGV4cGVyaW1lbnRhbCBzZXR0aW5nIGFu ZCBlbmFibGUgRm9udCBkZXRhaWxzIHNpZGViYXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDQzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSB0aGUgYEVsZW1lbnRzYCB0YWIgYEZvbnRgIGRl dGFpbHMgc2lkZWJhciBieSByZW1vdmluZyB0aGUgZXhwZXJpbWVudGFsIGZlYXR1cmUgc2V0dGlu Zy4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q czoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qczoKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChX SS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNvbnRl bnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3KToKKyAgICAg ICAgLSBSZW1vdmVkIHNldHRpbmcgYXMgd2VsbCBhcyB0aGUgYEVsZW1lbnRzIFRhYmAgZ3JvdXAs IGFzIGl0IGlzIG5vIGxvbmdlciB1c2VkIGZvciBhbnkgc2V0dGluZ3MgaW4gdGhlCisgICAgICAg IGBFeHBlcmltZW50YWxgIHBhbmUuCisKIDIwMjEtMDEtMDggIFBhdHJpY2sgQW5nbGUgIDxwYW5n bGVAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEZvbnQgRGV0YWlscyBzaWRl YmFyIC0gSW1wcm92ZSB2aXNpYmlsaXR5IG9mIHZhbHVlcyBieSBlbXBoYXNpemluZyB0aGVtL2Rl LWVtcGhhc2l6aW5nIHJhbmdlIGluZm9ybWF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qcwppbmRleCA0NjMxNWFiN2QyYjNhZTAzZjU3ZTM5MWJlZGVkZWZiNDEzYjkxNTJiLi4xODdi MTY2YTMwYTVhMjk5OGEwMDU5MDI0OTNlNjJjMWZhMzA4MzhmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanMKQEAgLTU0Nyw4ICs1NDcsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJFbGVt ZW50IG92ZXJsYXBzIG90aGVyIGNvbXBvc2l0aW5nIGVsZW1lbnQiXSA9ICJFbGVtZW50IG92ZXJs YQogbG9jYWxpemVkU3RyaW5nc1siRWxlbWVudHMiXSA9ICJFbGVtZW50cyI7CiAvKiBOYW1lIG9m IEVsZW1lbnRzIFRhYiAqLwogbG9jYWxpemVkU3RyaW5nc1siRWxlbWVudHMgVGFiIE5hbWUiXSA9 ICJFbGVtZW50cyI7Ci0vKiBDYXRlZ29yeSBsYWJlbCBmb3IgZXhwZXJpbWVudGFsIHNldHRpbmdz IHBlcnRhaW5pbmcgdG8gdGhlIEVsZW1lbnRzIHRhYiAqLwotbG9jYWxpemVkU3RyaW5nc1siRWxl bWVudHMgVGFiOiBAIEV4cGVyaW1lbnRhbCBTZXR0aW5ncyJdID0gIkVsZW1lbnRzIFRhYjoiOwog bG9jYWxpemVkU3RyaW5nc1siRW11bGF0ZSBVc2VyIEdlc3R1cmUiXSA9ICJFbXVsYXRlIFVzZXIg R2VzdHVyZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgQXVkaXQiXSA9ICJFbmFibGUgQXVk aXQiOwogbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIEJyZWFrcG9pbnQiXSA9ICJFbmFibGUgQnJl YWtwb2ludCI7CkBAIC0xMjkxLDcgKzEyODksNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IEFs bCBOb2RlcyAoJWQgTW9yZSkiXSA9ICJTaG93IEFsbCBOb2RlcyAoJWQgTW9yZSkiOwogbG9jYWxp emVkU3RyaW5nc1siU2hvdyBDb25zb2xlIl0gPSAiU2hvdyBDb25zb2xlIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlNob3cgQ29uc29sZSB0YWIiXSA9ICJTaG93IENvbnNvbGUgdGFiIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIlNob3cgRWxlbWVudHMiXSA9ICJTaG93IEVsZW1lbnRzIjsKLWxvY2FsaXplZFN0 cmluZ3NbIlNob3cgRm9udCBkZXRhaWxzIHNpZGViYXIgcGFuZWwiXSA9ICJTaG93IEZvbnQgZGV0 YWlscyBzaWRlYmFyIHBhbmVsIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgUGF0aCJdID0gIlNo b3cgUGF0aCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFJlbWFpbmluZyAoJWQpIl0gPSAiU2hv dyBSZW1haW5pbmcgKCVkKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFNjb3BlIENoYWluIG9u IHBhdXNlIl0gPSAiU2hvdyBTY29wZSBDaGFpbiBvbiBwYXVzZSI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKaW5kZXggNTFjYWM3 ZTRiNjM2NzJjNmRmYWYxOWQ2MzhkMDIwODEzMzJhOGI2My4uZTJkNWYwMDAwZWQyMTljYWI2YjYw MWY5NTJiYWZmMzZhYWU0MzJhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcwpAQCAtMjIzLDcgKzIyMyw2IEBAIFdJLnNldHRp bmdzID0gewogICAgIGV4cGVyaW1lbnRhbEVuYWJsZVByZXZpZXdGZWF0dXJlczogbmV3IFdJLlNl dHRpbmcoImV4cGVyaW1lbnRhbC1lbmFibGUtcHJldmlldy1mZWF0dXJlcyIsIHRydWUpLAogICAg IGV4cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0p1bXBUb0VmZmVjdGl2ZTogbmV3IFdJLlNldHRpbmco ImV4cGVyaW1lbnRhbC1zdHlsZXMtanVtcC10by1lZmZlY3RpdmUiLCBmYWxzZSksCiAgICAgZXhw ZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvVmFyaWFibGVEZWNsYXJhdGlvbjogbmV3IFdJLlNl dHRpbmcoImV4cGVyaW1lbnRhbC1zdHlsZXMtanVtcC10by12YXJpYWJsZS1kZWNsYXJhdGlvbiIs IGZhbHNlKSwKLSAgICBleHBlcmltZW50YWxFbmFibGVGb250RGV0YWlsc1BhbmVsOiBuZXcgV0ku U2V0dGluZygiZXhwZXJpbWVudGFsLWZvbnQtZGV0YWlscy1wYW5lbCIsIGZhbHNlKSwKIAogICAg IC8vIFByb3RvY29sCiAgICAgcHJvdG9jb2xMb2dBc1RleHQ6IG5ldyBXSS5TZXR0aW5nKCJwcm90 b2NvbC1sb2ctYXMtdGV4dCIsIGZhbHNlKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRW aWV3LmpzCmluZGV4IDAxZjk1YzA0YzM4NDk3MTRlMzQwNDk2OGQ0MjdiNzBkNmI4MTBmZjUuLjAz ZTQ1ZTdhMjM0Y2ZhMjk3ZTU0YjFlMmYxMTFmYTZlNzgyMWUxZWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZp ZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxl bWVudHNUYWJDb250ZW50Vmlldy5qcwpAQCAtMzMsNyArMzMsNyBAQCBXSS5FbGVtZW50c1RhYkNv bnRlbnRWaWV3ID0gY2xhc3MgRWxlbWVudHNUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRCcm93cwogCiAgICAgICAgIF07CiAgICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAxNC4w KTogYENTUy5nZXRGb250RGF0YUZvck5vZGVgIGRpZCBub3QgZXhpc3QgeWV0LgotICAgICAgICBp ZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlRm9udERldGFpbHNQYW5lbC52YWx1ZSAm JiBJbnNwZWN0b3JCYWNrZW5kLmhhc0NvbW1hbmQoIkNTUy5nZXRGb250RGF0YUZvck5vZGUiKSkK KyAgICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQuaGFzQ29tbWFuZCgiQ1NTLmdldEZvbnREYXRh Rm9yTm9kZSIpKQogICAgICAgICAgICAgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycy5w dXNoKFdJLkZvbnREZXRhaWxzU2lkZWJhclBhbmVsKTsKICAgICAgICAgZGV0YWlsc1NpZGViYXJQ YW5lbENvbnN0cnVjdG9ycy5wdXNoKFdJLkNoYW5nZXNEZXRhaWxzU2lkZWJhclBhbmVsLCBXSS5E T01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbCk7CiAgICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5k Lmhhc0RvbWFpbigiTGF5ZXJUcmVlIikpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmll dy5qcwppbmRleCAxYjQyZGM1ZmU5NjRjNjIyMWJiNmJmYjg2Nzk2ZjgyZjZmMjUwMWZiLi40ZTc3 OTk2YTc4YmRkYzBjMWRiYTk2M2QyODJmMWRhNjY3ODQ3MmM0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRp bmdzVGFiQ29udGVudFZpZXcuanMKQEAgLTQwMiwxMCArNDAyLDYgQEAgV0kuU2V0dGluZ3NUYWJD b250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJD b250ZW50VmkKICAgICAgICAgICAgIGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0 b3IoKTsKICAgICAgICAgfQogCi0gICAgICAgIGxldCBlbGVtZW50c0dyb3VwID0gZXhwZXJpbWVu dGFsU2V0dGluZ3NWaWV3LmFkZEdyb3VwKFdJLlVJU3RyaW5nKCJFbGVtZW50cyBUYWI6IiwgIkVs ZW1lbnRzIFRhYjogQCBFeHBlcmltZW50YWwgU2V0dGluZ3MiLCAiQ2F0ZWdvcnkgbGFiZWwgZm9y IGV4cGVyaW1lbnRhbCBzZXR0aW5ncyBwZXJ0YWluaW5nIHRvIHRoZSBFbGVtZW50cyB0YWIiKSk7 Ci0gICAgICAgIGVsZW1lbnRzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5leHBlcmltZW50 YWxFbmFibGVGb250RGV0YWlsc1BhbmVsLCBXSS5VSVN0cmluZygiU2hvdyBGb250IGRldGFpbHMg c2lkZWJhciBwYW5lbCIpKTsKLSAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNl cGFyYXRvcigpOwotCiAgICAgICAgIGxldCByZWxvYWRJbnNwZWN0b3JCdXR0b24gPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJidXR0b24iKTsKICAgICAgICAgcmVsb2FkSW5zcGVjdG9yQnV0dG9u LnRleHRDb250ZW50ID0gV0kuVUlTdHJpbmcoIlJlbG9hZCBXZWIgSW5zcGVjdG9yIik7CiAgICAg ICAgIHJlbG9hZEluc3BlY3RvckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIChldmVu dCkgPT4gewpAQCAtNDI5LDggKzQyNSw2IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBj bGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAgICAg ICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlU3R5 bGVzSnVtcFRvVmFyaWFibGVEZWNsYXJhdGlvbik7CiAgICAgICAgIH0KIAotICAgICAgICBsaXN0 ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlRm9udERldGFpbHNQYW5l bCk7Ci0KICAgICAgICAgdGhpcy5fY3JlYXRlUmVmZXJlbmNlTGluayhleHBlcmltZW50YWxTZXR0 aW5nc1ZpZXcpOwogCiAgICAgICAgIHRoaXMuYWRkU2V0dGluZ3NWaWV3KGV4cGVyaW1lbnRhbFNl dHRpbmdzVmlldyk7Cg== 417473 2021-01-12 11:10:42 -0800 2021-01-12 12:17:20 -0800 Patch v1.1 - Rebase bug-220438-20210112141041.patch text/plain 6167 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz M2RiZDMxNTY3Y2QxMDYzOTNlMTJhM2E0ZTc4YmYwYTI3OWM2ZGE0Li5kYTE4N2U5MDBmMTVlYjI3 OGZjMGVkMTA5NGY1Y2EzYzQzMGJjZmUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMS0wMS0xMiAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIGV4cGVyaW1lbnRhbCBzZXR0aW5nIGFu ZCBlbmFibGUgRm9udCBkZXRhaWxzIHNpZGViYXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDQzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5qczoKKyAg ICAgICAgKFdJLkVsZW1lbnRzVGFiQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlNldHRpbmdz VGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9jcmVhdGVFeHBlcmltZW50YWxTZXR0aW5nc1ZpZXcp OgorCiAyMDIxLTAxLTExICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBEZWJ1Z2dlcjogYWxsb3cgYnJlYWtwb2ludCBhY3Rpb25zIHRv IGJlIGV2YWx1YXRlZCBhcyBhIHVzZXIgZ2VzdHVyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMKaW5kZXggMDFkN2RiZTdjNjAzMWE4YzE3ZGZmOWRjMmFiNDE0YTVkODE5MWI5Ni4uMTM4 YjcwM2JlMzU0NzljOWUwMzgzY2NmY2I4ZjYxMjVlNTgxYzczMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzCkBAIC01NDcsOCArNTQ3LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siRWxl bWVudCBvdmVybGFwcyBvdGhlciBjb21wb3NpdGluZyBlbGVtZW50Il0gPSAiRWxlbWVudCBvdmVy bGEKIGxvY2FsaXplZFN0cmluZ3NbIkVsZW1lbnRzIl0gPSAiRWxlbWVudHMiOwogLyogTmFtZSBv ZiBFbGVtZW50cyBUYWIgKi8KIGxvY2FsaXplZFN0cmluZ3NbIkVsZW1lbnRzIFRhYiBOYW1lIl0g PSAiRWxlbWVudHMiOwotLyogQ2F0ZWdvcnkgbGFiZWwgZm9yIGV4cGVyaW1lbnRhbCBzZXR0aW5n cyBwZXJ0YWluaW5nIHRvIHRoZSBFbGVtZW50cyB0YWIgKi8KLWxvY2FsaXplZFN0cmluZ3NbIkVs ZW1lbnRzIFRhYjogQCBFeHBlcmltZW50YWwgU2V0dGluZ3MiXSA9ICJFbGVtZW50cyBUYWI6IjsK IC8qIENoZWNrYm94IHNob3duIGluIHRoZSBDb25zb2xlIHRvIGNhdXNlIGZ1dHVyZSBldmFsdWF0 aW9ucyBhcyB0aG91Z2ggdGhleSBhcmUgaW4gcmVzcG9uc2UgdG8gdXNlciBpbnRlcmFjdGlvbi4g Ki8KIGxvY2FsaXplZFN0cmluZ3NbIkVtdWxhdGUgVXNlciBHZXN0dXJlIEAgQ29uc29sZSJdID0g IkVtdWxhdGUgVXNlciBHZXN0dXJlIjsKIC8qIENoZWNrYm94IHNob3duIHdoZW4gY29uZmlndXJp bmcgbG9nL2V2YWx1YXRlL3Byb2JlIGJyZWFrcG9pbnQgYWN0aW9ucyB0byBjYXVzZSBpdCB0byBi ZSBldmFsdWF0ZWQgYXMgdGhvdWdoIGl0IHdhcyBpbiByZXNwb25zZSB0byB1c2VyIGludGVyYWN0 aW9uLiAqLwpAQCAtMTI5NCw3ICsxMjkyLDYgQEAgbG9jYWxpemVkU3RyaW5nc1siU2hvdyBBbGwg Tm9kZXMgKCVkIE1vcmUpIl0gPSAiU2hvdyBBbGwgTm9kZXMgKCVkIE1vcmUpIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIlNob3cgQ29uc29sZSJdID0gIlNob3cgQ29uc29sZSI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJTaG93IENvbnNvbGUgdGFiIl0gPSAiU2hvdyBDb25zb2xlIHRhYiI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IEVsZW1lbnRzIl0gPSAiU2hvdyBFbGVtZW50cyI7Ci1sb2NhbGl6ZWRTdHJp bmdzWyJTaG93IEZvbnQgZGV0YWlscyBzaWRlYmFyIHBhbmVsIl0gPSAiU2hvdyBGb250IGRldGFp bHMgc2lkZWJhciBwYW5lbCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFBhdGgiXSA9ICJTaG93 IFBhdGgiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBSZW1haW5pbmcgKCVkKSJdID0gIlNob3cg UmVtYWluaW5nICglZCkiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBTY29wZSBDaGFpbiBvbiBw YXVzZSJdID0gIlNob3cgU2NvcGUgQ2hhaW4gb24gcGF1c2UiOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IDUxY2FjN2U0 YjYzNjcyYzZkZmFmMTlkNjM4ZDAyMDgxMzMyYThiNjMuLmUyZDVmMDAwMGVkMjE5Y2FiNmI2MDFm OTUyYmFmZjM2YWFlNDMyYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKQEAgLTIyMyw3ICsyMjMsNiBAQCBXSS5zZXR0aW5n cyA9IHsKICAgICBleHBlcmltZW50YWxFbmFibGVQcmV2aWV3RmVhdHVyZXM6IG5ldyBXSS5TZXR0 aW5nKCJleHBlcmltZW50YWwtZW5hYmxlLXByZXZpZXctZmVhdHVyZXMiLCB0cnVlKSwKICAgICBl eHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9FZmZlY3RpdmU6IG5ldyBXSS5TZXR0aW5nKCJl eHBlcmltZW50YWwtc3R5bGVzLWp1bXAtdG8tZWZmZWN0aXZlIiwgZmFsc2UpLAogICAgIGV4cGVy aW1lbnRhbEVuYWJsZVN0eWxlc0p1bXBUb1ZhcmlhYmxlRGVjbGFyYXRpb246IG5ldyBXSS5TZXR0 aW5nKCJleHBlcmltZW50YWwtc3R5bGVzLWp1bXAtdG8tdmFyaWFibGUtZGVjbGFyYXRpb24iLCBm YWxzZSksCi0gICAgZXhwZXJpbWVudGFsRW5hYmxlRm9udERldGFpbHNQYW5lbDogbmV3IFdJLlNl dHRpbmcoImV4cGVyaW1lbnRhbC1mb250LWRldGFpbHMtcGFuZWwiLCBmYWxzZSksCiAKICAgICAv LyBQcm90b2NvbAogICAgIHByb3RvY29sTG9nQXNUZXh0OiBuZXcgV0kuU2V0dGluZygicHJvdG9j b2wtbG9nLWFzLXRleHQiLCBmYWxzZSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmll dy5qcwppbmRleCAwMWY5NWMwNGMzODQ5NzE0ZTM0MDQ5NjhkNDI3YjcwZDZiODEwZmY1Li4wM2U0 NWU3YTIzNGNmYTI5N2U1NGIxZTJmMTExZmE2ZTc4MjFlMWVmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1l bnRzVGFiQ29udGVudFZpZXcuanMKQEAgLTMzLDcgKzMzLDcgQEAgV0kuRWxlbWVudHNUYWJDb250 ZW50VmlldyA9IGNsYXNzIEVsZW1lbnRzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 QnJvd3MKIAogICAgICAgICBdOwogICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgMTQuMCk6 IGBDU1MuZ2V0Rm9udERhdGFGb3JOb2RlYCBkaWQgbm90IGV4aXN0IHlldC4KLSAgICAgICAgaWYg KFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUZvbnREZXRhaWxzUGFuZWwudmFsdWUgJiYg SW5zcGVjdG9yQmFja2VuZC5oYXNDb21tYW5kKCJDU1MuZ2V0Rm9udERhdGFGb3JOb2RlIikpCisg ICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLmhhc0NvbW1hbmQoIkNTUy5nZXRGb250RGF0YUZv ck5vZGUiKSkKICAgICAgICAgICAgIGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMucHVz aChXSS5Gb250RGV0YWlsc1NpZGViYXJQYW5lbCk7CiAgICAgICAgIGRldGFpbHNTaWRlYmFyUGFu ZWxDb25zdHJ1Y3RvcnMucHVzaChXSS5DaGFuZ2VzRGV0YWlsc1NpZGViYXJQYW5lbCwgV0kuRE9N Tm9kZURldGFpbHNTaWRlYmFyUGFuZWwpOwogICAgICAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5o YXNEb21haW4oIkxheWVyVHJlZSIpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcu anMKaW5kZXggMWI0MmRjNWZlOTY0YzYyMjFiYjZiZmI4Njc5NmY4MmY2ZjI1MDFmYi4uNGU3Nzk5 NmE3OGJkZGMwYzFkYmE5NjNkMjgyZjFkYTY2Nzg0NzJjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5n c1RhYkNvbnRlbnRWaWV3LmpzCkBAIC00MDIsMTAgKzQwMiw2IEBAIFdJLlNldHRpbmdzVGFiQ29u dGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29u dGVudFZpCiAgICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2VwYXJhdG9y KCk7CiAgICAgICAgIH0KIAotICAgICAgICBsZXQgZWxlbWVudHNHcm91cCA9IGV4cGVyaW1lbnRh bFNldHRpbmdzVmlldy5hZGRHcm91cChXSS5VSVN0cmluZygiRWxlbWVudHMgVGFiOiIsICJFbGVt ZW50cyBUYWI6IEAgRXhwZXJpbWVudGFsIFNldHRpbmdzIiwgIkNhdGVnb3J5IGxhYmVsIGZvciBl eHBlcmltZW50YWwgc2V0dGluZ3MgcGVydGFpbmluZyB0byB0aGUgRWxlbWVudHMgdGFiIikpOwot ICAgICAgICBlbGVtZW50c0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFs RW5hYmxlRm9udERldGFpbHNQYW5lbCwgV0kuVUlTdHJpbmcoIlNob3cgRm9udCBkZXRhaWxzIHNp ZGViYXIgcGFuZWwiKSk7Ci0gICAgICAgIGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBh cmF0b3IoKTsKLQogICAgICAgICBsZXQgcmVsb2FkSW5zcGVjdG9yQnV0dG9uID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiYnV0dG9uIik7CiAgICAgICAgIHJlbG9hZEluc3BlY3RvckJ1dHRvbi50 ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJSZWxvYWQgV2ViIEluc3BlY3RvciIpOwogICAgICAg ICByZWxvYWRJbnNwZWN0b3JCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCAoZXZlbnQp ID0+IHsKQEAgLTQyOSw4ICs0MjUsNiBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xh c3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogICAgICAg ICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVN0eWxl c0p1bXBUb1ZhcmlhYmxlRGVjbGFyYXRpb24pOwogICAgICAgICB9CiAKLSAgICAgICAgbGlzdGVu Rm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUZvbnREZXRhaWxzUGFuZWwp OwotCiAgICAgICAgIHRoaXMuX2NyZWF0ZVJlZmVyZW5jZUxpbmsoZXhwZXJpbWVudGFsU2V0dGlu Z3NWaWV3KTsKIAogICAgICAgICB0aGlzLmFkZFNldHRpbmdzVmlldyhleHBlcmltZW50YWxTZXR0 aW5nc1ZpZXcpOwo=