224943 2021-04-22 12:54:15 -0700 Add trace points for WKWebView snapshotting 2021-04-22 17:07:02 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser benjamin cdumez cmarcelo ews-watchlist simon.fraser thorton webkit-bug-importer oldest_to_newest 1753261 0 simon.fraser 2021-04-22 12:54:15 -0700 Add trace points for WKWebView snapshotting 1753262 1 426841 simon.fraser 2021-04-22 12:56:37 -0700 Created attachment 426841 Patch 1753303 2 426853 simon.fraser 2021-04-22 14:42:17 -0700 Created attachment 426853 Patch 1753325 3 simon.fraser 2021-04-22 15:42:17 -0700 https://trac.webkit.org/changeset/276473/webkit 1753377 4 webkit-bug-importer 2021-04-22 17:07:02 -0700 <rdar://problem/77045818> 426841 2021-04-22 12:56:37 -0700 2021-04-22 13:13:34 -0700 Patch bug-224943-20210422125636.patch text/plain 11834 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGIwYzBlMTY5ZDk4OWE0NjAyZjAyNjY5 ZjZlNzZhYzVjN2QwMmNlYzYuLmFmYTBlY2JiNDE1MTgyZDcyYzhlOTIwYzU0NmRjNzZkNDM0YmRk NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDQtMjIgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHRyYWNlIHBvaW50cyBmb3IgV0tXZWJW aWV3IHNuYXBzaG90dGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI0OTQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTmV3IHNuYXBzaG90IHZhbHVlcy4KKworICAgICAgICAqIHd0Zi9TeXN0ZW1UcmFj aW5nLmg6CisKIDIwMjEtMDQtMjEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5j b20+CiAKICAgICAgICAgRW5oYW5jZSBzY3JvbGxpbmctcmVsYXRlZCB0cmFjZSBwb2ludHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggMGFjOGJhM2VjNWM0OGJmNDM0M2UwYjkyMzk1YTI0NjI2YTg2YjZkZS4uYTA1Yzhi NDJlZmYyOWUzNWFjY2ZhZWQ1N2ZlOWU4NjZiMDdkMjYwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy NiBAQAorMjAyMS0wNC0yMiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K KworICAgICAgICBBZGQgdHJhY2UgcG9pbnRzIGZvciBXS1dlYlZpZXcgc25hcHNob3R0aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ5NDMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbmV3IHRy YWNlIHBvaW50cyB0byBtYWtlIHNuYXBzaG90dGluZy1yZWxhdGVkIGlzc3VlcyBlYXNpZXIgdG8g ZGlhZ25vc2UuIEluIHRoZSBVSQorICAgICAgICBwcm9jZXNzIHdlIHN0YXJ0L2VuZCBhIHRyYWNl IHNjb3BlIHdoZW4gcmVxdWVzdGVkIHRvIHNuYXBzaG90LCBhbmQgYmVmb3JlIGNhbGxpbmcgdGhl CisgICAgICAgIGNsaWVudCdzIGNvbXBsZXRpb24gaGFuZGxlci4KKworICAgICAgICBUcmFjZSBD QVJlbmRlclNlcnZlciBzbmFwc2hvdHMgd2hpY2ggaGFwcGVuIGluIHRoZSBVSSBwcm9jZXNzLCBh bmQgaW4gdGhlIHdlYiBwcm9jZXNzLCB0cmFjZQorICAgICAgICB0aGUgc3RhcnQgYW5kIGVuZCBv ZiB0aGUgc25hcHNob3QgcGFpbnRpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHRha2VTbmFwc2hvdFdpdGhDb25m aWd1cmF0aW9uOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLVGh1bWJuYWlsVmlldy5tbToKKyAgICAgICAgKC1bX1dLVGh1bWJuYWlsVmlldyBy ZXF1ZXN0U25hcHNob3RdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJ T1MubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfc25hcHNob3RSZWN0OmludG9JbWFnZU9mV2lk dGg6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwYWludFNuYXBzaG90QXRTaXpl KToKKwogMjAyMS0wNC0yMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBFbmhhbmNlIHNjcm9sbGluZy1yZWxhdGVkIHRyYWNlIHBvaW50cwpkaWZmIC0t Z2l0IGEvU291cmNlL1dURi93dGYvU3lzdGVtVHJhY2luZy5oIGIvU291cmNlL1dURi93dGYvU3lz dGVtVHJhY2luZy5oCmluZGV4IDRjYTdkZmEwODJhMzAzOTRmYzY5OGZkNWMyNDM3N2Q4NTliM2U2 NzEuLjJjYmMyNDYxNWZhZWRiNzgwM2U3NzEzYjFkZTg0ZGM0NjQwMmZlZmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XVEYvd3RmL1N5c3RlbVRyYWNpbmcuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9TeXN0 ZW1UcmFjaW5nLmgKQEAgLTExOSw2ICsxMTksMTIgQEAgZW51bSBUcmFjZVBvaW50Q29kZSB7CiAg ICAgRmx1c2hSZW1vdGVJbWFnZUJ1ZmZlckVuZCwKICAgICBDcmVhdGVJbmplY3RlZEJ1bmRsZVN0 YXJ0LAogICAgIENyZWF0ZUluamVjdGVkQnVuZGxlRW5kLAorICAgIFBhaW50U25hcHNob3RTdGFy dCwKKyAgICBQYWludFNuYXBzaG90RW5kLAorICAgIFJlbmRlclNlcnZlclNuYXBzaG90U3RhcnQs CisgICAgUmVuZGVyU2VydmVyU25hcHNob3RFbmQsCisgICAgVGFrZVNuYXBzaG90U3RhcnQsCisg ICAgVGFrZVNuYXBzaG90RW5kLAogCiAgICAgVUlQcm9jZXNzUmFuZ2UgPSAxNDAwMCwKICAgICBD b21taXRMYXllclRyZWVTdGFydCwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tCmluZGV4IGE4ZDY3NDc4YzFlNWM3YzZiMzY0ZmY0M2JhZjNjZjUwZGJm NjU2MTAuLjEzMzc5M2Y0MTI5MTAzNjcwNjdlNjRlMjM3YzcxNzc0ZjQyMzM3ODQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMTQ4LDYg KzE0OCw3IEBACiAjaW1wb3J0IDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbXBvcnQgPHd0Zi9P cHRpb25hbC5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgorI2ltcG9ydCA8d3RmL1N5c3Rl bVRyYWNpbmcuaD4KICNpbXBvcnQgPHd0Zi9VVUlELmg+CiAjaW1wb3J0IDx3dGYvY29jb2EvVmVj dG9yQ29jb2EuaD4KICNpbXBvcnQgPHd0Zi9zcGkvZGFyd2luL2R5bGRTUEkuaD4KQEAgLTExMDQs NiArMTEwNSw5IEBAIC0gKHZvaWQpX2V2YWx1YXRlSmF2YVNjcmlwdDooTlNTdHJpbmcgKilqYXZh U2NyaXB0U3RyaW5nIGFzQXN5bmNGdW5jdGlvbjooQk9PTClhCiAKIC0gKHZvaWQpdGFrZVNuYXBz aG90V2l0aENvbmZpZ3VyYXRpb246KFdLU25hcHNob3RDb25maWd1cmF0aW9uICopc25hcHNob3RD b25maWd1cmF0aW9uIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKENvY29hSW1hZ2UgKiwgTlNF cnJvciAqKSljb21wbGV0aW9uSGFuZGxlcgogeworICAgIGNvbnN0ZXhwciBib29sIHNuYXBzaG90 RmFpbGVkVHJhY2VWYWx1ZSA9IGZhbHNlOworICAgIHRyYWNlUG9pbnQoVGFrZVNuYXBzaG90U3Rh cnQpOworCiAgICAgQ0dSZWN0IHJlY3RJblZpZXdDb29yZGluYXRlcyA9IHNuYXBzaG90Q29uZmln dXJhdGlvbiAmJiAhQ0dSZWN0SXNOdWxsKHNuYXBzaG90Q29uZmlndXJhdGlvbi5yZWN0KSA/IHNu YXBzaG90Q29uZmlndXJhdGlvbi5yZWN0IDogc2VsZi5ib3VuZHM7CiAgICAgQ0dGbG9hdCBzbmFw c2hvdFdpZHRoOwogICAgIGlmIChzbmFwc2hvdENvbmZpZ3VyYXRpb24pCkBAIC0xMTI4LDEyICsx MTMyLDE0IEBAIC0gKHZvaWQpdGFrZVNuYXBzaG90V2l0aENvbmZpZ3VyYXRpb246KFdLU25hcHNo b3RDb25maWd1cmF0aW9uICopc25hcHNob3RDb25maWd1CiAgICAgLy8gaW4gc25hcHNob3RDb25m aWd1cmF0aW9uLmFmdGVyU2NyZWVuVXBkYXRlcyBhdCB0aGF0IHRpbWUuCiAgICAgX3BhZ2UtPnRh a2VTbmFwc2hvdChXZWJDb3JlOjplbmNsb3NpbmdJbnRSZWN0KHJlY3RJblZpZXdDb29yZGluYXRl cyksIGJpdG1hcFNpemUsIFdlYktpdDo6U25hcHNob3RPcHRpb25zSW5WaWV3Q29vcmRpbmF0ZXMs IFtoYW5kbGVyLCBzbmFwc2hvdFdpZHRoLCBpbWFnZUhlaWdodF0oY29uc3QgV2ViS2l0OjpTaGFy ZWFibGVCaXRtYXA6OkhhbmRsZSYgaW1hZ2VIYW5kbGUpIHsKICAgICAgICAgaWYgKGltYWdlSGFu ZGxlLmlzTnVsbCgpKSB7CisgICAgICAgICAgICB0cmFjZVBvaW50KFRha2VTbmFwc2hvdEVuZCwg c25hcHNob3RGYWlsZWRUcmFjZVZhbHVlKTsKICAgICAgICAgICAgIGhhbmRsZXIobmlsLCBjcmVh dGVOU0Vycm9yKFdLRXJyb3JVbmtub3duKS5nZXQoKSk7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KICAgICAgICAgYXV0byBiaXRtYXAgPSBXZWJLaXQ6OlNoYXJlYWJsZUJpdG1hcDo6 Y3JlYXRlKGltYWdlSGFuZGxlLCBXZWJLaXQ6OlNoYXJlZE1lbW9yeTo6UHJvdGVjdGlvbjo6UmVh ZE9ubHkpOwogICAgICAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY2dJbWFnZSA9IGJpdG1hcCA/ IGJpdG1hcC0+bWFrZUNHSW1hZ2UoKSA6IG51bGxwdHI7CiAgICAgICAgIGF1dG8gaW1hZ2UgPSBh ZG9wdE5TKFtbTlNJbWFnZSBhbGxvY10gaW5pdFdpdGhDR0ltYWdlOmNnSW1hZ2UuZ2V0KCkgc2l6 ZTpOU01ha2VTaXplKHNuYXBzaG90V2lkdGgsIGltYWdlSGVpZ2h0KV0pOworICAgICAgICB0cmFj ZVBvaW50KFRha2VTbmFwc2hvdEVuZCwgdHJ1ZSk7CiAgICAgICAgIGhhbmRsZXIoaW1hZ2UuZ2V0 KCksIG5pbCk7CiAgICAgfSk7CiAjZWxzZQpAQCAtMTE0OCw3ICsxMTU0LDggQEAgLSAodm9pZCl0 YWtlU25hcHNob3RXaXRoQ29uZmlndXJhdGlvbjooV0tTbmFwc2hvdENvbmZpZ3VyYXRpb24gKilz bmFwc2hvdENvbmZpZ3UKICAgICAgICAgICAgICAgICBlcnJvciA9IGNyZWF0ZU5TRXJyb3IoV0tF cnJvclVua25vd24pOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGltYWdlID0g YWRvcHROUyhbW1VJSW1hZ2UgYWxsb2NdIGluaXRXaXRoQ0dJbWFnZTpzbmFwc2hvdEltYWdlIHNj YWxlOmRldmljZVNjYWxlIG9yaWVudGF0aW9uOlVJSW1hZ2VPcmllbnRhdGlvblVwXSk7Ci0gICAg ICAgICAgICAKKworICAgICAgICAgICAgdHJhY2VQb2ludChUYWtlU25hcHNob3RFbmQsICEhc25h cHNob3RJbWFnZSk7CiAgICAgICAgICAgICBoYW5kbGVyKGltYWdlLmdldCgpLCBlcnJvci5nZXQo KSk7CiAgICAgICAgIH1dOwogICAgIH07CkBAIC0xMTYwLDYgKzExNjcsNyBAQCAtICh2b2lkKXRh a2VTbmFwc2hvdFdpdGhDb25maWd1cmF0aW9uOihXS1NuYXBzaG90Q29uZmlndXJhdGlvbiAqKXNu YXBzaG90Q29uZmlndQogCiAgICAgX3BhZ2UtPmNhbGxBZnRlck5leHRQcmVzZW50YXRpb25VcGRh dGUoW2NhbGxTbmFwc2hvdFJlY3QgPSBXVEZNb3ZlKGNhbGxTbmFwc2hvdFJlY3QpLCBoYW5kbGVy XShXZWJLaXQ6OkNhbGxiYWNrQmFzZTo6RXJyb3IgZXJyb3IpIHsKICAgICAgICAgaWYgKGVycm9y ICE9IFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcjo6Tm9uZSkgeworICAgICAgICAgICAgdHJh Y2VQb2ludChUYWtlU25hcHNob3RFbmQsIHNuYXBzaG90RmFpbGVkVHJhY2VWYWx1ZSk7CiAgICAg ICAgICAgICBoYW5kbGVyKG5pbCwgY3JlYXRlTlNFcnJvcihXS0Vycm9yVW5rbm93bikuZ2V0KCkp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVGh1bWJuYWlsVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tUaHVtYm5haWxWaWV3Lm1tCmluZGV4IGJhOGNhNzQy NmUwMjI0ZTgzM2Y4OWIwNDA5MjFkNTM1NjUxYzVmMDguLjA2MTFiNTc5NmRiYjlmNmVjY2IwOTAw ZjJhMTM2N2ExNjI0N2NiN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tUaHVtYm5haWxWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tUaHVtYm5haWxWaWV3Lm1tCkBAIC0zNiw2ICszNiw3IEBACiAjaW1wb3J0 ICJXZWJQYWdlUHJveHkuaCIKICNpbXBvcnQgPHBhbC9zcGkvY2cvQ29yZUdyYXBoaWNzU1BJLmg+ CiAjaW1wb3J0IDx3dGYvTmFrZWRQdHIuaD4KKyNpbXBvcnQgPHd0Zi9TeXN0ZW1UcmFjaW5nLmg+ CiAKIC8vIEZJWE1FOiBNYWtlIGl0IHBvc3NpYmxlIHRvIGxlYXZlIGEgc25hcHNob3Qgb2YgdGhl IGNvbnRlbnQgcHJlc2VudGVkIGluIHRoZSBXS1ZpZXcgd2hpbGUgdGhlIHRodW1ibmFpbCBpcyBs aXZlLgogLy8gRklYTUU6IERvbid0IG1ha2UgbmV3IHNwZWN1bGF0aXZlIHRpbGVzIHdoaWxlIHRo dW1ibmFpbGVkLgpAQCAtMTIyLDYgKzEyMyw3IEBAIC0gKHZvaWQpcmVxdWVzdFNuYXBzaG90CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICB0cmFjZVBvaW50KFRha2VTbmFwc2hvdFN0YXJ0 KTsKICAgICBfd2FpdGluZ0ZvclNuYXBzaG90ID0gWUVTOwogCiAgICAgUmV0YWluUHRyPF9XS1Ro dW1ibmFpbFZpZXc+IHRodW1ibmFpbFZpZXcgPSBzZWxmOwpAQCAtMTQ0LDYgKzE0Niw3IEBAIC0g KHZvaWQpcmVxdWVzdFNuYXBzaG90CiAgICAgX3dlYlBhZ2VQcm94eS0+dGFrZVNuYXBzaG90KHNu YXBzaG90UmVjdCwgYml0bWFwU2l6ZSwgb3B0aW9ucywgW3RodW1ibmFpbFZpZXddKGNvbnN0IFdl YktpdDo6U2hhcmVhYmxlQml0bWFwOjpIYW5kbGUmIGltYWdlSGFuZGxlKSB7CiAgICAgICAgIGF1 dG8gYml0bWFwID0gV2ViS2l0OjpTaGFyZWFibGVCaXRtYXA6OmNyZWF0ZShpbWFnZUhhbmRsZSwg V2ViS2l0OjpTaGFyZWRNZW1vcnk6OlByb3RlY3Rpb246OlJlYWRPbmx5KTsKICAgICAgICAgUmV0 YWluUHRyPENHSW1hZ2VSZWY+IGNnSW1hZ2UgPSBiaXRtYXAgPyBiaXRtYXAtPm1ha2VDR0ltYWdl KCkgOiBudWxscHRyOworICAgICAgICB0cmFjZVBvaW50KFRha2VTbmFwc2hvdEVuZCwgISFjZ0lt YWdlKTsKICAgICAgICAgW3RodW1ibmFpbFZpZXcgX2RpZFRha2VTbmFwc2hvdDpjZ0ltYWdlLmdl dCgpXTsKICAgICB9KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9pb3MvV0tXZWJWaWV3SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9X S1dlYlZpZXdJT1MubW0KaW5kZXggNzMwYzY1MTgyNzI2ZDdhMjIwMzhmYTc0OTQ4NWZkMjNmODhj YTMyMy4uMjBiZDAzZWRiMDFlMjY5ODBhYTgxZmVhMzQ4MzI2ZWQ1Njg1ZTFmYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KQEAgLTMwNzQs NiArMzA3NCw3IEBAIC0gKHZvaWQpX3NuYXBzaG90UmVjdDooQ0dSZWN0KXJlY3RJblZpZXdDb29y ZGluYXRlcyBpbnRvSW1hZ2VPZldpZHRoOihDR0Zsb2F0KWltCiAgICAgLy8gSWYgd2UgYXJlIHBh cmVudGVkIGFuZCBub3QgaGlkZGVuLCBhbmQgdGh1cyB3b24ndCBpbmN1ciBhIHNpZ25pZmljYW50 IHBlbmFsdHkgZnJvbSBwYWdpbmcgaW4gdGlsZXMsIHNuYXBzaG90IHRoZSB2aWV3IGhpZXJhcmNo eSBkaXJlY3RseS4KICAgICBOU1N0cmluZyAqZGlzcGxheU5hbWUgPSBzZWxmLndpbmRvdy5zY3Jl ZW4uZGlzcGxheUNvbmZpZ3VyYXRpb24ubmFtZTsKICAgICBpZiAoZGlzcGxheU5hbWUgJiYgIXNl bGYud2luZG93LmhpZGRlbikgeworICAgICAgICBUcmFjaW5nU2NvcGUgc25hcHNob3RTY29wZShS ZW5kZXJTZXJ2ZXJTbmFwc2hvdFN0YXJ0LCBSZW5kZXJTZXJ2ZXJTbmFwc2hvdEVuZCk7CiAgICAg ICAgIGF1dG8gc3VyZmFjZSA9IFdlYkNvcmU6OklPU3VyZmFjZTo6Y3JlYXRlKFdlYkNvcmU6OmV4 cGFuZGVkSW50U2l6ZShXZWJDb3JlOjpGbG9hdFNpemUoaW1hZ2VTaXplKSksIFdlYkNvcmU6OnNS R0JDb2xvclNwYWNlUmVmKCkpOwogICAgICAgICBpZiAoIXN1cmZhY2UpIHsKICAgICAgICAgICAg IGNvbXBsZXRpb25IYW5kbGVyKG51bGxwdHIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBiNzA2MWEwOGEyNDM5ZjliYjY4ODA2M2JiOThmZjIw MmUyN2QzMDM2Li4zZmNkZmViZmU2NWMzMjM4ZWE4N2U3ZjhkZWYxMDg3NzU5NmQzOGIwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMjU5LDYg KzI1OSw3IEBACiAjaW5jbHVkZSA8d3RmL1Byb2Nlc3NJRC5oPgogI2luY2x1ZGUgPHd0Zi9SdW5M b29wLmg+CiAjaW5jbHVkZSA8d3RmL1NldEZvclNjb3BlLmg+CisjaW5jbHVkZSA8d3RmL1N5c3Rl bVRyYWNpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0U3RyZWFtLmg+CiAKICNpZiBFTkFC TEUoQVBQX0hJR0hMSUdIVFMpCkBAIC0yNTM4LDYgKzI1MzksOCBAQCBSZWZQdHI8V2ViSW1hZ2U+ IFdlYlBhZ2U6OnNjYWxlZFNuYXBzaG90V2l0aE9wdGlvbnMoY29uc3QgSW50UmVjdCYgcmVjdCwg ZG91YmxlCiAKIHZvaWQgV2ViUGFnZTo6cGFpbnRTbmFwc2hvdEF0U2l6ZShjb25zdCBJbnRSZWN0 JiByZWN0LCBjb25zdCBJbnRTaXplJiBiaXRtYXBTaXplLCBTbmFwc2hvdE9wdGlvbnMgb3B0aW9u cywgRnJhbWUmIGZyYW1lLCBGcmFtZVZpZXcmIGZyYW1lVmlldywgR3JhcGhpY3NDb250ZXh0JiBn cmFwaGljc0NvbnRleHQpCiB7CisgICAgVHJhY2VTY29wZSBzbmFwc2hvdFNjb3BlKFBhaW50U25h cHNob3RTdGFydCwgUGFpbnRTbmFwc2hvdEVuZCwgb3B0aW9ucyk7CisKICAgICBJbnRSZWN0IHNu YXBzaG90UmVjdCA9IHJlY3Q7CiAgICAgZmxvYXQgaG9yaXpvbnRhbFNjYWxlRmFjdG9yID0gc3Rh dGljX2Nhc3Q8ZmxvYXQ+KGJpdG1hcFNpemUud2lkdGgoKSkgLyByZWN0LndpZHRoKCk7CiAgICAg ZmxvYXQgdmVydGljYWxTY2FsZUZhY3RvciA9IHN0YXRpY19jYXN0PGZsb2F0PihiaXRtYXBTaXpl LmhlaWdodCgpKSAvIHJlY3QuaGVpZ2h0KCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWIxMzIzY2RmMWRiNWI4ZGM5ZGJlNzA4NjkwMWMxOGQx NGQzODEwNS4uODRlOWEzMzY2M2ViZmJmM2QzMzE0MDU4ZTczNmI5ZjQ5OWM3NjkzZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIxLTA0LTIyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEFkZCB0cmFjZSBwb2ludHMgZm9yIFdLV2ViVmlldyBzbmFwc2hvdHRpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDk0MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5ldyBzbmFwc2hv dCBkZXNjcmlwdGlvbnMuCisKKyAgICAgICAgKiBUcmFjaW5nL1N5c3RlbVRyYWNlUG9pbnRzLnBs aXN0OgorCiAyMDIxLTA0LTIxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIEVuaGFuY2Ugc2Nyb2xsaW5nLXJlbGF0ZWQgdHJhY2UgcG9pbnRzCmRpZmYg LS1naXQgYS9Ub29scy9UcmFjaW5nL1N5c3RlbVRyYWNlUG9pbnRzLnBsaXN0IGIvVG9vbHMvVHJh Y2luZy9TeXN0ZW1UcmFjZVBvaW50cy5wbGlzdAppbmRleCA4NTZjZjczMTI4Yjk4MDZkZGM4OWIz ZDI3Y2YwNjFkYTdiOTNjYTc2Li4wN2M0MzdlM2QyMTA2M2Q0ZjNmYmRmOWE1YWZhYzY1NDkzMzEw MmQ5IDEwMDY0NAotLS0gYS9Ub29scy9UcmFjaW5nL1N5c3RlbVRyYWNlUG9pbnRzLnBsaXN0Cisr KyBiL1Rvb2xzL1RyYWNpbmcvU3lzdGVtVHJhY2VQb2ludHMucGxpc3QKQEAgLTUxMCw2ICs1MTAs NTIgQEAKICAgICAgICAgICAgICAgICAgPGtleT5Db2RlRW5kPC9rZXk+CiAgICAgICAgICAgICAg ICAgIDxzdHJpbmc+MTIwMTg8L3N0cmluZz4KICAgICAgICAgICAgICA8L2RpY3Q+CisgICAgICAg ICAgICAgPGRpY3Q+CisgICAgICAgICAgICAgICAgIDxrZXk+TmFtZTwva2V5PgorICAgICAgICAg ICAgICAgICA8c3RyaW5nPlBhaW50IHNuYXBzaG90PC9zdHJpbmc+CisgICAgICAgICAgICAgICAg IDxrZXk+VHlwZTwva2V5PgorICAgICAgICAgICAgICAgICA8c3RyaW5nPkludGVydmFsPC9zdHJp bmc+CisgICAgICAgICAgICAgICAgIDxrZXk+Q29tcG9uZW50PC9rZXk+CisgICAgICAgICAgICAg ICAgIDxzdHJpbmc+NDc8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPGtleT5Db2RlQmVnaW48 L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz4xMjAxOTwvc3RyaW5nPgorICAgICAgICAg ICAgICAgICA8a2V5PkNvZGVFbmQ8L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz4xMjAy MDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8a2V5PkFyZ05hbWVzQmVnaW48L2tleT4KKyAg ICAgICAgICAgICAgICAgPGRpY3Q+CisgICAgICAgICAgICAgICAgICAgICA8a2V5PkFyZzE8L2tl eT4KKyAgICAgICAgICAgICAgICAgICAgIDxzdHJpbmc+T3B0aW9uczwvc3RyaW5nPgorICAgICAg ICAgICAgICAgICA8L2RpY3Q+CisgICAgICAgICAgICAgPC9kaWN0PgorICAgICAgICAgICAgIDxk aWN0PgorICAgICAgICAgICAgICAgICA8a2V5Pk5hbWU8L2tleT4KKyAgICAgICAgICAgICAgICAg PHN0cmluZz5SZW5kZXIgc2VydmVyIHNuYXBzaG90PC9zdHJpbmc+CisgICAgICAgICAgICAgICAg IDxrZXk+VHlwZTwva2V5PgorICAgICAgICAgICAgICAgICA8c3RyaW5nPkludGVydmFsPC9zdHJp bmc+CisgICAgICAgICAgICAgICAgIDxrZXk+Q29tcG9uZW50PC9rZXk+CisgICAgICAgICAgICAg ICAgIDxzdHJpbmc+NDc8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPGtleT5Db2RlQmVnaW48 L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz4xMjAyMTwvc3RyaW5nPgorICAgICAgICAg ICAgICAgICA8a2V5PkNvZGVFbmQ8L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz4xMjAy Mjwvc3RyaW5nPgorICAgICAgICAgICAgIDwvZGljdD4KKyAgICAgICAgICAgICA8ZGljdD4KKyAg ICAgICAgICAgICAgICAgPGtleT5OYW1lPC9rZXk+CisgICAgICAgICAgICAgICAgIDxzdHJpbmc+ VGFrZSBzbmFwc2hvdDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8a2V5PlR5cGU8L2tleT4K KyAgICAgICAgICAgICAgICAgPHN0cmluZz5JbnRlcnZhbDwvc3RyaW5nPgorICAgICAgICAgICAg ICAgICA8a2V5PkNvbXBvbmVudDwva2V5PgorICAgICAgICAgICAgICAgICA8c3RyaW5nPjQ3PC9z dHJpbmc+CisgICAgICAgICAgICAgICAgIDxrZXk+Q29kZUJlZ2luPC9rZXk+CisgICAgICAgICAg ICAgICAgIDxzdHJpbmc+MTIwMjM8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPGtleT5Db2Rl RW5kPC9rZXk+CisgICAgICAgICAgICAgICAgIDxzdHJpbmc+MTIwMjQ8L3N0cmluZz4KKyAgICAg ICAgICAgICAgICAgPGtleT5BcmdOYW1lc0VuZDwva2V5PgorICAgICAgICAgICAgICAgICA8ZGlj dD4KKyAgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMTwva2V5PgorICAgICAgICAgICAgICAg ICAgICAgPHN0cmluZz5TdWNjZWVkZWQ8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPC9kaWN0 PgorICAgICAgICAgICAgIDwvZGljdD4KICAgICAgICAgICAgICA8ZGljdD4KICAgICAgICAgICAg ICAgICAgPGtleT5OYW1lPC9rZXk+CiAgICAgICAgICAgICAgICAgIDxzdHJpbmc+Q29tbWl0IFJl bW90ZUxheWVyVHJlZSB0cmFuc2FjdGlvbjwvc3RyaW5nPgo= 426853 2021-04-22 14:42:17 -0700 2021-04-22 14:42:17 -0700 Patch bug-224943-20210422144216.patch text/plain 12046 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGIwYzBlMTY5ZDk4OWE0NjAyZjAyNjY5 ZjZlNzZhYzVjN2QwMmNlYzYuLmZlY2Q0NDk2MzU2MTJjYjJjZTI2ZmRmZDZjZWI3MzJlZDFmM2Vh ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDQtMjIgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHRyYWNlIHBvaW50cyBmb3IgV0tXZWJW aWV3IHNuYXBzaG90dGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI0OTQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAg ICAgICBOZXcgc25hcHNob3QgdmFsdWVzLgorCisgICAgICAgICogd3RmL1N5c3RlbVRyYWNpbmcu aDoKKwogMjAyMS0wNC0yMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBFbmhhbmNlIHNjcm9sbGluZy1yZWxhdGVkIHRyYWNlIHBvaW50cwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpp bmRleCAwYWM4YmEzZWM1YzQ4YmY0MzQzZTBiOTIzOTVhMjQ2MjZhODZiNmRlLi5iMWMwYWU2Mzkw ZmJjNzZiNTYwYmUyMTg4MWRlMjY5M2NhZTAwMzk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBA CisyMDIxLTA0LTIyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisg ICAgICAgIEFkZCB0cmFjZSBwb2ludHMgZm9yIFdLV2ViVmlldyBzbmFwc2hvdHRpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDk0MworCisgICAg ICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgQWRkIG5ldyB0cmFjZSBwb2lu dHMgdG8gbWFrZSBzbmFwc2hvdHRpbmctcmVsYXRlZCBpc3N1ZXMgZWFzaWVyIHRvIGRpYWdub3Nl LiBJbiB0aGUgVUkKKyAgICAgICAgcHJvY2VzcyB3ZSBzdGFydC9lbmQgYSB0cmFjZSBzY29wZSB3 aGVuIHJlcXVlc3RlZCB0byBzbmFwc2hvdCwgYW5kIGJlZm9yZSBjYWxsaW5nIHRoZQorICAgICAg ICBjbGllbnQncyBjb21wbGV0aW9uIGhhbmRsZXIuCisKKyAgICAgICAgVHJhY2UgQ0FSZW5kZXJT ZXJ2ZXIgc25hcHNob3RzIHdoaWNoIGhhcHBlbiBpbiB0aGUgVUkgcHJvY2VzcywgYW5kIGluIHRo ZSB3ZWIgcHJvY2VzcywgdHJhY2UKKyAgICAgICAgdGhlIHN0YXJ0IGFuZCBlbmQgb2YgdGhlIHNu YXBzaG90IHBhaW50aW5nLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyB0YWtlU25hcHNob3RXaXRoQ29uZmlndXJhdGlv bjpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19X S1RodW1ibmFpbFZpZXcubW06CisgICAgICAgICgtW19XS1RodW1ibmFpbFZpZXcgcmVxdWVzdFNu YXBzaG90XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tOgor ICAgICAgICAoLVtXS1dlYlZpZXcgX3NuYXBzaG90UmVjdDppbnRvSW1hZ2VPZldpZHRoOmNvbXBs ZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cGFpbnRTbmFwc2hvdEF0U2l6ZSk6CisKIDIw MjEtMDQtMjEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAg ICAgRW5oYW5jZSBzY3JvbGxpbmctcmVsYXRlZCB0cmFjZSBwb2ludHMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XVEYvd3RmL1N5c3RlbVRyYWNpbmcuaCBiL1NvdXJjZS9XVEYvd3RmL1N5c3RlbVRyYWNp bmcuaAppbmRleCA0Y2E3ZGZhMDgyYTMwMzk0ZmM2OThmZDVjMjQzNzdkODU5YjNlNjcxLi4yY2Jj MjQ2MTVmYWVkYjc4MDNlNzcxM2IxZGU4NGRjNDY0MDJmZWZmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V1RGL3d0Zi9TeXN0ZW1UcmFjaW5nLmgKKysrIGIvU291cmNlL1dURi93dGYvU3lzdGVtVHJhY2lu Zy5oCkBAIC0xMTksNiArMTE5LDEyIEBAIGVudW0gVHJhY2VQb2ludENvZGUgewogICAgIEZsdXNo UmVtb3RlSW1hZ2VCdWZmZXJFbmQsCiAgICAgQ3JlYXRlSW5qZWN0ZWRCdW5kbGVTdGFydCwKICAg ICBDcmVhdGVJbmplY3RlZEJ1bmRsZUVuZCwKKyAgICBQYWludFNuYXBzaG90U3RhcnQsCisgICAg UGFpbnRTbmFwc2hvdEVuZCwKKyAgICBSZW5kZXJTZXJ2ZXJTbmFwc2hvdFN0YXJ0LAorICAgIFJl bmRlclNlcnZlclNuYXBzaG90RW5kLAorICAgIFRha2VTbmFwc2hvdFN0YXJ0LAorICAgIFRha2VT bmFwc2hvdEVuZCwKIAogICAgIFVJUHJvY2Vzc1JhbmdlID0gMTQwMDAsCiAgICAgQ29tbWl0TGF5 ZXJUcmVlU3RhcnQsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQppbmRleCBhOGQ2NzQ3OGMxZTVjN2M2YjM2NGZmNDNiYWYzY2Y1MGRiZjY1NjEwLi4x MzM3OTNmNDEyOTEwMzY3MDY3ZTY0ZTIzN2M3MTc3NGY0MjMzNzg0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTE0OCw2ICsxNDgsNyBA QAogI2ltcG9ydCA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW1wb3J0IDx3dGYvT3B0aW9uYWwu aD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KKyNpbXBvcnQgPHd0Zi9TeXN0ZW1UcmFjaW5n Lmg+CiAjaW1wb3J0IDx3dGYvVVVJRC5oPgogI2ltcG9ydCA8d3RmL2NvY29hL1ZlY3RvckNvY29h Lmg+CiAjaW1wb3J0IDx3dGYvc3BpL2Rhcndpbi9keWxkU1BJLmg+CkBAIC0xMTA0LDYgKzExMDUs OSBAQCAtICh2b2lkKV9ldmFsdWF0ZUphdmFTY3JpcHQ6KE5TU3RyaW5nICopamF2YVNjcmlwdFN0 cmluZyBhc0FzeW5jRnVuY3Rpb246KEJPT0wpYQogCiAtICh2b2lkKXRha2VTbmFwc2hvdFdpdGhD b25maWd1cmF0aW9uOihXS1NuYXBzaG90Q29uZmlndXJhdGlvbiAqKXNuYXBzaG90Q29uZmlndXJh dGlvbiBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCheKShDb2NvYUltYWdlICosIE5TRXJyb3IgKikp Y29tcGxldGlvbkhhbmRsZXIKIHsKKyAgICBjb25zdGV4cHIgYm9vbCBzbmFwc2hvdEZhaWxlZFRy YWNlVmFsdWUgPSBmYWxzZTsKKyAgICB0cmFjZVBvaW50KFRha2VTbmFwc2hvdFN0YXJ0KTsKKwog ICAgIENHUmVjdCByZWN0SW5WaWV3Q29vcmRpbmF0ZXMgPSBzbmFwc2hvdENvbmZpZ3VyYXRpb24g JiYgIUNHUmVjdElzTnVsbChzbmFwc2hvdENvbmZpZ3VyYXRpb24ucmVjdCkgPyBzbmFwc2hvdENv bmZpZ3VyYXRpb24ucmVjdCA6IHNlbGYuYm91bmRzOwogICAgIENHRmxvYXQgc25hcHNob3RXaWR0 aDsKICAgICBpZiAoc25hcHNob3RDb25maWd1cmF0aW9uKQpAQCAtMTEyOCwxMiArMTEzMiwxNCBA QCAtICh2b2lkKXRha2VTbmFwc2hvdFdpdGhDb25maWd1cmF0aW9uOihXS1NuYXBzaG90Q29uZmln dXJhdGlvbiAqKXNuYXBzaG90Q29uZmlndQogICAgIC8vIGluIHNuYXBzaG90Q29uZmlndXJhdGlv bi5hZnRlclNjcmVlblVwZGF0ZXMgYXQgdGhhdCB0aW1lLgogICAgIF9wYWdlLT50YWtlU25hcHNo b3QoV2ViQ29yZTo6ZW5jbG9zaW5nSW50UmVjdChyZWN0SW5WaWV3Q29vcmRpbmF0ZXMpLCBiaXRt YXBTaXplLCBXZWJLaXQ6OlNuYXBzaG90T3B0aW9uc0luVmlld0Nvb3JkaW5hdGVzLCBbaGFuZGxl ciwgc25hcHNob3RXaWR0aCwgaW1hZ2VIZWlnaHRdKGNvbnN0IFdlYktpdDo6U2hhcmVhYmxlQml0 bWFwOjpIYW5kbGUmIGltYWdlSGFuZGxlKSB7CiAgICAgICAgIGlmIChpbWFnZUhhbmRsZS5pc051 bGwoKSkgeworICAgICAgICAgICAgdHJhY2VQb2ludChUYWtlU25hcHNob3RFbmQsIHNuYXBzaG90 RmFpbGVkVHJhY2VWYWx1ZSk7CiAgICAgICAgICAgICBoYW5kbGVyKG5pbCwgY3JlYXRlTlNFcnJv cihXS0Vycm9yVW5rbm93bikuZ2V0KCkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAgICAgICAgIGF1dG8gYml0bWFwID0gV2ViS2l0OjpTaGFyZWFibGVCaXRtYXA6OmNyZWF0ZShp bWFnZUhhbmRsZSwgV2ViS2l0OjpTaGFyZWRNZW1vcnk6OlByb3RlY3Rpb246OlJlYWRPbmx5KTsK ICAgICAgICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IGNnSW1hZ2UgPSBiaXRtYXAgPyBiaXRtYXAt Pm1ha2VDR0ltYWdlKCkgOiBudWxscHRyOwogICAgICAgICBhdXRvIGltYWdlID0gYWRvcHROUyhb W05TSW1hZ2UgYWxsb2NdIGluaXRXaXRoQ0dJbWFnZTpjZ0ltYWdlLmdldCgpIHNpemU6TlNNYWtl U2l6ZShzbmFwc2hvdFdpZHRoLCBpbWFnZUhlaWdodCldKTsKKyAgICAgICAgdHJhY2VQb2ludChU YWtlU25hcHNob3RFbmQsIHRydWUpOwogICAgICAgICBoYW5kbGVyKGltYWdlLmdldCgpLCBuaWwp OwogICAgIH0pOwogI2Vsc2UKQEAgLTExNDgsNyArMTE1NCw4IEBAIC0gKHZvaWQpdGFrZVNuYXBz aG90V2l0aENvbmZpZ3VyYXRpb246KFdLU25hcHNob3RDb25maWd1cmF0aW9uICopc25hcHNob3RD b25maWd1CiAgICAgICAgICAgICAgICAgZXJyb3IgPSBjcmVhdGVOU0Vycm9yKFdLRXJyb3JVbmtu b3duKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBpbWFnZSA9IGFkb3B0TlMo W1tVSUltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6c25hcHNob3RJbWFnZSBzY2FsZTpkZXZp Y2VTY2FsZSBvcmllbnRhdGlvbjpVSUltYWdlT3JpZW50YXRpb25VcF0pOwotICAgICAgICAgICAg CisKKyAgICAgICAgICAgIHRyYWNlUG9pbnQoVGFrZVNuYXBzaG90RW5kLCAhIXNuYXBzaG90SW1h Z2UpOwogICAgICAgICAgICAgaGFuZGxlcihpbWFnZS5nZXQoKSwgZXJyb3IuZ2V0KCkpOwogICAg ICAgICB9XTsKICAgICB9OwpAQCAtMTE2MCw2ICsxMTY3LDcgQEAgLSAodm9pZCl0YWtlU25hcHNo b3RXaXRoQ29uZmlndXJhdGlvbjooV0tTbmFwc2hvdENvbmZpZ3VyYXRpb24gKilzbmFwc2hvdENv bmZpZ3UKIAogICAgIF9wYWdlLT5jYWxsQWZ0ZXJOZXh0UHJlc2VudGF0aW9uVXBkYXRlKFtjYWxs U25hcHNob3RSZWN0ID0gV1RGTW92ZShjYWxsU25hcHNob3RSZWN0KSwgaGFuZGxlcl0oV2ViS2l0 OjpDYWxsYmFja0Jhc2U6OkVycm9yIGVycm9yKSB7CiAgICAgICAgIGlmIChlcnJvciAhPSBXZWJL aXQ6OkNhbGxiYWNrQmFzZTo6RXJyb3I6Ok5vbmUpIHsKKyAgICAgICAgICAgIHRyYWNlUG9pbnQo VGFrZVNuYXBzaG90RW5kLCBzbmFwc2hvdEZhaWxlZFRyYWNlVmFsdWUpOwogICAgICAgICAgICAg aGFuZGxlcihuaWwsIGNyZWF0ZU5TRXJyb3IoV0tFcnJvclVua25vd24pLmdldCgpKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1RodW1ibmFpbFZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLVGh1bWJuYWlsVmlldy5tbQppbmRleCBiYThjYTc0MjZlMDIyNGU4 MzNmODliMDQwOTIxZDUzNTY1MWM1ZjA4Li4wNjExYjU3OTZkYmI5ZjZlY2NiMDkwMGYyYTEzNjdh MTYyNDdjYjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev X1dLVGh1bWJuYWlsVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvX1dLVGh1bWJuYWlsVmlldy5tbQpAQCAtMzYsNiArMzYsNyBAQAogI2ltcG9ydCAiV2ViUGFn ZVByb3h5LmgiCiAjaW1wb3J0IDxwYWwvc3BpL2NnL0NvcmVHcmFwaGljc1NQSS5oPgogI2ltcG9y dCA8d3RmL05ha2VkUHRyLmg+CisjaW1wb3J0IDx3dGYvU3lzdGVtVHJhY2luZy5oPgogCiAvLyBG SVhNRTogTWFrZSBpdCBwb3NzaWJsZSB0byBsZWF2ZSBhIHNuYXBzaG90IG9mIHRoZSBjb250ZW50 IHByZXNlbnRlZCBpbiB0aGUgV0tWaWV3IHdoaWxlIHRoZSB0aHVtYm5haWwgaXMgbGl2ZS4KIC8v IEZJWE1FOiBEb24ndCBtYWtlIG5ldyBzcGVjdWxhdGl2ZSB0aWxlcyB3aGlsZSB0aHVtYm5haWxl ZC4KQEAgLTEyMiw2ICsxMjMsNyBAQCAtICh2b2lkKXJlcXVlc3RTbmFwc2hvdAogICAgICAgICBy ZXR1cm47CiAgICAgfQogCisgICAgdHJhY2VQb2ludChUYWtlU25hcHNob3RTdGFydCk7CiAgICAg X3dhaXRpbmdGb3JTbmFwc2hvdCA9IFlFUzsKIAogICAgIFJldGFpblB0cjxfV0tUaHVtYm5haWxW aWV3PiB0aHVtYm5haWxWaWV3ID0gc2VsZjsKQEAgLTE0NCw2ICsxNDYsNyBAQCAtICh2b2lkKXJl cXVlc3RTbmFwc2hvdAogICAgIF93ZWJQYWdlUHJveHktPnRha2VTbmFwc2hvdChzbmFwc2hvdFJl Y3QsIGJpdG1hcFNpemUsIG9wdGlvbnMsIFt0aHVtYm5haWxWaWV3XShjb25zdCBXZWJLaXQ6OlNo YXJlYWJsZUJpdG1hcDo6SGFuZGxlJiBpbWFnZUhhbmRsZSkgewogICAgICAgICBhdXRvIGJpdG1h cCA9IFdlYktpdDo6U2hhcmVhYmxlQml0bWFwOjpjcmVhdGUoaW1hZ2VIYW5kbGUsIFdlYktpdDo6 U2hhcmVkTWVtb3J5OjpQcm90ZWN0aW9uOjpSZWFkT25seSk7CiAgICAgICAgIFJldGFpblB0cjxD R0ltYWdlUmVmPiBjZ0ltYWdlID0gYml0bWFwID8gYml0bWFwLT5tYWtlQ0dJbWFnZSgpIDogbnVs bHB0cjsKKyAgICAgICAgdHJhY2VQb2ludChUYWtlU25hcHNob3RFbmQsICEhY2dJbWFnZSk7CiAg ICAgICAgIFt0aHVtYm5haWxWaWV3IF9kaWRUYWtlU25hcHNob3Q6Y2dJbWFnZS5nZXQoKV07CiAg ICAgfSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dL V2ViVmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3 SU9TLm1tCmluZGV4IDczMGM2NTE4MjcyNmQ3YTIyMDM4ZmE3NDk0ODVmZDIzZjg4Y2EzMjMuLmZh ODg0ZmI5YTdlNTA4ODUwYTk0ZGIwMmIxOGUyZmFiMDYzZjUwZTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCkBAIC02MCw2ICs2MCw3IEBA CiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL1F1YXJ0ekNvcmVTUEkuaD4KICNpbXBvcnQgPHBhbC9z cGkvaW9zL0dyYXBoaWNzU2VydmljZXNTUEkuaD4KICNpbXBvcnQgPHd0Zi9CbG9ja1B0ci5oPgor I2ltcG9ydCA8d3RmL1N5c3RlbVRyYWNpbmcuaD4KICNpbXBvcnQgPHd0Zi9jb2NvYS9WZWN0b3JD b2NvYS5oPgogCiAjaWYgRU5BQkxFKERBVEFfREVURUNUSU9OKQpAQCAtMzA3NCw2ICszMDc1LDcg QEAgLSAodm9pZClfc25hcHNob3RSZWN0OihDR1JlY3QpcmVjdEluVmlld0Nvb3JkaW5hdGVzIGlu dG9JbWFnZU9mV2lkdGg6KENHRmxvYXQpaW0KICAgICAvLyBJZiB3ZSBhcmUgcGFyZW50ZWQgYW5k IG5vdCBoaWRkZW4sIGFuZCB0aHVzIHdvbid0IGluY3VyIGEgc2lnbmlmaWNhbnQgcGVuYWx0eSBm cm9tIHBhZ2luZyBpbiB0aWxlcywgc25hcHNob3QgdGhlIHZpZXcgaGllcmFyY2h5IGRpcmVjdGx5 LgogICAgIE5TU3RyaW5nICpkaXNwbGF5TmFtZSA9IHNlbGYud2luZG93LnNjcmVlbi5kaXNwbGF5 Q29uZmlndXJhdGlvbi5uYW1lOwogICAgIGlmIChkaXNwbGF5TmFtZSAmJiAhc2VsZi53aW5kb3cu aGlkZGVuKSB7CisgICAgICAgIFRyYWNlU2NvcGUgc25hcHNob3RTY29wZShSZW5kZXJTZXJ2ZXJT bmFwc2hvdFN0YXJ0LCBSZW5kZXJTZXJ2ZXJTbmFwc2hvdEVuZCk7CiAgICAgICAgIGF1dG8gc3Vy ZmFjZSA9IFdlYkNvcmU6OklPU3VyZmFjZTo6Y3JlYXRlKFdlYkNvcmU6OmV4cGFuZGVkSW50U2l6 ZShXZWJDb3JlOjpGbG9hdFNpemUoaW1hZ2VTaXplKSksIFdlYkNvcmU6OnNSR0JDb2xvclNwYWNl UmVmKCkpOwogICAgICAgICBpZiAoIXN1cmZhY2UpIHsKICAgICAgICAgICAgIGNvbXBsZXRpb25I YW5kbGVyKG51bGxwdHIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAppbmRleCBiNzA2MWEwOGEyNDM5ZjliYjY4ODA2M2JiOThmZjIwMmUyN2QzMDM2Li4z ZmNkZmViZmU2NWMzMjM4ZWE4N2U3ZjhkZWYxMDg3NzU5NmQzOGIwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMjU5LDYgKzI1OSw3IEBACiAj aW5jbHVkZSA8d3RmL1Byb2Nlc3NJRC5oPgogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CiAjaW5j bHVkZSA8d3RmL1NldEZvclNjb3BlLmg+CisjaW5jbHVkZSA8d3RmL1N5c3RlbVRyYWNpbmcuaD4K ICNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0U3RyZWFtLmg+CiAKICNpZiBFTkFCTEUoQVBQX0hJR0hM SUdIVFMpCkBAIC0yNTM4LDYgKzI1MzksOCBAQCBSZWZQdHI8V2ViSW1hZ2U+IFdlYlBhZ2U6OnNj YWxlZFNuYXBzaG90V2l0aE9wdGlvbnMoY29uc3QgSW50UmVjdCYgcmVjdCwgZG91YmxlCiAKIHZv aWQgV2ViUGFnZTo6cGFpbnRTbmFwc2hvdEF0U2l6ZShjb25zdCBJbnRSZWN0JiByZWN0LCBjb25z dCBJbnRTaXplJiBiaXRtYXBTaXplLCBTbmFwc2hvdE9wdGlvbnMgb3B0aW9ucywgRnJhbWUmIGZy YW1lLCBGcmFtZVZpZXcmIGZyYW1lVmlldywgR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRl eHQpCiB7CisgICAgVHJhY2VTY29wZSBzbmFwc2hvdFNjb3BlKFBhaW50U25hcHNob3RTdGFydCwg UGFpbnRTbmFwc2hvdEVuZCwgb3B0aW9ucyk7CisKICAgICBJbnRSZWN0IHNuYXBzaG90UmVjdCA9 IHJlY3Q7CiAgICAgZmxvYXQgaG9yaXpvbnRhbFNjYWxlRmFjdG9yID0gc3RhdGljX2Nhc3Q8Zmxv YXQ+KGJpdG1hcFNpemUud2lkdGgoKSkgLyByZWN0LndpZHRoKCk7CiAgICAgZmxvYXQgdmVydGlj YWxTY2FsZUZhY3RvciA9IHN0YXRpY19jYXN0PGZsb2F0PihiaXRtYXBTaXplLmhlaWdodCgpKSAv IHJlY3QuaGVpZ2h0KCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggOWIxMzIzY2RmMWRiNWI4ZGM5ZGJlNzA4NjkwMWMxOGQxNGQzODEwNS4uZDM4 ZTE2Mjc2YWUxZTE1NDQ5MGM4MDRiOGUyMjBlOGZlYTkwNDA0ZiAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA0 LTIyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFk ZCB0cmFjZSBwb2ludHMgZm9yIFdLV2ViVmlldyBzbmFwc2hvdHRpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDk0MworCisgICAgICAgIFJldmll d2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgTmV3IHNuYXBzaG90IGRlc2NyaXB0aW9ucy4K KworICAgICAgICAqIFRyYWNpbmcvU3lzdGVtVHJhY2VQb2ludHMucGxpc3Q6CisKIDIwMjEtMDQt MjEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRW5o YW5jZSBzY3JvbGxpbmctcmVsYXRlZCB0cmFjZSBwb2ludHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Ry YWNpbmcvU3lzdGVtVHJhY2VQb2ludHMucGxpc3QgYi9Ub29scy9UcmFjaW5nL1N5c3RlbVRyYWNl UG9pbnRzLnBsaXN0CmluZGV4IDg1NmNmNzMxMjhiOTgwNmRkYzg5YjNkMjdjZjA2MWRhN2I5M2Nh NzYuLjA3YzQzN2UzZDIxMDYzZDRmM2ZiZGY5YTVhZmFjNjU0OTMzMTAyZDkgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1RyYWNpbmcvU3lzdGVtVHJhY2VQb2ludHMucGxpc3QKKysrIGIvVG9vbHMvVHJhY2lu Zy9TeXN0ZW1UcmFjZVBvaW50cy5wbGlzdApAQCAtNTEwLDYgKzUxMCw1MiBAQAogICAgICAgICAg ICAgICAgICA8a2V5PkNvZGVFbmQ8L2tleT4KICAgICAgICAgICAgICAgICAgPHN0cmluZz4xMjAx ODwvc3RyaW5nPgogICAgICAgICAgICAgIDwvZGljdD4KKyAgICAgICAgICAgICA8ZGljdD4KKyAg ICAgICAgICAgICAgICAgPGtleT5OYW1lPC9rZXk+CisgICAgICAgICAgICAgICAgIDxzdHJpbmc+ UGFpbnQgc25hcHNob3Q8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPGtleT5UeXBlPC9rZXk+ CisgICAgICAgICAgICAgICAgIDxzdHJpbmc+SW50ZXJ2YWw8L3N0cmluZz4KKyAgICAgICAgICAg ICAgICAgPGtleT5Db21wb25lbnQ8L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz40Nzwv c3RyaW5nPgorICAgICAgICAgICAgICAgICA8a2V5PkNvZGVCZWdpbjwva2V5PgorICAgICAgICAg ICAgICAgICA8c3RyaW5nPjEyMDE5PC9zdHJpbmc+CisgICAgICAgICAgICAgICAgIDxrZXk+Q29k ZUVuZDwva2V5PgorICAgICAgICAgICAgICAgICA8c3RyaW5nPjEyMDIwPC9zdHJpbmc+CisgICAg ICAgICAgICAgICAgIDxrZXk+QXJnTmFtZXNCZWdpbjwva2V5PgorICAgICAgICAgICAgICAgICA8 ZGljdD4KKyAgICAgICAgICAgICAgICAgICAgIDxrZXk+QXJnMTwva2V5PgorICAgICAgICAgICAg ICAgICAgICAgPHN0cmluZz5PcHRpb25zPC9zdHJpbmc+CisgICAgICAgICAgICAgICAgIDwvZGlj dD4KKyAgICAgICAgICAgICA8L2RpY3Q+CisgICAgICAgICAgICAgPGRpY3Q+CisgICAgICAgICAg ICAgICAgIDxrZXk+TmFtZTwva2V5PgorICAgICAgICAgICAgICAgICA8c3RyaW5nPlJlbmRlciBz ZXJ2ZXIgc25hcHNob3Q8L3N0cmluZz4KKyAgICAgICAgICAgICAgICAgPGtleT5UeXBlPC9rZXk+ CisgICAgICAgICAgICAgICAgIDxzdHJpbmc+SW50ZXJ2YWw8L3N0cmluZz4KKyAgICAgICAgICAg ICAgICAgPGtleT5Db21wb25lbnQ8L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz40Nzwv c3RyaW5nPgorICAgICAgICAgICAgICAgICA8a2V5PkNvZGVCZWdpbjwva2V5PgorICAgICAgICAg ICAgICAgICA8c3RyaW5nPjEyMDIxPC9zdHJpbmc+CisgICAgICAgICAgICAgICAgIDxrZXk+Q29k ZUVuZDwva2V5PgorICAgICAgICAgICAgICAgICA8c3RyaW5nPjEyMDIyPC9zdHJpbmc+CisgICAg ICAgICAgICAgPC9kaWN0PgorICAgICAgICAgICAgIDxkaWN0PgorICAgICAgICAgICAgICAgICA8 a2V5Pk5hbWU8L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz5UYWtlIHNuYXBzaG90PC9z dHJpbmc+CisgICAgICAgICAgICAgICAgIDxrZXk+VHlwZTwva2V5PgorICAgICAgICAgICAgICAg ICA8c3RyaW5nPkludGVydmFsPC9zdHJpbmc+CisgICAgICAgICAgICAgICAgIDxrZXk+Q29tcG9u ZW50PC9rZXk+CisgICAgICAgICAgICAgICAgIDxzdHJpbmc+NDc8L3N0cmluZz4KKyAgICAgICAg ICAgICAgICAgPGtleT5Db2RlQmVnaW48L2tleT4KKyAgICAgICAgICAgICAgICAgPHN0cmluZz4x MjAyMzwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8a2V5PkNvZGVFbmQ8L2tleT4KKyAgICAg ICAgICAgICAgICAgPHN0cmluZz4xMjAyNDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8a2V5 PkFyZ05hbWVzRW5kPC9rZXk+CisgICAgICAgICAgICAgICAgIDxkaWN0PgorICAgICAgICAgICAg ICAgICAgICAgPGtleT5BcmcxPC9rZXk+CisgICAgICAgICAgICAgICAgICAgICA8c3RyaW5nPlN1 Y2NlZWRlZDwvc3RyaW5nPgorICAgICAgICAgICAgICAgICA8L2RpY3Q+CisgICAgICAgICAgICAg PC9kaWN0PgogICAgICAgICAgICAgIDxkaWN0PgogICAgICAgICAgICAgICAgICA8a2V5Pk5hbWU8 L2tleT4KICAgICAgICAgICAgICAgICAgPHN0cmluZz5Db21taXQgUmVtb3RlTGF5ZXJUcmVlIHRy YW5zYWN0aW9uPC9zdHJpbmc+Cg==