215594 2020-08-17 16:31:41 -0700 A PiP window is closed when the video element is removed from DOM 2021-10-21 18:19:21 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=232125 InRadar P2 Normal --- 1 peng.liu6 peng.liu6 calvaris cdumez changseok eric.carlson esprehn+autocc ews-watchlist glenn gyuyoung.kim jer.noble kondapallykalyan pdr philipj sergio webkit-bug-importer oldest_to_newest 1680969 0 peng.liu6 2020-08-17 16:31:41 -0700 A PiP window will be closed when the video element is removed from DOM 1680970 1 peng.liu6 2020-08-17 16:33:29 -0700 <rdar://problem/66633670> 1681407 2 406854 peng.liu6 2020-08-19 10:57:28 -0700 Created attachment 406854 Patch 1681414 3 406858 peng.liu6 2020-08-19 11:12:23 -0700 Created attachment 406858 fix build failures 1681416 4 406859 peng.liu6 2020-08-19 11:16:09 -0700 Created attachment 406859 fix build failures again 1681427 5 406859 eric.carlson 2020-08-19 11:44:17 -0700 Comment on attachment 406859 fix build failures again View in context: https://bugs.webkit.org/attachment.cgi?id=406859&action=review > Source/WebCore/html/HTMLMediaElement.cpp:4931 > + if (m_videoFullscreenMode == VideoFullscreenModePictureInPicture) > + return true; > + It took me a minute to figure out why this is necessary, so I think it would be useful to have a short comment here. > LayoutTests/media/remove-video-element-in-pip-from-document.html:31 > + setTimeout(endTest, 4000); We shouldn't use a timeout to end tests if at all possible. Four seconds is a very long time to wait for most test runs, but will probably be too short on a very heavily loaded bot. Luckily, I think you can do what you need with a MutationObserver instead. 1681468 6 406871 peng.liu6 2020-08-19 14:05:57 -0700 Created attachment 406871 patch for landing 1681471 7 406859 peng.liu6 2020-08-19 14:17:51 -0700 Comment on attachment 406859 fix build failures again View in context: https://bugs.webkit.org/attachment.cgi?id=406859&action=review >> Source/WebCore/html/HTMLMediaElement.cpp:4931 >> + > > It took me a minute to figure out why this is necessary, so I think it would be useful to have a short comment here. Good suggestion! Fixed. >> LayoutTests/media/remove-video-element-in-pip-from-document.html:31 >> + setTimeout(endTest, 4000); > > We shouldn't use a timeout to end tests if at all possible. Four seconds is a very long time to wait for most test runs, but will probably be too short on a very heavily loaded bot. > > Luckily, I think you can do what you need with a MutationObserver instead. Fixed. The new patch uses a MutationObserver to observe the event that the video element has been removed from DOM, and set up a one-second timer to end the test. 1681504 8 ews-feeder 2020-08-19 15:36:42 -0700 Committed r265904: <https://trac.webkit.org/changeset/265904> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406871. 406854 2020-08-19 10:57:28 -0700 2020-08-19 11:12:22 -0700 Patch bug-215594-20200819105728.patch text/plain 6636 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2RkNTk4NGZiMjc3MzE1 YzIzODY3ZDM5ZWRiYmRjMTliYjUyNWEwNy4uZDJmMzE1ZWU0ZDNiY2FlZTBkOWI1NGZkYWVmYWRh ZmFiMThhMzMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA4LTE5ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgQSBQaVAgd2luZG93IGlzIGNs b3NlZCB3aGVuIHRoZSB2aWRlbyBlbGVtZW50IGlzIHJlbW92ZWQgZnJvbSBET00KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTU5NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3JlbW92 ZS12aWRlby1lbGVtZW50LWluLXBpcC1mcm9tLWRvY3VtZW50Lmh0bWwKKworICAgICAgICAqIGh0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVt ZW50OjpwYXVzZUFmdGVyRGV0YWNoZWRUYXNrKToKKyAgICAgICAgV2hlbiBhIHZpZGVvIGlzIHBs YXlpbmcgaW4gdGhlIHBpY3R1cmUtaW4tcGljdHVyZSBtb2RlLCBkbyBub3QgcGF1c2UgaXQgb3Ig ZXhpdCB0aGUKKyAgICAgICAgcGljdHVyZS1pbi1waWN0dXJlIG1vZGUgd2hlbiBkZXRhY2hpbmcg dGhlIHZpZGVvIGVsZW1lbnQgZnJvbSB0aGUgRE9NLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJSZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkKToKKyAgICAg ICAgQWx3YXlzIHJldHVybiB0cnVlIHdoZW4gdGhlIHZpZGVvIGlzIHBsYXlpbmcgaW4gdGhlIHBp Y3R1cmUtaW4tcGljdHVyZSBtb2RlLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWRlby5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWRlbzo6d2lsbEJlRGVzdHJveWVkKToKKyAg ICAgICAgRG9uJ3QgaGlkZSB0aGUgcGxheWVyIHdoZW4gZGVzdHJveWluZyB0aGUgcmVuZGVyZXIg b2YgYW4gaW5saW5lIHZpZGVvLgorCiAyMDIwLTA4LTE3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHpl ckBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgRHJhZ0FwcGxpY2F0aW9uRmxhZ3MgYWZ0 ZXIgc3dpdGNoIHRvIE9wdGlvblNldDw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcAppbmRleCAwOGRlYjA3ZGJhZjMxYjQ2MzIyMjU1OGZjNjMwZTdlMmE3YmQxYTc4Li4y OTdjYjM1NzJkMTAwMWUxNmY0ODg3ODZlOTMxY2NkMjg4NmJiMDdjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTgzNSw5ICs4MzUsOSBAQCB2b2lkIEhUTUxN ZWRpYUVsZW1lbnQ6OnBhdXNlQWZ0ZXJEZXRhY2hlZFRhc2soKQogICAgIGlmIChtX2luQWN0aXZl RG9jdW1lbnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX25ldHdvcmtTdGF0ZSA+IE5F VFdPUktfRU1QVFkpCisgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSAhPSBWaWRlb0Z1bGxz Y3JlZW5Nb2RlUGljdHVyZUluUGljdHVyZSAmJiBtX25ldHdvcmtTdGF0ZSA+IE5FVFdPUktfRU1Q VFkpCiAgICAgICAgIHBhdXNlKCk7Ci0gICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSAhPSBW aWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSkKKyAgICBpZiAobV92aWRlb0Z1bGxzY3JlZW5Nb2RlID09 IFZpZGVvRnVsbHNjcmVlbk1vZGVTdGFuZGFyZCkKICAgICAgICAgZXhpdEZ1bGxzY3JlZW4oKTsK IAogICAgIGlmICghbV9wbGF5ZXIpCkBAIC00OTI2LDYgKzQ5MjYsOSBAQCB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhUGxheWVyU2l6ZUNoYW5nZWQoKQogCiBib29sIEhUTUxNZWRpYUVsZW1l bnQ6Om1lZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCgpCiB7CisgICAgaWYgKG1f dmlkZW9GdWxsc2NyZWVuTW9kZSA9PSBWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUluUGljdHVy ZSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBhdXRvKiByZW5kZXJlciA9IHRoaXMtPnJl bmRlcmVyKCk7CiAgICAgcmV0dXJuIGlzPFJlbmRlclZpZGVvPihyZW5kZXJlcikKICAgICAgICAg JiYgZG93bmNhc3Q8UmVuZGVyVmlkZW8+KCpyZW5kZXJlcikudmlldygpLmNvbXBvc2l0b3IoKS5j YW5BY2NlbGVyYXRlVmlkZW9SZW5kZXJpbmcoZG93bmNhc3Q8UmVuZGVyVmlkZW8+KCpyZW5kZXJl cikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAKaW5kZXggZTRjNWU3 NGMzOGY1MDQ2OWMxYzU3NjcwYjYwZjljNTA2NWIzMjgwMi4uNGI0ZGE4MDk5ZjM0MGY4NGQ0Y2Fm OTUzMDYzNmNlYzZhODc1YjM3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclZpZGVvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlk ZW8uY3BwCkBAIC02NSw3ICs2NSw5IEBAIFJlbmRlclZpZGVvOjp+UmVuZGVyVmlkZW8oKQogdm9p ZCBSZW5kZXJWaWRlbzo6d2lsbEJlRGVzdHJveWVkKCkKIHsKICAgICB2aXNpYmxlSW5WaWV3cG9y dFN0YXRlQ2hhbmdlZCgpOwotICAgIGlmIChhdXRvIHBsYXllciA9IHZpZGVvRWxlbWVudCgpLnBs YXllcigpKQorCisgICAgYXV0byBwbGF5ZXIgPSB2aWRlb0VsZW1lbnQoKS5wbGF5ZXIoKTsKKyAg ICBpZiAocGxheWVyICYmIHZpZGVvRWxlbWVudCgpLndlYmtpdFByZXNlbnRhdGlvbk1vZGUoKSAh PSBIVE1MVmlkZW9FbGVtZW50OjpWaWRlb1ByZXNlbnRhdGlvbk1vZGU6OlBpY3R1cmVJblBpY3R1 cmUpCiAgICAgICAgIHBsYXllci0+c2V0VmlzaWJsZShmYWxzZSk7CiAKICAgICBSZW5kZXJNZWRp YTo6d2lsbEJlRGVzdHJveWVkKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggM2I1Y2Y5NjE2MzViMWIxZWQzNjc5NjAxMTEz NmI5NWZlODE3ZGNhYi4uYzAzMzBjM2FiMjUyOWQyYTcwNTg1MGU2MTEzNTY0MTBmZDI5YzA3NiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA4LTE5ICBQZW5nIExpdSAgPHBlbmcubGl1NkBh cHBsZS5jb20+CisKKyAgICAgICAgQSBQaVAgd2luZG93IGlzIGNsb3NlZCB3aGVuIHRoZSB2aWRl byBlbGVtZW50IGlzIHJlbW92ZWQgZnJvbSBET00KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTU5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogbWVkaWEvcmVtb3ZlLXZpZGVvLWVsZW1lbnQtaW4tcGlw LWZyb20tZG9jdW1lbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS9yZW1v dmUtdmlkZW8tZWxlbWVudC1pbi1waXAtZnJvbS1kb2N1bWVudC5odG1sOiBBZGRlZC4KKwogMjAy MC0wOC0xNyAgSGVjdG9yIExvcGV6ICA8aGVjdG9yX2lfbG9wZXpAYXBwbGUuY29tPgogCiAgICAg ICAgIFsgbWFjT1MgXSBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdm9sdW1lLXVwLXN1cHBv cnQvdm9sdW1lLXVwLXN1cHBvcnQuaHRtbCBpcyBhIGZsYWt5IHRpbWVvdXQKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL21lZGlhL3JlbW92ZS12aWRlby1lbGVtZW50LWluLXBpcC1mcm9tLWRvY3Vt ZW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL3JlbW92ZS12aWRlby1lbGVtZW50 LWluLXBpcC1mcm9tLWRvY3VtZW50LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40MjZkMmY1Mjhm NjRlZmNkMWU3MmEwZTIwOWM0N2RlYzcxOWQ4NDMyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvbWVkaWEvcmVtb3ZlLXZpZGVvLWVsZW1lbnQtaW4tcGlwLWZyb20tZG9jdW1lbnQtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTAgQEAKK1Rlc3QgdGhhdCByZW1vdmluZyBhIHZpZGVvIGVs ZW1lbnQgZnJvbSB0aGUgRE9NIHdoaWxlIHRoZSB2aWRlbyBpcyBpbiB0aGUgcGljdHVyZS1pbi1w aWN0dXJlIG1vZGUgZG9lcyBub3QgY2xvc2UgdGhlIFBpUCB3aW5kb3cuCisKK1JVTihpbnRlcm5h bHMuc2V0dGluZ3Muc2V0QWxsb3dzUGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2sodHJ1ZSkp CitSVU4oaW50ZXJuYWxzLnNldE1vY2tWaWRlb1ByZXNlbnRhdGlvbk1vZGVFbmFibGVkKHRydWUp KQorRVZFTlQoY2FucGxheXRocm91Z2gpCitFVkVOVChlbnRlcnBpY3R1cmVpbnBpY3R1cmUpCitF WFBFQ1RFRCAocGlwV2luZG93LndpZHRoID4gJzAnKSBPSworRVhQRUNURUQgKHBpcFdpbmRvdy5o ZWlnaHQgPiAnMCcpIE9LCitFTkQgT0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9t ZWRpYS9yZW1vdmUtdmlkZW8tZWxlbWVudC1pbi1waXAtZnJvbS1kb2N1bWVudC5odG1sIGIvTGF5 b3V0VGVzdHMvbWVkaWEvcmVtb3ZlLXZpZGVvLWVsZW1lbnQtaW4tcGlwLWZyb20tZG9jdW1lbnQu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi4yNzk1NWFiYTc4ZjE5OGFhNzgxNTBiMTViMWM0MTdmOGM3MjU4Zjgz Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvcmVtb3ZlLXZpZGVvLWVsZW1l bnQtaW4tcGlwLWZyb20tZG9jdW1lbnQuaHRtbApAQCAtMCwwICsxLDQ1IEBACis8IURPQ1RZUEUg aHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHNjcmlwdCBzcmM9InZpZGVvLXRlc3QuanMiPjwv c2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJtZWRpYS1maWxlLmpzIj48L3NjcmlwdD4KKyAgICA8 c2NyaXB0PgorICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGFzeW5jIGV2 ZW50ID0+IHsKKyAgICAgICAgICAgIGlmICghd2luZG93LmludGVybmFscykgeworICAgICAgICAg ICAgICAgIGZhaWxUZXN0KCdUaGlzIHRlc3QgcmVxdWlyZXMgd2luZG93LmludGVybmFscy4nKTsK KyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGNv bnNvbGVXcml0ZSgnJyk7CisgICAgICAgICAgICBydW4oJ2ludGVybmFscy5zZXR0aW5ncy5zZXRB bGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjayh0cnVlKScpOworICAgICAgICAgICAg cnVuKCdpbnRlcm5hbHMuc2V0TW9ja1ZpZGVvUHJlc2VudGF0aW9uTW9kZUVuYWJsZWQodHJ1ZSkn KTsKKworICAgICAgICAgICAgZmluZE1lZGlhRWxlbWVudCgpOworICAgICAgICAgICAgdmlkZW8u c3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiY29udGVudC90ZXN0Iik7CisKKyAgICAgICAg ICAgIGF3YWl0IHdhaXRGb3IodmlkZW8sICdjYW5wbGF5dGhyb3VnaCcpOworCisgICAgICAgICAg ICBydW5XaXRoS2V5RG93bigoKSA9PiB7CisgICAgICAgICAgICAgICAgdmlkZW8ud2Via2l0U2V0 UHJlc2VudGF0aW9uTW9kZSgncGljdHVyZS1pbi1waWN0dXJlJyk7CisgICAgICAgICAgICB9KTsK KworICAgICAgICAgICAgd2FpdEZvckV2ZW50T25jZSgnZW50ZXJwaWN0dXJlaW5waWN0dXJlJywg ZXZlbnQgPT4geworICAgICAgICAgICAgICAgIHdpbmRvdy5waXBXaW5kb3cgPSBldmVudC5waWN0 dXJlSW5QaWN0dXJlV2luZG93OworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgncGlwV2lu ZG93LndpZHRoJywgMCwgJz4nKTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoJ3BpcFdp bmRvdy5oZWlnaHQnLCAwLCAnPicpOworCisgICAgICAgICAgICAgICAgc2V0VGltZW91dChlbmRU ZXN0LCA0MDAwKTsKKyAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoJ3dlYmtpdHByZXNlbnRh dGlvbm1vZGVjaGFuZ2VkJywgKCkgPT4geworICAgICAgICAgICAgICAgICAgICBmYWlsVGVzdCgn UGlQIHdpbmRvdyBpcyBjbG9zZWQhJyk7CisgICAgICAgICAgICAgICAgfSk7CisKKyAgICAgICAg ICAgICAgICBkb2N1bWVudC5ib2R5LnJlbW92ZUNoaWxkKHZpZGVvKTsKKyAgICAgICAgICAgIH0p OworICAgICAgICB9KTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXY+ VGVzdCB0aGF0IHJlbW92aW5nIGEgdmlkZW8gZWxlbWVudCBmcm9tIHRoZSBET00gd2hpbGUgdGhl IHZpZGVvIGlzIGluIHRoZSBwaWN0dXJlLWluLXBpY3R1cmUgbW9kZSBkb2VzIG5vdCBjbG9zZSB0 aGUgUGlQIHdpbmRvdy48L2Rpdj4KKyAgICA8dmlkZW8gY29udHJvbHMgcGxheXNpbmxpbmU+PC92 aWRlbz4KKzwvYm9keT4KKzwvaHRtbD4K 406858 2020-08-19 11:12:23 -0700 2020-08-19 11:16:07 -0700 fix build failures bug-215594-20200819111223.patch text/plain 6771 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2RkNTk4NGZiMjc3MzE1 YzIzODY3ZDM5ZWRiYmRjMTliYjUyNWEwNy4uZDJmMzE1ZWU0ZDNiY2FlZTBkOWI1NGZkYWVmYWRh ZmFiMThhMzMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA4LTE5ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgQSBQaVAgd2luZG93IGlzIGNs b3NlZCB3aGVuIHRoZSB2aWRlbyBlbGVtZW50IGlzIHJlbW92ZWQgZnJvbSBET00KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTU5NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3JlbW92 ZS12aWRlby1lbGVtZW50LWluLXBpcC1mcm9tLWRvY3VtZW50Lmh0bWwKKworICAgICAgICAqIGh0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVt ZW50OjpwYXVzZUFmdGVyRGV0YWNoZWRUYXNrKToKKyAgICAgICAgV2hlbiBhIHZpZGVvIGlzIHBs YXlpbmcgaW4gdGhlIHBpY3R1cmUtaW4tcGljdHVyZSBtb2RlLCBkbyBub3QgcGF1c2UgaXQgb3Ig ZXhpdCB0aGUKKyAgICAgICAgcGljdHVyZS1pbi1waWN0dXJlIG1vZGUgd2hlbiBkZXRhY2hpbmcg dGhlIHZpZGVvIGVsZW1lbnQgZnJvbSB0aGUgRE9NLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJSZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkKToKKyAgICAg ICAgQWx3YXlzIHJldHVybiB0cnVlIHdoZW4gdGhlIHZpZGVvIGlzIHBsYXlpbmcgaW4gdGhlIHBp Y3R1cmUtaW4tcGljdHVyZSBtb2RlLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWRlby5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWRlbzo6d2lsbEJlRGVzdHJveWVkKToKKyAg ICAgICAgRG9uJ3QgaGlkZSB0aGUgcGxheWVyIHdoZW4gZGVzdHJveWluZyB0aGUgcmVuZGVyZXIg b2YgYW4gaW5saW5lIHZpZGVvLgorCiAyMDIwLTA4LTE3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHpl ckBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgRHJhZ0FwcGxpY2F0aW9uRmxhZ3MgYWZ0 ZXIgc3dpdGNoIHRvIE9wdGlvblNldDw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcAppbmRleCAwOGRlYjA3ZGJhZjMxYjQ2MzIyMjU1OGZjNjMwZTdlMmE3YmQxYTc4Li4y OTdjYjM1NzJkMTAwMWUxNmY0ODg3ODZlOTMxY2NkMjg4NmJiMDdjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTgzNSw5ICs4MzUsOSBAQCB2b2lkIEhUTUxN ZWRpYUVsZW1lbnQ6OnBhdXNlQWZ0ZXJEZXRhY2hlZFRhc2soKQogICAgIGlmIChtX2luQWN0aXZl RG9jdW1lbnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX25ldHdvcmtTdGF0ZSA+IE5F VFdPUktfRU1QVFkpCisgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSAhPSBWaWRlb0Z1bGxz Y3JlZW5Nb2RlUGljdHVyZUluUGljdHVyZSAmJiBtX25ldHdvcmtTdGF0ZSA+IE5FVFdPUktfRU1Q VFkpCiAgICAgICAgIHBhdXNlKCk7Ci0gICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSAhPSBW aWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSkKKyAgICBpZiAobV92aWRlb0Z1bGxzY3JlZW5Nb2RlID09 IFZpZGVvRnVsbHNjcmVlbk1vZGVTdGFuZGFyZCkKICAgICAgICAgZXhpdEZ1bGxzY3JlZW4oKTsK IAogICAgIGlmICghbV9wbGF5ZXIpCkBAIC00OTI2LDYgKzQ5MjYsOSBAQCB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhUGxheWVyU2l6ZUNoYW5nZWQoKQogCiBib29sIEhUTUxNZWRpYUVsZW1l bnQ6Om1lZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCgpCiB7CisgICAgaWYgKG1f dmlkZW9GdWxsc2NyZWVuTW9kZSA9PSBWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUluUGljdHVy ZSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBhdXRvKiByZW5kZXJlciA9IHRoaXMtPnJl bmRlcmVyKCk7CiAgICAgcmV0dXJuIGlzPFJlbmRlclZpZGVvPihyZW5kZXJlcikKICAgICAgICAg JiYgZG93bmNhc3Q8UmVuZGVyVmlkZW8+KCpyZW5kZXJlcikudmlldygpLmNvbXBvc2l0b3IoKS5j YW5BY2NlbGVyYXRlVmlkZW9SZW5kZXJpbmcoZG93bmNhc3Q8UmVuZGVyVmlkZW8+KCpyZW5kZXJl cikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAKaW5kZXggZTRjNWU3 NGMzOGY1MDQ2OWMxYzU3NjcwYjYwZjljNTA2NWIzMjgwMi4uMTkzZjg0YjU1ZDUwOTQzZWVkY2U5 MjVmMmVmYTBjODYyZTkzZTEwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclZpZGVvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlk ZW8uY3BwCkBAIC02NSw4ICs2NSwxNSBAQCBSZW5kZXJWaWRlbzo6flJlbmRlclZpZGVvKCkKIHZv aWQgUmVuZGVyVmlkZW86OndpbGxCZURlc3Ryb3llZCgpCiB7CiAgICAgdmlzaWJsZUluVmlld3Bv cnRTdGF0ZUNoYW5nZWQoKTsKLSAgICBpZiAoYXV0byBwbGF5ZXIgPSB2aWRlb0VsZW1lbnQoKS5w bGF5ZXIoKSkKKworI2lmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKKyAgICBhdXRv IHBsYXllciA9IHZpZGVvRWxlbWVudCgpLnBsYXllcigpOworICAgIGlmIChwbGF5ZXIgJiYgdmlk ZW9FbGVtZW50KCkud2Via2l0UHJlc2VudGF0aW9uTW9kZSgpICE9IEhUTUxWaWRlb0VsZW1lbnQ6 OlZpZGVvUHJlc2VudGF0aW9uTW9kZTo6UGljdHVyZUluUGljdHVyZSkKICAgICAgICAgcGxheWVy LT5zZXRWaXNpYmxlKGZhbHNlKTsKKyNlbHNlCisgICAgaWYgKHBsYXllciA9IHZpZGVvRWxlbWVu dCgpLnBsYXllcigpKQorICAgICAgICBwbGF5ZXItPnNldFZpc2libGUoZmFsc2UpOworI2VuZGlm CiAKICAgICBSZW5kZXJNZWRpYTo6d2lsbEJlRGVzdHJveWVkKCk7CiB9CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggM2I1Y2Y5 NjE2MzViMWIxZWQzNjc5NjAxMTEzNmI5NWZlODE3ZGNhYi4uYzAzMzBjM2FiMjUyOWQyYTcwNTg1 MGU2MTEzNTY0MTBmZDI5YzA3NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA4LTE5ICBQ ZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgQSBQaVAgd2luZG93IGlz IGNsb3NlZCB3aGVuIHRoZSB2aWRlbyBlbGVtZW50IGlzIHJlbW92ZWQgZnJvbSBET00KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTU5NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbWVkaWEvcmVtb3Zl LXZpZGVvLWVsZW1lbnQtaW4tcGlwLWZyb20tZG9jdW1lbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4K KyAgICAgICAgKiBtZWRpYS9yZW1vdmUtdmlkZW8tZWxlbWVudC1pbi1waXAtZnJvbS1kb2N1bWVu dC5odG1sOiBBZGRlZC4KKwogMjAyMC0wOC0xNyAgSGVjdG9yIExvcGV6ICA8aGVjdG9yX2lfbG9w ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFsgbWFjT1MgXSBtZWRpYS9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvdm9sdW1lLXVwLXN1cHBvcnQvdm9sdW1lLXVwLXN1cHBvcnQuaHRtbCBpcyBhIGZsYWt5 IHRpbWVvdXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL3JlbW92ZS12aWRlby1lbGVt ZW50LWluLXBpcC1mcm9tLWRvY3VtZW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlh L3JlbW92ZS12aWRlby1lbGVtZW50LWluLXBpcC1mcm9tLWRvY3VtZW50LWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi40MjZkMmY1MjhmNjRlZmNkMWU3MmEwZTIwOWM0N2RlYzcxOWQ4NDMyCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvcmVtb3ZlLXZpZGVvLWVsZW1lbnQtaW4t cGlwLWZyb20tZG9jdW1lbnQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTAgQEAKK1Rlc3QgdGhh dCByZW1vdmluZyBhIHZpZGVvIGVsZW1lbnQgZnJvbSB0aGUgRE9NIHdoaWxlIHRoZSB2aWRlbyBp cyBpbiB0aGUgcGljdHVyZS1pbi1waWN0dXJlIG1vZGUgZG9lcyBub3QgY2xvc2UgdGhlIFBpUCB3 aW5kb3cuCisKK1JVTihpbnRlcm5hbHMuc2V0dGluZ3Muc2V0QWxsb3dzUGljdHVyZUluUGljdHVy ZU1lZGlhUGxheWJhY2sodHJ1ZSkpCitSVU4oaW50ZXJuYWxzLnNldE1vY2tWaWRlb1ByZXNlbnRh dGlvbk1vZGVFbmFibGVkKHRydWUpKQorRVZFTlQoY2FucGxheXRocm91Z2gpCitFVkVOVChlbnRl cnBpY3R1cmVpbnBpY3R1cmUpCitFWFBFQ1RFRCAocGlwV2luZG93LndpZHRoID4gJzAnKSBPSwor RVhQRUNURUQgKHBpcFdpbmRvdy5oZWlnaHQgPiAnMCcpIE9LCitFTkQgT0YgVEVTVAorCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9yZW1vdmUtdmlkZW8tZWxlbWVudC1pbi1waXAtZnJv bS1kb2N1bWVudC5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvcmVtb3ZlLXZpZGVvLWVsZW1lbnQt aW4tcGlwLWZyb20tZG9jdW1lbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yNzk1NWFiYTc4ZjE5OGFhNzgx NTBiMTViMWM0MTdmOGM3MjU4ZjgzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVk aWEvcmVtb3ZlLXZpZGVvLWVsZW1lbnQtaW4tcGlwLWZyb20tZG9jdW1lbnQuaHRtbApAQCAtMCww ICsxLDQ1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHNjcmlwdCBz cmM9InZpZGVvLXRlc3QuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJtZWRpYS1maWxl LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0PgorICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0 ZW5lcignbG9hZCcsIGFzeW5jIGV2ZW50ID0+IHsKKyAgICAgICAgICAgIGlmICghd2luZG93Lmlu dGVybmFscykgeworICAgICAgICAgICAgICAgIGZhaWxUZXN0KCdUaGlzIHRlc3QgcmVxdWlyZXMg d2luZG93LmludGVybmFscy4nKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgnJyk7CisgICAgICAgICAgICBydW4oJ2lu dGVybmFscy5zZXR0aW5ncy5zZXRBbGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjayh0 cnVlKScpOworICAgICAgICAgICAgcnVuKCdpbnRlcm5hbHMuc2V0TW9ja1ZpZGVvUHJlc2VudGF0 aW9uTW9kZUVuYWJsZWQodHJ1ZSknKTsKKworICAgICAgICAgICAgZmluZE1lZGlhRWxlbWVudCgp OworICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiY29udGVu dC90ZXN0Iik7CisKKyAgICAgICAgICAgIGF3YWl0IHdhaXRGb3IodmlkZW8sICdjYW5wbGF5dGhy b3VnaCcpOworCisgICAgICAgICAgICBydW5XaXRoS2V5RG93bigoKSA9PiB7CisgICAgICAgICAg ICAgICAgdmlkZW8ud2Via2l0U2V0UHJlc2VudGF0aW9uTW9kZSgncGljdHVyZS1pbi1waWN0dXJl Jyk7CisgICAgICAgICAgICB9KTsKKworICAgICAgICAgICAgd2FpdEZvckV2ZW50T25jZSgnZW50 ZXJwaWN0dXJlaW5waWN0dXJlJywgZXZlbnQgPT4geworICAgICAgICAgICAgICAgIHdpbmRvdy5w aXBXaW5kb3cgPSBldmVudC5waWN0dXJlSW5QaWN0dXJlV2luZG93OworICAgICAgICAgICAgICAg IHRlc3RFeHBlY3RlZCgncGlwV2luZG93LndpZHRoJywgMCwgJz4nKTsKKyAgICAgICAgICAgICAg ICB0ZXN0RXhwZWN0ZWQoJ3BpcFdpbmRvdy5oZWlnaHQnLCAwLCAnPicpOworCisgICAgICAgICAg ICAgICAgc2V0VGltZW91dChlbmRUZXN0LCA0MDAwKTsKKyAgICAgICAgICAgICAgICB3YWl0Rm9y RXZlbnQoJ3dlYmtpdHByZXNlbnRhdGlvbm1vZGVjaGFuZ2VkJywgKCkgPT4geworICAgICAgICAg ICAgICAgICAgICBmYWlsVGVzdCgnUGlQIHdpbmRvdyBpcyBjbG9zZWQhJyk7CisgICAgICAgICAg ICAgICAgfSk7CisKKyAgICAgICAgICAgICAgICBkb2N1bWVudC5ib2R5LnJlbW92ZUNoaWxkKHZp ZGVvKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKyAgICA8L3NjcmlwdD4KKzwvaGVh ZD4KKzxib2R5PgorICAgIDxkaXY+VGVzdCB0aGF0IHJlbW92aW5nIGEgdmlkZW8gZWxlbWVudCBm cm9tIHRoZSBET00gd2hpbGUgdGhlIHZpZGVvIGlzIGluIHRoZSBwaWN0dXJlLWluLXBpY3R1cmUg bW9kZSBkb2VzIG5vdCBjbG9zZSB0aGUgUGlQIHdpbmRvdy48L2Rpdj4KKyAgICA8dmlkZW8gY29u dHJvbHMgcGxheXNpbmxpbmU+PC92aWRlbz4KKzwvYm9keT4KKzwvaHRtbD4K 406859 2020-08-19 11:16:09 -0700 2020-08-19 11:44:17 -0700 fix build failures again bug-215594-20200819111608.patch text/plain 6728 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2RkNTk4NGZiMjc3MzE1 YzIzODY3ZDM5ZWRiYmRjMTliYjUyNWEwNy4uZDJmMzE1ZWU0ZDNiY2FlZTBkOWI1NGZkYWVmYWRh ZmFiMThhMzMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA4LTE5ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgQSBQaVAgd2luZG93IGlzIGNs b3NlZCB3aGVuIHRoZSB2aWRlbyBlbGVtZW50IGlzIHJlbW92ZWQgZnJvbSBET00KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTU5NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3JlbW92 ZS12aWRlby1lbGVtZW50LWluLXBpcC1mcm9tLWRvY3VtZW50Lmh0bWwKKworICAgICAgICAqIGh0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVt ZW50OjpwYXVzZUFmdGVyRGV0YWNoZWRUYXNrKToKKyAgICAgICAgV2hlbiBhIHZpZGVvIGlzIHBs YXlpbmcgaW4gdGhlIHBpY3R1cmUtaW4tcGljdHVyZSBtb2RlLCBkbyBub3QgcGF1c2UgaXQgb3Ig ZXhpdCB0aGUKKyAgICAgICAgcGljdHVyZS1pbi1waWN0dXJlIG1vZGUgd2hlbiBkZXRhY2hpbmcg dGhlIHZpZGVvIGVsZW1lbnQgZnJvbSB0aGUgRE9NLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJSZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkKToKKyAgICAg ICAgQWx3YXlzIHJldHVybiB0cnVlIHdoZW4gdGhlIHZpZGVvIGlzIHBsYXlpbmcgaW4gdGhlIHBp Y3R1cmUtaW4tcGljdHVyZSBtb2RlLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWRlby5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWRlbzo6d2lsbEJlRGVzdHJveWVkKToKKyAg ICAgICAgRG9uJ3QgaGlkZSB0aGUgcGxheWVyIHdoZW4gZGVzdHJveWluZyB0aGUgcmVuZGVyZXIg b2YgYW4gaW5saW5lIHZpZGVvLgorCiAyMDIwLTA4LTE3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHpl ckBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgRHJhZ0FwcGxpY2F0aW9uRmxhZ3MgYWZ0 ZXIgc3dpdGNoIHRvIE9wdGlvblNldDw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcAppbmRleCAwOGRlYjA3ZGJhZjMxYjQ2MzIyMjU1OGZjNjMwZTdlMmE3YmQxYTc4Li4y OTdjYjM1NzJkMTAwMWUxNmY0ODg3ODZlOTMxY2NkMjg4NmJiMDdjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTgzNSw5ICs4MzUsOSBAQCB2b2lkIEhUTUxN ZWRpYUVsZW1lbnQ6OnBhdXNlQWZ0ZXJEZXRhY2hlZFRhc2soKQogICAgIGlmIChtX2luQWN0aXZl RG9jdW1lbnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX25ldHdvcmtTdGF0ZSA+IE5F VFdPUktfRU1QVFkpCisgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSAhPSBWaWRlb0Z1bGxz Y3JlZW5Nb2RlUGljdHVyZUluUGljdHVyZSAmJiBtX25ldHdvcmtTdGF0ZSA+IE5FVFdPUktfRU1Q VFkpCiAgICAgICAgIHBhdXNlKCk7Ci0gICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSAhPSBW aWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSkKKyAgICBpZiAobV92aWRlb0Z1bGxzY3JlZW5Nb2RlID09 IFZpZGVvRnVsbHNjcmVlbk1vZGVTdGFuZGFyZCkKICAgICAgICAgZXhpdEZ1bGxzY3JlZW4oKTsK IAogICAgIGlmICghbV9wbGF5ZXIpCkBAIC00OTI2LDYgKzQ5MjYsOSBAQCB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhUGxheWVyU2l6ZUNoYW5nZWQoKQogCiBib29sIEhUTUxNZWRpYUVsZW1l bnQ6Om1lZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCgpCiB7CisgICAgaWYgKG1f dmlkZW9GdWxsc2NyZWVuTW9kZSA9PSBWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUluUGljdHVy ZSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBhdXRvKiByZW5kZXJlciA9IHRoaXMtPnJl bmRlcmVyKCk7CiAgICAgcmV0dXJuIGlzPFJlbmRlclZpZGVvPihyZW5kZXJlcikKICAgICAgICAg JiYgZG93bmNhc3Q8UmVuZGVyVmlkZW8+KCpyZW5kZXJlcikudmlldygpLmNvbXBvc2l0b3IoKS5j YW5BY2NlbGVyYXRlVmlkZW9SZW5kZXJpbmcoZG93bmNhc3Q8UmVuZGVyVmlkZW8+KCpyZW5kZXJl cikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAKaW5kZXggZTRjNWU3 NGMzOGY1MDQ2OWMxYzU3NjcwYjYwZjljNTA2NWIzMjgwMi4uZWQ5N2FmYTQyYmRlZjNhY2NhNjk1 MTNlMjQ2ZWM1ZmI5M2RjNzBjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclZpZGVvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlk ZW8uY3BwCkBAIC02NSw4ICs2NSwxNSBAQCBSZW5kZXJWaWRlbzo6flJlbmRlclZpZGVvKCkKIHZv aWQgUmVuZGVyVmlkZW86OndpbGxCZURlc3Ryb3llZCgpCiB7CiAgICAgdmlzaWJsZUluVmlld3Bv cnRTdGF0ZUNoYW5nZWQoKTsKKworI2lmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkK KyAgICBhdXRvIHBsYXllciA9IHZpZGVvRWxlbWVudCgpLnBsYXllcigpOworICAgIGlmIChwbGF5 ZXIgJiYgdmlkZW9FbGVtZW50KCkud2Via2l0UHJlc2VudGF0aW9uTW9kZSgpICE9IEhUTUxWaWRl b0VsZW1lbnQ6OlZpZGVvUHJlc2VudGF0aW9uTW9kZTo6UGljdHVyZUluUGljdHVyZSkKKyAgICAg ICAgcGxheWVyLT5zZXRWaXNpYmxlKGZhbHNlKTsKKyNlbHNlCiAgICAgaWYgKGF1dG8gcGxheWVy ID0gdmlkZW9FbGVtZW50KCkucGxheWVyKCkpCiAgICAgICAgIHBsYXllci0+c2V0VmlzaWJsZShm YWxzZSk7CisjZW5kaWYKIAogICAgIFJlbmRlck1lZGlhOjp3aWxsQmVEZXN0cm95ZWQoKTsKIH0K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzYjVjZjk2MTYzNWIxYjFlZDM2Nzk2MDExMTM2Yjk1ZmU4MTdkY2FiLi5jMDMzMGMz YWIyNTI5ZDJhNzA1ODUwZTYxMTM1NjQxMGZkMjljMDc2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMjAtMDgtMTkgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKworICAgICAgICBB IFBpUCB3aW5kb3cgaXMgY2xvc2VkIHdoZW4gdGhlIHZpZGVvIGVsZW1lbnQgaXMgcmVtb3ZlZCBm cm9tIERPTQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE1NTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBtZWRpYS9yZW1vdmUtdmlkZW8tZWxlbWVudC1pbi1waXAtZnJvbS1kb2N1bWVudC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3JlbW92ZS12aWRlby1lbGVtZW50LWluLXBp cC1mcm9tLWRvY3VtZW50Lmh0bWw6IEFkZGVkLgorCiAyMDIwLTA4LTE3ICBIZWN0b3IgTG9wZXog IDxoZWN0b3JfaV9sb3BlekBhcHBsZS5jb20+CiAKICAgICAgICAgWyBtYWNPUyBdIG1lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy92b2x1bWUtdXAtc3VwcG9ydC92b2x1bWUtdXAtc3VwcG9ydC5o dG1sIGlzIGEgZmxha3kgdGltZW91dApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvcmVt b3ZlLXZpZGVvLWVsZW1lbnQtaW4tcGlwLWZyb20tZG9jdW1lbnQtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvbWVkaWEvcmVtb3ZlLXZpZGVvLWVsZW1lbnQtaW4tcGlwLWZyb20tZG9jdW1lbnQt ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQyNmQyZjUyOGY2NGVmY2QxZTcyYTBlMjA5YzQ3ZGVj NzE5ZDg0MzIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9yZW1vdmUtdmlk ZW8tZWxlbWVudC1pbi1waXAtZnJvbS1kb2N1bWVudC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwx MCBAQAorVGVzdCB0aGF0IHJlbW92aW5nIGEgdmlkZW8gZWxlbWVudCBmcm9tIHRoZSBET00gd2hp bGUgdGhlIHZpZGVvIGlzIGluIHRoZSBwaWN0dXJlLWluLXBpY3R1cmUgbW9kZSBkb2VzIG5vdCBj bG9zZSB0aGUgUGlQIHdpbmRvdy4KKworUlVOKGludGVybmFscy5zZXR0aW5ncy5zZXRBbGxvd3NQ aWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjayh0cnVlKSkKK1JVTihpbnRlcm5hbHMuc2V0TW9j a1ZpZGVvUHJlc2VudGF0aW9uTW9kZUVuYWJsZWQodHJ1ZSkpCitFVkVOVChjYW5wbGF5dGhyb3Vn aCkKK0VWRU5UKGVudGVycGljdHVyZWlucGljdHVyZSkKK0VYUEVDVEVEIChwaXBXaW5kb3cud2lk dGggPiAnMCcpIE9LCitFWFBFQ1RFRCAocGlwV2luZG93LmhlaWdodCA+ICcwJykgT0sKK0VORCBP RiBURVNUCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL3JlbW92ZS12aWRlby1lbGVt ZW50LWluLXBpcC1mcm9tLWRvY3VtZW50Lmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9yZW1vdmUt dmlkZW8tZWxlbWVudC1pbi1waXAtZnJvbS1kb2N1bWVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjI3OTU1 YWJhNzhmMTk4YWE3ODE1MGIxNWIxYzQxN2Y4YzcyNThmODMKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9tZWRpYS9yZW1vdmUtdmlkZW8tZWxlbWVudC1pbi1waXAtZnJvbS1kb2N1bWVu dC5odG1sCkBAIC0wLDAgKzEsNDUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4K KyAgICA8c2NyaXB0IHNyYz0idmlkZW8tdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBz cmM9Im1lZGlhLWZpbGUuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgICAgIHdpbmRv dy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgYXN5bmMgZXZlbnQgPT4geworICAgICAgICAgICAg aWYgKCF3aW5kb3cuaW50ZXJuYWxzKSB7CisgICAgICAgICAgICAgICAgZmFpbFRlc3QoJ1RoaXMg dGVzdCByZXF1aXJlcyB3aW5kb3cuaW50ZXJuYWxzLicpOworICAgICAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgY29uc29sZVdyaXRlKCcnKTsKKyAgICAg ICAgICAgIHJ1bignaW50ZXJuYWxzLnNldHRpbmdzLnNldEFsbG93c1BpY3R1cmVJblBpY3R1cmVN ZWRpYVBsYXliYWNrKHRydWUpJyk7CisgICAgICAgICAgICBydW4oJ2ludGVybmFscy5zZXRNb2Nr VmlkZW9QcmVzZW50YXRpb25Nb2RlRW5hYmxlZCh0cnVlKScpOworCisgICAgICAgICAgICBmaW5k TWVkaWFFbGVtZW50KCk7CisgICAgICAgICAgICB2aWRlby5zcmMgPSBmaW5kTWVkaWFGaWxlKCJ2 aWRlbyIsICJjb250ZW50L3Rlc3QiKTsKKworICAgICAgICAgICAgYXdhaXQgd2FpdEZvcih2aWRl bywgJ2NhbnBsYXl0aHJvdWdoJyk7CisKKyAgICAgICAgICAgIHJ1bldpdGhLZXlEb3duKCgpID0+ IHsKKyAgICAgICAgICAgICAgICB2aWRlby53ZWJraXRTZXRQcmVzZW50YXRpb25Nb2RlKCdwaWN0 dXJlLWluLXBpY3R1cmUnKTsKKyAgICAgICAgICAgIH0pOworCisgICAgICAgICAgICB3YWl0Rm9y RXZlbnRPbmNlKCdlbnRlcnBpY3R1cmVpbnBpY3R1cmUnLCBldmVudCA9PiB7CisgICAgICAgICAg ICAgICAgd2luZG93LnBpcFdpbmRvdyA9IGV2ZW50LnBpY3R1cmVJblBpY3R1cmVXaW5kb3c7Cisg ICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCdwaXBXaW5kb3cud2lkdGgnLCAwLCAnPicpOwor ICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgncGlwV2luZG93LmhlaWdodCcsIDAsICc+Jyk7 CisKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KGVuZFRlc3QsIDQwMDApOworICAgICAgICAg ICAgICAgIHdhaXRGb3JFdmVudCgnd2Via2l0cHJlc2VudGF0aW9ubW9kZWNoYW5nZWQnLCAoKSA9 PiB7CisgICAgICAgICAgICAgICAgICAgIGZhaWxUZXN0KCdQaVAgd2luZG93IGlzIGNsb3NlZCEn KTsKKyAgICAgICAgICAgICAgICB9KTsKKworICAgICAgICAgICAgICAgIGRvY3VtZW50LmJvZHku cmVtb3ZlQ2hpbGQodmlkZW8pOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0pOworICAgIDwv c2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdj5UZXN0IHRoYXQgcmVtb3ZpbmcgYSB2 aWRlbyBlbGVtZW50IGZyb20gdGhlIERPTSB3aGlsZSB0aGUgdmlkZW8gaXMgaW4gdGhlIHBpY3R1 cmUtaW4tcGljdHVyZSBtb2RlIGRvZXMgbm90IGNsb3NlIHRoZSBQaVAgd2luZG93LjwvZGl2Pgor ICAgIDx2aWRlbyBjb250cm9scyBwbGF5c2lubGluZT48L3ZpZGVvPgorPC9ib2R5PgorPC9odG1s Pgo= 406871 2020-08-19 14:05:57 -0700 2020-08-19 15:36:43 -0700 patch for landing bug-215594-20200819140557.patch text/plain 9349 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2RkNTk4NGZiMjc3MzE1 YzIzODY3ZDM5ZWRiYmRjMTliYjUyNWEwNy4uMDAwYWYwZWI5NjEwNjZjOGYxOTNjYTYyYjUxODky M2Y2NmRjZTdjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA4LTE5ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgQSBQaVAgd2luZG93IGlzIGNs b3NlZCB3aGVuIHRoZSB2aWRlbyBlbGVtZW50IGlzIHJlbW92ZWQgZnJvbSBET00KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNTU5NAorCisgICAgICAg IFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBUZXN0OiBtZWRpYS9yZW1vdmUt dmlkZW8tZWxlbWVudC1pbi1waXAtZnJvbS1kb2N1bWVudC5odG1sCisKKyAgICAgICAgKiBodG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVu dDo6cGF1c2VBZnRlckRldGFjaGVkVGFzayk6CisgICAgICAgIFdoZW4gYSB2aWRlbyBpcyBwbGF5 aW5nIGluIHRoZSBwaWN0dXJlLWluLXBpY3R1cmUgbW9kZSwgZG8gbm90IHBhdXNlIGl0IG9yIGV4 aXQgdGhlCisgICAgICAgIHBpY3R1cmUtaW4tcGljdHVyZSBtb2RlIHdoZW4gZGV0YWNoaW5nIHRo ZSB2aWRlbyBlbGVtZW50IGZyb20gdGhlIERPTS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCk6CisgICAgICAg IEFsd2F5cyByZXR1cm4gdHJ1ZSB3aGVuIHRoZSB2aWRlbyBpcyBwbGF5aW5nIGluIHRoZSBwaWN0 dXJlLWluLXBpY3R1cmUgbW9kZS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlkZW8uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlkZW86OndpbGxCZURlc3Ryb3llZCk6CisgICAg ICAgIERvbid0IGhpZGUgdGhlIHBsYXllciB3aGVuIGRlc3Ryb3lpbmcgdGhlIHJlbmRlcmVyIG9m IGFuIGlubGluZSB2aWRlby4KKwogMjAyMC0wOC0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJA YXBwbGUuY29tPgogCiAgICAgICAgIENsZWFuIHVwIERyYWdBcHBsaWNhdGlvbkZsYWdzIGFmdGVy IHN3aXRjaCB0byBPcHRpb25TZXQ8PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAKaW5kZXggMDhkZWIwN2RiYWYzMWI0NjMyMjI1NThmYzYzMGU3ZTJhN2JkMWE3OC4uMTYw MzQ1YTVhYzIxOGIzNTM1ZDAyZjA3ZmVhZTZlYjZkN2VhMWRmOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC04MzUsOSArODM1LDkgQEAgdm9pZCBIVE1MTWVk aWFFbGVtZW50OjpwYXVzZUFmdGVyRGV0YWNoZWRUYXNrKCkKICAgICBpZiAobV9pbkFjdGl2ZURv Y3VtZW50KQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9uZXR3b3JrU3RhdGUgPiBORVRX T1JLX0VNUFRZKQorICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbk1vZGUgIT0gVmlkZW9GdWxsc2Ny ZWVuTW9kZVBpY3R1cmVJblBpY3R1cmUgJiYgbV9uZXR3b3JrU3RhdGUgPiBORVRXT1JLX0VNUFRZ KQogICAgICAgICBwYXVzZSgpOwotICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbk1vZGUgIT0gVmlk ZW9GdWxsc2NyZWVuTW9kZU5vbmUpCisgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSA9PSBW aWRlb0Z1bGxzY3JlZW5Nb2RlU3RhbmRhcmQpCiAgICAgICAgIGV4aXRGdWxsc2NyZWVuKCk7CiAK ICAgICBpZiAoIW1fcGxheWVyKQpAQCAtNDkyNiw2ICs0OTI2LDEyIEBAIHZvaWQgSFRNTE1lZGlh RWxlbWVudDo6bWVkaWFQbGF5ZXJTaXplQ2hhbmdlZCgpCiAKIGJvb2wgSFRNTE1lZGlhRWxlbWVu dDo6bWVkaWFQbGF5ZXJSZW5kZXJpbmdDYW5CZUFjY2VsZXJhdGVkKCkKIHsKKyAgICAvLyBUaGlz IGZ1bmN0aW9uIG11c3QgcmV0dXJuICJ0cnVlIiB3aGVuIHRoZSB2aWRlbyBpcyBwbGF5aW5nIGlu IHRoZQorICAgIC8vIHBpY3R1cmUtaW4tcGljdHVyZSB3aW5kb3cuIE90aGVyd2lzZSwgdGhlIE1l ZGlhUGxheWVyUHJpdmF0ZSogbWF5CisgICAgLy8gZGVzdHJveSB0aGUgdmlkZW8gbGF5ZXIuCisg ICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTW9kZSA9PSBWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVy ZUluUGljdHVyZSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBhdXRvKiByZW5kZXJlciA9 IHRoaXMtPnJlbmRlcmVyKCk7CiAgICAgcmV0dXJuIGlzPFJlbmRlclZpZGVvPihyZW5kZXJlcikK ICAgICAgICAgJiYgZG93bmNhc3Q8UmVuZGVyVmlkZW8+KCpyZW5kZXJlcikudmlldygpLmNvbXBv c2l0b3IoKS5jYW5BY2NlbGVyYXRlVmlkZW9SZW5kZXJpbmcoZG93bmNhc3Q8UmVuZGVyVmlkZW8+ KCpyZW5kZXJlcikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clZpZGVvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAKaW5k ZXggZTRjNWU3NGMzOGY1MDQ2OWMxYzU3NjcwYjYwZjljNTA2NWIzMjgwMi4uZWQ5N2FmYTQyYmRl ZjNhY2NhNjk1MTNlMjQ2ZWM1ZmI5M2RjNzBjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclZpZGVvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVmlkZW8uY3BwCkBAIC02NSw4ICs2NSwxNSBAQCBSZW5kZXJWaWRlbzo6flJlbmRlclZp ZGVvKCkKIHZvaWQgUmVuZGVyVmlkZW86OndpbGxCZURlc3Ryb3llZCgpCiB7CiAgICAgdmlzaWJs ZUluVmlld3BvcnRTdGF0ZUNoYW5nZWQoKTsKKworI2lmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJ T05fTU9ERSkKKyAgICBhdXRvIHBsYXllciA9IHZpZGVvRWxlbWVudCgpLnBsYXllcigpOworICAg IGlmIChwbGF5ZXIgJiYgdmlkZW9FbGVtZW50KCkud2Via2l0UHJlc2VudGF0aW9uTW9kZSgpICE9 IEhUTUxWaWRlb0VsZW1lbnQ6OlZpZGVvUHJlc2VudGF0aW9uTW9kZTo6UGljdHVyZUluUGljdHVy ZSkKKyAgICAgICAgcGxheWVyLT5zZXRWaXNpYmxlKGZhbHNlKTsKKyNlbHNlCiAgICAgaWYgKGF1 dG8gcGxheWVyID0gdmlkZW9FbGVtZW50KCkucGxheWVyKCkpCiAgICAgICAgIHBsYXllci0+c2V0 VmlzaWJsZShmYWxzZSk7CisjZW5kaWYKIAogICAgIFJlbmRlck1lZGlhOjp3aWxsQmVEZXN0cm95 ZWQoKTsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCAzYjVjZjk2MTYzNWIxYjFlZDM2Nzk2MDExMTM2Yjk1ZmU4MTdkY2Fi Li4xMjIzZTRhOGE3OTIwNThhZWMxNzkzNzQ3NDY5YmNkYzA4MzkzODA1IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMjAtMDgtMTkgIFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KKwor ICAgICAgICBBIFBpUCB3aW5kb3cgaXMgY2xvc2VkIHdoZW4gdGhlIHZpZGVvIGVsZW1lbnQgaXMg cmVtb3ZlZCBmcm9tIERPTQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE1NTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisg ICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKyAgICAgICAgKiBtZWRpYS9yZW1vdmUtdmlkZW8t ZWxlbWVudC1pbi1waXAtZnJvbS1kb2N1bWVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg ICAqIG1lZGlhL3JlbW92ZS12aWRlby1lbGVtZW50LWluLXBpcC1mcm9tLWRvY3VtZW50Lmh0bWw6 IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2lwYWQvVGVzdEV4cGVjdGF0aW9uczoKKyAgICAg ICAgKiBwbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjAtMDgtMTcgIEhl Y3RvciBMb3BleiAgPGhlY3Rvcl9pX2xvcGV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbIG1hY09T IF0gbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3ZvbHVtZS11cC1zdXBwb3J0L3ZvbHVtZS11 cC1zdXBwb3J0Lmh0bWwgaXMgYSBmbGFreSB0aW1lb3V0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBl MTdmNDg1MzkwNzJjYzJiZjgzZmJlYWExYzgyNTVlZWI3YjI4NDRjLi4yNzA0ZThkYTNhNzdmNGM0 MjI4NzE4NWQ1MmMxMWNlYjc0YzBiOGJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhw ZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTIyNyw2ICsy MjcsOCBAQCB3ZWJraXQub3JnL2IvMjAyNjE3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvcGljdHVyZS1pbi1waWN0dXJlIFsgU2tpcCBdCiAjIFBpUCBBUEkgdGVzdHMgYXJlIG9ubHkg cmVsZXZhbnQgb24gbWFjIGFuZCBpUGFkCiBtZWRpYS9waWN0dXJlLWluLXBpY3R1cmUgWyBTa2lw IF0KIAorbWVkaWEvcmVtb3ZlLXZpZGVvLWVsZW1lbnQtaW4tcGlwLWZyb20tZG9jdW1lbnQuaHRt bCBbIFNraXAgXQorCiAjIFNoYXJlZCBXb3JrZXJzIGFyZSB1bnN1cHBvcnRlZAogaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9zZWN1cmUtY29udGV4dHMvYmFzaWMtc2hhcmVkLXdvcmtl ci5odG1sIFsgU2tpcCBdCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3NlY3VyZS1j b250ZXh0cy9iYXNpYy1zaGFyZWQtd29ya2VyLmh0dHBzLmh0bWwgWyBTa2lwIF0KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL21lZGlhL3JlbW92ZS12aWRlby1lbGVtZW50LWluLXBpcC1mcm9tLWRv Y3VtZW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL3JlbW92ZS12aWRlby1lbGVt ZW50LWluLXBpcC1mcm9tLWRvY3VtZW50LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mNDQ1NzZj NWQ0YzU5OTRiMjBmNDA5MTcyMzQ0NWQzMzI5ZjgxZWQyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvbWVkaWEvcmVtb3ZlLXZpZGVvLWVsZW1lbnQtaW4tcGlwLWZyb20tZG9jdW1lbnQt ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTEgQEAKK1Rlc3QgdGhhdCByZW1vdmluZyBhIHZpZGVv IGVsZW1lbnQgZnJvbSB0aGUgRE9NIHdoaWxlIHRoZSB2aWRlbyBpcyBpbiB0aGUgcGljdHVyZS1p bi1waWN0dXJlIG1vZGUgZG9lcyBub3QgY2xvc2UgdGhlIFBpUCB3aW5kb3cuCisKK1JVTihpbnRl cm5hbHMuc2V0dGluZ3Muc2V0QWxsb3dzUGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2sodHJ1 ZSkpCitSVU4oaW50ZXJuYWxzLnNldE1vY2tWaWRlb1ByZXNlbnRhdGlvbk1vZGVFbmFibGVkKHRy dWUpKQorRVZFTlQoY2FucGxheXRocm91Z2gpCitFVkVOVChlbnRlcnBpY3R1cmVpbnBpY3R1cmUp CitFWFBFQ1RFRCAocGlwV2luZG93LndpZHRoID4gJzAnKSBPSworRVhQRUNURUQgKHBpcFdpbmRv dy5oZWlnaHQgPiAnMCcpIE9LCitUaGUgdmlkZW8gZWxlbWVudCBoYXMgYmVlbiByZW1vdmVkIGZy b20gRE9NLgorRU5EIE9GIFRFU1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvcmVt b3ZlLXZpZGVvLWVsZW1lbnQtaW4tcGlwLWZyb20tZG9jdW1lbnQuaHRtbCBiL0xheW91dFRlc3Rz L21lZGlhL3JlbW92ZS12aWRlby1lbGVtZW50LWluLXBpcC1mcm9tLWRvY3VtZW50Lmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZjRjZGFmMmZhM2I2ZTllODhmMDFmZTZjN2MxOGUxZmQ5MjNhNWM0MwotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL3JlbW92ZS12aWRlby1lbGVtZW50LWluLXBp cC1mcm9tLWRvY3VtZW50Lmh0bWwKQEAgLTAsMCArMSw0OCBAQAorPCFET0NUWVBFIGh0bWw+Cis8 aHRtbD4KKzxoZWFkPgorICAgIDxzY3JpcHQgc3JjPSJ2aWRlby10ZXN0LmpzIj48L3NjcmlwdD4K KyAgICA8c2NyaXB0IHNyYz0ibWVkaWEtZmlsZS5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4K KyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBhc3luYyBldmVudCA9PiB7 CisgICAgICAgICAgICBpZiAoIXdpbmRvdy5pbnRlcm5hbHMpIHsKKyAgICAgICAgICAgICAgICBm YWlsVGVzdCgnVGhpcyB0ZXN0IHJlcXVpcmVzIHdpbmRvdy5pbnRlcm5hbHMuJyk7CisgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBjb25zb2xlV3Jp dGUoJycpOworICAgICAgICAgICAgcnVuKCdpbnRlcm5hbHMuc2V0dGluZ3Muc2V0QWxsb3dzUGlj dHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2sodHJ1ZSknKTsKKyAgICAgICAgICAgIHJ1bignaW50 ZXJuYWxzLnNldE1vY2tWaWRlb1ByZXNlbnRhdGlvbk1vZGVFbmFibGVkKHRydWUpJyk7CisKKyAg ICAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKKyAgICAgICAgICAgIHZpZGVvLnNyYyA9IGZp bmRNZWRpYUZpbGUoInZpZGVvIiwgImNvbnRlbnQvdGVzdCIpOworCisgICAgICAgICAgICBhd2Fp dCB3YWl0Rm9yKHZpZGVvLCAnY2FucGxheXRocm91Z2gnKTsKKworICAgICAgICAgICAgcnVuV2l0 aEtleURvd24oKCkgPT4geworICAgICAgICAgICAgICAgIHZpZGVvLndlYmtpdFNldFByZXNlbnRh dGlvbk1vZGUoJ3BpY3R1cmUtaW4tcGljdHVyZScpOworICAgICAgICAgICAgfSk7CisKKyAgICAg ICAgICAgIHdhaXRGb3JFdmVudE9uY2UoJ2VudGVycGljdHVyZWlucGljdHVyZScsIGV2ZW50ID0+ IHsKKyAgICAgICAgICAgICAgICB3aW5kb3cucGlwV2luZG93ID0gZXZlbnQucGljdHVyZUluUGlj dHVyZVdpbmRvdzsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoJ3BpcFdpbmRvdy53aWR0 aCcsIDAsICc+Jyk7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCdwaXBXaW5kb3cuaGVp Z2h0JywgMCwgJz4nKTsKKworICAgICAgICAgICAgICAgIGNvbnN0IG9ic2VydmVyID0gbmV3IE11 dGF0aW9uT2JzZXJ2ZXIoKCkgPT4geworICAgICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUo J1RoZSB2aWRlbyBlbGVtZW50IGhhcyBiZWVuIHJlbW92ZWQgZnJvbSBET00uJyk7CisgICAgICAg ICAgICAgICAgICAgIHNldFRpbWVvdXQoZW5kVGVzdCwgMTAwMCk7CisgICAgICAgICAgICAgICAg fSk7CisgICAgICAgICAgICAgICAgb2JzZXJ2ZXIub2JzZXJ2ZShkb2N1bWVudC5ib2R5LCB7IGNo aWxkTGlzdDogdHJ1ZSB9KTsKKyAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoJ3dlYmtpdHBy ZXNlbnRhdGlvbm1vZGVjaGFuZ2VkJywgKCkgPT4geworICAgICAgICAgICAgICAgICAgICBmYWls VGVzdCgnUGlQIHdpbmRvdyBpcyBjbG9zZWQhJyk7CisgICAgICAgICAgICAgICAgfSk7CisgICAg ICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5yZW1vdmVDaGlsZCh2aWRlbyk7CisgICAgICAgICAg ICB9KTsKKyAgICAgICAgfSk7CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8 ZGl2PlRlc3QgdGhhdCByZW1vdmluZyBhIHZpZGVvIGVsZW1lbnQgZnJvbSB0aGUgRE9NIHdoaWxl IHRoZSB2aWRlbyBpcyBpbiB0aGUgcGljdHVyZS1pbi1waWN0dXJlIG1vZGUgZG9lcyBub3QgY2xv c2UgdGhlIFBpUCB3aW5kb3cuPC9kaXY+CisgICAgPHZpZGVvIGNvbnRyb2xzIHBsYXlzaW5saW5l PjwvdmlkZW8+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9pcGFkL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pcGFkL1Rl c3RFeHBlY3RhdGlvbnMKaW5kZXggZWY3NDdhMDQwNWM0MzJmNTAxOTI1OTU5ZjUxMGEzODI2ZmNi OTM5YS4uMzA1ZjIyMzA5NjY5ZTFhZGMxNzFhOGMwM2ZmODI2ZGIxM2FkODhkMCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaXBhZC9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2lwYWQvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNjYsMyArNjYsNCBAQCB3 ZWJraXQub3JnL2IvMjAzMjY0IGVkaXRpbmcvcGFzdGVib2FyZC9zbWFydC1wYXN0ZS1wYXJhZ3Jh cGgtMDAyLmh0bWwgWyBQYXNzIF0KIHdlYmtpdC5vcmcvYi8yMDMyNjQgZWRpdGluZy9wYXN0ZWJv YXJkL3NtYXJ0LXBhc3RlLXBhcmFncmFwaC0wMDQuaHRtbCBbIFBhc3MgXQogCiBtZWRpYS9waWN0 dXJlLWluLXBpY3R1cmUgWyBQYXNzIF0KK21lZGlhL3JlbW92ZS12aWRlby1lbGVtZW50LWluLXBp cC1mcm9tLWRvY3VtZW50Lmh0bWwgWyBQYXNzIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy13azIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAxZDYwNTg5MTc5ZTRlMzQ4MjZmMjYyZmUxYjVm ZmQ3Mjg1N2FmMjJlLi4wNDg5YzUwM2QwMzg0ZDEyZmI0OTE3ZDkxMmI2NmZmNjE1ODQ4M2I1IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMK KysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCkBAIC01 MTMsNiArNTEzLDggQEAgbWVkaWEvZnVsbHNjcmVlbi1hcGktZW5hYmxlZC1tZWRpYS13aXRoLXBy ZXNlbnRhdGlvbi1tb2RlLmh0bWwgWyBQYXNzIF0KIHdlYmtpdC5vcmcvYi8xNzMxOTkgbWVkaWEv bmF2aWdhdGUtd2l0aC1waXAtc2hvdWxkLW5vdC1jcmFzaC5odG1sIFsgUGFzcyBGYWlsdXJlIF0K IG1lZGlhL3BpcC12aWRlby1nb2luZy1pbnRvLWZ1bGxzY3JlZW4uaHRtbCBbIFBhc3MgXQogbWVk aWEvcGljdHVyZS1pbi1waWN0dXJlIFsgUGFzcyBdCittZWRpYS9yZW1vdmUtdmlkZW8tZWxlbWVu dC1pbi1waXAtZnJvbS1kb2N1bWVudC5odG1sIFsgUGFzcyBdCisKIAogIyBSVEwgU2Nyb2xsYmFy cyBhcmUgZW5hYmxlZCBvbiBTaWVycmEgV2ViS2l0Mi4KIHdlYmtpdC5vcmcvYi8xNzk0NTUgZmFz dC9zY3JvbGxpbmcvcnRsLXNjcm9sbGJhcnMuaHRtbCBbIFBhc3MgSW1hZ2VPbmx5RmFpbHVyZSBd Cg==