190378 2018-10-08 16:14:01 -0700 PSON: Doing a cross-site navigation via the URL bar does not swap process on iOS 2018-10-09 12:04:56 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen commit-queue ggaren rniwa webkit-bug-importer oldest_to_newest 1467244 0 cdumez 2018-10-08 16:14:01 -0700 Doing a cross-site navigation via the URL bar does not swap process on iOS, even though PSON is enabled. 1467246 1 cdumez 2018-10-08 16:14:26 -0700 <rdar://problem/45059466> 1467252 2 351830 cdumez 2018-10-08 16:22:28 -0700 Created attachment 351830 Patch 1467452 3 351830 achristensen 2018-10-09 10:39:46 -0700 Comment on attachment 351830 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351830&action=review > Source/WebKit/ChangeLog:10 > + which would use a new WebView for the speculative load and rely on the _relatedWebView SPI to use WKWebView > Source/WebKit/UIProcess/WebProcessPool.cpp:2147 > + url = URL { { }, page.configuration().relatedPage()->pageLoadState().url() }; I feel like url needs a more descriptive name. sourceURL? > Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1852 > + auto processPoolConfiguration = adoptNS([[_WKProcessPoolConfiguration alloc] init]); These two tests should share some code. 1467478 4 351897 cdumez 2018-10-09 10:58:51 -0700 Created attachment 351897 Patch 1467482 5 351897 ggaren 2018-10-09 11:15:00 -0700 Comment on attachment 351897 Patch r=me 1467507 6 351897 commit-queue 2018-10-09 12:04:54 -0700 Comment on attachment 351897 Patch Clearing flags on attachment: 351897 Committed r236973: <https://trac.webkit.org/changeset/236973> 1467508 7 commit-queue 2018-10-09 12:04:56 -0700 All reviewed patches have been landed. Closing bug. 351830 2018-10-08 16:22:28 -0700 2018-10-09 10:58:50 -0700 Patch bug-190378-20181008162227.patch text/plain 9456 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2OTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRiYTVjMDhjZThlZjYwNWM4 NzAwODRlMWNmMGQ5ZmZkY2NiNDlmYzMuLmY2NTBmZTgxYTZlMGM4NjYxN2MwNWRhZGFmNzc5M2I2 ODIxMDQ5ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTgtMTAtMDggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBQU09OOiBEb2luZyBhIGNyb3NzLXNp dGUgbmF2aWdhdGlvbiB2aWEgdGhlIFVSTCBiYXIgZG9lcyBub3Qgc3dhcCBwcm9jZXNzIG9uIGlP UworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMzc4 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NTA1OTQ2Nj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcm9jZXNzIHN3YXBwaW5nIHdhcyBzb21ldGlt ZXMgbm90IGhhcHBlbmluZyB2aWEgVVJMIGJhciBuYXZpZ2F0aW9uIG9uIGlPUyBkdWUgdG8gdG9w LWhpdCBwcmVsb2FkaW5nLAorICAgICAgICB3aGljaCB3b3VsZCB1c2UgYSBuZXcgV2ViVmlldyBm b3IgdGhlIHNwZWN1bGF0aXZlIGxvYWQgYW5kIHJlbHkgb24gdGhlIF9yZWxhdGVkV2ViVmlldyBT UEkgdG8gdXNlCisgICAgICAgIHRoZSBzYW1lIFdlYkNvbnRlbnQgcHJvY2VzcyBhcyB0aGUgdmll dyBjdXJyZW50bHkgb24gc2NyZWVuLgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCBp ZiB0aGUgc291cmNlIFVSTCBpcyBlbXB0eSBhbmQgdGhlIHBhZ2UgaGFzIGEgcmVsYXRlZCBwYWdl LCB1c2UgdGhlIHJlbGF0ZWQKKyAgICAgICAgcGFnZSdzIFVSTCBhcyBzb3VyY2UgVVJMIHdoZW4g ZG9pbmcgdGhlIHByb2Nlc3Mtc3dhcCBkZWNpc2lvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQVBJUGFnZUNvbmZpZ3VyYXRpb24uY3BwOgorICAgICAgICAoQVBJOjpQYWdlQ29uZmlndXJh dGlvbjo6cmVsYXRlZFBhZ2UgY29uc3QpOgorICAgICAgICAoQVBJOjpQYWdlQ29uZmlndXJhdGlv bjo6cmVsYXRlZFBhZ2UpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJUGFn ZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25J bnRlcm5hbCk6CisKIDIwMTgtMTAtMDcgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4K IAogICAgICAgICBUcmllZCB0byBmaXggSEFWRShMSU5LX1BSRVZJRVcpIGlPUyBidWlsZHMuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUGFnZUNvbmZpZ3VyYXRp b24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVBhZ2VDb25maWd1cmF0aW9u LmNwcAppbmRleCAxMmQ5N2Y2NWM3OWM4M2JhMTdjN2RhZjI3YjFhOTdhMTQzOTU2MjNiLi5jZjRj ZmU1ZTgzY2NmMmM4NjRiMjhlN2ZhZTk4NDc3NGJiMmZjZTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUGFnZUNvbmZpZ3VyYXRpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQYWdlQ29uZmlndXJhdGlvbi5jcHAKQEAgLTEyOSw3 ICsxMjksNyBAQCB2b2lkIFBhZ2VDb25maWd1cmF0aW9uOjpzZXRQcmVmZXJlbmNlcyhXZWJQcmVm ZXJlbmNlcyogcHJlZmVyZW5jZXMpCiAgICAgbV9wcmVmZXJlbmNlcyA9IHByZWZlcmVuY2VzOwog fQogCi1XZWJQYWdlUHJveHkqIFBhZ2VDb25maWd1cmF0aW9uOjpyZWxhdGVkUGFnZSgpCitXZWJQ YWdlUHJveHkqIFBhZ2VDb25maWd1cmF0aW9uOjpyZWxhdGVkUGFnZSgpIGNvbnN0CiB7CiAgICAg cmV0dXJuIG1fcmVsYXRlZFBhZ2UuZ2V0KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQVBJUGFnZUNvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9BUElQYWdlQ29uZmlndXJhdGlvbi5oCmluZGV4IDdlNGEzYWVhYjQxNTZmMTc3 OWM2ZGNkY2MwMzc3YmExNTI2M2QyOTEuLjZiNzI3MzM1MWYwYzFjNDNiYmUyYzE3NWQwYzYxYzk0 MzMxMWFiZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQYWdl Q29uZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQYWdl Q29uZmlndXJhdGlvbi5oCkBAIC03Miw3ICs3Miw3IEBAIHB1YmxpYzoKIAogICAgIFdlYktpdDo6 V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFsdWVNYXAmIHByZWZlcmVuY2VWYWx1ZXMoKSB7IHJldHVy biBtX3ByZWZlcmVuY2VWYWx1ZXM7IH0KIAotICAgIFdlYktpdDo6V2ViUGFnZVByb3h5KiByZWxh dGVkUGFnZSgpOworICAgIFdlYktpdDo6V2ViUGFnZVByb3h5KiByZWxhdGVkUGFnZSgpIGNvbnN0 OwogICAgIHZvaWQgc2V0UmVsYXRlZFBhZ2UoV2ViS2l0OjpXZWJQYWdlUHJveHkqKTsKIAogICAg IFdlYktpdDo6VmlzaXRlZExpbmtTdG9yZSogdmlzaXRlZExpbmtTdG9yZSgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IDgxNzVhM2M2ODVmNzQyN2Yx NTQxNDk1YWYyMTUwOWFjOThjMWYxN2UuLmNkZGVjZjI1NDdkNGFkZTg4Mjk3YmRjY2Q2NDZlNGVh Yjc3YTI1MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ b29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAK QEAgLTIxNDIsNiArMjE0MiwxMiBAQCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzUG9v bDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbChXZWJQYWdlUHJveHkmCiAgICAgICAgICAg ICB1cmwgPSBVUkwgeyBVUkwoKSwgbmF2aWdhdGlvbi5yZXF1ZXN0ZXJPcmlnaW4oKS50b1N0cmlu ZygpIH07CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHVybCA9IFVSTCB7IHsgfSwgcGFnZS5w YWdlTG9hZFN0YXRlKCkudXJsKCkgfTsKKworICAgICAgICBpZiAodXJsLmlzRW1wdHkoKSAmJiBw YWdlLmNvbmZpZ3VyYXRpb24oKS5yZWxhdGVkUGFnZSgpKSB7CisgICAgICAgICAgICB1cmwgPSBV UkwgeyB7IH0sIHBhZ2UuY29uZmlndXJhdGlvbigpLnJlbGF0ZWRQYWdlKCktPnBhZ2VMb2FkU3Rh dGUoKS51cmwoKSB9OworICAgICAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAi VXNpbmcgcmVsYXRlZCBwYWdlICVwJ3MgVVJMIGFzIHNvdXJjZSBVUkwgZm9yIHByb2Nlc3Mgc3dh cCBkZWNpc2lvbiIsIHBhZ2UuY29uZmlndXJhdGlvbigpLnJlbGF0ZWRQYWdlKCkpOworICAgICAg ICB9CisKICAgICAgICAgaWYgKCF1cmwuaXNWYWxpZCgpIHx8ICF0YXJnZXRVUkwuaXNWYWxpZCgp IHx8IHVybC5pc0VtcHR5KCkgfHwgdXJsLmlzQmxhbmtVUkwoKSB8fCByZWdpc3RyYWJsZURvbWFp bnNBcmVFcXVhbCh1cmwsIHRhcmdldFVSTCkpIHsKICAgICAgICAgICAgIHJlYXNvbiA9ICJOYXZp Z2F0aW9uIGlzIHNhbWUtc2l0ZSJfczsKICAgICAgICAgICAgIHJldHVybiBwYWdlLnByb2Nlc3Mo KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAy ZmRiNDUyNDI3YzcwNWE3NDA3MDhkYzgxN2FkYjYxM2ExNWYzMjMxLi4wNGI0MDNjZTNjNzUwNzEy ZDYwNjY3YTg2M2U0ZmVkOTc3YzUxMjZhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMTAtMDggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBQU09OOiBEb2luZyBhIGNyb3NzLXNp dGUgbmF2aWdhdGlvbiB2aWEgdGhlIFVSTCBiYXIgZG9lcyBub3Qgc3dhcCBwcm9jZXNzIG9uIGlP UworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMzc4 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NTA1OTQ2Nj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJIHRlc3QgY292ZXJhZ2UuCisKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZp Z2F0aW9uLm1tOgorCiAyMDE4LTEwLTA4ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+ CiAKICAgICAgICAgVG9vbHMgcGFydCBvZiBbWGNvZGVdIFVwZGF0ZSBzb21lIGJ1aWxkIHNldHRp bmdzIGFzIHJlY29tbWVuZGVkIGJ5IFhjb2RlIDEwCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlv bi5tbQppbmRleCA4ZmUwNzNiODNjYTZlNzdlOWViNmUxNjFhNDM3NzA4MzcwNWVmYmYwLi5mMDhj YTg2MWEwMjY0OTRjOGQ5ODIzNGY0NzFiYTRlYmIxNjQ1NjYzIDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1t CisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBP bk5hdmlnYXRpb24ubW0KQEAgLTE4MDMsNiArMTgwMyw5NCBAQCBURVNUKFByb2Nlc3NTd2FwLCBB UElDb250cm9sbGVkUHJvY2Vzc1N3YXBwaW5nKQogICAgIEVYUEVDVF9ORShwaWQxLCBwaWQzKTsK IH0KIAorVEVTVChQcm9jZXNzU3dhcCwgUHJvY2Vzc1N3YXBEdWVUb1JlbGF0ZWRWaWV3KQorewor ICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQ b29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJh dGlvbi5nZXQoKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAgcHJvY2Vzc1Bv b2xDb25maWd1cmF0aW9uLmdldCgpLnByZXdhcm1zUHJvY2Vzc2VzQXV0b21hdGljYWxseSA9IFlF UzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2Nd IF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7 CisKKyAgICBhdXRvIHdlYlZpZXcxQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdD b25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcxQ29uZmlndXJhdGlvbiBz ZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5kbGVyID0gYWRv cHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldzFDb25maWd1cmF0 aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJQU09O Il07CisKKyAgICBhdXRvIHdlYlZpZXcxID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5p dFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZp ZXcxQ29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtb UFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3MSBzZXRO YXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgbnVtYmVyT2ZEZWNpZGVQ b2xpY3lDYWxscyA9IDA7CisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVz dCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cud2Via2l0 Lm9yZy9tYWluMS5odG1sIl1dOworICAgIFt3ZWJWaWV3MSBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsK KworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNl OworCisgICAgYXV0byBwaWQxID0gW3dlYlZpZXcxIF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisK KyAgICBhdXRvIHdlYlZpZXcyQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25m aWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcyQ29uZmlndXJhdGlvbiBzZXRQ cm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgW3dlYlZpZXcyQ29uZmlndXJhdGlv biBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAiUFNPTiJd OworICAgIHdlYlZpZXcyQ29uZmlndXJhdGlvbi5nZXQoKS5fcmVsYXRlZFdlYlZpZXcgPSB3ZWJW aWV3MS5nZXQoKTsgLy8gd2ViVmlldzIgd2lsbCBiZSByZWxhdGVkIHRvIHdlYlZpZXcxIGFuZCB3 ZWJWaWV3MSdzIFVSTCB3aWxsIGJlIHVzZWQgZm9yIHByb2Nlc3Mgc3dhcCBkZWNpc2lvbi4KKyAg ICBhdXRvIHdlYlZpZXcyID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFt ZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXcyQ29uZmln dXJhdGlvbi5nZXQoKV0pOworICAgIFt3ZWJWaWV3MiBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVs ZWdhdGUuZ2V0KCldOworCisgICAgcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhV Ukw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluMi5odG1s Il1dOworICAgIFt3ZWJWaWV3MiBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJL aXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgYXV0byBw aWQyID0gW3dlYlZpZXcyIF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBFWFBFQ1RfRkFM U0UocGlkMSA9PSBwaWQyKTsKKyAgICBFWFBFQ1RfRVEoMiwgbnVtYmVyT2ZEZWNpZGVQb2xpY3lD YWxscyk7Cit9CisKK1RFU1QoUHJvY2Vzc1N3YXAsIE5vUHJvY2Vzc1N3YXBEdWVUb1JlbGF0ZWRW aWV3KQoreworICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19X S1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIHByb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAg cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByZXdhcm1zUHJvY2Vzc2VzQXV0b21hdGlj YWxseSA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bv b2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u LmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXcxQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tX S1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcxQ29uZmln dXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5k bGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlldzFD b25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hl bWU6QCJQU09OIl07CisKKyAgICBhdXRvIHdlYlZpZXcxID0gYWRvcHROUyhbW1dLV2ViVmlldyBh bGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0 aW9uOndlYlZpZXcxQ29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gZGVsZWdhdGUgPSBh ZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJW aWV3MSBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgbnVtYmVy T2ZEZWNpZGVQb2xpY3lDYWxscyA9IDA7CisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05T VVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93 d3cud2Via2l0Lm9yZy9tYWluMS5odG1sIl1dOworICAgIFt3ZWJWaWV3MSBsb2FkUmVxdWVzdDpy ZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9u ZSA9IGZhbHNlOworCisgICAgYXV0byBwaWQxID0gW3dlYlZpZXcxIF93ZWJQcm9jZXNzSWRlbnRp Zmllcl07CisKKyAgICBhdXRvIHdlYlZpZXcyQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dl YlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcyQ29uZmlndXJh dGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgW3dlYlZpZXcyQ29u ZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1l OkAiUFNPTiJdOworICAgIHdlYlZpZXcyQ29uZmlndXJhdGlvbi5nZXQoKS5fcmVsYXRlZFdlYlZp ZXcgPSB3ZWJWaWV3MS5nZXQoKTsgLy8gd2ViVmlldzIgd2lsbCBiZSByZWxhdGVkIHRvIHdlYlZp ZXcxIGFuZCB3ZWJWaWV3MSdzIFVSTCB3aWxsIGJlIHVzZWQgZm9yIHByb2Nlc3Mgc3dhcCBkZWNp c2lvbi4KKyAgICBhdXRvIHdlYlZpZXcyID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5p dFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZp ZXcyQ29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIFt3ZWJWaWV3MiBzZXROYXZpZ2F0aW9uRGVs ZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVx dWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcv bWFpbjIuaHRtbCJdXTsKKyAgICBbd2ViVmlldzIgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKwor ICAgIGF1dG8gcGlkMiA9IFt3ZWJWaWV3MiBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAg RVhQRUNUX1RSVUUocGlkMSA9PSBwaWQyKTsKKyAgICBFWFBFQ1RfRVEoMiwgbnVtYmVyT2ZEZWNp ZGVQb2xpY3lDYWxscyk7Cit9CisKIFRFU1QoUHJvY2Vzc1N3YXAsIFRlcm1pbmF0ZWRTdXNwZW5k ZWRQYWdlUHJvY2VzcykKIHsKICAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IGFk b3B0TlMoW1tfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsK 351897 2018-10-09 10:58:51 -0700 2018-10-09 12:04:54 -0700 Patch bug-190378-20181009105851.patch text/plain 8474 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2OTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI0YWJhN2Y3M2VhMjAxZWRm NTY1MmEyN2NmNTZlYjEzMDJjMGNkNWIuLjM0ZGE1N2I1ODQzZTQ1ZDA3MWVmMjRmYzA3NDAyMzlm ZGFmNWYzNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTgtMTAtMDkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBQU09OOiBEb2luZyBhIGNyb3NzLXNp dGUgbmF2aWdhdGlvbiB2aWEgdGhlIFVSTCBiYXIgZG9lcyBub3Qgc3dhcCBwcm9jZXNzIG9uIGlP UworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMzc4 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NTA1OTQ2Nj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcm9jZXNzIHN3YXBwaW5nIHdhcyBzb21ldGlt ZXMgbm90IGhhcHBlbmluZyB2aWEgVVJMIGJhciBuYXZpZ2F0aW9uIG9uIGlPUyBkdWUgdG8gdG9w LWhpdCBwcmVsb2FkaW5nLAorICAgICAgICB3aGljaCB3b3VsZCB1c2UgYSBuZXcgV0tXZWJWaWV3 IGZvciB0aGUgc3BlY3VsYXRpdmUgbG9hZCBhbmQgcmVseSBvbiB0aGUgX3JlbGF0ZWRXZWJWaWV3 IFNQSSB0byB1c2UKKyAgICAgICAgdGhlIHNhbWUgV2ViQ29udGVudCBwcm9jZXNzIGFzIHRoZSB2 aWV3IGN1cnJlbnRseSBvbiBzY3JlZW4uCisKKyAgICAgICAgVG8gYWRkcmVzcyB0aGUgaXNzdWUs IGlmIHRoZSBzb3VyY2UgVVJMIGlzIGVtcHR5IGFuZCB0aGUgcGFnZSBoYXMgYSByZWxhdGVkIHBh Z2UsIHVzZSB0aGUgcmVsYXRlZAorICAgICAgICBwYWdlJ3MgVVJMIGFzIHNvdXJjZSBVUkwgd2hl biBkb2luZyB0aGUgcHJvY2Vzcy1zd2FwIGRlY2lzaW9uLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9BUElQYWdlQ29uZmlndXJhdGlvbi5jcHA6CisgICAgICAgIChBUEk6OlBhZ2VDb25maWd1 cmF0aW9uOjpyZWxhdGVkUGFnZSBjb25zdCk6CisgICAgICAgIChBUEk6OlBhZ2VDb25maWd1cmF0 aW9uOjpyZWxhdGVkUGFnZSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQ YWdlQ29uZmlndXJhdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdhdGlv bkludGVybmFsKToKKwogMjAxOC0xMC0wOSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjMyNDE2KTogQ2FuIG5vdCBzY3JvbGwg YWZ0ZXIgc3dpcGluZyBiYWNrIG9uIHF1b3RldW5xdW90ZWFwcHMuY29tCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJUGFnZUNvbmZpZ3VyYXRpb24uY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVBhZ2VDb25maWd1cmF0aW9uLmNwcAppbmRleCAx MmQ5N2Y2NWM3OWM4M2JhMTdjN2RhZjI3YjFhOTdhMTQzOTU2MjNiLi5jZjRjZmU1ZTgzY2NmMmM4 NjRiMjhlN2ZhZTk4NDc3NGJiMmZjZTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQVBJUGFnZUNvbmZpZ3VyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9BUElQYWdlQ29uZmlndXJhdGlvbi5jcHAKQEAgLTEyOSw3ICsxMjksNyBAQCB2 b2lkIFBhZ2VDb25maWd1cmF0aW9uOjpzZXRQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyogcHJl ZmVyZW5jZXMpCiAgICAgbV9wcmVmZXJlbmNlcyA9IHByZWZlcmVuY2VzOwogfQogCi1XZWJQYWdl UHJveHkqIFBhZ2VDb25maWd1cmF0aW9uOjpyZWxhdGVkUGFnZSgpCitXZWJQYWdlUHJveHkqIFBh Z2VDb25maWd1cmF0aW9uOjpyZWxhdGVkUGFnZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fcmVs YXRlZFBhZ2UuZ2V0KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQVBJUGFnZUNvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9B UElQYWdlQ29uZmlndXJhdGlvbi5oCmluZGV4IDdlNGEzYWVhYjQxNTZmMTc3OWM2ZGNkY2MwMzc3 YmExNTI2M2QyOTEuLjZiNzI3MzM1MWYwYzFjNDNiYmUyYzE3NWQwYzYxYzk0MzMxMWFiZTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQYWdlQ29uZmlndXJhdGlv bi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElQYWdlQ29uZmlndXJhdGlv bi5oCkBAIC03Miw3ICs3Miw3IEBAIHB1YmxpYzoKIAogICAgIFdlYktpdDo6V2ViUHJlZmVyZW5j ZXNTdG9yZTo6VmFsdWVNYXAmIHByZWZlcmVuY2VWYWx1ZXMoKSB7IHJldHVybiBtX3ByZWZlcmVu Y2VWYWx1ZXM7IH0KIAotICAgIFdlYktpdDo6V2ViUGFnZVByb3h5KiByZWxhdGVkUGFnZSgpOwor ICAgIFdlYktpdDo6V2ViUGFnZVByb3h5KiByZWxhdGVkUGFnZSgpIGNvbnN0OwogICAgIHZvaWQg c2V0UmVsYXRlZFBhZ2UoV2ViS2l0OjpXZWJQYWdlUHJveHkqKTsKIAogICAgIFdlYktpdDo6Vmlz aXRlZExpbmtTdG9yZSogdmlzaXRlZExpbmtTdG9yZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IDVmNTY2ZDc1NjhmNGEwZjM2NzI0M2U3MDRkNzkz YTcxN2E2MTJmYzMuLmVmYmMyMmJjYjI4MWRmM2QwNjI5Y2M5YmY3NmIxMTc0MmFhYzQ0Y2IgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTIxMzgsMTIg KzIxMzgsMTggQEAgUmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NG b3JOYXZpZ2F0aW9uSW50ZXJuYWwoV2ViUGFnZVByb3h5JgogICAgICAgICB9CiAKICAgICAgICAg Ym9vbCBpc0luaXRpYWxMb2FkSW5OZXdXaW5kb3dPcGVuZWRCeURPTSA9IHBhZ2Uub3BlbmVkQnlE T00oKSAmJiAhcGFnZS5oYXNDb21taXR0ZWRBbnlQcm92aXNpb25hbExvYWRzKCk7Ci0gICAgICAg IFVSTCB1cmw7CisgICAgICAgIFVSTCBzb3VyY2VVUkw7CiAgICAgICAgIGlmIChpc0luaXRpYWxM b2FkSW5OZXdXaW5kb3dPcGVuZWRCeURPTSAmJiAhbmF2aWdhdGlvbi5yZXF1ZXN0ZXJPcmlnaW4o KS5pc0VtcHR5KCkpCi0gICAgICAgICAgICB1cmwgPSBVUkwgeyBVUkwoKSwgbmF2aWdhdGlvbi5y ZXF1ZXN0ZXJPcmlnaW4oKS50b1N0cmluZygpIH07CisgICAgICAgICAgICBzb3VyY2VVUkwgPSBV UkwgeyBVUkwoKSwgbmF2aWdhdGlvbi5yZXF1ZXN0ZXJPcmlnaW4oKS50b1N0cmluZygpIH07CiAg ICAgICAgIGVsc2UKLSAgICAgICAgICAgIHVybCA9IFVSTCB7IHsgfSwgcGFnZS5wYWdlTG9hZFN0 YXRlKCkudXJsKCkgfTsKLSAgICAgICAgaWYgKCF1cmwuaXNWYWxpZCgpIHx8ICF0YXJnZXRVUkwu aXNWYWxpZCgpIHx8IHVybC5pc0VtcHR5KCkgfHwgdXJsLmlzQmxhbmtVUkwoKSB8fCByZWdpc3Ry YWJsZURvbWFpbnNBcmVFcXVhbCh1cmwsIHRhcmdldFVSTCkpIHsKKyAgICAgICAgICAgIHNvdXJj ZVVSTCA9IFVSTCB7IHsgfSwgcGFnZS5wYWdlTG9hZFN0YXRlKCkudXJsKCkgfTsKKworICAgICAg ICBpZiAoc291cmNlVVJMLmlzRW1wdHkoKSAmJiBwYWdlLmNvbmZpZ3VyYXRpb24oKS5yZWxhdGVk UGFnZSgpKSB7CisgICAgICAgICAgICBzb3VyY2VVUkwgPSBVUkwgeyB7IH0sIHBhZ2UuY29uZmln dXJhdGlvbigpLnJlbGF0ZWRQYWdlKCktPnBhZ2VMb2FkU3RhdGUoKS51cmwoKSB9OworICAgICAg ICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAiVXNpbmcgcmVsYXRlZCBwYWdlICVw J3MgVVJMIGFzIHNvdXJjZSBVUkwgZm9yIHByb2Nlc3Mgc3dhcCBkZWNpc2lvbiIsIHBhZ2UuY29u ZmlndXJhdGlvbigpLnJlbGF0ZWRQYWdlKCkpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKCFz b3VyY2VVUkwuaXNWYWxpZCgpIHx8ICF0YXJnZXRVUkwuaXNWYWxpZCgpIHx8IHNvdXJjZVVSTC5p c0VtcHR5KCkgfHwgc291cmNlVVJMLmlzQmxhbmtVUkwoKSB8fCByZWdpc3RyYWJsZURvbWFpbnNB cmVFcXVhbChzb3VyY2VVUkwsIHRhcmdldFVSTCkpIHsKICAgICAgICAgICAgIHJlYXNvbiA9ICJO YXZpZ2F0aW9uIGlzIHNhbWUtc2l0ZSJfczsKICAgICAgICAgICAgIHJldHVybiBwYWdlLnByb2Nl c3MoKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IDVlNGUxNjg4YjFmOTIxYWNkNTllMmI1YzBiOTgxNmM0ZWI0N2ZhZjEuLjA3 MWNiNTQzM2ZjZGQyODVhYzQxZmNlODk2M2NiNGQwMDY5MDE5MDkgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOC0x MC0wOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFBTT046IERv aW5nIGEgY3Jvc3Mtc2l0ZSBuYXZpZ2F0aW9uIHZpYSB0aGUgVVJMIGJhciBkb2VzIG5vdCBzd2Fw IHByb2Nlc3Mgb24gaU9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTAzNzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ1MDU5NDY2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVzdCBj b3ZlcmFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJv Y2Vzc1N3YXBPbk5hdmlnYXRpb24ubW06CisKIDIwMTgtMTAtMDkgIEplciBOb2JsZSAgPGplci5u b2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgSVNPVHJhY2tFbmNyeXB0aW9uQm94IHJldHVybnMg aW5jb3JyZWN0IGRlZmF1bHRLZXlJRApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KaW5k ZXggOGZlMDczYjgzY2E2ZTc3ZTllYjZlMTYxYTQzNzcwODM3MDVlZmJmMC4uNGQxNmRhYzg1MjRh NTcwZTlmZTU2ZGY2OWM0NTk0NGM3NjRkZmY3YiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQorKysgYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0 aW9uLm1tCkBAIC0xODAzLDYgKzE4MDMsNjUgQEAgVEVTVChQcm9jZXNzU3dhcCwgQVBJQ29udHJv bGxlZFByb2Nlc3NTd2FwcGluZykKICAgICBFWFBFQ1RfTkUocGlkMSwgcGlkMyk7CiB9CiAKK2Vu dW0gY2xhc3MgRXhwZWN0U3dhcCB7IE5vLCBZZXMgfTsKK3N0YXRpYyB2b2lkIHJ1blByb2Nlc3NT d2FwRHVlVG9SZWxhdGVkV2ViVmlld1Rlc3QoTlNVUkwqIHJlbGF0ZWRWaWV3VVJMLCBOU1VSTCog dGFyZ2V0VVJMLCBFeHBlY3RTd2FwIGV4cGVjdFN3YXApCit7CisgICAgYXV0byBwcm9jZXNzUG9v bENvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFs bG9jXSBpbml0XSk7CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NT d2Fwc09uTmF2aWdhdGlvbiA9IFlFUzsKKyAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0 KCkucHJld2FybXNQcm9jZXNzZXNBdXRvbWF0aWNhbGx5ID0gWUVTOworICAgIGF1dG8gcHJvY2Vz c1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJh dGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIGF1dG8gd2ViVmll dzFDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2Nd IGluaXRdKTsKKyAgICBbd2ViVmlldzFDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nl c3NQb29sLmdldCgpXTsKKyAgICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBh bGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3MUNvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFu ZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAIlBTT04iXTsKKworICAgIGF1dG8gd2Vi VmlldzEgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJl Y3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2ViVmlldzFDb25maWd1cmF0aW9uLmdl dCgpXSk7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVn YXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcxIHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpk ZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBudW1iZXJPZkRlY2lkZVBvbGljeUNhbGxzID0gMDsKKyAg ICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOnJl bGF0ZWRWaWV3VVJMXTsKKyAgICBbd2ViVmlldzEgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKwor ICAgIGF1dG8gcGlkMSA9IFt3ZWJWaWV3MSBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAg YXV0byB3ZWJWaWV3MkNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJh dGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3MkNvbmZpZ3VyYXRpb24gc2V0UHJvY2Vz c1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIFt3ZWJWaWV3MkNvbmZpZ3VyYXRpb24gc2V0 VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAIlBTT04iXTsKKyAg ICB3ZWJWaWV3MkNvbmZpZ3VyYXRpb24uZ2V0KCkuX3JlbGF0ZWRXZWJWaWV3ID0gd2ViVmlldzEu Z2V0KCk7IC8vIHdlYlZpZXcyIHdpbGwgYmUgcmVsYXRlZCB0byB3ZWJWaWV3MSBhbmQgd2ViVmll dzEncyBVUkwgd2lsbCBiZSB1c2VkIGZvciBwcm9jZXNzIHN3YXAgZGVjaXNpb24uCisgICAgYXV0 byB3ZWJWaWV3MiA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNN YWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3MkNvbmZpZ3VyYXRp b24uZ2V0KCldKTsKKyAgICBbd2ViVmlldzIgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRl LmdldCgpXTsKKworICAgIHJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOnRh cmdldFVSTF07CisgICAgW3dlYlZpZXcyIGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBh dXRvIHBpZDIgPSBbd2ViVmlldzIgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIGlmIChl eHBlY3RTd2FwID09IEV4cGVjdFN3YXA6Ok5vKQorICAgICAgICBFWFBFQ1RfVFJVRShwaWQxID09 IHBpZDIpOworICAgIGVsc2UKKyAgICAgICAgRVhQRUNUX0ZBTFNFKHBpZDEgPT0gcGlkMik7CisK KyAgICBFWFBFQ1RfRVEoMiwgbnVtYmVyT2ZEZWNpZGVQb2xpY3lDYWxscyk7Cit9CisKK1RFU1Qo UHJvY2Vzc1N3YXAsIFByb2Nlc3NTd2FwRHVlVG9SZWxhdGVkVmlldykKK3sKKyAgICBydW5Qcm9j ZXNzU3dhcER1ZVRvUmVsYXRlZFdlYlZpZXdUZXN0KFtOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNv bjovL3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwiXSwgW05TVVJMIFVSTFdpdGhTdHJpbmc6QCJw c29uOi8vd3d3LmFwcGxlLmNvbS9tYWluMi5odG1sIl0sIEV4cGVjdFN3YXA6Olllcyk7Cit9CisK K1RFU1QoUHJvY2Vzc1N3YXAsIE5vUHJvY2Vzc1N3YXBEdWVUb1JlbGF0ZWRWaWV3KQoreworICAg IHJ1blByb2Nlc3NTd2FwRHVlVG9SZWxhdGVkV2ViVmlld1Rlc3QoW05TVVJMIFVSTFdpdGhTdHJp bmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbjEuaHRtbCJdLCBbTlNVUkwgVVJMV2l0aFN0 cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluMi5odG1sIl0sIEV4cGVjdFN3YXA6Ok5v KTsKK30KKwogVEVTVChQcm9jZXNzU3dhcCwgVGVybWluYXRlZFN1c3BlbmRlZFBhZ2VQcm9jZXNz KQogewogICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1By b2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOwo=