226305 2021-05-26 16:42:41 -0700 Calling -[WKWebView _closeAllMediaPresentations] crashes 2021-09-09 16:37:46 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226340 InRadar P2 Normal --- 1 peng.liu6 peng.liu6 cdumez eric.carlson katherine_cheney webkit-bug-importer oldest_to_newest 1764115 0 peng.liu6 2021-05-26 16:42:41 -0700 Calling -[WKWebView _closeAllMediaPresentations] crashes 1764119 1 peng.liu6 2021-05-26 16:50:23 -0700 <rdar://78538835> 1764121 2 429814 peng.liu6 2021-05-26 16:50:46 -0700 Created attachment 429814 Patch 1764122 3 429814 cdumez 2021-05-26 16:51:30 -0700 Comment on attachment 429814 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429814&action=review > Source/WebKit/ChangeLog:11 > + (-[WKWebView _closeAllMediaPresentations]): Can we write an API test for this? 1764126 4 429814 peng.liu6 2021-05-26 16:56:06 -0700 Comment on attachment 429814 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429814&action=review >> Source/WebKit/ChangeLog:11 >> + (-[WKWebView _closeAllMediaPresentations]): > > Can we write an API test for this? Yes. Let me add a test. 1764145 5 429819 peng.liu6 2021-05-26 17:37:58 -0700 Created attachment 429819 Add an API test 1764183 6 429831 peng.liu6 2021-05-26 20:04:02 -0700 Created attachment 429831 Fix a mistake in the API test 1764337 7 429831 eric.carlson 2021-05-27 08:42:26 -0700 Comment on attachment 429831 Fix a mistake in the API test View in context: https://bugs.webkit.org/attachment.cgi?id=429831&action=review > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewCloseAllMediaPresentations.mm:111 > + } while (true); I think it would be better to loop a fixed number of times so if the test fails rather than timings out if it doesn't exit from PiP for some reason. 1764367 8 429831 peng.liu6 2021-05-27 09:46:58 -0700 Comment on attachment 429831 Fix a mistake in the API test View in context: https://bugs.webkit.org/attachment.cgi?id=429831&action=review >> Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewCloseAllMediaPresentations.mm:111 >> + } while (true); > > I think it would be better to loop a fixed number of times so if the test fails rather than timings out if it doesn't exit from PiP for some reason. Agree. Actually this pattern is used multiple times in this file. Filed bug 226340 to fix all of them. 1764369 9 429888 peng.liu6 2021-05-27 09:50:25 -0700 Created attachment 429888 Patch for landing 1764412 10 ews-feeder 2021-05-27 10:56:28 -0700 Committed r278169 (238213@main): <https://commits.webkit.org/238213@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429888. 429814 2021-05-26 16:50:46 -0700 2021-05-26 17:37:56 -0700 Patch bug-226305-20210526165045.patch text/plain 1385 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ4YmE5MzRlZWRiMWY0OTcx ZTJmZTcwOTQ2YTc0ZjJhZTUyZmI0MGYuLmQyZjk5ZmNmMWZhNTRlMDhjMTNmNzZiMDI4OWNjZTE4 ODU2NDIxN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDUtMjYgIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBDYWxsaW5nIC1bV0tXZWJWaWV3IF9j bG9zZUFsbE1lZGlhUHJlc2VudGF0aW9uc10gY3Jhc2hlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJvdmlkZSBhbiBlbXB0eSBjb21wbGV0aW9uIGhh bmRsZXIgdG8gZml4IGEgY3Jhc2guCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jbG9zZUFsbE1lZGlhUHJlc2VudGF0 aW9uc10pOgorCiAyMDIxLTA1LTI1ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIGFub3RoZXIgR0NDOCBidWlsZCBmaXggYWZ0ZXIgcjI3ODAz NQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5k ZXggODkyYWE0ODU4ZjQ4YTc5YmIyYTNkOWUzZjRjNjViZjFkOGM5NDM3Ny4uZjMwYzVlYzNlYjI1 YmQ1OTg0OGIxN2Y4NzQwMzhlZDBlNDlkZGNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0yMjQxLDcgKzIyNDEsNyBAQCBzdGF0aWMg UmV0YWluUHRyPE5TQXJyYXk+IHdrVGV4dE1hbmlwdWxhdGlvbkVycm9ycyhOU0FycmF5PF9XS1Rl eHRNYW5pcHVsYXRpb25JdAogLSAodm9pZClfY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMKIHsK ICAgICBUSFJPV19JRl9TVVNQRU5ERUQ7Ci0gICAgW3NlbGYgY2xvc2VBbGxNZWRpYVByZXNlbnRh dGlvbnNXaXRoQ29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKyAgICBbc2VsZiBjbG9zZUFsbE1lZGlh UHJlc2VudGF0aW9uc1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeeyB9XTsKIH0KIAogLSAodm9pZClf c3RvcE1lZGlhQ2FwdHVyZQo= 429819 2021-05-26 17:37:58 -0700 2021-05-26 17:49:45 -0700 Add an API test bug-226305-20210526173757.patch text/plain 4037 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ4YmE5MzRlZWRiMWY0OTcx ZTJmZTcwOTQ2YTc0ZjJhZTUyZmI0MGYuLmQyZjk5ZmNmMWZhNTRlMDhjMTNmNzZiMDI4OWNjZTE4 ODU2NDIxN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDUtMjYgIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBDYWxsaW5nIC1bV0tXZWJWaWV3IF9j bG9zZUFsbE1lZGlhUHJlc2VudGF0aW9uc10gY3Jhc2hlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJvdmlkZSBhbiBlbXB0eSBjb21wbGV0aW9uIGhh bmRsZXIgdG8gZml4IGEgY3Jhc2guCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jbG9zZUFsbE1lZGlhUHJlc2VudGF0 aW9uc10pOgorCiAyMDIxLTA1LTI1ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIGFub3RoZXIgR0NDOCBidWlsZCBmaXggYWZ0ZXIgcjI3ODAz NQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5k ZXggODkyYWE0ODU4ZjQ4YTc5YmIyYTNkOWUzZjRjNjViZjFkOGM5NDM3Ny4uZjMwYzVlYzNlYjI1 YmQ1OTg0OGIxN2Y4NzQwMzhlZDBlNDlkZGNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0yMjQxLDcgKzIyNDEsNyBAQCBzdGF0aWMg UmV0YWluUHRyPE5TQXJyYXk+IHdrVGV4dE1hbmlwdWxhdGlvbkVycm9ycyhOU0FycmF5PF9XS1Rl eHRNYW5pcHVsYXRpb25JdAogLSAodm9pZClfY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMKIHsK ICAgICBUSFJPV19JRl9TVVNQRU5ERUQ7Ci0gICAgW3NlbGYgY2xvc2VBbGxNZWRpYVByZXNlbnRh dGlvbnNXaXRoQ29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKyAgICBbc2VsZiBjbG9zZUFsbE1lZGlh UHJlc2VudGF0aW9uc1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeeyB9XTsKIH0KIAogLSAodm9pZClf c3RvcE1lZGlhQ2FwdHVyZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IGRiMzY3ODRlNjFmYmM3ZmU1OTViYjU4ZTA2YTkyMDIyYTMwYTc2ODMuLjcx NTU4MmZhZjAwYWQ2NjdjNDFkZjQ5ZDVkMmIzMzY0OTU3OGJmMjUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0w NS0yNiAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgorCisgICAgICAgIENhbGxpbmcg LVtXS1dlYlZpZXcgX2Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zXSBjcmFzaGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYzMDUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMubW06 CisgICAgICAgIChURVNUKToKKwogMjAyMS0wNS0yNiAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFy ZEBhcHBsZS5jb20+CiAKICAgICAgICAgW3Rlc3QtbGxkYi13ZWJraXRdIFVwZGF0ZSBmb3IgWGNv ZGUgMTIuNQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XS1dlYlZpZXdDbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9ucy5tbSBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlv bnMubW0KaW5kZXggNTZmMjRiNDVmYzc5YWRjMjc4YTEyNDg2MDQyYjMyMjg3NjkzNzEzMS4uZjcz MjhmODg5MjZhNzYxZWMwNDA2YzYxZTRhOTlhYTRlMThmMmEyMyAxMDA2NDQKLS0tIGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdDbG9zZUFsbE1lZGlhUHJl c2VudGF0aW9ucy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1dLV2ViVmlld0Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zLm1tCkBAIC03MCw3ICs3MCw2IEBA IFRFU1QoV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMsIFBpY3R1cmVJblBpY3R1 cmUpCiAgICAgICAgIEAiV2ViS2l0MkxvZ2dpbmciOiBAIkZ1bGxzY3JlZW49ZGVidWciLAogICAg IH1dOwogCi0KICAgICBhdXRvICpjb25maWd1cmF0aW9uID0gW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gX3Rlc3RfY29uZmlndXJhdGlvbldpdGhUZXN0UGx1Z0luQ2xhc3NOYW1lOkAiV2ViUHJvY2Vz c1BsdWdJbldpdGhJbnRlcm5hbHMiIGNvbmZpZ3VyZUpTQ0ZvclRlc3Rpbmc6WUVTXTsKICAgICBb W2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNdIF9zZXRBbGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVk aWFQbGF5YmFjazpZRVNdOwogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZp Z3VyYXRpb246Y29uZmlndXJhdGlvbiBhZGRUb1dpbmRvdzpZRVNdKTsKQEAgLTg2LDYgKzg1LDI5 IEBAIFRFU1QoV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMsIFBpY3R1cmVJblBp Y3R1cmUpCiAgICAgRVhQRUNUX1RSVUUoW3dlYlZpZXcgX2FsbE1lZGlhUHJlc2VudGF0aW9uc0Ns b3NlZF0pOwogfQogCitURVNUKFdLV2ViVmlld0Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zSW50 ZXJuYWwsIFBpY3R1cmVJblBpY3R1cmUpCit7CisgICAgaWYgKCFXZWJDb3JlOjpzdXBwb3J0c1Bp Y3R1cmVJblBpY3R1cmUoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgW1tOU1VzZXJEZWZhdWx0 cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gcmVnaXN0ZXJEZWZhdWx0czpAeworICAgICAgICBAIldl YkNvcmVMb2dnaW5nIjogQCJGdWxsc2NyZWVuPWRlYnVnIiwKKyAgICAgICAgQCJXZWJLaXQyTG9n Z2luZyI6IEAiRnVsbHNjcmVlbj1kZWJ1ZyIsCisgICAgfV07CisKKyAgICBhdXRvICpjb25maWd1 cmF0aW9uID0gW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX3Rlc3RfY29uZmlndXJhdGlvbldpdGhU ZXN0UGx1Z0luQ2xhc3NOYW1lOkAiV2ViUHJvY2Vzc1BsdWdJbldpdGhJbnRlcm5hbHMiIGNvbmZp Z3VyZUpTQ0ZvclRlc3Rpbmc6WUVTXTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNd IF9zZXRBbGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjazpZRVNdOworICAgIGF1dG8g d2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5T TWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbiBhZGRU b1dpbmRvdzpZRVNdKTsKKworICAgIGxvYWRQaWN0dXJlSW5QaWN0dXJlKHdlYlZpZXcpOworCisg ICAgc3RhdGljIGJvb2wgaXNEb25lID0gZmFsc2U7CisgICAgW3dlYlZpZXcgX2Nsb3NlQWxsTWVk aWFQcmVzZW50YXRpb25zXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmlzRG9uZSk7 CisKKyAgICBFWFBFQ1RfVFJVRShbd2ViVmlldyBfYWxsTWVkaWFQcmVzZW50YXRpb25zQ2xvc2Vk XSk7Cit9CisKICNlbmRpZgogCiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQo= 429831 2021-05-26 20:04:02 -0700 2021-05-26 20:04:02 -0700 Fix a mistake in the API test bug-226305-20210526200401.patch text/plain 4205 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ4YmE5MzRlZWRiMWY0OTcx ZTJmZTcwOTQ2YTc0ZjJhZTUyZmI0MGYuLmQyZjk5ZmNmMWZhNTRlMDhjMTNmNzZiMDI4OWNjZTE4 ODU2NDIxN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDUtMjYgIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBDYWxsaW5nIC1bV0tXZWJWaWV3IF9j bG9zZUFsbE1lZGlhUHJlc2VudGF0aW9uc10gY3Jhc2hlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJvdmlkZSBhbiBlbXB0eSBjb21wbGV0aW9uIGhh bmRsZXIgdG8gZml4IGEgY3Jhc2guCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jbG9zZUFsbE1lZGlhUHJlc2VudGF0 aW9uc10pOgorCiAyMDIxLTA1LTI1ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIGFub3RoZXIgR0NDOCBidWlsZCBmaXggYWZ0ZXIgcjI3ODAz NQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5k ZXggODkyYWE0ODU4ZjQ4YTc5YmIyYTNkOWUzZjRjNjViZjFkOGM5NDM3Ny4uZjMwYzVlYzNlYjI1 YmQ1OTg0OGIxN2Y4NzQwMzhlZDBlNDlkZGNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0yMjQxLDcgKzIyNDEsNyBAQCBzdGF0aWMg UmV0YWluUHRyPE5TQXJyYXk+IHdrVGV4dE1hbmlwdWxhdGlvbkVycm9ycyhOU0FycmF5PF9XS1Rl eHRNYW5pcHVsYXRpb25JdAogLSAodm9pZClfY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMKIHsK ICAgICBUSFJPV19JRl9TVVNQRU5ERUQ7Ci0gICAgW3NlbGYgY2xvc2VBbGxNZWRpYVByZXNlbnRh dGlvbnNXaXRoQ29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKyAgICBbc2VsZiBjbG9zZUFsbE1lZGlh UHJlc2VudGF0aW9uc1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeeyB9XTsKIH0KIAogLSAodm9pZClf c3RvcE1lZGlhQ2FwdHVyZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IGRiMzY3ODRlNjFmYmM3ZmU1OTViYjU4ZTA2YTkyMDIyYTMwYTc2ODMuLjcx NTU4MmZhZjAwYWQ2NjdjNDFkZjQ5ZDVkMmIzMzY0OTU3OGJmMjUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0w NS0yNiAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgorCisgICAgICAgIENhbGxpbmcg LVtXS1dlYlZpZXcgX2Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zXSBjcmFzaGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYzMDUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMubW06 CisgICAgICAgIChURVNUKToKKwogMjAyMS0wNS0yNiAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFy ZEBhcHBsZS5jb20+CiAKICAgICAgICAgW3Rlc3QtbGxkYi13ZWJraXRdIFVwZGF0ZSBmb3IgWGNv ZGUgMTIuNQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XS1dlYlZpZXdDbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9ucy5tbSBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlv bnMubW0KaW5kZXggNTZmMjRiNDVmYzc5YWRjMjc4YTEyNDg2MDQyYjMyMjg3NjkzNzEzMS4uNTNj M2M2Y2FiYjFhZDkyNzFmNGQ4M2VhYzliYTg2YzBkZjJmNjExMCAxMDA2NDQKLS0tIGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdDbG9zZUFsbE1lZGlhUHJl c2VudGF0aW9ucy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1dLV2ViVmlld0Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zLm1tCkBAIC03MCw3ICs3MCw2IEBA IFRFU1QoV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMsIFBpY3R1cmVJblBpY3R1 cmUpCiAgICAgICAgIEAiV2ViS2l0MkxvZ2dpbmciOiBAIkZ1bGxzY3JlZW49ZGVidWciLAogICAg IH1dOwogCi0KICAgICBhdXRvICpjb25maWd1cmF0aW9uID0gW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gX3Rlc3RfY29uZmlndXJhdGlvbldpdGhUZXN0UGx1Z0luQ2xhc3NOYW1lOkAiV2ViUHJvY2Vz c1BsdWdJbldpdGhJbnRlcm5hbHMiIGNvbmZpZ3VyZUpTQ0ZvclRlc3Rpbmc6WUVTXTsKICAgICBb W2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNdIF9zZXRBbGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVk aWFQbGF5YmFjazpZRVNdOwogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZp Z3VyYXRpb246Y29uZmlndXJhdGlvbiBhZGRUb1dpbmRvdzpZRVNdKTsKQEAgLTg2LDYgKzg1LDM0 IEBAIFRFU1QoV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMsIFBpY3R1cmVJblBp Y3R1cmUpCiAgICAgRVhQRUNUX1RSVUUoW3dlYlZpZXcgX2FsbE1lZGlhUHJlc2VudGF0aW9uc0Ns b3NlZF0pOwogfQogCitURVNUKFdLV2ViVmlld0Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zSW50 ZXJuYWwsIFBpY3R1cmVJblBpY3R1cmUpCit7CisgICAgaWYgKCFXZWJDb3JlOjpzdXBwb3J0c1Bp Y3R1cmVJblBpY3R1cmUoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgW1tOU1VzZXJEZWZhdWx0 cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gcmVnaXN0ZXJEZWZhdWx0czpAeworICAgICAgICBAIldl YkNvcmVMb2dnaW5nIjogQCJGdWxsc2NyZWVuPWRlYnVnIiwKKyAgICAgICAgQCJXZWJLaXQyTG9n Z2luZyI6IEAiRnVsbHNjcmVlbj1kZWJ1ZyIsCisgICAgfV07CisKKyAgICBhdXRvICpjb25maWd1 cmF0aW9uID0gW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX3Rlc3RfY29uZmlndXJhdGlvbldpdGhU ZXN0UGx1Z0luQ2xhc3NOYW1lOkAiV2ViUHJvY2Vzc1BsdWdJbldpdGhJbnRlcm5hbHMiIGNvbmZp Z3VyZUpTQ0ZvclRlc3Rpbmc6WUVTXTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNd IF9zZXRBbGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjazpZRVNdOworICAgIGF1dG8g d2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5T TWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbiBhZGRU b1dpbmRvdzpZRVNdKTsKKworICAgIGxvYWRQaWN0dXJlSW5QaWN0dXJlKHdlYlZpZXcpOworCisg ICAgW3dlYlZpZXcgX2Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zXTsKKworICAgIGRvIHsKKyAg ICAgICAgaWYgKCFbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAid2luZG93 LmludGVybmFscy5pc0NoYW5naW5nUHJlc2VudGF0aW9uTW9kZShkb2N1bWVudC5xdWVyeVNlbGVj dG9yKCd2aWRlbycpKSJdLmJvb2xWYWx1ZSkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAg IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnNsZWVwKDAuNSk7CisgICAgfSB3aGlsZSAodHJ1ZSk7CisK KyAgICBFWFBFQ1RfVFJVRShbd2ViVmlldyBfYWxsTWVkaWFQcmVzZW50YXRpb25zQ2xvc2VkXSk7 Cit9CisKICNlbmRpZgogCiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQo= 429888 2021-05-27 09:50:25 -0700 2021-05-27 10:56:29 -0700 Patch for landing bug-226305-20210527095024.patch text/plain 4199 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ4YmE5MzRlZWRiMWY0OTcx ZTJmZTcwOTQ2YTc0ZjJhZTUyZmI0MGYuLmI4OTM2ZDI4OTUzNWM4ZTIwMzk0MzVmMTgyMDlmYzc5 MjYwMDM1OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDUtMjYgIFBlbmcgTGl1 ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBDYWxsaW5nIC1bV0tXZWJWaWV3IF9j bG9zZUFsbE1lZGlhUHJlc2VudGF0aW9uc10gY3Jhc2hlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2MzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRHVtZXouCisKKyAgICAgICAgUHJvdmlkZSBhbiBlbXB0eSBjb21wbGV0aW9uIGhhbmRs ZXIgdG8gZml4IGEgY3Jhc2guCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9u c10pOgorCiAyMDIxLTA1LTI1ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIGFub3RoZXIgR0NDOCBidWlsZCBmaXggYWZ0ZXIgcjI3ODAzNQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXgg ODkyYWE0ODU4ZjQ4YTc5YmIyYTNkOWUzZjRjNjViZjFkOGM5NDM3Ny4uZjMwYzVlYzNlYjI1YmQ1 OTg0OGIxN2Y4NzQwMzhlZDBlNDlkZGNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0yMjQxLDcgKzIyNDEsNyBAQCBzdGF0aWMgUmV0 YWluUHRyPE5TQXJyYXk+IHdrVGV4dE1hbmlwdWxhdGlvbkVycm9ycyhOU0FycmF5PF9XS1RleHRN YW5pcHVsYXRpb25JdAogLSAodm9pZClfY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMKIHsKICAg ICBUSFJPV19JRl9TVVNQRU5ERUQ7Ci0gICAgW3NlbGYgY2xvc2VBbGxNZWRpYVByZXNlbnRhdGlv bnNXaXRoQ29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKyAgICBbc2VsZiBjbG9zZUFsbE1lZGlhUHJl c2VudGF0aW9uc1dpdGhDb21wbGV0aW9uSGFuZGxlcjpeeyB9XTsKIH0KIAogLSAodm9pZClfc3Rv cE1lZGlhQ2FwdHVyZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IGRiMzY3ODRlNjFmYmM3ZmU1OTViYjU4ZTA2YTkyMDIyYTMwYTc2ODMuLjU3MmEz MjVhNGM3ZjllZTRjNjFhZDI5OTc4OTQyOTQwNzRkZTBhYWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNS0y NiAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgorCisgICAgICAgIENhbGxpbmcgLVtX S1dlYlZpZXcgX2Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zXSBjcmFzaGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjYzMDUKKworICAgICAgICBS ZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMubW06CisgICAg ICAgIChURVNUKToKKwogMjAyMS0wNS0yNiAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBs ZS5jb20+CiAKICAgICAgICAgW3Rlc3QtbGxkYi13ZWJraXRdIFVwZGF0ZSBmb3IgWGNvZGUgMTIu NQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dl YlZpZXdDbG9zZUFsbE1lZGlhUHJlc2VudGF0aW9ucy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMubW0K aW5kZXggNTZmMjRiNDVmYzc5YWRjMjc4YTEyNDg2MDQyYjMyMjg3NjkzNzEzMS4uNTNjM2M2Y2Fi YjFhZDkyNzFmNGQ4M2VhYzliYTg2YzBkZjJmNjExMCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdDbG9zZUFsbE1lZGlhUHJlc2VudGF0 aW9ucy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLV2Vi Vmlld0Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zLm1tCkBAIC03MCw3ICs3MCw2IEBAIFRFU1Qo V0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMsIFBpY3R1cmVJblBpY3R1cmUpCiAg ICAgICAgIEAiV2ViS2l0MkxvZ2dpbmciOiBAIkZ1bGxzY3JlZW49ZGVidWciLAogICAgIH1dOwog Ci0KICAgICBhdXRvICpjb25maWd1cmF0aW9uID0gW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX3Rl c3RfY29uZmlndXJhdGlvbldpdGhUZXN0UGx1Z0luQ2xhc3NOYW1lOkAiV2ViUHJvY2Vzc1BsdWdJ bldpdGhJbnRlcm5hbHMiIGNvbmZpZ3VyZUpTQ0ZvclRlc3Rpbmc6WUVTXTsKICAgICBbW2NvbmZp Z3VyYXRpb24gcHJlZmVyZW5jZXNdIF9zZXRBbGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5 YmFjazpZRVNdOwogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFs bG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRp b246Y29uZmlndXJhdGlvbiBhZGRUb1dpbmRvdzpZRVNdKTsKQEAgLTg2LDYgKzg1LDM0IEBAIFRF U1QoV0tXZWJWaWV3Q2xvc2VBbGxNZWRpYVByZXNlbnRhdGlvbnMsIFBpY3R1cmVJblBpY3R1cmUp CiAgICAgRVhQRUNUX1RSVUUoW3dlYlZpZXcgX2FsbE1lZGlhUHJlc2VudGF0aW9uc0Nsb3NlZF0p OwogfQogCitURVNUKFdLV2ViVmlld0Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zSW50ZXJuYWws IFBpY3R1cmVJblBpY3R1cmUpCit7CisgICAgaWYgKCFXZWJDb3JlOjpzdXBwb3J0c1BpY3R1cmVJ blBpY3R1cmUoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgW1tOU1VzZXJEZWZhdWx0cyBzdGFu ZGFyZFVzZXJEZWZhdWx0c10gcmVnaXN0ZXJEZWZhdWx0czpAeworICAgICAgICBAIldlYkNvcmVM b2dnaW5nIjogQCJGdWxsc2NyZWVuPWRlYnVnIiwKKyAgICAgICAgQCJXZWJLaXQyTG9nZ2luZyI6 IEAiRnVsbHNjcmVlbj1kZWJ1ZyIsCisgICAgfV07CisKKyAgICBhdXRvICpjb25maWd1cmF0aW9u ID0gW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX3Rlc3RfY29uZmlndXJhdGlvbldpdGhUZXN0UGx1 Z0luQ2xhc3NOYW1lOkAiV2ViUHJvY2Vzc1BsdWdJbldpdGhJbnRlcm5hbHMiIGNvbmZpZ3VyZUpT Q0ZvclRlc3Rpbmc6WUVTXTsKKyAgICBbW2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNdIF9zZXRB bGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjazpZRVNdOworICAgIGF1dG8gd2ViVmll dyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJl Y3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbiBhZGRUb1dpbmRv dzpZRVNdKTsKKworICAgIGxvYWRQaWN0dXJlSW5QaWN0dXJlKHdlYlZpZXcpOworCisgICAgW3dl YlZpZXcgX2Nsb3NlQWxsTWVkaWFQcmVzZW50YXRpb25zXTsKKworICAgIGRvIHsKKyAgICAgICAg aWYgKCFbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAid2luZG93LmludGVy bmFscy5pc0NoYW5naW5nUHJlc2VudGF0aW9uTW9kZShkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCd2 aWRlbycpKSJdLmJvb2xWYWx1ZSkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIFRlc3RX ZWJLaXRBUEk6OlV0aWw6OnNsZWVwKDAuNSk7CisgICAgfSB3aGlsZSAodHJ1ZSk7CisKKyAgICBF WFBFQ1RfVFJVRShbd2ViVmlldyBfYWxsTWVkaWFQcmVzZW50YXRpb25zQ2xvc2VkXSk7Cit9CisK ICNlbmRpZgogCiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQo=