222392 2021-02-24 16:17:27 -0800 Hold assertion while waiting for WebContent process to finish initializing 2021-03-03 16:18:15 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=207144 InRadar P2 Normal --- 1 pvollan pvollan cdumez webkit-bug-importer oldest_to_newest 1733137 0 pvollan 2021-02-24 16:17:27 -0800 Make sure the WebContent process is not suspended during initialization by holding assertion while waiting for WebContent process to finish initializing. 1733138 1 421480 pvollan 2021-02-24 16:22:10 -0800 Created attachment 421480 Patch 1733156 2 421485 pvollan 2021-02-24 17:19:29 -0800 Created attachment 421485 Patch 1733334 3 421485 cdumez 2021-02-25 08:29:44 -0800 Comment on attachment 421485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421485&action=review > Source/WebKit/UIProcess/WebProcessPool.cpp:849 > + process.sendWithAsyncReply(Messages::WebProcess::InitializeWebProcess(parameters), [initializationActivity = WTFMove(initializationActivity)] { So the thing is. I tried this exact change in the past and had to revert it due to regression. I suggest you take a look at: Unreviewed, revert r255662 as it seems to cause blank views in SVC. https://bugs.webkit.org/show_bug.cgi?id=207144 <rdar://problem/59334011> 1733336 4 421485 cdumez 2021-02-25 08:31:22 -0800 Comment on attachment 421485 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421485&action=review > Source/WebKit/ChangeLog:3 > + Hold assertion while waiting for WebContent process to finish initializing The title is misleading since we are already going that. You are merely doing it in a different way. 1733522 5 pvollan 2021-02-25 14:34:57 -0800 (In reply to Chris Dumez from comment #3) > Comment on attachment 421485 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421485&action=review > > > Source/WebKit/UIProcess/WebProcessPool.cpp:849 > > + process.sendWithAsyncReply(Messages::WebProcess::InitializeWebProcess(parameters), [initializationActivity = WTFMove(initializationActivity)] { > > So the thing is. I tried this exact change in the past and had to revert it > due to regression. I suggest you take a look at: > Unreviewed, revert r255662 as it seems to cause blank views in SVC. > https://bugs.webkit.org/show_bug.cgi?id=207144 > <rdar://problem/59334011> Ah, that is interesting! Do you think it is possible that the process could suspend before the assertion is taken? Thanks for reviewing! 1733527 6 cdumez 2021-02-25 14:42:32 -0800 (In reply to Per Arne Vollan from comment #5) > (In reply to Chris Dumez from comment #3) > > Comment on attachment 421485 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=421485&action=review > > > > > Source/WebKit/UIProcess/WebProcessPool.cpp:849 > > > + process.sendWithAsyncReply(Messages::WebProcess::InitializeWebProcess(parameters), [initializationActivity = WTFMove(initializationActivity)] { > > > > So the thing is. I tried this exact change in the past and had to revert it > > due to regression. I suggest you take a look at: > > Unreviewed, revert r255662 as it seems to cause blank views in SVC. > > https://bugs.webkit.org/show_bug.cgi?id=207144 > > <rdar://problem/59334011> > > Ah, that is interesting! > > Do you think it is possible that the process could suspend before the > assertion is taken? No idea. RunningBoard logging would tell you though. 1735591 7 webkit-bug-importer 2021-03-03 16:18:15 -0800 <rdar://problem/75008899> 421480 2021-02-24 16:22:10 -0800 2021-02-24 17:19:23 -0800 Patch bug-222392-20210224162209.patch text/plain 5807 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzM0NTMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAyLTI0ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBIb2xkIGFzc2VydGlvbiB3aGls ZSB3YWl0aW5nIGZvciBXZWJDb250ZW50IHByb2Nlc3MgdG8gZmluaXNoIGluaXRpYWxpemluZwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMzkyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBzdXJl IHRoZSBXZWJDb250ZW50IHByb2Nlc3MgaXMgbm90IHN1c3BlbmRlZCBkdXJpbmcgaW5pdGlhbGl6 YXRpb24gYnkgaG9sZGluZyBhc3NlcnRpb24gd2hpbGUgd2FpdGluZyBmb3IgV2ViQ29udGVudCBw cm9jZXNzIHRvIGZpbmlzaCBpbml0aWFsaXppbmcuCisKKyAgICAgICAgKiBSZXNvdXJjZXMvU2Fu ZGJveFByb2ZpbGVzL2lvcy9jb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQuc2I6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Bvb2w6OmluaXRpYWxpemVOZXdXZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjppbml0aWFsaXpl V2ViUHJvY2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmg6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nl c3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW46CisKIDIwMjEtMDItMjQgIENocmlzIER1bWV6 ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggYnVpbGQgd2l0 aCB0aGUgbGF0ZXN0IGlPUyBTREsuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuY3BwCShyZXZpc2lvbiAyNzM0MDUpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc3MCwxMiArNzcwLDYg QEAgV2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMgV2ViUHJvY2Vzcwogdm9pZCBXZWJQcm9j ZXNzUG9vbDo6aW5pdGlhbGl6ZU5ld1dlYlByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNz LCBXZWJzaXRlRGF0YVN0b3JlKiB3ZWJzaXRlRGF0YVN0b3JlLCBXZWJQcm9jZXNzUHJveHk6Oklz UHJld2FybWVkIGlzUHJld2FybWVkKQogewogICAgIGF1dG8gaW5pdGlhbGl6YXRpb25BY3Rpdml0 eSA9IHByb2Nlc3MudGhyb3R0bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5KCJXZWJQcm9jZXNzIGlu aXRpYWxpemF0aW9uIl9zKTsKLSAgICBhdXRvIHNjb3BlRXhpdCA9IG1ha2VTY29wZUV4aXQoWyZw cm9jZXNzLCBpbml0aWFsaXphdGlvbkFjdGl2aXR5ID0gV1RGTW92ZShpbml0aWFsaXphdGlvbkFj dGl2aXR5KV0oKSBtdXRhYmxlIHsKLSAgICAgICAgLy8gUm91bmQtdHJpcCB0byB0aGUgV2ViIENv bnRlbnQgcHJvY2VzcyBiZWZvcmUgcmVsZWFzaW5nIHRoZQotICAgICAgICAvLyBpbml0aWFsaXph dGlvbiBhY3Rpdml0eSwgc28gdGhhdCB3ZSdyZSBzdXJlIHRoYXQgYWxsCi0gICAgICAgIC8vIG1l c3NhZ2VzIHNlbnQgZnJvbSB0aGlzIGZ1bmN0aW9uIGhhdmUgYmVlbiBoYW5kbGVkLgotICAgICAg ICBwcm9jZXNzLmlzUmVzcG9uc2l2ZShbaW5pdGlhbGl6YXRpb25BY3Rpdml0eSA9IFdURk1vdmUo aW5pdGlhbGl6YXRpb25BY3Rpdml0eSldIChib29sKSB7IH0pOwotICAgIH0pOwogCiAgICAgV2Vi UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyBwYXJhbWV0ZXJzOwogCkBAIC04NTIsNyArODQ2LDkg QEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6aW5pdGlhbGl6ZU5ld1dlYlBybwogICAgIGlmICh3ZWJz aXRlRGF0YVN0b3JlKQogICAgICAgICBwYXJhbWV0ZXJzLndlYnNpdGVEYXRhU3RvcmVQYXJhbWV0 ZXJzID0gd2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMocHJvY2VzcywgKndlYnNpdGVEYXRh U3RvcmUpOwogCi0gICAgcHJvY2Vzcy5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpJbml0aWFs aXplV2ViUHJvY2VzcyhwYXJhbWV0ZXJzKSwgMCk7CisgICAgcHJvY2Vzcy5zZW5kV2l0aEFzeW5j UmVwbHkoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkluaXRpYWxpemVXZWJQcm9jZXNzKHBhcmFtZXRl cnMpLCBbaW5pdGlhbGl6YXRpb25BY3Rpdml0eSA9IFdURk1vdmUoaW5pdGlhbGl6YXRpb25BY3Rp dml0eSldIHsKKyAgICAgICAgLy8gVGhlIGFzc2VydGlvbiB3aWxsIGJlIHJlbGVhc2VkIHdoZW4g dGhlIGNvbXBsZXRpb24gaGFuZGxlciBpcyBkb25lLgorICAgIH0pOwogI2lmIFBMQVRGT1JNKENP Q09BKQogICAgIHByb2Nlc3Muc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0UU9TKHdlYlBy b2Nlc3NMYXRlbmN5UU9TKCksIHdlYlByb2Nlc3NUaHJvdWdocHV0UU9TKCkpLCAwKTsKICNlbmRp ZgpAQCAtODY1LDcgKzg2MSw2IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmluaXRpYWxpemVOZXdX ZWJQcm8KICAgICBpZiAoaXNQcmV3YXJtZWQgPT0gV2ViUHJvY2Vzc1Byb3h5OjpJc1ByZXdhcm1l ZDo6WWVzKSB7CiAgICAgICAgIEFTU0VSVCghbV9wcmV3YXJtZWRQcm9jZXNzKTsKICAgICAgICAg bV9wcmV3YXJtZWRQcm9jZXNzID0gJnByb2Nlc3M7Ci0gICAgICAgIHByb2Nlc3Muc2VuZChNZXNz YWdlczo6V2ViUHJvY2Vzczo6UHJld2FybUdsb2JhbGx5KCksIDApOwogICAgIH0KIAogI2lmIFBM QVRGT1JNKElPU19GQU1JTFkpICYmICFQTEFURk9STShNQUNDQVRBTFlTVCkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDI3MzQwNSkKKysrIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzQ5LDcgKzM0OSw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlhbGl6ZUNvbm5lY3Rpb24oSVAK ICAgICBtX3dlYkNvbm5lY3Rpb24gPSBXZWJDb25uZWN0aW9uVG9VSVByb2Nlc3M6OmNyZWF0ZSh0 aGlzKTsKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKK3ZvaWQgV2ViUHJvY2Vzczo6aW5p dGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRl cnMsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsgICAg CiAgICAgVHJhY2VTY29wZSB0cmFjZVNjb3BlKEluaXRpYWxpemVXZWJQcm9jZXNzU3RhcnQsIElu aXRpYWxpemVXZWJQcm9jZXNzRW5kKTsKIApAQCAtNTA5LDcgKzUwOSwxMiBAQCB2b2lkIFdlYlBy b2Nlc3M6OmluaXRpYWxpemVXZWJQcm9jZXNzKFdlCiAgICAgV2ViUmVzb3VyY2VMb2FkT2JzZXJ2 ZXI6OnNldFNob3VsZExvZ1VzZXJJbnRlcmFjdGlvbihwYXJhbWV0ZXJzLnNob3VsZExvZ1VzZXJJ bnRlcmFjdGlvbik7CiAjZW5kaWYKIAorICAgIGlmIChtX3Byb2Nlc3NUeXBlID09IFByb2Nlc3NU eXBlOjpQcmV3YXJtZWRXZWJDb250ZW50KQorICAgICAgICBwcmV3YXJtR2xvYmFsbHkoKTsKKwog ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2VzcywgImluaXRpYWxpemVXZWJQcm9jZXNz OiBQcmVzZW50aW5nIHByb2Nlc3NQSUQ9JWQiLCBXZWJDb3JlOjpwcmVzZW50aW5nQXBwbGljYXRp b25QSUQoKSk7CisKKyAgICBjb21wbGV0aW9uSGFuZGxlcigpOwogfQogCiB2b2lkIFdlYlByb2Nl c3M6OnNldFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzKFdlYlByb2Nlc3NEYXRhU3RvcmVQYXJh bWV0ZXJzJiYgcGFyYW1ldGVycykKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ cm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nl c3MuaAkocmV2aXNpb24gMjczNDA1KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy b2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzc5LDcgKzM3OSw3IEBAIHByaXZhdGU6CiAgICAg V2ViUHJvY2VzcygpOwogICAgIH5XZWJQcm9jZXNzKCk7CiAKLSAgICB2b2lkIGluaXRpYWxpemVX ZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmJik7CisgICAgdm9pZCBpbml0 aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiYsIENvbXBsZXRp b25IYW5kbGVyPHZvaWQoKT4mJik7CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9j ZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmKTsKICAgICB2b2lkIHNldFdlYnNpdGVE YXRhU3RvcmVQYXJhbWV0ZXJzKFdlYlByb2Nlc3NEYXRhU3RvcmVQYXJhbWV0ZXJzJiYpOwogICAg IHZvaWQgcGxhdGZvcm1TZXRXZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycyhXZWJQcm9jZXNzRGF0 YVN0b3JlUGFyYW1ldGVycyYmKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ cm9jZXNzLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAyNzM0MDUpCisrKyBTb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAt MjEsNyArMjEsNyBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBtZXNzYWdlcyAtPiBXZWJQcm9jZXNzIExl Z2FjeVJlY2VpdmVyIE5vdFJlZkNvdW50ZWQgewotICAgIEluaXRpYWxpemVXZWJQcm9jZXNzKHN0 cnVjdCBXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgcHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycykKKyAgICBJbml0aWFsaXplV2ViUHJvY2VzcyhzdHJ1Y3QgV2ViS2l0OjpXZWJQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMpICAtPiAo KSBBc3luYwogICAgIFNldFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzKHN0cnVjdCBXZWJLaXQ6 OldlYlByb2Nlc3NEYXRhU3RvcmVQYXJhbWV0ZXJzIHBhcmFtZXRlcnMpCiAKICAgICBDcmVhdGVX ZWJQYWdlKFdlYkNvcmU6OlBhZ2VJZGVudGlmaWVyIG5ld1BhZ2VJRCwgc3RydWN0IFdlYktpdDo6 V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBwYWdlQ3JlYXRpb25QYXJhbWV0ZXJzKQo= 421485 2021-02-24 17:19:29 -0800 2021-02-24 17:19:29 -0800 Patch bug-222392-20210224171926.patch text/plain 5836 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzM0NTMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAyLTI0ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBIb2xkIGFzc2VydGlvbiB3aGls ZSB3YWl0aW5nIGZvciBXZWJDb250ZW50IHByb2Nlc3MgdG8gZmluaXNoIGluaXRpYWxpemluZwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyMzkyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBzdXJl IHRoZSBXZWJDb250ZW50IHByb2Nlc3MgaXMgbm90IHN1c3BlbmRlZCBkdXJpbmcgaW5pdGlhbGl6 YXRpb24gYnkgaG9sZGluZyBhc3NlcnRpb24gd2hpbGUgd2FpdGluZyBmb3IgV2ViQ29udGVudCBw cm9jZXNzIHRvIGZpbmlzaCBpbml0aWFsaXppbmcuCisKKyAgICAgICAgKiBSZXNvdXJjZXMvU2Fu ZGJveFByb2ZpbGVzL2lvcy9jb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQuc2I6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Bvb2w6OmluaXRpYWxpemVOZXdXZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjppbml0aWFsaXpl V2ViUHJvY2Vzcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmg6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nl c3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW46CisKIDIwMjEtMDItMjQgIENocmlzIER1bWV6 ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggYnVpbGQgd2l0 aCB0aGUgbGF0ZXN0IGlPUyBTREsuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuY3BwCShyZXZpc2lvbiAyNzM0MDUpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc3MCwxMiArNzcwLDYg QEAgV2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMgV2ViUHJvY2Vzcwogdm9pZCBXZWJQcm9j ZXNzUG9vbDo6aW5pdGlhbGl6ZU5ld1dlYlByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNz LCBXZWJzaXRlRGF0YVN0b3JlKiB3ZWJzaXRlRGF0YVN0b3JlLCBXZWJQcm9jZXNzUHJveHk6Oklz UHJld2FybWVkIGlzUHJld2FybWVkKQogewogICAgIGF1dG8gaW5pdGlhbGl6YXRpb25BY3Rpdml0 eSA9IHByb2Nlc3MudGhyb3R0bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5KCJXZWJQcm9jZXNzIGlu aXRpYWxpemF0aW9uIl9zKTsKLSAgICBhdXRvIHNjb3BlRXhpdCA9IG1ha2VTY29wZUV4aXQoWyZw cm9jZXNzLCBpbml0aWFsaXphdGlvbkFjdGl2aXR5ID0gV1RGTW92ZShpbml0aWFsaXphdGlvbkFj dGl2aXR5KV0oKSBtdXRhYmxlIHsKLSAgICAgICAgLy8gUm91bmQtdHJpcCB0byB0aGUgV2ViIENv bnRlbnQgcHJvY2VzcyBiZWZvcmUgcmVsZWFzaW5nIHRoZQotICAgICAgICAvLyBpbml0aWFsaXph dGlvbiBhY3Rpdml0eSwgc28gdGhhdCB3ZSdyZSBzdXJlIHRoYXQgYWxsCi0gICAgICAgIC8vIG1l c3NhZ2VzIHNlbnQgZnJvbSB0aGlzIGZ1bmN0aW9uIGhhdmUgYmVlbiBoYW5kbGVkLgotICAgICAg ICBwcm9jZXNzLmlzUmVzcG9uc2l2ZShbaW5pdGlhbGl6YXRpb25BY3Rpdml0eSA9IFdURk1vdmUo aW5pdGlhbGl6YXRpb25BY3Rpdml0eSldIChib29sKSB7IH0pOwotICAgIH0pOwogCiAgICAgV2Vi UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyBwYXJhbWV0ZXJzOwogCkBAIC04NTIsNyArODQ2LDkg QEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6aW5pdGlhbGl6ZU5ld1dlYlBybwogICAgIGlmICh3ZWJz aXRlRGF0YVN0b3JlKQogICAgICAgICBwYXJhbWV0ZXJzLndlYnNpdGVEYXRhU3RvcmVQYXJhbWV0 ZXJzID0gd2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMocHJvY2VzcywgKndlYnNpdGVEYXRh U3RvcmUpOwogCi0gICAgcHJvY2Vzcy5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpJbml0aWFs aXplV2ViUHJvY2VzcyhwYXJhbWV0ZXJzKSwgMCk7CisgICAgcHJvY2Vzcy5zZW5kV2l0aEFzeW5j UmVwbHkoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkluaXRpYWxpemVXZWJQcm9jZXNzKHBhcmFtZXRl cnMpLCBbaW5pdGlhbGl6YXRpb25BY3Rpdml0eSA9IFdURk1vdmUoaW5pdGlhbGl6YXRpb25BY3Rp dml0eSldIHsKKyAgICAgICAgLy8gVGhlIGFzc2VydGlvbiB3aWxsIGJlIHJlbGVhc2VkIHdoZW4g dGhlIGNvbXBsZXRpb24gaGFuZGxlciBpcyBkb25lLgorICAgIH0pOwogI2lmIFBMQVRGT1JNKENP Q09BKQogICAgIHByb2Nlc3Muc2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0UU9TKHdlYlBy b2Nlc3NMYXRlbmN5UU9TKCksIHdlYlByb2Nlc3NUaHJvdWdocHV0UU9TKCkpLCAwKTsKICNlbmRp ZgpAQCAtODY1LDcgKzg2MSw2IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmluaXRpYWxpemVOZXdX ZWJQcm8KICAgICBpZiAoaXNQcmV3YXJtZWQgPT0gV2ViUHJvY2Vzc1Byb3h5OjpJc1ByZXdhcm1l ZDo6WWVzKSB7CiAgICAgICAgIEFTU0VSVCghbV9wcmV3YXJtZWRQcm9jZXNzKTsKICAgICAgICAg bV9wcmV3YXJtZWRQcm9jZXNzID0gJnByb2Nlc3M7Ci0gICAgICAgIHByb2Nlc3Muc2VuZChNZXNz YWdlczo6V2ViUHJvY2Vzczo6UHJld2FybUdsb2JhbGx5KCksIDApOwogICAgIH0KIAogI2lmIFBM QVRGT1JNKElPU19GQU1JTFkpICYmICFQTEFURk9STShNQUNDQVRBTFlTVCkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDI3MzQwNSkKKysrIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzQ5LDcgKzM0OSw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlhbGl6ZUNvbm5lY3Rpb24oSVAK ICAgICBtX3dlYkNvbm5lY3Rpb24gPSBXZWJDb25uZWN0aW9uVG9VSVByb2Nlc3M6OmNyZWF0ZSh0 aGlzKTsKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKK3ZvaWQgV2ViUHJvY2Vzczo6aW5p dGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRl cnMsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsgICAg CiAgICAgVHJhY2VTY29wZSB0cmFjZVNjb3BlKEluaXRpYWxpemVXZWJQcm9jZXNzU3RhcnQsIElu aXRpYWxpemVXZWJQcm9jZXNzRW5kKTsKIApAQCAtNTA5LDcgKzUwOSwxNCBAQCB2b2lkIFdlYlBy b2Nlc3M6OmluaXRpYWxpemVXZWJQcm9jZXNzKFdlCiAgICAgV2ViUmVzb3VyY2VMb2FkT2JzZXJ2 ZXI6OnNldFNob3VsZExvZ1VzZXJJbnRlcmFjdGlvbihwYXJhbWV0ZXJzLnNob3VsZExvZ1VzZXJJ bnRlcmFjdGlvbik7CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGlmIChtX3By b2Nlc3NUeXBlID09IFByb2Nlc3NUeXBlOjpQcmV3YXJtZWRXZWJDb250ZW50KQorICAgICAgICBw cmV3YXJtR2xvYmFsbHkoKTsKKyNlbmRpZgorCiAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQ cm9jZXNzLCAiaW5pdGlhbGl6ZVdlYlByb2Nlc3M6IFByZXNlbnRpbmcgcHJvY2Vzc1BJRD0lZCIs IFdlYkNvcmU6OnByZXNlbnRpbmdBcHBsaWNhdGlvblBJRCgpKTsKKworICAgIGNvbXBsZXRpb25I YW5kbGVyKCk7CiB9CiAKIHZvaWQgV2ViUHJvY2Vzczo6c2V0V2Vic2l0ZURhdGFTdG9yZVBhcmFt ZXRlcnMoV2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQpJbmRleDog U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCShyZXZpc2lvbiAyNzM0MDUpCisrKyBT b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0z NzksNyArMzc5LDcgQEAgcHJpdmF0ZToKICAgICBXZWJQcm9jZXNzKCk7CiAgICAgfldlYlByb2Nl c3MoKTsKIAotICAgIHZvaWQgaW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycyYmKTsKKyAgICB2b2lkIGluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3ND cmVhdGlvblBhcmFtZXRlcnMmJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICAgICB2 b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVycyYpOwogICAgIHZvaWQgc2V0V2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMoV2ViUHJvY2Vz c0RhdGFTdG9yZVBhcmFtZXRlcnMmJik7CiAgICAgdm9pZCBwbGF0Zm9ybVNldFdlYnNpdGVEYXRh U3RvcmVQYXJhbWV0ZXJzKFdlYlByb2Nlc3NEYXRhU3RvcmVQYXJhbWV0ZXJzJiYpOwpJbmRleDog U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4JKHJl dmlzaW9uIDI3MzQwNSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1l c3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0yMSw3ICsyMSw3IEBACiAjIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CiAKIG1lc3NhZ2VzIC0+IFdlYlByb2Nlc3MgTGVnYWN5UmVjZWl2ZXIgTm90UmVmQ291bnRlZCB7 Ci0gICAgSW5pdGlhbGl6ZVdlYlByb2Nlc3Moc3RydWN0IFdlYktpdDo6V2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycyBwcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzKQorICAgIEluaXRpYWxpemVX ZWJQcm9jZXNzKHN0cnVjdCBXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgcHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycykgIC0+ICgpIEFzeW5jCiAgICAgU2V0V2Vic2l0ZURhdGFT dG9yZVBhcmFtZXRlcnMoc3RydWN0IFdlYktpdDo6V2ViUHJvY2Vzc0RhdGFTdG9yZVBhcmFtZXRl cnMgcGFyYW1ldGVycykKIAogICAgIENyZWF0ZVdlYlBhZ2UoV2ViQ29yZTo6UGFnZUlkZW50aWZp ZXIgbmV3UGFnZUlELCBzdHJ1Y3QgV2ViS2l0OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHBh Z2VDcmVhdGlvblBhcmFtZXRlcnMpCg==