202298 2019-09-26 17:35:59 -0700 Enable and disable ResourceLoadStatistics only by session 2019-09-27 08:56:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez webkit-bug-importer youennf oldest_to_newest 1574692 0 achristensen 2019-09-26 17:35:59 -0700 Enable and disable ResourceLoadStatistics only by session 1574695 1 379705 achristensen 2019-09-26 17:39:50 -0700 Created attachment 379705 Patch 1574804 2 379705 youennf 2019-09-27 07:43:50 -0700 Comment on attachment 379705 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379705&action=review > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1871 > + processPool->sendToNetworkingProcess(Messages::NetworkProcess::SetResourceLoadStatisticsEnabled(m_sessionID, true)); I guess we want to store this value in WebsiteDataStore and send it when creating new NetworkProcesses. 1574808 3 379723 achristensen 2019-09-27 07:56:58 -0700 Created attachment 379723 Patch 1574822 4 achristensen 2019-09-27 08:55:15 -0700 http://trac.webkit.org/r250424 1574825 5 webkit-bug-importer 2019-09-27 08:56:19 -0700 <rdar://problem/55783239> 379705 2019-09-26 17:39:50 -0700 2019-09-27 07:56:55 -0700 Patch bug-202298-20190926173947.patch text/plain 7981 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTA0MDQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA5LTI2ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRW5hYmxlIGFuZCBk aXNhYmxlIFJlc291cmNlTG9hZFN0YXRpc3RpY3Mgb25seSBieSBzZXNzaW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIyOTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIG5lZWRlZCB0byBr ZWVwIHBlci1zZXNzaW9uIHRoaW5ncyBwZXItc2Vzc2lvbiBhbmQgcGVyLXByb2Nlc3MtcG9vbCB0 aGluZ3MgcGVyLXByb2Nlc3MtcG9vbC4KKyAgICAgICAgVGhpcyB3YXMgYSBzdHJhbmdlIGNhc2Ug d2hlcmUgd2Ugd291bGQgdGFrZSB0aGUgY3VycmVudCBzZXNzaW9uJ3MgdmFsdWUgYW5kIGFwcGx5 IGl0IGdsb2JhbGx5LgorICAgICAgICBUaGlzIGhhcyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IgYmVj YXVzZSBpdCBpcyBnbG9iYWxseSBlbmFibGVkIGFuZCBkaXNhYmxlZCBieSBBUEkgY2xpZW50cyBh bnl3YXlzLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGlj c0VuYWJsZWQpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmg6Cisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MubWVzc2FnZXMuaW46CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2Vi VmlldyBfaW5pdGlhbGl6ZVdpdGhDb25maWd1cmF0aW9uOl0pOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpz ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCk6IERlbGV0ZWQuCisgICAgICAgICogVUlQ cm9jZXNzL1dlYlByb2Nlc3NQb29sLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3Jl OjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCk6CisKIDIwMTktMDktMjYgIERlYW4g SmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIENvbnRleHRNZW51IG9uIGEgbGlu ayBpbiBhbiBlbWFpbCBubyBsb25nZXIgc2hvd3Mgd2ViIHByZXZpZXcKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCShyZXZpc2lvbiAy NTAzNTEpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTEzOSwxMSArMTEzOSwxMCBAQCB2b2lkIE5ldHdvcmtQcm9j ZXNzOjpzZXRTaG91bGRDbGFzc2lmeVJlCiAgICAgfQogfQogCi12b2lkIE5ldHdvcmtQcm9jZXNz OjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChib29sIGVuYWJsZWQpCit2b2lkIE5l dHdvcmtQcm9jZXNzOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChQQUw6OlNlc3Np b25JRCBzZXNzaW9uSUQsIGJvb2wgZW5hYmxlZCkKIHsKLSAgICBmb3JFYWNoTmV0d29ya1Nlc3Np b24oW2VuYWJsZWRdKGF1dG8mIG5ldHdvcmtTZXNzaW9uKSB7Ci0gICAgICAgIG5ldHdvcmtTZXNz aW9uLnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGVuYWJsZWQpOwotICAgIH0pOwor ICAgIGlmIChhdXRvKiBuZXR3b3JrU2Vzc2lvbiA9IHRoaXMtPm5ldHdvcmtTZXNzaW9uKHNlc3Np b25JRCkpCisgICAgICAgIG5ldHdvcmtTZXNzaW9uLT5zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNz RW5hYmxlZChlbmFibGVkKTsKIH0KIAogdm9pZCBOZXR3b3JrUHJvY2Vzczo6c2V0UmVzb3VyY2VM b2FkU3RhdGlzdGljc0xvZ1Rlc3RpbmdFdmVudChib29sIGVuYWJsZWQpCkluZGV4OiBTb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCShyZXZpc2lvbiAyNTAz NTApCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgJKHdv cmtpbmcgY29weSkKQEAgLTI0Nyw3ICsyNDcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXROb3Rp ZnlQYWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkKFBBTDo6U2Vzc2lvbklELCBib29sIHZh bHVlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgc2V0SXNSdW5uaW5n UmVzb3VyY2VMb2FkU3RhdGlzdGljc1Rlc3QoUEFMOjpTZXNzaW9uSUQsIGJvb2wgdmFsdWUsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAgICAgdm9pZCBzZXROb3RpZnlQYWdlc1doZW5U ZWxlbWV0cnlXYXNDYXB0dXJlZChQQUw6OlNlc3Npb25JRCwgYm9vbCB2YWx1ZSwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZCgpPiYmKTsKLSAgICB2b2lkIHNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NF bmFibGVkKGJvb2wpOworICAgIHZvaWQgc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQo UEFMOjpTZXNzaW9uSUQsIGJvb2wpOwogICAgIHZvaWQgc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGlj c0xvZ1Rlc3RpbmdFdmVudChib29sKTsKICAgICB2b2lkIHNldFJlc291cmNlTG9hZFN0YXRpc3Rp Y3NEZWJ1Z01vZGUoUEFMOjpTZXNzaW9uSUQsIGJvb2wgZGVidWdNb2RlLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKCk+JiZkKTsKICAgICB2b2lkIHNldFNob3VsZENsYXNzaWZ5UmVzb3VyY2VzQmVm b3JlRGF0YVJlY29yZHNSZW1vdmFsKFBBTDo6U2Vzc2lvbklELCBib29sIHZhbHVlLCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAyNTAz NTApCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3Nh Z2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC04Nyw3ICs4Nyw3IEBAIG1lc3NhZ2VzIC0+IE5ldHdv cmtQcm9jZXNzIExlZ2FjeVJlY2VpdmUKICAgICBDbGVhclByZXZhbGVudFJlc291cmNlKFBBTDo6 U2Vzc2lvbklEIHNlc3Npb25JRCwgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4gcmVzb3VyY2VE b21haW4pIC0+ICgpIEFzeW5jCiAgICAgQ2xlYXJVc2VySW50ZXJhY3Rpb24oUEFMOjpTZXNzaW9u SUQgc2Vzc2lvbklELCBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiByZXNvdXJjZURvbWFpbikg LT4gKCkgQXN5bmMKICAgICBEdW1wUmVzb3VyY2VMb2FkU3RhdGlzdGljcyhQQUw6OlNlc3Npb25J RCBzZXNzaW9uSUQpIC0+IChTdHJpbmcgZHVtcGVkU3RhdGlzdGljcykgQXN5bmMKLSAgICBTZXRS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChib29sIGVuYWJsZWQpCisgICAgU2V0UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBib29sIGVu YWJsZWQpCiAgICAgU2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0xvZ1Rlc3RpbmdFdmVudChib29s IGVuYWJsZWQpCiAgICAgVXBkYXRlUHJldmFsZW50RG9tYWluc1RvQmxvY2tDb29raWVzRm9yKFBB TDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgVmVjdG9yPFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWlu PiBkb21haW5zVG9CbG9jaykgLT4gKCkgQXN5bmMKICAgICBJc0dyYW5kZmF0aGVyZWQoUEFMOjpT ZXNzaW9uSUQgc2Vzc2lvbklELCBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiB0YXJnZXREb21h aW4pIC0+IChib29sIGlzR3JhbmRmYXRoZXJlZCkgQXN5bmMKSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJKHJldmlzaW9uIDI1MDM1MikKKysrIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTQ2OCwxNSArMTQ2OCw2IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnNldFNob3VsZFVzZUZvbnRT bW8KICAgICBzZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldFNob3Vs ZFVzZUZvbnRTbW9vdGhpbmcodXNlRm9udFNtb290aGluZykpOwogfQogCi12b2lkIFdlYlByb2Nl c3NQb29sOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChib29sIGVuYWJsZWQpCi17 Ci0gICAgbV9zaG91bGRFbmFibGVJVFBGb3JEZWZhdWx0U2Vzc2lvbnMgPSBlbmFibGVkOwotICAg IHNlbmRUb0FsbFByb2Nlc3NlcyhNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0UmVzb3VyY2VMb2Fk U3RhdGlzdGljc0VuYWJsZWQoZW5hYmxlZCkpOwotI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NU QVRJU1RJQ1MpCi0gICAgc2VuZFRvTmV0d29ya2luZ1Byb2Nlc3MoTWVzc2FnZXM6Ok5ldHdvcmtQ cm9jZXNzOjpTZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChlbmFibGVkKSk7Ci0jZW5k aWYKLX0KLQogdm9pZCBXZWJQcm9jZXNzUG9vbDo6Y2xlYXJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz KCkKIHsKICAgICBzZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkNsZWFy UmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQb29sLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Bvb2wuaAkocmV2aXNpb24gMjUwMzUwKQorKysgU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAkod29ya2luZyBjb3B5KQpAQCAtNDQ3LDcgKzQ0Nyw2IEBA IHB1YmxpYzoKICAgICAgICAgcmV0dXJuIG1faGlkZGVuUGFnZVRocm90dGxpbmdBdXRvSW5jcmVh c2VzQ291bnRlci5jb3VudCgpOwogICAgIH0KIAotICAgIHZvaWQgc2V0UmVzb3VyY2VMb2FkU3Rh dGlzdGljc0VuYWJsZWQoYm9vbCk7CiAgICAgdm9pZCBjbGVhclJlc291cmNlTG9hZFN0YXRpc3Rp Y3MoKTsKIAogICAgIGJvb2wgYWx3YXlzUnVuc0F0QmFja2dyb3VuZFByaW9yaXR5KCkgY29uc3Qg eyByZXR1cm4gbV9hbHdheXNSdW5zQXRCYWNrZ3JvdW5kUHJpb3JpdHk7IH0KSW5kZXg6IFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQkocmV2aXNpb24g MjUwMzUwKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bQkod29ya2luZyBjb3B5KQpAQCAtNTczLDcgKzU3Myw2IEBAIC0gKHZvaWQpX2luaXRpYWxpemVX aXRoQ29uZmlndXJhdGlvbjooV0sKICAgICB2YWxpZGF0ZShfY29uZmlndXJhdGlvbi5nZXQoKSk7 CiAKICAgICBXZWJLaXQ6OldlYlByb2Nlc3NQb29sJiBwcm9jZXNzUG9vbCA9ICpbX2NvbmZpZ3Vy YXRpb24gcHJvY2Vzc1Bvb2xdLT5fcHJvY2Vzc1Bvb2w7Ci0gICAgcHJvY2Vzc1Bvb2wuc2V0UmVz b3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoY29uZmlndXJhdGlvbi53ZWJzaXRlRGF0YVN0b3Jl Ll9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCk7CiAKICAgICBhdXRvIHBhZ2VDb25maWd1 cmF0aW9uID0gW2NvbmZpZ3VyYXRpb24gY29weVBhZ2VDb25maWd1cmF0aW9uXTsKIApJbmRleDog U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0 ZURhdGFTdG9yZS5jcHAJKHJldmlzaW9uIDI1MDM1MikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x ODY3LDE3ICsxODY3LDEzIEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6c2V0UmVzb3VyY2VMb2Fk U3QKICAgICAgICAgCiAgICAgICAgIHJlc29sdmVEaXJlY3Rvcmllc0lmTmVjZXNzYXJ5KCk7CiAg ICAgICAgIAotICAgICAgICBmb3IgKGF1dG8mIHByb2Nlc3NQb29sIDogcHJvY2Vzc1Bvb2xzKHN0 ZDo6bnVtZXJpY19saW1pdHM8c2l6ZV90Pjo6bWF4KCksIGZhbHNlKSkgewotICAgICAgICAgICAg cHJvY2Vzc1Bvb2wtPnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKHRydWUpOwotICAg ICAgICAgICAgcHJvY2Vzc1Bvb2wtPnNlbmRUb05ldHdvcmtpbmdQcm9jZXNzKE1lc3NhZ2VzOjpO ZXR3b3JrUHJvY2Vzczo6U2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQodHJ1ZSkpOwot ICAgICAgICB9CisgICAgICAgIGZvciAoYXV0byYgcHJvY2Vzc1Bvb2wgOiBwcm9jZXNzUG9vbHMo c3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSwgZmFsc2UpKQorICAgICAgICAgICAg cHJvY2Vzc1Bvb2wtPnNlbmRUb05ldHdvcmtpbmdQcm9jZXNzKE1lc3NhZ2VzOjpOZXR3b3JrUHJv Y2Vzczo6U2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQobV9zZXNzaW9uSUQsIHRydWUp KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGZvciAoYXV0byYgcHJvY2Vzc1Bvb2wg OiBwcm9jZXNzUG9vbHMoc3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSwgZmFsc2Up KSB7Ci0gICAgICAgIHByb2Nlc3NQb29sLT5zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxl ZChmYWxzZSk7Ci0gICAgICAgIHByb2Nlc3NQb29sLT5zZW5kVG9OZXR3b3JraW5nUHJvY2VzcyhN ZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVk KGZhbHNlKSk7Ci0gICAgfQorICAgIGZvciAoYXV0byYgcHJvY2Vzc1Bvb2wgOiBwcm9jZXNzUG9v bHMoc3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSwgZmFsc2UpKQorICAgICAgICBw cm9jZXNzUG9vbC0+c2VuZFRvTmV0d29ya2luZ1Byb2Nlc3MoTWVzc2FnZXM6Ok5ldHdvcmtQcm9j ZXNzOjpTZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChtX3Nlc3Npb25JRCwgZmFsc2Up KTsKIAogICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQgPSBmYWxzZTsKICNlbHNl Cg== 379723 2019-09-27 07:56:58 -0700 2019-09-27 08:46:25 -0700 Patch bug-202298-20190927075656.patch text/plain 9903 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTA0MjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA5LTI3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRW5hYmxlIGFuZCBk aXNhYmxlIFJlc291cmNlTG9hZFN0YXRpc3RpY3Mgb25seSBieSBzZXNzaW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIyOTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIG5lZWRlZCB0byBr ZWVwIHBlci1zZXNzaW9uIHRoaW5ncyBwZXItc2Vzc2lvbiBhbmQgcGVyLXByb2Nlc3MtcG9vbCB0 aGluZ3MgcGVyLXByb2Nlc3MtcG9vbC4KKyAgICAgICAgVGhpcyB3YXMgYSBzdHJhbmdlIGNhc2Ug d2hlcmUgd2Ugd291bGQgdGFrZSB0aGUgY3VycmVudCBzZXNzaW9uJ3MgdmFsdWUgYW5kIGFwcGx5 IGl0IGdsb2JhbGx5LgorICAgICAgICBUaGlzIGhhcyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IgYmVj YXVzZSBpdCBpcyBnbG9iYWxseSBlbmFibGVkIGFuZCBkaXNhYmxlZCBieSBBUEkgY2xpZW50cyBh bnl3YXlzLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGlj c0VuYWJsZWQpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmg6Cisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MubWVzc2FnZXMuaW46CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2Vi VmlldyBfaW5pdGlhbGl6ZVdpdGhDb25maWd1cmF0aW9uOl0pOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpz ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCk6IERlbGV0ZWQuCisgICAgICAgICogVUlQ cm9jZXNzL1dlYlByb2Nlc3NQb29sLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3Jl OjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCk6CisKIDIwMTktMDktMjcgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZW1vdmUg dW51c2VkIFdlYlByb2Nlc3NQb29sOjpzZXRDYW5IYW5kbGVIVFRQU1NlcnZlclRydXN0RXZhbHVh dGlvbgpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv Y2Vzcy5jcHAJKHJldmlzaW9uIDI1MDQyMikKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Byb2Nlc3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUwLDExICsxMTUwLDEw IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnNldFNob3VsZENsYXNzaWZ5UmUKICAgICB9CiB9CiAK LXZvaWQgTmV0d29ya1Byb2Nlc3M6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGJv b2wgZW5hYmxlZCkKK3ZvaWQgTmV0d29ya1Byb2Nlc3M6OnNldFJlc291cmNlTG9hZFN0YXRpc3Rp Y3NFbmFibGVkKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgYm9vbCBlbmFibGVkKQogewotICAg IGZvckVhY2hOZXR3b3JrU2Vzc2lvbihbZW5hYmxlZF0oYXV0byYgbmV0d29ya1Nlc3Npb24pIHsK LSAgICAgICAgbmV0d29ya1Nlc3Npb24uc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQo ZW5hYmxlZCk7Ci0gICAgfSk7CisgICAgaWYgKGF1dG8qIG5ldHdvcmtTZXNzaW9uID0gdGhpcy0+ bmV0d29ya1Nlc3Npb24oc2Vzc2lvbklEKSkKKyAgICAgICAgbmV0d29ya1Nlc3Npb24tPnNldFJl c291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGVuYWJsZWQpOwogfQogCiB2b2lkIE5ldHdvcmtQ cm9jZXNzOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTG9nVGVzdGluZ0V2ZW50KGJvb2wgZW5h YmxlZCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3Mu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLmgJKHJldmlzaW9uIDI1MDQyMikKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Byb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMjQ2LDcgKzI0Niw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIHNldE5vdGlmeVBhZ2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQoUEFM OjpTZXNzaW9uSUQsIGJvb2wgdmFsdWUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAg ICAgdm9pZCBzZXRJc1J1bm5pbmdSZXNvdXJjZUxvYWRTdGF0aXN0aWNzVGVzdChQQUw6OlNlc3Np b25JRCwgYm9vbCB2YWx1ZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICAgICB2b2lk IHNldE5vdGlmeVBhZ2VzV2hlblRlbGVtZXRyeVdhc0NhcHR1cmVkKFBBTDo6U2Vzc2lvbklELCBi b29sIHZhbHVlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwotICAgIHZvaWQgc2V0UmVz b3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoYm9vbCk7CisgICAgdm9pZCBzZXRSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRW5hYmxlZChQQUw6OlNlc3Npb25JRCwgYm9vbCk7CiAgICAgdm9pZCBzZXRS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzTG9nVGVzdGluZ0V2ZW50KGJvb2wpOwogICAgIHZvaWQgc2V0 UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZShQQUw6OlNlc3Npb25JRCwgYm9vbCBkZWJ1 Z01vZGUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJmQpOwogICAgIHZvaWQgc2V0U2hvdWxk Q2xhc3NpZnlSZXNvdXJjZXNCZWZvcmVEYXRhUmVjb3Jkc1JlbW92YWwoUEFMOjpTZXNzaW9uSUQs IGJvb2wgdmFsdWUsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CkluZGV4OiBTb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MubWVzc2Fn ZXMuaW4JKHJldmlzaW9uIDI1MDQyMikKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Byb2Nlc3MubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTg2LDcgKzg2LDcg QEAgbWVzc2FnZXMgLT4gTmV0d29ya1Byb2Nlc3MgTGVnYWN5UmVjZWl2ZQogICAgIENsZWFyUHJl dmFsZW50UmVzb3VyY2UoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBXZWJDb3JlOjpSZWdpc3Ry YWJsZURvbWFpbiByZXNvdXJjZURvbWFpbikgLT4gKCkgQXN5bmMKICAgICBDbGVhclVzZXJJbnRl cmFjdGlvbihQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9t YWluIHJlc291cmNlRG9tYWluKSAtPiAoKSBBc3luYwogICAgIER1bXBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkgLT4gKFN0cmluZyBkdW1wZWRTdGF0aXN0 aWNzKSBBc3luYwotICAgIFNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGJvb2wgZW5h YmxlZCkKKyAgICBTZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChQQUw6OlNlc3Npb25J RCBzZXNzaW9uSUQsIGJvb2wgZW5hYmxlZCkKICAgICBTZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNz TG9nVGVzdGluZ0V2ZW50KGJvb2wgZW5hYmxlZCkKICAgICBVcGRhdGVQcmV2YWxlbnREb21haW5z VG9CbG9ja0Nvb2tpZXNGb3IoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBWZWN0b3I8V2ViQ29y ZTo6UmVnaXN0cmFibGVEb21haW4+IGRvbWFpbnNUb0Jsb2NrKSAtPiAoKSBBc3luYwogICAgIElz R3JhbmRmYXRoZXJlZChQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIFdlYkNvcmU6OlJlZ2lzdHJh YmxlRG9tYWluIHRhcmdldERvbWFpbikgLT4gKGJvb2wgaXNHcmFuZGZhdGhlcmVkKSBBc3luYwpJ bmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkocmV2aXNp b24gMjUwNDIyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC01NjksNyArNTY5LDcgQEAgTmV0d29ya1Byb2Nlc3NQcm94eSYg V2ViUHJvY2Vzc1Bvb2w6OmVucwogCiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxl Rm9yUmVhZFdyaXRlRGlyZWN0b3J5KHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRl cnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rv cnksIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25Q YXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUp OwogCi0gICAgYm9vbCBlbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gbV9zaG91bGRFbmFi bGVJVFBGb3JEZWZhdWx0U2Vzc2lvbnM7CisgICAgYm9vbCBlbmFibGVSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzID0gZmFsc2U7CiAgICAgYm9vbCBlbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTG9n VGVzdGluZ0V2ZW50ID0gZmFsc2U7CiAgICAgYm9vbCBzaG91bGRJbmNsdWRlTG9jYWxob3N0ID0g dHJ1ZTsKICAgICBib29sIGVuYWJsZVJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgPSBm YWxzZTsKQEAgLTYxNSw2ICs2MTUsOCBAQCBOZXR3b3JrUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNz UG9vbDo6ZW5zCiAgICAgICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGUobmV0 d29ya0NhY2hlRGlyZWN0b3J5LCBTYW5kYm94RXh0ZW5zaW9uOjpUeXBlOjpSZWFkV3JpdGUsIHBh cmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0 ZXJzLm5ldHdvcmtDYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAgICAgICAgIH0KICAg ICB9IGVsc2UgeworICAgICAgICBpZiAoV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9y ZUV4aXN0cygpKQorICAgICAgICAgICAgZW5hYmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IFdl YnNpdGVEYXRhU3RvcmU6OmRlZmF1bHREYXRhU3RvcmUoKS0+cmVzb3VyY2VMb2FkU3RhdGlzdGlj c0VuYWJsZWQoKTsKICAgICAgICAgYXV0byBuZXR3b3JrQ2FjaGVEaXJlY3RvcnkgPSBXZWJzaXRl RGF0YVN0b3JlOjpkZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5KCk7CiAgICAgICAgIHBhcmFt ZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJz Lm5ldHdvcmtDYWNoZURpcmVjdG9yeSA9IG5ldHdvcmtDYWNoZURpcmVjdG9yeTsKICAgICAgICAg U2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKG5ldHdvcmtDYWNoZURpcmVjdG9yeSwgU2Fu ZGJveEV4dGVuc2lvbjo6VHlwZTo6UmVhZFdyaXRlLCBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3Rv cmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5uZXR3b3JrQ2FjaGVEaXJlY3Rv cnlFeHRlbnNpb25IYW5kbGUpOwpAQCAtMTQ2NCwxNSArMTQ2Niw2IEBAIHZvaWQgV2ViUHJvY2Vz c1Bvb2w6OnNldFNob3VsZFVzZUZvbnRTbW8KICAgICBzZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2Fn ZXM6OldlYlByb2Nlc3M6OlNldFNob3VsZFVzZUZvbnRTbW9vdGhpbmcodXNlRm9udFNtb290aGlu ZykpOwogfQogCi12b2lkIFdlYlByb2Nlc3NQb29sOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNz RW5hYmxlZChib29sIGVuYWJsZWQpCi17Ci0gICAgbV9zaG91bGRFbmFibGVJVFBGb3JEZWZhdWx0 U2Vzc2lvbnMgPSBlbmFibGVkOwotICAgIHNlbmRUb0FsbFByb2Nlc3NlcyhNZXNzYWdlczo6V2Vi UHJvY2Vzczo6U2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoZW5hYmxlZCkpOwotI2lm IEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCi0gICAgc2VuZFRvTmV0d29ya2luZ1By b2Nlc3MoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpTZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNz RW5hYmxlZChlbmFibGVkKSk7Ci0jZW5kaWYKLX0KLQogdm9pZCBXZWJQcm9jZXNzUG9vbDo6Y2xl YXJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKCkKIHsKICAgICBzZW5kVG9BbGxQcm9jZXNzZXMoTWVz c2FnZXM6OldlYlByb2Nlc3M6OkNsZWFyUmVzb3VyY2VMb2FkU3RhdGlzdGljcygpKTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAkocmV2aXNpb24gMjUwNDIy KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAkod29ya2luZyBj b3B5KQpAQCAtNDQ2LDcgKzQ0Niw2IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIG1faGlkZGVu UGFnZVRocm90dGxpbmdBdXRvSW5jcmVhc2VzQ291bnRlci5jb3VudCgpOwogICAgIH0KIAotICAg IHZvaWQgc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoYm9vbCk7CiAgICAgdm9pZCBj bGVhclJlc291cmNlTG9hZFN0YXRpc3RpY3MoKTsKIAogICAgIGJvb2wgYWx3YXlzUnVuc0F0QmFj a2dyb3VuZFByaW9yaXR5KCkgY29uc3QgeyByZXR1cm4gbV9hbHdheXNSdW5zQXRCYWNrZ3JvdW5k UHJpb3JpdHk7IH0KQEAgLTcyNCw3ICs3MjMsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9zaG91 bGRUYWtlVUlCYWNrZ3JvdW5kQXNzZXJ0aW9uOwogICAgIGJvb2wgbV9zaG91bGRNYWtlTmV4dFdl YlByb2Nlc3NMYXVuY2hGYWlsRm9yVGVzdGluZyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3Nob3Vs ZE1ha2VOZXh0TmV0d29ya1Byb2Nlc3NMYXVuY2hGYWlsRm9yVGVzdGluZyB7IGZhbHNlIH07Ci0g ICAgYm9vbCBtX3Nob3VsZEVuYWJsZUlUUEZvckRlZmF1bHRTZXNzaW9ucyB7IGZhbHNlIH07CiAK ICAgICBVc2VyT2JzZXJ2YWJsZVBhZ2VDb3VudGVyIG1fdXNlck9ic2VydmFibGVQYWdlQ291bnRl cjsKICAgICBQcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZENvdW50ZXIgbV9wcm9jZXNzU3VwcHJl c3Npb25EaXNhYmxlZEZvclBhZ2VDb3VudGVyOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCShyZXZpc2lvbiAyNTA0MjEpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkp CkBAIC01NzksNyArNTc5LDYgQEAgLSAodm9pZClfaW5pdGlhbGl6ZVdpdGhDb25maWd1cmF0aW9u OihXSwogICAgIHZhbGlkYXRlKF9jb25maWd1cmF0aW9uLmdldCgpKTsKIAogICAgIFdlYktpdDo6 V2ViUHJvY2Vzc1Bvb2wmIHByb2Nlc3NQb29sID0gKltfY29uZmlndXJhdGlvbiBwcm9jZXNzUG9v bF0tPl9wcm9jZXNzUG9vbDsKLSAgICBwcm9jZXNzUG9vbC5zZXRSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRW5hYmxlZChjb25maWd1cmF0aW9uLndlYnNpdGVEYXRhU3RvcmUuX3Jlc291cmNlTG9hZFN0 YXRpc3RpY3NFbmFibGVkKTsKIAogICAgIGF1dG8gcGFnZUNvbmZpZ3VyYXRpb24gPSBbY29uZmln dXJhdGlvbiBjb3B5UGFnZUNvbmZpZ3VyYXRpb25dOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAko cmV2aXNpb24gMjUwNDIxKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv V2Vic2l0ZURhdGFTdG9yZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4ODksMTcgKzE4ODksMTMg QEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpzZXRSZXNvdXJjZUxvYWRTdAogICAgICAgICAKICAg ICAgICAgcmVzb2x2ZURpcmVjdG9yaWVzSWZOZWNlc3NhcnkoKTsKICAgICAgICAgCi0gICAgICAg IGZvciAoYXV0byYgcHJvY2Vzc1Bvb2wgOiBwcm9jZXNzUG9vbHMoc3RkOjpudW1lcmljX2xpbWl0 czxzaXplX3Q+OjptYXgoKSwgZmFsc2UpKSB7Ci0gICAgICAgICAgICBwcm9jZXNzUG9vbC0+c2V0 UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQodHJ1ZSk7Ci0gICAgICAgICAgICBwcm9jZXNz UG9vbC0+c2VuZFRvTmV0d29ya2luZ1Byb2Nlc3MoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpT ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCh0cnVlKSk7Ci0gICAgICAgIH0KKyAgICAg ICAgZm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scyhzdGQ6Om51bWVyaWNfbGlt aXRzPHNpemVfdD46Om1heCgpLCBmYWxzZSkpCisgICAgICAgICAgICBwcm9jZXNzUG9vbC0+c2Vu ZFRvTmV0d29ya2luZ1Byb2Nlc3MoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpTZXRSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChtX3Nlc3Npb25JRCwgdHJ1ZSkpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCi0gICAgZm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scyhz dGQ6Om51bWVyaWNfbGltaXRzPHNpemVfdD46Om1heCgpLCBmYWxzZSkpIHsKLSAgICAgICAgcHJv Y2Vzc1Bvb2wtPnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGZhbHNlKTsKLSAgICAg ICAgcHJvY2Vzc1Bvb2wtPnNlbmRUb05ldHdvcmtpbmdQcm9jZXNzKE1lc3NhZ2VzOjpOZXR3b3Jr UHJvY2Vzczo6U2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoZmFsc2UpKTsKLSAgICB9 CisgICAgZm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scyhzdGQ6Om51bWVyaWNf bGltaXRzPHNpemVfdD46Om1heCgpLCBmYWxzZSkpCisgICAgICAgIHByb2Nlc3NQb29sLT5zZW5k VG9OZXR3b3JraW5nUHJvY2VzcyhNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlNldFJlc291cmNl TG9hZFN0YXRpc3RpY3NFbmFibGVkKG1fc2Vzc2lvbklELCBmYWxzZSkpOwogCiAgICAgbV9yZXNv dXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCA9IGZhbHNlOwogI2Vsc2UK