210952 2020-04-23 21:21:46 -0700 Move some post-renderingUpdate code into WebCore 2020-04-24 08:17:48 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 210884 1 simon.fraser simon.fraser koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1645073 0 simon.fraser 2020-04-23 21:21:46 -0700 Move some post-renderingUpdate code into WebCore 1645074 1 397421 simon.fraser 2020-04-23 21:24:14 -0700 Created attachment 397421 Patch 1645085 2 397427 simon.fraser 2020-04-23 22:13:15 -0700 Created attachment 397427 Patch 1645196 3 ews-feeder 2020-04-24 08:03:27 -0700 Committed r260643: <https://trac.webkit.org/changeset/260643> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397427. 1645197 4 webkit-bug-importer 2020-04-24 08:04:17 -0700 <rdar://problem/62313180> 397421 2020-04-23 21:24:14 -0700 2020-04-23 22:13:14 -0700 Patch bug-210952-20200423212413.patch text/plain 9061 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTllNDU5YzI1Yzk4N2Iy Njc1MWM3YzdjY2IyYzg5MWUwMzE2MmIzYS4uMjYxM2UzY2YyN2RjZGU2NzNiYTVjNTQ0ZTY1ZmI2 YjhkZTQ0NTYxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA0LTIzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgc29tZSBw b3N0LXJlbmRlcmluZ1VwZGF0ZSBjb2RlIGludG8gV2ViQ29yZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwOTUyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRmFjdG9yIHNvbWUgY29kZSBjYWxsZWQgYnkg dGhlIHZhcmlvdXMgRHJhd2luZ0FyZWEgc3ViY2xhc3NlcyBpbnRvIFBhZ2U6OmZpbmFsaXplUmVu ZGVyaW5nVXBkYXRlKCksCisgICAgICAgIHdpdGggc29tZSBmbGFncyB0byBjb250cm9sIGJlaGF2 aW9yIHRoYXQgZGlmZmVycyBiZXR3ZWVuIGRyYXdpbmcgYXJlYXMuCisKKyAgICAgICAgU2Nyb2xs aW5nQ29vcmRpbmF0b3I6OmNvbW1pdFRyZWVTdGF0ZUlmTmVlZGVkKCkgaXMgYSBuby1vcCBmb3Ig UmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3Igc28KKyAgICAgICAgaXQncyBmaW5lIHRvIGFsd2F5 cyBjYWxsIGl0LgorCisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBhZ2U6OnBhc3NpdmVUb3VjaEV2ZW50TGlzdGVuZXJSZWN0c0ZvclRlc3RpbmcpOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUpOgorICAgICAgICAqIHBh Z2UvUGFnZS5oOgorCiAyMDIwLTA0LTIzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgogCiAgICAgICAgIE1vdmUgdGhlIHN0b3JhZ2Ugb2YgRGlzcGxheUlEIGZyb20gQ2hy b21lIHRvIFBhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNGRmMjUyZjEyZWVlZTcxYzhiNzRmNWU1ZTg2OWFjMTVm NzYxNzVlZS4uYzJjYzZiNzdiNzdjNThlMjI4OGVmOTUwZTVhNmI3N2YxYjNlMTY2NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNCBAQAorMjAyMC0wNC0yMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHNvbWUgcG9zdC1yZW5kZXJpbmdVcGRhdGUg Y29kZSBpbnRvIFdlYkNvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMDk1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZhY3RvciBzb21lIGNvZGUgY2FsbGVkIGJ5IHRoZSB2YXJpb3VzIERyYXdpbmdB cmVhIHN1YmNsYXNzZXMgaW50byBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpLAorICAg ICAgICB3aXRoIHNvbWUgZmxhZ3MgdG8gY29udHJvbCBiZWhhdmlvciB0aGF0IGRpZmZlcnMgYmV0 d2VlbiBkcmF3aW5nIGFyZWFzLgorCisgICAgICAgIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpjb21t aXRUcmVlU3RhdGVJZk5lZWRlZCgpIGlzIGEgbm8tb3AgZm9yIFJlbW90ZVNjcm9sbGluZ0Nvb3Jk aW5hdG9yIHNvCisgICAgICAgIGl0J3MgZmluZSB0byBhbHdheXMgY2FsbCBpdC4KKworICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh Ojp1cGRhdGVSZW5kZXJpbmcpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUp OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToKKyAg ICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZVJlbmRl cmluZyk6CisKIDIwMjAtMDQtMjMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5j b20+CiAKICAgICAgICAgQm91bmNlIGRpc3BsYXlXYXNSZWZyZXNoZWQoKSB2aWEgRXZlbnREaXNw YXRjaGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCA1MGJlMmE0YjNjNGVlNmZiZGI0OTM3YzYyZjU2 NjhlOThhZmYzNDY1Li5jZDBhMTgyY2IzMzAzMWNmZDVlZGNhOWNjODkwOTEwMDFmMjVkM2YyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTUxNiw3ICs1MTYsNyBAQCBSZWY8RE9NUmVjdExpc3Q+IFBh Z2U6OnBhc3NpdmVUb3VjaEV2ZW50TGlzdGVuZXJSZWN0c0ZvclRlc3RpbmcoKQogICAgIH0KIAog ICAgIFZlY3RvcjxJbnRSZWN0PiByZWN0czsKLSAgICBpZiAoU2Nyb2xsaW5nQ29vcmRpbmF0b3Iq IHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gdGhpcy0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkKKyAg ICBpZiAoYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSB0aGlzLT5zY3JvbGxpbmdDb29yZGlu YXRvcigpKQogICAgICAgICByZWN0cy5hcHBlbmRWZWN0b3Ioc2Nyb2xsaW5nQ29vcmRpbmF0b3It PmFic29sdXRlRXZlbnRUcmFja2luZ1JlZ2lvbnMoKS5hc3luY2hyb25vdXNEaXNwYXRjaFJlZ2lv bi5yZWN0cygpKTsKIAogICAgIFZlY3RvcjxGbG9hdFF1YWQ+IHF1YWRzKHJlY3RzLnNpemUoKSk7 CkBAIC0xNDIyLDYgKzE0MjIsMjYgQEAgdm9pZCBQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5n KCkKICNlbmRpZgogfQogCit2b2lkIFBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKE9wdGlv blNldDxGaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZUZsYWdzPiBmbGFncykKK3sKKyAgICBhdXRvKiB2 aWV3ID0gbWFpbkZyYW1lKCkudmlldygpOworICAgIGlmICghdmlldykKKyAgICAgICAgcmV0dXJu OworCisgICAgaWYgKGZsYWdzLmNvbnRhaW5zKEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M6 OkludmFsaWRhdGVJbWFnZXNXaXRoQXN5bmNEZWNvZGVzKSkKKyAgICAgICAgdmlldy0+aW52YWxp ZGF0ZUltYWdlc1dpdGhBc3luY0RlY29kZXMoKTsKKworICAgIHZpZXctPmZsdXNoQ29tcG9zaXRp bmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpOworCisjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElO RykKKyAgICBpZiAoYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSB0aGlzLT5zY3JvbGxpbmdD b29yZGluYXRvcigpKSB7CisgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5jb21taXRUcmVl U3RhdGVJZk5lZWRlZCgpOworICAgICAgICBpZiAoZmxhZ3MuY29udGFpbnMoRmluYWxpemVSZW5k ZXJpbmdVcGRhdGVGbGFnczo6QXBwbHlTY3JvbGxpbmdUcmVlTGF5ZXJQb3NpdGlvbnMpKQorICAg ICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmFwcGx5U2Nyb2xsaW5nVHJlZUxheWVyUG9z aXRpb25zKCk7CisgICAgfQorI2VuZGlmCit9CisKIHZvaWQgUGFnZTo6c3VzcGVuZFNjcmlwdGVk QW5pbWF0aW9ucygpCiB7CiAgICAgbV9zY3JpcHRlZEFuaW1hdGlvbnNTdXNwZW5kZWQgPSB0cnVl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2UuaAppbmRleCBkNjM1OGQyZmVlMWJhYTE4YjMxMTlkNjc1OGZiMWNlZTBiMGIw ZjFkLi4xMDY3Y2Y3OGIzOGRjMWE4YmE1NWRhYTUxMWIxM2VhNTFiYTZiZDhkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bh Z2UuaApAQCAtMTY0LDYgKzE2NCwxMSBAQCBlbnVtIGNsYXNzIENvbXBvc2l0aW5nUG9saWN5IDog Ym9vbCB7CiAgICAgQ29uc2VydmF0aXZlLCAvLyBVc2VkIGluIGxvdyBtZW1vcnkgc2l0dWF0aW9u cy4KIH07CiAKK2VudW0gY2xhc3MgRmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncyA6IHVpbnQ4 X3QgeworICAgIEFwcGx5U2Nyb2xsaW5nVHJlZUxheWVyUG9zaXRpb25zLAorICAgIEludmFsaWRh dGVJbWFnZXNXaXRoQXN5bmNEZWNvZGVzLAorfTsKKwogY2xhc3MgUGFnZSA6IHB1YmxpYyBTdXBw bGVtZW50YWJsZTxQYWdlPiwgcHVibGljIENhbk1ha2VXZWFrUHRyPFBhZ2U+IHsKICAgICBXVEZf TUFLRV9OT05DT1BZQUJMRShQYWdlKTsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKQEAg LTQ4MSw2ICs0ODYsOCBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBsYXlvdXRJ Zk5lZWRlZCgpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgdXBkYXRlUmVuZGVyaW5nKCk7CiAg ICAgCisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShPcHRp b25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4pOworICAgIAogICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgc2NoZWR1bGVSZW5kZXJpbmdVcGRhdGUoKTsKICAgICB2b2lkIHNjaGVkdWxl VGltZWRSZW5kZXJpbmdVcGRhdGUoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh Lm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1Jl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tCmluZGV4IGY0MWZmMzEyNDRiOWUyY2UwOGVmYzUz Njc3NWE1ZmQ3NmEyMDg1YWUuLjEzNTNmMWJmZTkyNjU0ODljYTMxM2EwYWJmOWUwMDc3Y2Y1ZGVl NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxh eWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2lu Z0FyZWEubW0KQEAgLTMzOCwxMCArMzM4LDExIEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2lu Z0FyZWE6OnVwZGF0ZVJlbmRlcmluZygpCiAKICAgICBhZGRDb21taXRIYW5kbGVycygpOwogCisg ICAgT3B0aW9uU2V0PEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M+IGZsYWdzOwogICAgIGlm IChtX25leHRSZW5kZXJpbmdVcGRhdGVSZXF1aXJlc1N5bmNocm9ub3VzSW1hZ2VEZWNvZGluZykK LSAgICAgICAgbV93ZWJQYWdlLm1haW5GcmFtZVZpZXcoKS0+aW52YWxpZGF0ZUltYWdlc1dpdGhB c3luY0RlY29kZXMoKTsKKyAgICAgICAgZmxhZ3MuYWRkKEZpbmFsaXplUmVuZGVyaW5nVXBkYXRl RmxhZ3M6OkludmFsaWRhdGVJbWFnZXNXaXRoQXN5bmNEZWNvZGVzKTsKIAotICAgIG1fd2ViUGFn ZS5tYWluRnJhbWVWaWV3KCktPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1l cygpOworICAgIG1fd2ViUGFnZS5maW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShmbGFncyk7CiAKICAg ICAvLyBCZWNhdXNlIG91ciB2aWV3LXJlbGF0aXZlIG92ZXJsYXkgcm9vdCBsYXllciBpcyBub3Qg YXR0YWNoZWQgdG8gdGhlIEZyYW1lVmlldydzIEdyYXBoaWNzTGF5ZXIgdHJlZSwgd2UgbmVlZCB0 byBmbHVzaCBpdCBtYW51YWxseS4KICAgICBpZiAobV92aWV3T3ZlcmxheVJvb3RMYXllcikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZTFkOGIw YjBiN2YwZjE1M2JkNmU5NjdmZDBjZWEwMjk0ZTRlZmM1Ny4uZjI0MzdjMWYxNDVkZjRjOTZkNzU0 OGU0ZTRkZDk2ZDk3Y2UxYWI3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAKQEAgLTM4MTIsNiArMzgxMiwxMSBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0 ZVJlbmRlcmluZygpCiAgICAgbV9wYWdlLT51cGRhdGVSZW5kZXJpbmcoKTsKIH0KIAordm9pZCBX ZWJQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShPcHRpb25TZXQ8RmluYWxpemVSZW5kZXJp bmdVcGRhdGVGbGFncz4gZmxhZ3MpCit7CisgICAgbV9wYWdlLT5maW5hbGl6ZVJlbmRlcmluZ1Vw ZGF0ZShmbGFncyk7Cit9CisKIFdlYkluc3BlY3RvciogV2ViUGFnZTo6aW5zcGVjdG9yKExhenlD cmVhdGlvblBvbGljeSBiZWhhdmlvcikKIHsKICAgICBpZiAobV9pc0Nsb3NlZCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCAzMGYwMjM1ZTc5MGIzNmE4 ZDI5YTEwZjllZjI0YmEzNTUwNTBlMDZjLi5jMTJjMmM5NWUxYTg5ZmE1YTc1Njg1ODhkMTM4NGQ1 NWNhNzM1ZDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o CkBAIC0zNTEsNiArMzUxLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBsYXlvdXRJZk5lZWRlZCgp OwogICAgIHZvaWQgdXBkYXRlUmVuZGVyaW5nKCk7CisgICAgdm9pZCBmaW5hbGl6ZVJlbmRlcmlu Z1VwZGF0ZShPcHRpb25TZXQ8V2ViQ29yZTo6RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4p OwogCiAgICAgZW51bSBjbGFzcyBMYXp5Q3JlYXRpb25Qb2xpY3kgeyBVc2VFeGlzdGluZ09ubHks IENyZWF0ZUlmTmVlZGVkIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJl YS5tbQppbmRleCAwODc4YmViODVlNzEyNjc3ZjAwMmExMDc2ZTIwMzU3YjM4YTU0YWFiLi40YmI2 N2YyZjYwM2JlNDQ1NzAxNGZmMTA3YzVhODUxM2YwZjhkN2Y3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWEubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC00NzUsMTYgKzQ3NSwxMiBAQCB2b2lkIFRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVSZW5kZXJpbmcoVXBkYXRlUmVuZGVyaW5n VHlwZSBmbHVzaFR5cAogICAgICAgICAgICAgbV92aWV3T3ZlcmxheVJvb3RMYXllci0+Zmx1c2hD b21wb3NpdGluZ1N0YXRlKHZpc2libGVSZWN0KTsKIAogICAgICAgICBhZGRDb21taXRIYW5kbGVy cygpOwotICAgICAgICAKLSAgICAgICAgYm9vbCBkaWRGbHVzaEFsbEZyYW1lcyA9IG1fd2ViUGFn ZS5tYWluRnJhbWVWaWV3KCktPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1l cygpOwogCi0jaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElORykKLSAgICAgICAgaWYgKGF1dG8qIHNj cm9sbGluZ0Nvb3JkaW5hdG9yID0gbV93ZWJQYWdlLmNvcmVQYWdlKCktPnNjcm9sbGluZ0Nvb3Jk aW5hdG9yKCkpIHsKLSAgICAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5jb21taXRUcmVl U3RhdGVJZk5lZWRlZCgpOwotICAgICAgICAgICAgaWYgKGZsdXNoVHlwZSA9PSBVcGRhdGVSZW5k ZXJpbmdUeXBlOjpOb3JtYWwpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3It PmFwcGx5U2Nyb2xsaW5nVHJlZUxheWVyUG9zaXRpb25zKCk7Ci0gICAgICAgIH0KLSNlbmRpZgor ICAgICAgICBPcHRpb25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4gZmxhZ3M7Cisg ICAgICAgIGlmIChmbHVzaFR5cGUgPT0gVXBkYXRlUmVuZGVyaW5nVHlwZTo6Tm9ybWFsKQorICAg ICAgICAgICAgZmxhZ3MuYWRkKEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M6OkFwcGx5U2Ny b2xsaW5nVHJlZUxheWVyUG9zaXRpb25zKTsKKworICAgICAgICBtX3dlYlBhZ2UuZmluYWxpemVS ZW5kZXJpbmdVcGRhdGUoZmxhZ3MpOwogCiAgICAgICAgIC8vIElmIHdlIGhhdmUgYW4gYWN0aXZl IHRyYW5zaWVudCB6b29tLCB3ZSB3YW50IHRoZSB6b29tIHRvIHdpbiBvdmVyIGFueSBjaGFuZ2Vz CiAgICAgICAgIC8vIHRoYXQgV2ViQ29yZSBtYWtlcyB0byB0aGUgcmVsZXZhbnQgbGF5ZXJzLCBz byByZS1hcHBseSBvdXIgY2hhbmdlcyBhZnRlciBmbHVzaGluZy4KQEAgLTQ5NiwxMCArNDkyLDgg QEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlUmVuZGVyaW5nKFVw ZGF0ZVJlbmRlcmluZ1R5cGUgZmx1c2hUeXAKICAgICAgICAgICAgIG1fcGVuZGluZ0NhbGxiYWNr SURzLmNsZWFyKCk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoZGlkRmx1c2hBbGxGcmFtZXMp IHsKLSAgICAgICAgICAgIHNlbmREaWRGaXJzdExheWVyRmx1c2hJZk5lZWRlZCgpOwotICAgICAg ICAgICAgaW52YWxpZGF0ZVJlbmRlcmluZ1VwZGF0ZVJ1bkxvb3BPYnNlcnZlcigpOwotICAgICAg ICB9CisgICAgICAgIHNlbmREaWRGaXJzdExheWVyRmx1c2hJZk5lZWRlZCgpOworICAgICAgICBp bnZhbGlkYXRlUmVuZGVyaW5nVXBkYXRlUnVuTG9vcE9ic2VydmVyKCk7CiAgICAgfQogfQogCg== 397427 2020-04-23 22:13:15 -0700 2020-04-24 08:03:28 -0700 Patch bug-210952-20200423221315.patch text/plain 9085 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTllNDU5YzI1Yzk4N2Iy Njc1MWM3YzdjY2IyYzg5MWUwMzE2MmIzYS4uMjYxM2UzY2YyN2RjZGU2NzNiYTVjNTQ0ZTY1ZmI2 YjhkZTQ0NTYxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA0LTIzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgc29tZSBw b3N0LXJlbmRlcmluZ1VwZGF0ZSBjb2RlIGludG8gV2ViQ29yZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwOTUyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRmFjdG9yIHNvbWUgY29kZSBjYWxsZWQgYnkg dGhlIHZhcmlvdXMgRHJhd2luZ0FyZWEgc3ViY2xhc3NlcyBpbnRvIFBhZ2U6OmZpbmFsaXplUmVu ZGVyaW5nVXBkYXRlKCksCisgICAgICAgIHdpdGggc29tZSBmbGFncyB0byBjb250cm9sIGJlaGF2 aW9yIHRoYXQgZGlmZmVycyBiZXR3ZWVuIGRyYXdpbmcgYXJlYXMuCisKKyAgICAgICAgU2Nyb2xs aW5nQ29vcmRpbmF0b3I6OmNvbW1pdFRyZWVTdGF0ZUlmTmVlZGVkKCkgaXMgYSBuby1vcCBmb3Ig UmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3Igc28KKyAgICAgICAgaXQncyBmaW5lIHRvIGFsd2F5 cyBjYWxsIGl0LgorCisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBhZ2U6OnBhc3NpdmVUb3VjaEV2ZW50TGlzdGVuZXJSZWN0c0ZvclRlc3RpbmcpOgorICAgICAg ICAoV2ViQ29yZTo6UGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUpOgorICAgICAgICAqIHBh Z2UvUGFnZS5oOgorCiAyMDIwLTA0LTIzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgogCiAgICAgICAgIE1vdmUgdGhlIHN0b3JhZ2Ugb2YgRGlzcGxheUlEIGZyb20gQ2hy b21lIHRvIFBhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNGRmMjUyZjEyZWVlZTcxYzhiNzRmNWU1ZTg2OWFjMTVm NzYxNzVlZS4uYzJjYzZiNzdiNzdjNThlMjI4OGVmOTUwZTVhNmI3N2YxYjNlMTY2NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNCBAQAorMjAyMC0wNC0yMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHNvbWUgcG9zdC1yZW5kZXJpbmdVcGRhdGUg Y29kZSBpbnRvIFdlYkNvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMDk1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZhY3RvciBzb21lIGNvZGUgY2FsbGVkIGJ5IHRoZSB2YXJpb3VzIERyYXdpbmdB cmVhIHN1YmNsYXNzZXMgaW50byBQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpLAorICAg ICAgICB3aXRoIHNvbWUgZmxhZ3MgdG8gY29udHJvbCBiZWhhdmlvciB0aGF0IGRpZmZlcnMgYmV0 d2VlbiBkcmF3aW5nIGFyZWFzLgorCisgICAgICAgIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpjb21t aXRUcmVlU3RhdGVJZk5lZWRlZCgpIGlzIGEgbm8tb3AgZm9yIFJlbW90ZVNjcm9sbGluZ0Nvb3Jk aW5hdG9yIHNvCisgICAgICAgIGl0J3MgZmluZSB0byBhbHdheXMgY2FsbCBpdC4KKworICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh Ojp1cGRhdGVSZW5kZXJpbmcpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUp OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToKKyAg ICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZVJlbmRl cmluZyk6CisKIDIwMjAtMDQtMjMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5j b20+CiAKICAgICAgICAgQm91bmNlIGRpc3BsYXlXYXNSZWZyZXNoZWQoKSB2aWEgRXZlbnREaXNw YXRjaGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCA1MGJlMmE0YjNjNGVlNmZiZGI0OTM3YzYyZjU2 NjhlOThhZmYzNDY1Li5jZDBhMTgyY2IzMzAzMWNmZDVlZGNhOWNjODkwOTEwMDFmMjVkM2YyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTUxNiw3ICs1MTYsNyBAQCBSZWY8RE9NUmVjdExpc3Q+IFBh Z2U6OnBhc3NpdmVUb3VjaEV2ZW50TGlzdGVuZXJSZWN0c0ZvclRlc3RpbmcoKQogICAgIH0KIAog ICAgIFZlY3RvcjxJbnRSZWN0PiByZWN0czsKLSAgICBpZiAoU2Nyb2xsaW5nQ29vcmRpbmF0b3Iq IHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gdGhpcy0+c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkKKyAg ICBpZiAoYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSB0aGlzLT5zY3JvbGxpbmdDb29yZGlu YXRvcigpKQogICAgICAgICByZWN0cy5hcHBlbmRWZWN0b3Ioc2Nyb2xsaW5nQ29vcmRpbmF0b3It PmFic29sdXRlRXZlbnRUcmFja2luZ1JlZ2lvbnMoKS5hc3luY2hyb25vdXNEaXNwYXRjaFJlZ2lv bi5yZWN0cygpKTsKIAogICAgIFZlY3RvcjxGbG9hdFF1YWQ+IHF1YWRzKHJlY3RzLnNpemUoKSk7 CkBAIC0xNDIyLDYgKzE0MjIsMjYgQEAgdm9pZCBQYWdlOjpkb0FmdGVyVXBkYXRlUmVuZGVyaW5n KCkKICNlbmRpZgogfQogCit2b2lkIFBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKE9wdGlv blNldDxGaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZUZsYWdzPiBmbGFncykKK3sKKyAgICBhdXRvKiB2 aWV3ID0gbWFpbkZyYW1lKCkudmlldygpOworICAgIGlmICghdmlldykKKyAgICAgICAgcmV0dXJu OworCisgICAgaWYgKGZsYWdzLmNvbnRhaW5zKEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M6 OkludmFsaWRhdGVJbWFnZXNXaXRoQXN5bmNEZWNvZGVzKSkKKyAgICAgICAgdmlldy0+aW52YWxp ZGF0ZUltYWdlc1dpdGhBc3luY0RlY29kZXMoKTsKKworICAgIHZpZXctPmZsdXNoQ29tcG9zaXRp bmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpOworCisjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElO RykKKyAgICBpZiAoYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSB0aGlzLT5zY3JvbGxpbmdD b29yZGluYXRvcigpKSB7CisgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5jb21taXRUcmVl U3RhdGVJZk5lZWRlZCgpOworICAgICAgICBpZiAoZmxhZ3MuY29udGFpbnMoRmluYWxpemVSZW5k ZXJpbmdVcGRhdGVGbGFnczo6QXBwbHlTY3JvbGxpbmdUcmVlTGF5ZXJQb3NpdGlvbnMpKQorICAg ICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmFwcGx5U2Nyb2xsaW5nVHJlZUxheWVyUG9z aXRpb25zKCk7CisgICAgfQorI2VuZGlmCit9CisKIHZvaWQgUGFnZTo6c3VzcGVuZFNjcmlwdGVk QW5pbWF0aW9ucygpCiB7CiAgICAgbV9zY3JpcHRlZEFuaW1hdGlvbnNTdXNwZW5kZWQgPSB0cnVl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2UuaAppbmRleCBkNjM1OGQyZmVlMWJhYTE4YjMxMTlkNjc1OGZiMWNlZTBiMGIw ZjFkLi45NWYyMDY2ZmEwMTc1YTBiOTE1ZTQ5YWNjYzg3ZmViYjViZTNlMjY3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bh Z2UuaApAQCAtMTY0LDYgKzE2NCwxMSBAQCBlbnVtIGNsYXNzIENvbXBvc2l0aW5nUG9saWN5IDog Ym9vbCB7CiAgICAgQ29uc2VydmF0aXZlLCAvLyBVc2VkIGluIGxvdyBtZW1vcnkgc2l0dWF0aW9u cy4KIH07CiAKK2VudW0gY2xhc3MgRmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncyA6IHVpbnQ4 X3QgeworICAgIEFwcGx5U2Nyb2xsaW5nVHJlZUxheWVyUG9zaXRpb25zICAgID0gMSA8PCAwLAor ICAgIEludmFsaWRhdGVJbWFnZXNXaXRoQXN5bmNEZWNvZGVzICAgID0gMSA8PCAxLAorfTsKKwog Y2xhc3MgUGFnZSA6IHB1YmxpYyBTdXBwbGVtZW50YWJsZTxQYWdlPiwgcHVibGljIENhbk1ha2VX ZWFrUHRyPFBhZ2U+IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShQYWdlKTsKICAgICBXVEZf TUFLRV9GQVNUX0FMTE9DQVRFRDsKQEAgLTQ4MSw2ICs0ODYsOCBAQCBwdWJsaWM6CiAgICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBsYXlvdXRJZk5lZWRlZCgpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgdXBkYXRlUmVuZGVyaW5nKCk7CiAgICAgCisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBmaW5h bGl6ZVJlbmRlcmluZ1VwZGF0ZShPcHRpb25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFn cz4pOworICAgIAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2NoZWR1bGVSZW5kZXJpbmdVcGRh dGUoKTsKICAgICB2b2lkIHNjaGVkdWxlVGltZWRSZW5kZXJpbmdVcGRhdGUoKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1Jl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tCmluZGV4 IGY0MWZmMzEyNDRiOWUyY2UwOGVmYzUzNjc3NWE1ZmQ3NmEyMDg1YWUuLjEzNTNmMWJmZTkyNjU0 ODljYTMxM2EwYWJmOWUwMDc3Y2Y1ZGVlNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJl YS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRy ZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0KQEAgLTMzOCwxMCArMzM4LDExIEBAIHZv aWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OnVwZGF0ZVJlbmRlcmluZygpCiAKICAgICBh ZGRDb21taXRIYW5kbGVycygpOwogCisgICAgT3B0aW9uU2V0PEZpbmFsaXplUmVuZGVyaW5nVXBk YXRlRmxhZ3M+IGZsYWdzOwogICAgIGlmIChtX25leHRSZW5kZXJpbmdVcGRhdGVSZXF1aXJlc1N5 bmNocm9ub3VzSW1hZ2VEZWNvZGluZykKLSAgICAgICAgbV93ZWJQYWdlLm1haW5GcmFtZVZpZXco KS0+aW52YWxpZGF0ZUltYWdlc1dpdGhBc3luY0RlY29kZXMoKTsKKyAgICAgICAgZmxhZ3MuYWRk KEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlRmxhZ3M6OkludmFsaWRhdGVJbWFnZXNXaXRoQXN5bmNE ZWNvZGVzKTsKIAotICAgIG1fd2ViUGFnZS5tYWluRnJhbWVWaWV3KCktPmZsdXNoQ29tcG9zaXRp bmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpOworICAgIG1fd2ViUGFnZS5maW5hbGl6ZVJlbmRl cmluZ1VwZGF0ZShmbGFncyk7CiAKICAgICAvLyBCZWNhdXNlIG91ciB2aWV3LXJlbGF0aXZlIG92 ZXJsYXkgcm9vdCBsYXllciBpcyBub3QgYXR0YWNoZWQgdG8gdGhlIEZyYW1lVmlldydzIEdyYXBo aWNzTGF5ZXIgdHJlZSwgd2UgbmVlZCB0byBmbHVzaCBpdCBtYW51YWxseS4KICAgICBpZiAobV92 aWV3T3ZlcmxheVJvb3RMYXllcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAKaW5kZXggZTFkOGIwYjBiN2YwZjE1M2JkNmU5NjdmZDBjZWEwMjk0ZTRlZmM1 Ny4uZjI0MzdjMWYxNDVkZjRjOTZkNzU0OGU0ZTRkZDk2ZDk3Y2UxYWI3NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTM4MTIsNiArMzgxMiwx MSBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVJlbmRlcmluZygpCiAgICAgbV9wYWdlLT51cGRhdGVS ZW5kZXJpbmcoKTsKIH0KIAordm9pZCBXZWJQYWdlOjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShP cHRpb25TZXQ8RmluYWxpemVSZW5kZXJpbmdVcGRhdGVGbGFncz4gZmxhZ3MpCit7CisgICAgbV9w YWdlLT5maW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShmbGFncyk7Cit9CisKIFdlYkluc3BlY3Rvciog V2ViUGFnZTo6aW5zcGVjdG9yKExhenlDcmVhdGlvblBvbGljeSBiZWhhdmlvcikKIHsKICAgICBp ZiAobV9pc0Nsb3NlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aAppbmRleCAzMGYwMjM1ZTc5MGIzNmE4ZDI5YTEwZjllZjI0YmEzNTUwNTBlMDZjLi5jMTJjMmM5 NWUxYTg5ZmE1YTc1Njg1ODhkMTM4NGQ1NWNhNzM1ZDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0zNTEsNiArMzUxLDcgQEAgcHVibGljOgogCiAg ICAgdm9pZCBsYXlvdXRJZk5lZWRlZCgpOwogICAgIHZvaWQgdXBkYXRlUmVuZGVyaW5nKCk7Cisg ICAgdm9pZCBmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZShPcHRpb25TZXQ8V2ViQ29yZTo6RmluYWxp emVSZW5kZXJpbmdVcGRhdGVGbGFncz4pOwogCiAgICAgZW51bSBjbGFzcyBMYXp5Q3JlYXRpb25Q b2xpY3kgeyBVc2VFeGlzdGluZ09ubHksIENyZWF0ZUlmTmVlZGVkIH07CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYS5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQppbmRleCAwODc4YmViODVlNzEyNjc3ZjAwMmEx MDc2ZTIwMzU3YjM4YTU0YWFiLi40YmI2N2YyZjYwM2JlNDQ1NzAxNGZmMTA3YzVhODUxM2YwZjhk N2Y3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC00NzUs MTYgKzQ3NSwxMiBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVS ZW5kZXJpbmcoVXBkYXRlUmVuZGVyaW5nVHlwZSBmbHVzaFR5cAogICAgICAgICAgICAgbV92aWV3 T3ZlcmxheVJvb3RMYXllci0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlKHZpc2libGVSZWN0KTsKIAog ICAgICAgICBhZGRDb21taXRIYW5kbGVycygpOwotICAgICAgICAKLSAgICAgICAgYm9vbCBkaWRG bHVzaEFsbEZyYW1lcyA9IG1fd2ViUGFnZS5tYWluRnJhbWVWaWV3KCktPmZsdXNoQ29tcG9zaXRp bmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpOwogCi0jaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElO RykKLSAgICAgICAgaWYgKGF1dG8qIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gbV93ZWJQYWdlLmNv cmVQYWdlKCktPnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCkpIHsKLSAgICAgICAgICAgIHNjcm9sbGlu Z0Nvb3JkaW5hdG9yLT5jb21taXRUcmVlU3RhdGVJZk5lZWRlZCgpOwotICAgICAgICAgICAgaWYg KGZsdXNoVHlwZSA9PSBVcGRhdGVSZW5kZXJpbmdUeXBlOjpOb3JtYWwpCi0gICAgICAgICAgICAg ICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmFwcGx5U2Nyb2xsaW5nVHJlZUxheWVyUG9zaXRpb25z KCk7Ci0gICAgICAgIH0KLSNlbmRpZgorICAgICAgICBPcHRpb25TZXQ8RmluYWxpemVSZW5kZXJp bmdVcGRhdGVGbGFncz4gZmxhZ3M7CisgICAgICAgIGlmIChmbHVzaFR5cGUgPT0gVXBkYXRlUmVu ZGVyaW5nVHlwZTo6Tm9ybWFsKQorICAgICAgICAgICAgZmxhZ3MuYWRkKEZpbmFsaXplUmVuZGVy aW5nVXBkYXRlRmxhZ3M6OkFwcGx5U2Nyb2xsaW5nVHJlZUxheWVyUG9zaXRpb25zKTsKKworICAg ICAgICBtX3dlYlBhZ2UuZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoZmxhZ3MpOwogCiAgICAgICAg IC8vIElmIHdlIGhhdmUgYW4gYWN0aXZlIHRyYW5zaWVudCB6b29tLCB3ZSB3YW50IHRoZSB6b29t IHRvIHdpbiBvdmVyIGFueSBjaGFuZ2VzCiAgICAgICAgIC8vIHRoYXQgV2ViQ29yZSBtYWtlcyB0 byB0aGUgcmVsZXZhbnQgbGF5ZXJzLCBzbyByZS1hcHBseSBvdXIgY2hhbmdlcyBhZnRlciBmbHVz aGluZy4KQEAgLTQ5NiwxMCArNDkyLDggQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5n QXJlYTo6dXBkYXRlUmVuZGVyaW5nKFVwZGF0ZVJlbmRlcmluZ1R5cGUgZmx1c2hUeXAKICAgICAg ICAgICAgIG1fcGVuZGluZ0NhbGxiYWNrSURzLmNsZWFyKCk7CiAgICAgICAgIH0KIAotICAgICAg ICBpZiAoZGlkRmx1c2hBbGxGcmFtZXMpIHsKLSAgICAgICAgICAgIHNlbmREaWRGaXJzdExheWVy Rmx1c2hJZk5lZWRlZCgpOwotICAgICAgICAgICAgaW52YWxpZGF0ZVJlbmRlcmluZ1VwZGF0ZVJ1 bkxvb3BPYnNlcnZlcigpOwotICAgICAgICB9CisgICAgICAgIHNlbmREaWRGaXJzdExheWVyRmx1 c2hJZk5lZWRlZCgpOworICAgICAgICBpbnZhbGlkYXRlUmVuZGVyaW5nVXBkYXRlUnVuTG9vcE9i c2VydmVyKCk7CiAgICAgfQogfQogCg==