217407 2020-10-06 15:13:09 -0700 Reloading a view in its processTerminationHandler does not work reliably when using related views 2021-03-05 10:38:10 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 222011 222809 1 cdumez cdumez achristensen beidson bugs-noreply ggaren mcatanzaro webkit-bug-importer oldest_to_newest 1695336 0 cdumez 2020-10-06 15:13:09 -0700 Reloading a view in its processTerminationHandler does not work reliable when using related views. 1695341 1 410702 cdumez 2020-10-06 15:20:40 -0700 Created attachment 410702 Patch 1695346 2 webkit-bug-importer 2020-10-06 15:23:27 -0700 <rdar://problem/70019867> 1695351 3 410702 ggaren 2020-10-06 15:29:05 -0700 Comment on attachment 410702 Patch r=me 1695353 4 410703 cdumez 2020-10-06 15:32:11 -0700 Created attachment 410703 Patch 1695399 5 ews-feeder 2020-10-06 17:21:07 -0700 Committed r268097: <https://trac.webkit.org/changeset/268097> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410703. 1727549 6 mcatanzaro 2021-02-10 08:38:30 -0800 This introduced a regression in Epiphany. Previously, our web-process-terminated signal handler checked the URI of the web view to decide which page to reload. The Reload button in our crash page is hooked up to some JS that sets window.location to this URI. But since this commit, the web view changes its URI to an empty string before it emits web-process-terminated. So now when users click the Reload button, nothing happens. It's very easy to work around in Epiphany: we could simply remember the last non-empty URL and use that when loading the crash page. That's a bit messy, but it seems better than going back to synchronous loading that doesn't work properly for related views. But I wouldn't be surprised if other WebKit clients might be broken in the same way. 1729672 7 mcatanzaro 2021-02-16 08:00:49 -0800 Hm, even vanilla reload() cannot work anymore, because it would only reload an empty address and wind up with about:blank. So although we *can* work around this in the client, I'm not sure we should, because it seems like all clients would be affected. (Are you sure this didn't break Safari?) 1729679 8 cdumez 2021-02-16 08:27:21 -0800 (In reply to Michael Catanzaro from comment #7) > Hm, even vanilla reload() cannot work anymore, because it would only reload > an empty address and wind up with about:blank. So although we *can* work > around this in the client, I'm not sure we should, because it seems like all > clients would be affected. (Are you sure this didn't break Safari?) It did break Safari iirc and we fixed Safari. 1729697 9 mcatanzaro 2021-02-16 09:06:15 -0800 OK, my proposed Epiphany fix is https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/913 1729698 10 cdumez 2021-02-16 09:07:53 -0800 (In reply to Michael Catanzaro from comment #9) > OK, my proposed Epiphany fix is > https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/913 BTW, I would expect reload() to work. As a matter of fact, this is what WebKit's default crash handler does (when the client does not set a custom crash handler). 1729704 11 mcatanzaro 2021-02-16 09:14:19 -0800 That doesn't work on its own because before we can reload(), we have to do webkit_web_view_load_alternate_html(), and then whatever URI we pass to that is what will get reloaded. So we need to track the previous nonempty URI regardless, or we'll just wind up reloading an empty string. 1730028 12 cdumez 2021-02-16 17:14:46 -0800 (In reply to Michael Catanzaro from comment #11) > That doesn't work on its own because before we can reload(), we have to do > webkit_web_view_load_alternate_html(), and then whatever URI we pass to that > is what will get reloaded. So we need to track the previous nonempty URI > regardless, or we'll just wind up reloading an empty string. I see. I agree this is risky. I will see if I can find a better way to fix this. 1730039 13 cdumez 2021-02-16 17:37:27 -0800 (In reply to Chris Dumez from comment #12) > (In reply to Michael Catanzaro from comment #11) > > That doesn't work on its own because before we can reload(), we have to do > > webkit_web_view_load_alternate_html(), and then whatever URI we pass to that > > is what will get reloaded. So we need to track the previous nonempty URI > > regardless, or we'll just wind up reloading an empty string. > > I see. I agree this is risky. I will see if I can find a better way to fix > this. Fixing via Bug 222011. 1730250 14 mcatanzaro 2021-02-17 06:35:52 -0800 Ah cool, thanks. 410702 2020-10-06 15:20:40 -0700 2020-10-06 15:32:09 -0700 Patch bug-217407-20201006152039.patch text/plain 8219 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQwMzRlZmMyZWM2MDNmYWI1 N2NiYTI4MmJlNDc0NTVlMGIxMjE2ZDQuLjM4YmNlMjhkN2RiOThkMDE4ZDJlYzlmZTAxZmUyZTYy MjhkMTQ4ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjAtMTAtMDYgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWxvYWRpbmcgYSB2aWV3IGluIGl0 cyBwcm9jZXNzVGVybWluYXRpb25IYW5kbGVyIGRvZXMgbm90IHdvcmsgcmVsaWFibGUgd2hlbiB1 c2luZyByZWxhdGVkIHZpZXdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTc0MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZWxhdGVkIHdlYiB2aWV3cyBzaGFyZSB0aGUgc2FtZSBXZWJDb250ZW50IHBy b2Nlc3MuIFdoZW4gdGhpcyBwcm9jZXNzIGNyYXNoZXMsIHdlIGl0ZXJhdGUgb3ZlcgorICAgICAg ICB0aGUgbGlzdCBvZiBXZWJQYWdlUHJveHkgb2JqZWN0cyBzaGFyaW5nIHRoaXMgcHJvY2VzcyBh bmQgbGV0IHRoZW0ga25vdyB0aGF0IHRoZWlyIHByb2Nlc3MgaGFzCisgICAgICAgIGNyYXNoZWQu IFRoaXMgY2F1c2VzIHRoZSBXZWJQYWdlUHJveHkgdG8gcmVzZXQgaXRzIHN0YXRlIChzbyB0aGF0 IGl0IGlzIGF3YXJlIGl0IG5vIGxvbmdlciBoYXMKKyAgICAgICAgYSBydW5uaW5nIHByb2Nlc3Mp IGFuZCB0byBub3RpZnkgdGhlIGNsaWVudCBhcHBsaWNhdGlvbi4gQmVjYXVzZSB3ZSB3ZXJlIG5v dGlmeWluZyB0aGUgY2xpZW50CisgICAgICAgIGFwcGxpY2F0aW9uIHN5bmNocm9ub3VzbHksIHRo ZSBjbGllbnQgY291bGQgdHJpZ2dlciBhIGxvYWQgaW4gdGhlIHZpZXcgc3luY2hyb25vdXNseSB3 aGlsZSB3ZQorICAgICAgICBhcmUgc3RpbGwgaXRlcmF0aW5nIG92ZXIgdGhlIFdlYlBhZ2VQcm94 eSBvYmplY3RzLiBXaGVuIHRyaWdnZXJpbmcgYSBsb2FkIGluIGEgd2ViIHZpZXcgdGhhdAorICAg ICAgICBoYXMgbm8gcnVubmluZyBwcm9jZXNzLCB3ZSBub3JtYWxseSByZWxhdW5jaCBvbmUuIEhv d2V2ZXIsIGluIHRoZSBjYXNlIG9mIHJlbGF0ZWQgd2ViIHZpZXdzLAorICAgICAgICB0aGUgdmll dyB1c2VzIGl0cyByZWxhdGVkIHdlYnZpZXcncyBwcm9jZXNzLCByZWxhdW5jaGluZyBpdCBpZiBu ZWNlc3NhcnkuIFRoZSAncmVsYXVuY2hpbmcKKyAgICAgICAgaWYgbmVjZXNzYXJ5JyBwYXJ0IHdh cyBub3QgcmVsaWFibHkgaGFwcGVuaW5nIGhlcmUgYmVjYXVzZSB0aGUgcmVsYXRlZCB3ZWIgdmll dyBtYXkgbm90IGhhdmUKKyAgICAgICAgYmVlbiBub3RpZmllZCB5ZXQgdGhhdCBpdHMgV2ViUHJv Y2VzcyBoYXMgY3Jhc2hlZCAoc2luY2Ugd2UgYXJlIHN0aWxsIGl0ZXJhdGluZyBvdmVyIHRoZQor ICAgICAgICBwYWdlcyB0byBub3RpZnkgdGhlbSkuCisKKyAgICAgICAgVG8gYWRkcmVzcyB0aGUg aXNzdWUsIHdlIG5vdyBub3RpZnkgdGhlIGNsaWVudCBhc3luY2hyb25vdXNseSBvZiB0aGUgcHJv Y2VzcyB0ZXJtaW5hdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpc3BhdGNoUHJvY2Vzc0RpZFRlcm1p bmF0ZSk6CisKIDIwMjAtMTAtMDYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIEVuYWJsZSB2aWRlbyBjYXB0dXJlIGluIFdlYlByb2Nlc3MgYnkgZGVmYXVsdCBv biBNYWNPUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZjYz Yjc0ZDM4MjFjMDJiZGY1OTIwYzE4YTU4OTc3NzFjYTBhNWQxOC4uNTFmY2ZjYTA1YTRmNjFmZjg1 YjhjYjFkZTZlOWUwMDUyOWE3M2NiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCkBAIC03NDgwLDE0ICs3NDgwLDIyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaXNw YXRjaFByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uIHJlYXNvbikK IHsKICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKExvYWRpbmcsICJkaXNwYXRjaFBy b2Nlc3NEaWRUZXJtaW5hdGU6IHJlYXNvbiA9ICVkIiwgcmVhc29uKTsKIAotICAgIGJvb2wgaGFu ZGxlZEJ5Q2xpZW50ID0gZmFsc2U7Ci0gICAgaWYgKG1fbG9hZGVyQ2xpZW50KQotICAgICAgICBo YW5kbGVkQnlDbGllbnQgPSByZWFzb24gIT0gUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1 ZXN0ZWRCeUNsaWVudCAmJiBtX2xvYWRlckNsaWVudC0+cHJvY2Vzc0RpZENyYXNoKCp0aGlzKTsK LSAgICBlbHNlCi0gICAgICAgIGhhbmRsZWRCeUNsaWVudCA9IG1fbmF2aWdhdGlvbkNsaWVudC0+ cHJvY2Vzc0RpZFRlcm1pbmF0ZSgqdGhpcywgcmVhc29uKTsKKyAgICAvLyBXZSBub3RpZnkgdGhl IGNsaWVudCBhc3luY2hyb25vdXNseSBiZWNhdXNlIHNldmVyYWwgcGFnZXMgbWF5IHNoYXJlIHRo ZSBzYW1lIHByb2Nlc3MKKyAgICAvLyBhbmQgd2Ugd2FudCB0byBtYWtlIHN1cmUgYWxsIHBhZ2Vz IGFyZSBhd2FyZSB0aGVpciBwcm9jZXNzIGhhcyBjcmFzaGVkIGJlZm9yZSB0aGUKKyAgICAvLyB0 aGUgY2xpZW50IHJlYWN0cyB0byB0aGUgcHJvY2VzcyB0ZXJtaW5hdGlvbi4KKyAgICBSdW5Mb29w OjptYWluKCkuZGlzcGF0Y2goW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCBy ZWFzb25dIHsKKyAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgIHJldHVybjsKIAot ICAgIGlmICghaGFuZGxlZEJ5Q2xpZW50ICYmIHNob3VsZFJlbG9hZEFmdGVyUHJvY2Vzc1Rlcm1p bmF0aW9uKHJlYXNvbikpCi0gICAgICAgIHRyeVJlbG9hZEFmdGVyUHJvY2Vzc1Rlcm1pbmF0aW9u KCk7CisgICAgICAgIGJvb2wgaGFuZGxlZEJ5Q2xpZW50ID0gZmFsc2U7CisgICAgICAgIGlmICht X2xvYWRlckNsaWVudCkKKyAgICAgICAgICAgIGhhbmRsZWRCeUNsaWVudCA9IHJlYXNvbiAhPSBQ cm9jZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50ICYmIG1fbG9hZGVyQ2xp ZW50LT5wcm9jZXNzRGlkQ3Jhc2goKnRoaXMpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBo YW5kbGVkQnlDbGllbnQgPSBtX25hdmlnYXRpb25DbGllbnQtPnByb2Nlc3NEaWRUZXJtaW5hdGUo KnRoaXMsIHJlYXNvbik7CisKKyAgICAgICAgaWYgKCFoYW5kbGVkQnlDbGllbnQgJiYgc2hvdWxk UmVsb2FkQWZ0ZXJQcm9jZXNzVGVybWluYXRpb24ocmVhc29uKSkKKyAgICAgICAgICAgIHRyeVJl bG9hZEFmdGVyUHJvY2Vzc1Rlcm1pbmF0aW9uKCk7CisgICAgfSk7CiB9CiAKIHZvaWQgV2ViUGFn ZVByb3h5Ojp0cnlSZWxvYWRBZnRlclByb2Nlc3NUZXJtaW5hdGlvbigpCmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzFlNDdjZGY4NmU0YTUwYTQ2 NjA0YzQ3ZGY1MDQxZmFkMGI0YWE2Yy4uMGY3ODA1NzQ3NWZlMTliYWRiZGVjMDE0NjI0MGYxOGZj NTA2YmZiOCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTEwLTA2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CisKKyAgICAgICAgUmVsb2FkaW5nIGEgdmlldyBpbiBpdHMgcHJvY2Vzc1Rlcm1pbmF0 aW9uSGFuZGxlciBkb2VzIG5vdCB3b3JrIHJlbGlhYmxlIHdoZW4gdXNpbmcgcmVsYXRlZCB2aWV3 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDA3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIEFQ SSB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9XZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbToKKyAgICAgICAgKC1bTmF2aWdh dGlvbkRlbGVnYXRlV2l0aENyYXNoSGFuZGxlclRoYXRMb2Fkc0FnYWluIF93ZWJWaWV3OndlYkNv bnRlbnRQcm9jZXNzRGlkVGVybWluYXRlV2l0aFJlYXNvbjpdKToKKyAgICAgICAgKC1bTmF2aWdh dGlvbkRlbGVnYXRlV2l0aENyYXNoSGFuZGxlclRoYXRMb2Fkc0FnYWluIHdlYlZpZXc6ZGlkRmlu aXNoTmF2aWdhdGlvbjpdKToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIwLTEwLTA2ICBBZHJpYW4g UGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lP TihyMjY3Mzk5KTogW1dQRV0gQnVpbGQgYnJva2VuIHdpdGggRU5BQkxFX0FDQ0VTU0lCSUxJVFk9 T0ZGCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dl YkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9XZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbQppbmRleCAwMTRm NGQ3MTUxMTNhZWI0YTQ4ZWRiYTY1NWQ0ODg5YzY5NzJlZmEyLi43ZTI1MWQ3YjIyNTc4ZWE4YzZk YWFkOGE1MDY2ODg3ZmVkZTUyODA5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlLm1tCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nlc3NEaWRU ZXJtaW5hdGUubW0KQEAgLTMxLDggKzMxLDEwIEBACiAjaW1wb3J0IDxXZWJLaXQvV0tOYXZpZ2F0 aW9uUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CiAj aW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3Lmg+CisjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3Q29u ZmlndXJhdGlvblByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdQcml2YXRlLmg+ CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CisjaW1wb3J0IDx3dGYvVmVjdG9yLmg+CiAKIHN0 YXRpYyBib29sIGRpZENyYXNoOwogc3RhdGljIF9XS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbiBl eHBlY3RlZENyYXNoUmVhc29uOwpAQCAtNDIsNiArNDQsOSBAQCBzdGF0aWMgYm9vbCBzaG91bGRM b2FkQWdhaW5PbkNyYXNoOwogc3RhdGljIGJvb2wgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlOwogc3Rh dGljIGJvb2wgY2FsbGVkQWxsQ2FsbGJhY2tzOwogc3RhdGljIHVuc2lnbmVkIGNhbGxiYWNrQ291 bnQ7CitzdGF0aWMgdW5zaWduZWQgY3Jhc2hIYW5kbGVyQ291bnQ7CitzdGF0aWMgdW5zaWduZWQg bG9hZENvdW50Oworc3RhdGljIHVuc2lnbmVkIGV4cGVjdGVkTG9hZENvdW50OwogCiBzdGF0aWMg TlNTdHJpbmcgKnRlc3RIVE1MID0gQCI8c2NyaXB0PndpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRs ZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCdMT0FERUQnKTs8L3NjcmlwdD4iOwogCkBAIC0y NzcsMyArMjgyLDczIEBAIFRFU1QoV0tOYXZpZ2F0aW9uLCBQcm9jZXNzQ3Jhc2hEdXJpbmdDYWxs YmFjaykKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzbGVlcCgwLjUpOwogICAgIEVYUEVDVF9F USg2VSwgY2FsbGJhY2tDb3VudCk7CiB9CisKK0BpbnRlcmZhY2UgTmF2aWdhdGlvbkRlbGVnYXRl V2l0aENyYXNoSGFuZGxlclRoYXRMb2Fkc0FnYWluIDogTlNPYmplY3QgPFdLTmF2aWdhdGlvbkRl bGVnYXRlPgorQGVuZAorCitAaW1wbGVtZW50YXRpb24gTmF2aWdhdGlvbkRlbGVnYXRlV2l0aENy YXNoSGFuZGxlclRoYXRMb2Fkc0FnYWluCisKKy0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAq KXdlYlZpZXcgd2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uOihfV0tQcm9j ZXNzVGVybWluYXRpb25SZWFzb24pcmVhc29uCit7CisgICAgKytjcmFzaEhhbmRsZXJDb3VudDsK KworICAgIC8vIEF0dGVtcHQgdGhlIGxvYWQgYWdhaW4gc3luY2hyb25vdXNseS4KKyAgICBbd2Vi VmlldyBsb2FkSFRNTFN0cmluZzpAImZvbyIgYmFzZVVSTDpuaWxdOworfQorCistICh2b2lkKXdl YlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkRmluaXNoTmF2aWdhdGlvbjooV0tOYXZpZ2F0 aW9uICopbmF2aWdhdGlvbgoreworICAgIGlmICgrK2xvYWRDb3VudCA9PSBleHBlY3RlZExvYWRD b3VudCkKKyAgICAgICAgZmluaXNoZWRMb2FkID0gdHJ1ZTsKK30KKworQGVuZAorCitURVNUKFdL TmF2aWdhdGlvbiwgUmVsb2FkUmVsYXRlZFZpZXdzSW5Qcm9jZXNzRGlkVGVybWluYXRlKQorewor ICAgIGNvbnN0IHVuc2lnbmVkIG51bWJlck9mVmlld3MgPSAyMDsKKyAgICBhdXRvIGNvbmZpZ3Vy YXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOwor ICAgIGF1dG8gd2ViVmlldzEgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy YW1lOk5TTWFrZVJlY3QoMCwgMCwgMTAwLCAxMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlv bi5nZXQoKV0pOworCisgICAgVmVjdG9yPFJldGFpblB0cjxXS1dlYlZpZXc+PiB3ZWJWaWV3czsK KyAgICB3ZWJWaWV3cy5hcHBlbmQod2ViVmlldzEpOworCisgICAgY29uZmlndXJhdGlvbi5nZXQo KS5fcmVsYXRlZFdlYlZpZXcgPSB3ZWJWaWV3MS5nZXQoKTsKKyAgICBmb3IgKHVuc2lnbmVkIGkg PSAwOyBpIDwgbnVtYmVyT2ZWaWV3cyAtIDE7ICsraSkgeworICAgICAgICBhdXRvIHdlYlZpZXcg PSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwg MCwgMTAwLCAxMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgICAg ICB3ZWJWaWV3cy5hcHBlbmQod2ViVmlldyk7CisgICAgfQorICAgIGF1dG8gZGVsZWdhdGUgPSBh ZG9wdE5TKFtbTmF2aWdhdGlvbkRlbGVnYXRlV2l0aENyYXNoSGFuZGxlclRoYXRMb2Fkc0FnYWlu IGFsbG9jXSBpbml0XSk7CisgICAgZm9yIChhdXRvJiB3ZWJWaWV3IDogd2ViVmlld3MpCisgICAg ICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAg ICBjcmFzaEhhbmRsZXJDb3VudCA9IDA7CisgICAgbG9hZENvdW50ID0gMDsKKyAgICBleHBlY3Rl ZExvYWRDb3VudCA9IG51bWJlck9mVmlld3M7CisgICAgZmluaXNoZWRMb2FkID0gZmFsc2U7CisK KyAgICBmb3IgKGF1dG8mIHdlYlZpZXcgOiB3ZWJWaWV3cykKKyAgICAgICAgW3dlYlZpZXcgbG9h ZEhUTUxTdHJpbmc6QCJmb28iIGJhc2VVUkw6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmZmluaXNoZWRMb2FkKTsKKyAgICBFWFBFQ1RfRVEoMFUsIGNyYXNoSGFuZGxlckNv dW50KTsKKworICAgIGF1dG8gcGlkQmVmb3JlID0gW3dlYlZpZXcxIF93ZWJQcm9jZXNzSWRlbnRp Zmllcl07CisgICAgRVhQRUNUX1RSVUUoISFwaWRCZWZvcmUpOworICAgIGZvciAoYXV0byYgd2Vi VmlldyA6IHdlYlZpZXdzKQorICAgICAgICBFWFBFQ1RfRVEocGlkQmVmb3JlLCBbd2ViVmlldyBf d2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKKworICAgIGxvYWRDb3VudCA9IDA7CisgICAgZmluaXNo ZWRMb2FkID0gZmFsc2U7CisKKyAgICAvLyBLaWxsIHRoZSBXZWJDb250ZW50IHByb2Nlc3MuIFRo ZSBjcmFzaCBoYW5kbGVyIHNob3VsZCByZWxvYWQgYWxsIHZpZXdzLgorICAgIGtpbGwocGlkQmVm b3JlLCA5KTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWRMb2FkKTsK KyAgICBFWFBFQ1RfRVEobnVtYmVyT2ZWaWV3cywgY3Jhc2hIYW5kbGVyQ291bnQpOworCisgICAg YXV0byBwaWRBZnRlciA9IFt3ZWJWaWV3MSBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworICAgIEVY UEVDVF9UUlVFKCEhcGlkQWZ0ZXIpOworICAgIGZvciAoYXV0byYgd2ViVmlldyA6IHdlYlZpZXdz KQorICAgICAgICBFWFBFQ1RfRVEocGlkQWZ0ZXIsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRp Zmllcl0pOworfQo= 410703 2020-10-06 15:32:11 -0700 2020-10-06 17:21:07 -0700 Patch bug-217407-20201006153210.patch text/plain 8213 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQwMzRlZmMyZWM2MDNmYWI1 N2NiYTI4MmJlNDc0NTVlMGIxMjE2ZDQuLjYwZmY1YTFiMjhhNmZhMjUxNzY4YTdjZjY5NGExOGU3 ZmQwYWU2ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjAtMTAtMDYgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWxvYWRpbmcgYSB2aWV3IGluIGl0 cyBwcm9jZXNzVGVybWluYXRpb25IYW5kbGVyIGRvZXMgbm90IHdvcmsgcmVsaWFibHkgd2hlbiB1 c2luZyByZWxhdGVkIHZpZXdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTc0MDcKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KKwor ICAgICAgICBSZWxhdGVkIHdlYiB2aWV3cyBzaGFyZSB0aGUgc2FtZSBXZWJDb250ZW50IHByb2Nl c3MuIFdoZW4gdGhpcyBwcm9jZXNzIGNyYXNoZXMsIHdlIGl0ZXJhdGUgb3ZlcgorICAgICAgICB0 aGUgbGlzdCBvZiBXZWJQYWdlUHJveHkgb2JqZWN0cyBzaGFyaW5nIHRoaXMgcHJvY2VzcyBhbmQg bGV0IHRoZW0ga25vdyB0aGF0IHRoZWlyIHByb2Nlc3MgaGFzCisgICAgICAgIGNyYXNoZWQuIFRo aXMgY2F1c2VzIHRoZSBXZWJQYWdlUHJveHkgdG8gcmVzZXQgaXRzIHN0YXRlIChzbyB0aGF0IGl0 IGlzIGF3YXJlIGl0IG5vIGxvbmdlciBoYXMKKyAgICAgICAgYSBydW5uaW5nIHByb2Nlc3MpIGFu ZCB0byBub3RpZnkgdGhlIGNsaWVudCBhcHBsaWNhdGlvbi4gQmVjYXVzZSB3ZSB3ZXJlIG5vdGlm eWluZyB0aGUgY2xpZW50CisgICAgICAgIGFwcGxpY2F0aW9uIHN5bmNocm9ub3VzbHksIHRoZSBj bGllbnQgY291bGQgdHJpZ2dlciBhIGxvYWQgaW4gdGhlIHZpZXcgc3luY2hyb25vdXNseSB3aGls ZSB3ZQorICAgICAgICBhcmUgc3RpbGwgaXRlcmF0aW5nIG92ZXIgdGhlIFdlYlBhZ2VQcm94eSBv YmplY3RzLiBXaGVuIHRyaWdnZXJpbmcgYSBsb2FkIGluIGEgd2ViIHZpZXcgdGhhdAorICAgICAg ICBoYXMgbm8gcnVubmluZyBwcm9jZXNzLCB3ZSBub3JtYWxseSByZWxhdW5jaCBvbmUuIEhvd2V2 ZXIsIGluIHRoZSBjYXNlIG9mIHJlbGF0ZWQgd2ViIHZpZXdzLAorICAgICAgICB0aGUgdmlldyB1 c2VzIGl0cyByZWxhdGVkIHdlYnZpZXcncyBwcm9jZXNzLCByZWxhdW5jaGluZyBpdCBpZiBuZWNl c3NhcnkuIFRoZSAncmVsYXVuY2hpbmcKKyAgICAgICAgaWYgbmVjZXNzYXJ5JyBwYXJ0IHdhcyBu b3QgcmVsaWFibHkgaGFwcGVuaW5nIGhlcmUgYmVjYXVzZSB0aGUgcmVsYXRlZCB3ZWIgdmlldyBt YXkgbm90IGhhdmUKKyAgICAgICAgYmVlbiBub3RpZmllZCB5ZXQgdGhhdCBpdHMgV2ViUHJvY2Vz cyBoYXMgY3Jhc2hlZCAoc2luY2Ugd2UgYXJlIHN0aWxsIGl0ZXJhdGluZyBvdmVyIHRoZQorICAg ICAgICBwYWdlcyB0byBub3RpZnkgdGhlbSkuCisKKyAgICAgICAgVG8gYWRkcmVzcyB0aGUgaXNz dWUsIHdlIG5vdyBub3RpZnkgdGhlIGNsaWVudCBhc3luY2hyb25vdXNseSBvZiB0aGUgcHJvY2Vz cyB0ZXJtaW5hdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpc3BhdGNoUHJvY2Vzc0RpZFRlcm1pbmF0 ZSk6CisKIDIwMjAtMTAtMDYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAg ICAgICAgIEVuYWJsZSB2aWRlbyBjYXB0dXJlIGluIFdlYlByb2Nlc3MgYnkgZGVmYXVsdCBvbiBN YWNPUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZjYzYjc0 ZDM4MjFjMDJiZGY1OTIwYzE4YTU4OTc3NzFjYTBhNWQxOC4uNTFmY2ZjYTA1YTRmNjFmZjg1Yjhj YjFkZTZlOWUwMDUyOWE3M2NiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCkBAIC03NDgwLDE0ICs3NDgwLDIyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaXNwYXRj aFByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uIHJlYXNvbikKIHsK ICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKExvYWRpbmcsICJkaXNwYXRjaFByb2Nl c3NEaWRUZXJtaW5hdGU6IHJlYXNvbiA9ICVkIiwgcmVhc29uKTsKIAotICAgIGJvb2wgaGFuZGxl ZEJ5Q2xpZW50ID0gZmFsc2U7Ci0gICAgaWYgKG1fbG9hZGVyQ2xpZW50KQotICAgICAgICBoYW5k bGVkQnlDbGllbnQgPSByZWFzb24gIT0gUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0 ZWRCeUNsaWVudCAmJiBtX2xvYWRlckNsaWVudC0+cHJvY2Vzc0RpZENyYXNoKCp0aGlzKTsKLSAg ICBlbHNlCi0gICAgICAgIGhhbmRsZWRCeUNsaWVudCA9IG1fbmF2aWdhdGlvbkNsaWVudC0+cHJv Y2Vzc0RpZFRlcm1pbmF0ZSgqdGhpcywgcmVhc29uKTsKKyAgICAvLyBXZSBub3RpZnkgdGhlIGNs aWVudCBhc3luY2hyb25vdXNseSBiZWNhdXNlIHNldmVyYWwgcGFnZXMgbWF5IHNoYXJlIHRoZSBz YW1lIHByb2Nlc3MKKyAgICAvLyBhbmQgd2Ugd2FudCB0byBtYWtlIHN1cmUgYWxsIHBhZ2VzIGFy ZSBhd2FyZSB0aGVpciBwcm9jZXNzIGhhcyBjcmFzaGVkIGJlZm9yZSB0aGUKKyAgICAvLyB0aGUg Y2xpZW50IHJlYWN0cyB0byB0aGUgcHJvY2VzcyB0ZXJtaW5hdGlvbi4KKyAgICBSdW5Mb29wOjpt YWluKCkuZGlzcGF0Y2goW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCByZWFz b25dIHsKKyAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgIHJldHVybjsKIAotICAg IGlmICghaGFuZGxlZEJ5Q2xpZW50ICYmIHNob3VsZFJlbG9hZEFmdGVyUHJvY2Vzc1Rlcm1pbmF0 aW9uKHJlYXNvbikpCi0gICAgICAgIHRyeVJlbG9hZEFmdGVyUHJvY2Vzc1Rlcm1pbmF0aW9uKCk7 CisgICAgICAgIGJvb2wgaGFuZGxlZEJ5Q2xpZW50ID0gZmFsc2U7CisgICAgICAgIGlmIChtX2xv YWRlckNsaWVudCkKKyAgICAgICAgICAgIGhhbmRsZWRCeUNsaWVudCA9IHJlYXNvbiAhPSBQcm9j ZXNzVGVybWluYXRpb25SZWFzb246OlJlcXVlc3RlZEJ5Q2xpZW50ICYmIG1fbG9hZGVyQ2xpZW50 LT5wcm9jZXNzRGlkQ3Jhc2goKnRoaXMpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBoYW5k bGVkQnlDbGllbnQgPSBtX25hdmlnYXRpb25DbGllbnQtPnByb2Nlc3NEaWRUZXJtaW5hdGUoKnRo aXMsIHJlYXNvbik7CisKKyAgICAgICAgaWYgKCFoYW5kbGVkQnlDbGllbnQgJiYgc2hvdWxkUmVs b2FkQWZ0ZXJQcm9jZXNzVGVybWluYXRpb24ocmVhc29uKSkKKyAgICAgICAgICAgIHRyeVJlbG9h ZEFmdGVyUHJvY2Vzc1Rlcm1pbmF0aW9uKCk7CisgICAgfSk7CiB9CiAKIHZvaWQgV2ViUGFnZVBy b3h5Ojp0cnlSZWxvYWRBZnRlclByb2Nlc3NUZXJtaW5hdGlvbigpCmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzFlNDdjZGY4NmU0YTUwYTQ2NjA0 YzQ3ZGY1MDQxZmFkMGI0YWE2Yy4uZjZmYmY0ZWVkN2I0NWNjNDgxZWE4ZGY5YTIyYTQyMjA0MDA0 MDY4NSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDIwLTEwLTA2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CisKKyAgICAgICAgUmVsb2FkaW5nIGEgdmlldyBpbiBpdHMgcHJvY2Vzc1Rlcm1pbmF0aW9u SGFuZGxlciBkb2VzIG5vdCB3b3JrIHJlbGlhYmx5IHdoZW4gdXNpbmcgcmVsYXRlZCB2aWV3cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDA3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCisKKyAgICAgICAgQWRkIEFQSSB0ZXN0 IGNvdmVyYWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9X ZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbToKKyAgICAgICAgKC1bTmF2aWdhdGlvbkRl bGVnYXRlV2l0aENyYXNoSGFuZGxlclRoYXRMb2Fkc0FnYWluIF93ZWJWaWV3OndlYkNvbnRlbnRQ cm9jZXNzRGlkVGVybWluYXRlV2l0aFJlYXNvbjpdKToKKyAgICAgICAgKC1bTmF2aWdhdGlvbkRl bGVnYXRlV2l0aENyYXNoSGFuZGxlclRoYXRMb2Fkc0FnYWluIHdlYlZpZXc6ZGlkRmluaXNoTmF2 aWdhdGlvbjpdKToKKyAgICAgICAgKFRFU1QpOgorCiAyMDIwLTEwLTA2ICBBZHJpYW4gUGVyZXog ZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjY3 Mzk5KTogW1dQRV0gQnVpbGQgYnJva2VuIHdpdGggRU5BQkxFX0FDQ0VTU0lCSUxJVFk9T0ZGCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYkNvbnRl bnRQcm9jZXNzRGlkVGVybWluYXRlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9XZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZS5tbQppbmRleCAwMTRmNGQ3MTUx MTNhZWI0YTQ4ZWRiYTY1NWQ0ODg5YzY5NzJlZmEyLi43ZTI1MWQ3YjIyNTc4ZWE4YzZkYWFkOGE1 MDY2ODg3ZmVkZTUyODA5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlLm1tCisrKyBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5h dGUubW0KQEAgLTMxLDggKzMxLDEwIEBACiAjaW1wb3J0IDxXZWJLaXQvV0tOYXZpZ2F0aW9uUHJp dmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CiAjaW1wb3J0 IDxXZWJLaXQvV0tXZWJWaWV3Lmg+CisjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3Q29uZmlndXJh dGlvblByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdQcml2YXRlLmg+CiAjaW1w b3J0IDx3dGYvUmV0YWluUHRyLmg+CisjaW1wb3J0IDx3dGYvVmVjdG9yLmg+CiAKIHN0YXRpYyBi b29sIGRpZENyYXNoOwogc3RhdGljIF9XS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbiBleHBlY3Rl ZENyYXNoUmVhc29uOwpAQCAtNDIsNiArNDQsOSBAQCBzdGF0aWMgYm9vbCBzaG91bGRMb2FkQWdh aW5PbkNyYXNoOwogc3RhdGljIGJvb2wgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlOwogc3RhdGljIGJv b2wgY2FsbGVkQWxsQ2FsbGJhY2tzOwogc3RhdGljIHVuc2lnbmVkIGNhbGxiYWNrQ291bnQ7Citz dGF0aWMgdW5zaWduZWQgY3Jhc2hIYW5kbGVyQ291bnQ7CitzdGF0aWMgdW5zaWduZWQgbG9hZENv dW50Oworc3RhdGljIHVuc2lnbmVkIGV4cGVjdGVkTG9hZENvdW50OwogCiBzdGF0aWMgTlNTdHJp bmcgKnRlc3RIVE1MID0gQCI8c2NyaXB0PndpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRl c3RIYW5kbGVyLnBvc3RNZXNzYWdlKCdMT0FERUQnKTs8L3NjcmlwdD4iOwogCkBAIC0yNzcsMyAr MjgyLDczIEBAIFRFU1QoV0tOYXZpZ2F0aW9uLCBQcm9jZXNzQ3Jhc2hEdXJpbmdDYWxsYmFjaykK ICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzbGVlcCgwLjUpOwogICAgIEVYUEVDVF9FUSg2VSwg Y2FsbGJhY2tDb3VudCk7CiB9CisKK0BpbnRlcmZhY2UgTmF2aWdhdGlvbkRlbGVnYXRlV2l0aENy YXNoSGFuZGxlclRoYXRMb2Fkc0FnYWluIDogTlNPYmplY3QgPFdLTmF2aWdhdGlvbkRlbGVnYXRl PgorQGVuZAorCitAaW1wbGVtZW50YXRpb24gTmF2aWdhdGlvbkRlbGVnYXRlV2l0aENyYXNoSGFu ZGxlclRoYXRMb2Fkc0FnYWluCisKKy0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZp ZXcgd2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uOihfV0tQcm9jZXNzVGVy bWluYXRpb25SZWFzb24pcmVhc29uCit7CisgICAgKytjcmFzaEhhbmRsZXJDb3VudDsKKworICAg IC8vIEF0dGVtcHQgdGhlIGxvYWQgYWdhaW4gc3luY2hyb25vdXNseS4KKyAgICBbd2ViVmlldyBs b2FkSFRNTFN0cmluZzpAImZvbyIgYmFzZVVSTDpuaWxdOworfQorCistICh2b2lkKXdlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkRmluaXNoTmF2aWdhdGlvbjooV0tOYXZpZ2F0aW9uICop bmF2aWdhdGlvbgoreworICAgIGlmICgrK2xvYWRDb3VudCA9PSBleHBlY3RlZExvYWRDb3VudCkK KyAgICAgICAgZmluaXNoZWRMb2FkID0gdHJ1ZTsKK30KKworQGVuZAorCitURVNUKFdLTmF2aWdh dGlvbiwgUmVsb2FkUmVsYXRlZFZpZXdzSW5Qcm9jZXNzRGlkVGVybWluYXRlKQoreworICAgIGNv bnN0IHVuc2lnbmVkIG51bWJlck9mVmlld3MgPSAyMDsKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24g PSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIGF1 dG8gd2ViVmlldzEgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5T TWFrZVJlY3QoMCwgMCwgMTAwLCAxMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQo KV0pOworCisgICAgVmVjdG9yPFJldGFpblB0cjxXS1dlYlZpZXc+PiB3ZWJWaWV3czsKKyAgICB3 ZWJWaWV3cy5hcHBlbmQod2ViVmlldzEpOworCisgICAgY29uZmlndXJhdGlvbi5nZXQoKS5fcmVs YXRlZFdlYlZpZXcgPSB3ZWJWaWV3MS5nZXQoKTsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgbnVtYmVyT2ZWaWV3cyAtIDE7ICsraSkgeworICAgICAgICBhdXRvIHdlYlZpZXcgPSBhZG9w dE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgMTAw LCAxMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgICAgICB3ZWJW aWV3cy5hcHBlbmQod2ViVmlldyk7CisgICAgfQorICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5T KFtbTmF2aWdhdGlvbkRlbGVnYXRlV2l0aENyYXNoSGFuZGxlclRoYXRMb2Fkc0FnYWluIGFsbG9j XSBpbml0XSk7CisgICAgZm9yIChhdXRvJiB3ZWJWaWV3IDogd2ViVmlld3MpCisgICAgICAgIFt3 ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBjcmFz aEhhbmRsZXJDb3VudCA9IDA7CisgICAgbG9hZENvdW50ID0gMDsKKyAgICBleHBlY3RlZExvYWRD b3VudCA9IG51bWJlck9mVmlld3M7CisgICAgZmluaXNoZWRMb2FkID0gZmFsc2U7CisKKyAgICBm b3IgKGF1dG8mIHdlYlZpZXcgOiB3ZWJWaWV3cykKKyAgICAgICAgW3dlYlZpZXcgbG9hZEhUTUxT dHJpbmc6QCJmb28iIGJhc2VVUkw6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZmluaXNoZWRMb2FkKTsKKyAgICBFWFBFQ1RfRVEoMFUsIGNyYXNoSGFuZGxlckNvdW50KTsK KworICAgIGF1dG8gcGlkQmVmb3JlID0gW3dlYlZpZXcxIF93ZWJQcm9jZXNzSWRlbnRpZmllcl07 CisgICAgRVhQRUNUX1RSVUUoISFwaWRCZWZvcmUpOworICAgIGZvciAoYXV0byYgd2ViVmlldyA6 IHdlYlZpZXdzKQorICAgICAgICBFWFBFQ1RfRVEocGlkQmVmb3JlLCBbd2ViVmlldyBfd2ViUHJv Y2Vzc0lkZW50aWZpZXJdKTsKKworICAgIGxvYWRDb3VudCA9IDA7CisgICAgZmluaXNoZWRMb2Fk ID0gZmFsc2U7CisKKyAgICAvLyBLaWxsIHRoZSBXZWJDb250ZW50IHByb2Nlc3MuIFRoZSBjcmFz aCBoYW5kbGVyIHNob3VsZCByZWxvYWQgYWxsIHZpZXdzLgorICAgIGtpbGwocGlkQmVmb3JlLCA5 KTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWRMb2FkKTsKKyAgICBF WFBFQ1RfRVEobnVtYmVyT2ZWaWV3cywgY3Jhc2hIYW5kbGVyQ291bnQpOworCisgICAgYXV0byBw aWRBZnRlciA9IFt3ZWJWaWV3MSBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworICAgIEVYUEVDVF9U UlVFKCEhcGlkQWZ0ZXIpOworICAgIGZvciAoYXV0byYgd2ViVmlldyA6IHdlYlZpZXdzKQorICAg ICAgICBFWFBFQ1RfRVEocGlkQWZ0ZXIsIFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0p OworfQo=