218688 2020-11-07 11:41:20 -0800 Receiving two enter/exit fullscreen delegate callbacks on iPad when presenting fullscreen elements 2021-01-11 17:11:43 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 peng.liu6 peng.liu6 darin eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1705550 0 peng.liu6 2020-11-07 11:41:20 -0800 Receiving two enter/exit fullscreen delegate callbacks on iPad when presenting fullscreen elements 1705551 1 peng.liu6 2020-11-07 11:42:21 -0800 <rdar://problem/70546084> 1705554 2 413531 peng.liu6 2020-11-07 11:49:45 -0800 Created attachment 413531 WIP patch (need an API test) 1705572 3 413537 peng.liu6 2020-11-07 19:02:05 -0800 Created attachment 413537 WIP patch (need an API test) 1718815 4 peng.liu6 2021-01-11 14:01:28 -0800 Just realized that I need to fix bug 212654 before adding a test for this patch. 1718825 5 413537 darin 2021-01-11 14:42:44 -0800 Comment on attachment 413537 WIP patch (need an API test) View in context: https://bugs.webkit.org/attachment.cgi?id=413537&action=review > Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:936 > + if (mode == HTMLMediaElementEnums::VideoFullscreenModeNone && standby) > + m_changingStandbyOnly = true; > + else > + m_changingStandbyOnly = false; m_changingStandbyOnly = mode == HTMLMediaElementEnums::VideoFullscreenModeNone && standby; > Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:972 > + if (!m_currentMode.hasVideo() && m_standby) > + m_changingStandbyOnly = true; > + else > + m_changingStandbyOnly = false; m_changingStandbyOnly = !m_currentMode.hasVideo() && m_standby; 1718839 6 417415 peng.liu6 2021-01-11 15:35:29 -0800 Created attachment 417415 Patch for landing 1718841 7 413537 peng.liu6 2021-01-11 15:36:52 -0800 Comment on attachment 413537 WIP patch (need an API test) View in context: https://bugs.webkit.org/attachment.cgi?id=413537&action=review >> Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:936 >> + m_changingStandbyOnly = false; > > m_changingStandbyOnly = mode == HTMLMediaElementEnums::VideoFullscreenModeNone && standby; Good idea! Fixed. >> Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:972 >> + m_changingStandbyOnly = false; > > m_changingStandbyOnly = !m_currentMode.hasVideo() && m_standby; Fixed. 1718872 8 ews-feeder 2021-01-11 17:11:42 -0800 Committed r271387: <https://trac.webkit.org/changeset/271387> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417415. 413531 2020-11-07 11:49:45 -0800 2020-11-07 19:02:03 -0800 WIP patch (need an API test) bug-218688-20201107114944.patch text/plain 5197 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjExMWY3ZTBkODA5N2Rl MmYzMzZhYzljZWRkMmIyMjNkZTI2M2VlZS4uYjdkY2NhYzgwM2I0ZjIyZGY5YWFkNzk3NjQ5OWYw MDY1ZDgzN2RmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTExLTA3ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVjZWl2aW5nIHR3byBlbnRl ci9leGl0IGZ1bGxzY3JlZW4gZGVsZWdhdGUgY2FsbGJhY2tzIG9uIGlQYWQgd2hlbiBwcmVzZW50 aW5nIGZ1bGxzY3JlZW4gZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxODY4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE9uIGlQYWRzLCB3aGVuIGEgdmlkZW8gZW50ZXJzL2V4aXRzIGZ1bGxz Y3JlZW4gc3RhbmRieSwgd2Ugc2hvdWxkIG5vdCBjYWxsIHRoZQorICAgICAgICB2aWRlbyBmdWxs c2NyZWVuIGRlbGVnYXRlIGNhbGxiYWNrcy4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9WaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9WaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKFZpZGVvRnVsbHNjcmVlbklu dGVyZmFjZUFWS2l0OjpzZXR1cEZ1bGxzY3JlZW4pOgorICAgICAgICAoVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKToKKwogMjAyMC0xMS0wNiAgUGVuZyBMaXUg IDxwZW5nLmxpdTZAYXBwbGUuY29tPgogCiAgICAgICAgIFBpUCByZXR1cm4gdG8gZWxlbWVudCBm dWxsIHNjcmVlbiBpcyBub3Qgc21vb3RoIG9uIHNvbWUgd2Vic2l0ZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZTYz ZGNmODY1ODFmYjM1MWZmMTg5NTljZWIwZjQ1ZTk5NzM4MzdiOS4uM2I3MDlkYTEzM2JmZTA5ZTVi OGRiOGVmNTM1NDc3YTY4M2YyZjk2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0x MS0wNyAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgorCisgICAgICAgIFJlY2Vpdmlu ZyB0d28gZW50ZXIvZXhpdCBmdWxsc2NyZWVuIGRlbGVnYXRlIGNhbGxiYWNrcyBvbiBpUGFkIHdo ZW4gcHJlc2VudGluZyBmdWxsc2NyZWVuIGVsZW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg2ODgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3Jl ZW5NYW5hZ2VyUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6OlZpZGVvRnVsbHNjcmVlbk1hbmFn ZXJQcm94eTo6ZGlkRXhpdEZ1bGxzY3JlZW4pOgorICAgICAgICAoV2ViS2l0OjpWaWRlb0Z1bGxz Y3JlZW5NYW5hZ2VyUHJveHk6OmRpZEVudGVyRnVsbHNjcmVlbik6CisKIDIwMjAtMTEtMDYgIFBl bmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBQaVAgcmV0dXJuIHRvIGVs ZW1lbnQgZnVsbCBzY3JlZW4gaXMgbm90IHNtb290aCBvbiBzb21lIHdlYnNpdGVzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdC5oCmluZGV4IGRlNWE4NmM5NDJhOGVmODI4MmExNDBiMDJmODU4ZDZlOWY0NDU1 NzAuLmI0ZjYwMDA3NmFiMjMyOTU3NDQ0ZWFhYmEwYzk2ZWUxN2ExYjZjMGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdC5oCkBAIC05MCw2ICs5MCw3IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9S VCB2b2lkIHNldEhhc1ZpZGVvQ29udGVudExheWVyKGJvb2wpOwogICAgIFdFQkNPUkVfRVhQT1JU IHZvaWQgc2V0SW5saW5lUmVjdChjb25zdCBJbnRSZWN0JiwgYm9vbCB2aXNpYmxlKTsKICAgICBX RUJDT1JFX0VYUE9SVCB2b2lkIHByZXBhcmVkVG9SZXR1cm5Ub1N0YW5kYnkoKTsKKyAgICBib29s IGNoYW5nZXNTdGFuZGJ5T25seSgpIHsgcmV0dXJuIG1fY2hhbmdlc1N0YW5kYnlPbmx5OyB9CiAK ICAgICBlbnVtIGNsYXNzIEV4aXRGdWxsU2NyZWVuUmVhc29uIHsKICAgICAgICAgRG9uZUJ1dHRv blRhcHBlZCwKQEAgLTIxOCw2ICsyMTksNyBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBtX2lubGlu ZUlzVmlzaWJsZSB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3N0YW5kYnkgeyBmYWxzZSB9OwogICAg IGJvb2wgbV90YXJnZXRTdGFuZGJ5IHsgZmFsc2UgfTsKKyAgICBib29sIG1fY2hhbmdlc1N0YW5k YnlPbmx5IHsgZmFsc2UgfTsKIAogI2lmIFBMQVRGT1JNKFdBVENIT1MpCiAgICAgYm9vbCBtX3dh aXRpbmdGb3JQcmVwYXJlZFRvRXhpdCB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0K aW5kZXggNDI2M2I4M2ZiMWQ5ZjdkMzY5MWYyM2M4NzJlMmE1ZTUyM2ZkZWNkNi4uYTZiYjc2OTVm ZDRjOTNhZTMxNjI1MzE4NDczYzg2OWExNzc4MzFjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5t bQpAQCAtOTMwLDYgKzkzMCwxMCBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 OjpzZXR1cEZ1bGxzY3JlZW4oVUlWaWV3JiB2aWRlb1ZpZXcsIGNvbnN0IEludAogewogICAgIEFT U0VSVChzdGFuZGJ5IHx8IG1vZGUgIT0gSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxz Y3JlZW5Nb2RlTm9uZSk7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJWaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdDo6c2V0dXBGdWxsc2NyZWVuKCVwKSIsIHRoaXMpOworICAgIGlmIChtb2RlID09 IEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZU5vbmUgJiYgc3RhbmRi eSkKKyAgICAgICAgbV9jaGFuZ2VzU3RhbmRieU9ubHkgPSB0cnVlOworICAgIGVsc2UKKyAgICAg ICAgbV9jaGFuZ2VzU3RhbmRieU9ubHkgPSBmYWxzZTsKIAogICAgIFtwbGF5ZXJDb250cm9sbGVy KCkgc2V0SGFzRW5hYmxlZFZpZGVvOnRydWVdOwogICAgIFtwbGF5ZXJDb250cm9sbGVyKCkgc2V0 SGFzVmlkZW86dHJ1ZV07CkBAIC05NjIsNiArOTY2LDExIEBAIGJvb2wgVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKGNvbnN0IEludFJlY3QmIGZpbmFsUmVjdCkK ICAgICBpZiAobV9zdGFuZGJ5ICYmIG1fZW50ZXJpbmdQaWN0dXJlSW5QaWN0dXJlKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoIW1fY3VycmVudE1vZGUuaGFzVmlkZW8oKSAmJiBt X3N0YW5kYnkpCisgICAgICAgIG1fY2hhbmdlc1N0YW5kYnlPbmx5ID0gdHJ1ZTsKKyAgICBlbHNl CisgICAgICAgIG1fY2hhbmdlc1N0YW5kYnlPbmx5ID0gZmFsc2U7CisKICAgICBtX3RhcmdldE1v ZGUgPSBIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVOb25lOwogCiAg ICAgc2V0SW5saW5lUmVjdChmaW5hbFJlY3QsIHRydWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Lm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Lm1t CmluZGV4IGFjNmNiMTM2OGIxNGZhMjI0YzJlMzRmNWFkYjNlYTZhZDEzZDNiNzUuLmVmNzdmZjNi NjZjODY0Y2RkNTlmYTkzOWEwMGJlYjk0ZmE5OGI5OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHku bW0KQEAgLTc2Myw2ICs3NjMsOSBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eTo6 d2lsbEV4aXRGdWxsc2NyZWVuKFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudAogdm9pZCBWaWRl b0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OmRpZEV4aXRGdWxsc2NyZWVuKFBsYXliYWNrU2Vzc2lv bkNvbnRleHRJZGVudGlmaWVyIGNvbnRleHRJZCkKIHsKICAgICBtX3BhZ2UtPnNlbmQoTWVzc2Fn ZXM6OlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OkRpZEV4aXRGdWxsc2NyZWVuKGNvbnRleHRJZCkp OworCisgICAgaWYgKGVuc3VyZUludGVyZmFjZShjb250ZXh0SWQpLmNoYW5nZXNTdGFuZGJ5T25s eSgpKQorICAgICAgICByZXR1cm47CiAgICAgbV9wYWdlLT5kaWRFeGl0RnVsbHNjcmVlbigpOwog fQogCkBAIC03NzMsNiArNzc2LDkgQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6 OmRpZEVudGVyRnVsbHNjcmVlbihQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnQKICAgICAgICAg b3B0aW9uYWxTaXplID0gc2l6ZTsKIAogICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6VmlkZW9G dWxsc2NyZWVuTWFuYWdlcjo6RGlkRW50ZXJGdWxsc2NyZWVuKGNvbnRleHRJZCwgb3B0aW9uYWxT aXplKSk7CisKKyAgICBpZiAoZW5zdXJlSW50ZXJmYWNlKGNvbnRleHRJZCkuY2hhbmdlc1N0YW5k YnlPbmx5KCkpCisgICAgICAgIHJldHVybjsKICAgICBtX3BhZ2UtPmRpZEVudGVyRnVsbHNjcmVl bigpOwogfQogCg== 413537 2020-11-07 19:02:05 -0800 2021-01-11 14:42:44 -0800 WIP patch (need an API test) bug-218688-20201107190204.patch text/plain 5967 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjExMWY3ZTBkODA5N2Rl MmYzMzZhYzljZWRkMmIyMjNkZTI2M2VlZS4uYjdkY2NhYzgwM2I0ZjIyZGY5YWFkNzk3NjQ5OWYw MDY1ZDgzN2RmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTExLTA3ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVjZWl2aW5nIHR3byBlbnRl ci9leGl0IGZ1bGxzY3JlZW4gZGVsZWdhdGUgY2FsbGJhY2tzIG9uIGlQYWQgd2hlbiBwcmVzZW50 aW5nIGZ1bGxzY3JlZW4gZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxODY4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE9uIGlQYWRzLCB3aGVuIGEgdmlkZW8gZW50ZXJzL2V4aXRzIGZ1bGxz Y3JlZW4gc3RhbmRieSwgd2Ugc2hvdWxkIG5vdCBjYWxsIHRoZQorICAgICAgICB2aWRlbyBmdWxs c2NyZWVuIGRlbGVnYXRlIGNhbGxiYWNrcy4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9WaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9WaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKFZpZGVvRnVsbHNjcmVlbklu dGVyZmFjZUFWS2l0OjpzZXR1cEZ1bGxzY3JlZW4pOgorICAgICAgICAoVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKToKKwogMjAyMC0xMS0wNiAgUGVuZyBMaXUg IDxwZW5nLmxpdTZAYXBwbGUuY29tPgogCiAgICAgICAgIFBpUCByZXR1cm4gdG8gZWxlbWVudCBm dWxsIHNjcmVlbiBpcyBub3Qgc21vb3RoIG9uIHNvbWUgd2Vic2l0ZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZTYz ZGNmODY1ODFmYjM1MWZmMTg5NTljZWIwZjQ1ZTk5NzM4MzdiOS4uM2I3MDlkYTEzM2JmZTA5ZTVi OGRiOGVmNTM1NDc3YTY4M2YyZjk2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0x MS0wNyAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgorCisgICAgICAgIFJlY2Vpdmlu ZyB0d28gZW50ZXIvZXhpdCBmdWxsc2NyZWVuIGRlbGVnYXRlIGNhbGxiYWNrcyBvbiBpUGFkIHdo ZW4gcHJlc2VudGluZyBmdWxsc2NyZWVuIGVsZW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg2ODgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3Jl ZW5NYW5hZ2VyUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6OlZpZGVvRnVsbHNjcmVlbk1hbmFn ZXJQcm94eTo6ZGlkRXhpdEZ1bGxzY3JlZW4pOgorICAgICAgICAoV2ViS2l0OjpWaWRlb0Z1bGxz Y3JlZW5NYW5hZ2VyUHJveHk6OmRpZEVudGVyRnVsbHNjcmVlbik6CisKIDIwMjAtMTEtMDYgIFBl bmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBQaVAgcmV0dXJuIHRvIGVs ZW1lbnQgZnVsbCBzY3JlZW4gaXMgbm90IHNtb290aCBvbiBzb21lIHdlYnNpdGVzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdC5oCmluZGV4IGRlNWE4NmM5NDJhOGVmODI4MmExNDBiMDJmODU4ZDZlOWY0NDU1 NzAuLmI5N2U5ODc1OWZiMjM1OWI3OWFlOTlmYjk3M2NkMDQ3NmMxZmZhNGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VBVktpdC5oCkBAIC05MCw2ICs5MCw3IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9S VCB2b2lkIHNldEhhc1ZpZGVvQ29udGVudExheWVyKGJvb2wpOwogICAgIFdFQkNPUkVfRVhQT1JU IHZvaWQgc2V0SW5saW5lUmVjdChjb25zdCBJbnRSZWN0JiwgYm9vbCB2aXNpYmxlKTsKICAgICBX RUJDT1JFX0VYUE9SVCB2b2lkIHByZXBhcmVkVG9SZXR1cm5Ub1N0YW5kYnkoKTsKKyAgICBib29s IGNoYW5naW5nU3RhbmRieU9ubHkoKSB7IHJldHVybiBtX2NoYW5naW5nU3RhbmRieU9ubHk7IH0K IAogICAgIGVudW0gY2xhc3MgRXhpdEZ1bGxTY3JlZW5SZWFzb24gewogICAgICAgICBEb25lQnV0 dG9uVGFwcGVkLApAQCAtMjE4LDYgKzIxOSw3IEBAIHByb3RlY3RlZDoKICAgICBib29sIG1faW5s aW5lSXNWaXNpYmxlIHsgZmFsc2UgfTsKICAgICBib29sIG1fc3RhbmRieSB7IGZhbHNlIH07CiAg ICAgYm9vbCBtX3RhcmdldFN0YW5kYnkgeyBmYWxzZSB9OworICAgIGJvb2wgbV9jaGFuZ2luZ1N0 YW5kYnlPbmx5IHsgZmFsc2UgfTsKIAogI2lmIFBMQVRGT1JNKFdBVENIT1MpCiAgICAgYm9vbCBt X3dhaXRpbmdGb3JQcmVwYXJlZFRvRXhpdCB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQu bW0KaW5kZXggNDI2M2I4M2ZiMWQ5ZjdkMzY5MWYyM2M4NzJlMmE1ZTUyM2ZkZWNkNi4uM2E0YmI3 YjJkY2I5MDU5NTFiYTVkMzM4NTc3NjYyZTJkMDU4ZTM3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dC5tbQpAQCAtOTMwLDYgKzkzMCwxMCBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0OjpzZXR1cEZ1bGxzY3JlZW4oVUlWaWV3JiB2aWRlb1ZpZXcsIGNvbnN0IEludAogewogICAg IEFTU0VSVChzdGFuZGJ5IHx8IG1vZGUgIT0gSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1 bGxzY3JlZW5Nb2RlTm9uZSk7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdDo6c2V0dXBGdWxsc2NyZWVuKCVwKSIsIHRoaXMpOworICAgIGlmIChtb2Rl ID09IEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZU5vbmUgJiYgc3Rh bmRieSkKKyAgICAgICAgbV9jaGFuZ2luZ1N0YW5kYnlPbmx5ID0gdHJ1ZTsKKyAgICBlbHNlCisg ICAgICAgIG1fY2hhbmdpbmdTdGFuZGJ5T25seSA9IGZhbHNlOwogCiAgICAgW3BsYXllckNvbnRy b2xsZXIoKSBzZXRIYXNFbmFibGVkVmlkZW86dHJ1ZV07CiAgICAgW3BsYXllckNvbnRyb2xsZXIo KSBzZXRIYXNWaWRlbzp0cnVlXTsKQEAgLTk2Miw2ICs5NjYsMTEgQEAgYm9vbCBWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdDo6ZXhpdEZ1bGxzY3JlZW4oY29uc3QgSW50UmVjdCYgZmluYWxS ZWN0KQogICAgIGlmIChtX3N0YW5kYnkgJiYgbV9lbnRlcmluZ1BpY3R1cmVJblBpY3R1cmUpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmICghbV9jdXJyZW50TW9kZS5oYXNWaWRlbygp ICYmIG1fc3RhbmRieSkKKyAgICAgICAgbV9jaGFuZ2luZ1N0YW5kYnlPbmx5ID0gdHJ1ZTsKKyAg ICBlbHNlCisgICAgICAgIG1fY2hhbmdpbmdTdGFuZGJ5T25seSA9IGZhbHNlOworCiAgICAgbV90 YXJnZXRNb2RlID0gSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlTm9u ZTsKIAogICAgIHNldElubGluZVJlY3QoZmluYWxSZWN0LCB0cnVlKTsKQEAgLTE0OTAsNiArMTQ5 OSw3IEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRvRW50ZXJGdWxsc2Ny ZWVuKCkKICAgICAgICAgfQogICAgICAgICBtX2Z1bGxzY3JlZW5DaGFuZ2VPYnNlcnZlci0+ZGlk RW50ZXJGdWxsc2NyZWVuKHNpemUpOwogICAgICAgICBtX2VudGVyaW5nUGljdHVyZUluUGljdHVy ZSA9IGZhbHNlOworICAgICAgICBtX2NoYW5naW5nU3RhbmRieU9ubHkgPSBmYWxzZTsKICAgICB9 CiAKICAgICBpZiAobV9jdXJyZW50TW9kZS5oYXNQaWN0dXJlSW5QaWN0dXJlKCkgJiYgbV92aWRl b0Z1bGxzY3JlZW5Nb2RlbCAmJiAhbV9yZXN0b3JpbmdGdWxsc2NyZWVuRm9yUGljdHVyZUluUGlj dHVyZVN0b3ApCkBAIC0xNTM3LDYgKzE1NDcsNyBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0Ojpkb0V4aXRGdWxsc2NyZWVuKCkKICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRj aF9nZXRfbWFpbl9xdWV1ZSgpLCBbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWZQdHIodGhpcyksIHRo aXNdIHsKICAgICAgICAgaWYgKG1fZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyKQogICAgICAgICAg ICAgbV9mdWxsc2NyZWVuQ2hhbmdlT2JzZXJ2ZXItPmRpZEV4aXRGdWxsc2NyZWVuKCk7CisgICAg ICAgIG1fY2hhbmdpbmdTdGFuZGJ5T25seSA9IGZhbHNlOwogICAgIH0pOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2Vy UHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5N YW5hZ2VyUHJveHkubW0KaW5kZXggYWM2Y2IxMzY4YjE0ZmEyMjRjMmUzNGY1YWRiM2VhNmFkMTNk M2I3NS4uYzY5MTg0NzEwZjE5MTdkNTA4OWM3NjJlM2IxODg3NDUzODdmZmRlMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlclBy b3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVl bk1hbmFnZXJQcm94eS5tbQpAQCAtNzYzLDYgKzc2MywxMSBAQCB2b2lkIFZpZGVvRnVsbHNjcmVl bk1hbmFnZXJQcm94eTo6d2lsbEV4aXRGdWxsc2NyZWVuKFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJ ZGVudAogdm9pZCBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OmRpZEV4aXRGdWxsc2NyZWVu KFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyIGNvbnRleHRJZCkKIHsKICAgICBtX3Bh Z2UtPnNlbmQoTWVzc2FnZXM6OlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OkRpZEV4aXRGdWxsc2Ny ZWVuKGNvbnRleHRJZCkpOworCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKyAgICBpZiAoZW5z dXJlSW50ZXJmYWNlKGNvbnRleHRJZCkuY2hhbmdpbmdTdGFuZGJ5T25seSgpKQorICAgICAgICBy ZXR1cm47CisjZW5kaWYKICAgICBtX3BhZ2UtPmRpZEV4aXRGdWxsc2NyZWVuKCk7CiB9CiAKQEAg LTc3Myw2ICs3NzgsMTEgQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OmRpZEVu dGVyRnVsbHNjcmVlbihQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnQKICAgICAgICAgb3B0aW9u YWxTaXplID0gc2l6ZTsKIAogICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6VmlkZW9GdWxsc2Ny ZWVuTWFuYWdlcjo6RGlkRW50ZXJGdWxsc2NyZWVuKGNvbnRleHRJZCwgb3B0aW9uYWxTaXplKSk7 CisKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIGlmIChlbnN1cmVJbnRlcmZhY2UoY29u dGV4dElkKS5jaGFuZ2luZ1N0YW5kYnlPbmx5KCkpCisgICAgICAgIHJldHVybjsKKyNlbmRpZgog ICAgIG1fcGFnZS0+ZGlkRW50ZXJGdWxsc2NyZWVuKCk7CiB9CiAK 417415 2021-01-11 15:35:29 -0800 2021-01-11 17:11:43 -0800 Patch for landing bug-218688-20210111153528.patch text/plain 5906 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmExMGJjMDZlYmMwMDlk ZWQwNTNlYjk5NGVkZjQ3OTcxMmQwODQzZS4uOTE2NzJiNDE4NzQ1MGVkMmQ5MDRlY2Q0NjMwOTU4 ZjY4MTk4ZGY0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAxLTExICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVjZWl2aW5nIHR3byBlbnRl ci9leGl0IGZ1bGxzY3JlZW4gZGVsZWdhdGUgY2FsbGJhY2tzIG9uIGlQYWQgd2hlbiBwcmVzZW50 aW5nIGZ1bGxzY3JlZW4gZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxODY4OAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgorCisgICAgICAgIE9uIGlQYWRzLCB3aGVuIGEgdmlkZW8gZW50ZXJzL2V4aXRzIGZ1bGxzY3Jl ZW4gc3RhbmRieSwgd2Ugc2hvdWxkIG5vdCBjYWxsIHRoZQorICAgICAgICB2aWRlbyBmdWxsc2Ny ZWVuIGRlbGVnYXRlIGNhbGxiYWNrcy4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9WaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9WaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKFZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0OjpzZXR1cEZ1bGxzY3JlZW4pOgorICAgICAgICAoVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKToKKwogMjAyMS0wMS0xMSAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFVzZSBzZW5kV2l0aEFz eW5jUmVwbHkgaW5zdGVhZCBvZiBkYXRhQ2FsbGJhY2sgZm9yIGljb24gbG9hZGluZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpp bmRleCA2ZDg2ODZmNmZiMWU5YjBmY2E4NDM4N2VhNDlhZjI0OTgxYmMzMDdlLi44YTAwYjQ2NTMw ZDBiMDNkZTRhZjIwODA5ZTg5N2ZiMGExNWNlMTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIxLTAxLTExICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAg UmVjZWl2aW5nIHR3byBlbnRlci9leGl0IGZ1bGxzY3JlZW4gZGVsZWdhdGUgY2FsbGJhY2tzIG9u IGlQYWQgd2hlbiBwcmVzZW50aW5nIGZ1bGxzY3JlZW4gZWxlbWVudHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODY4OAorCisgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVs bHNjcmVlbk1hbmFnZXJQcm94eS5tbToKKyAgICAgICAgKFdlYktpdDo6VmlkZW9GdWxsc2NyZWVu TWFuYWdlclByb3h5OjpkaWRFeGl0RnVsbHNjcmVlbik6CisgICAgICAgIChXZWJLaXQ6OlZpZGVv RnVsbHNjcmVlbk1hbmFnZXJQcm94eTo6ZGlkRW50ZXJGdWxsc2NyZWVuKToKKwogMjAyMS0wMS0x MSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IFVzZSBzZW5kV2l0aEFzeW5jUmVwbHkgaW5zdGVhZCBvZiBkYXRhQ2FsbGJhY2sgZm9yIGljb24g bG9hZGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQuaAppbmRleCBkZTVhODZjOTQyYThlZjgyODJhMTQw YjAyZjg1OGQ2ZTlmNDQ1NTcwLi5iOTdlOTg3NTlmYjIzNTliNzlhZTk5ZmI5NzNjZDA0NzZjMWZm YTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQuaApAQCAtOTAsNiArOTAsNyBAQCBwdWJsaWM6CiAg ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRIYXNWaWRlb0NvbnRlbnRMYXllcihib29sKTsKICAg ICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldElubGluZVJlY3QoY29uc3QgSW50UmVjdCYsIGJvb2wg dmlzaWJsZSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBwcmVwYXJlZFRvUmV0dXJuVG9TdGFu ZGJ5KCk7CisgICAgYm9vbCBjaGFuZ2luZ1N0YW5kYnlPbmx5KCkgeyByZXR1cm4gbV9jaGFuZ2lu Z1N0YW5kYnlPbmx5OyB9CiAKICAgICBlbnVtIGNsYXNzIEV4aXRGdWxsU2NyZWVuUmVhc29uIHsK ICAgICAgICAgRG9uZUJ1dHRvblRhcHBlZCwKQEAgLTIxOCw2ICsyMTksNyBAQCBwcm90ZWN0ZWQ6 CiAgICAgYm9vbCBtX2lubGluZUlzVmlzaWJsZSB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3N0YW5k YnkgeyBmYWxzZSB9OwogICAgIGJvb2wgbV90YXJnZXRTdGFuZGJ5IHsgZmFsc2UgfTsKKyAgICBi b29sIG1fY2hhbmdpbmdTdGFuZGJ5T25seSB7IGZhbHNlIH07CiAKICNpZiBQTEFURk9STShXQVRD SE9TKQogICAgIGJvb2wgbV93YWl0aW5nRm9yUHJlcGFyZWRUb0V4aXQgeyBmYWxzZSB9OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IDQyNjNiODNmYjFkOWY3ZDM2OTFmMjNjODcyZTJhNWU1 MjNmZGVjZDYuLjJiYjBjNGY1MmEyMWJjY2JmY2RiYmZlZjgwNzhlMzU5ZGMzNTdjZDMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTkzMSw2ICs5MzEsOCBAQCB2b2lkIFZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0OjpzZXR1cEZ1bGxzY3JlZW4oVUlWaWV3JiB2aWRlb1ZpZXcsIGNv bnN0IEludAogICAgIEFTU0VSVChzdGFuZGJ5IHx8IG1vZGUgIT0gSFRNTE1lZGlhRWxlbWVudEVu dW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSk7CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6c2V0dXBGdWxsc2NyZWVuKCVwKSIsIHRoaXMpOwog CisgICAgbV9jaGFuZ2luZ1N0YW5kYnlPbmx5ID0gbW9kZSA9PSBIVE1MTWVkaWFFbGVtZW50RW51 bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVOb25lICYmIHN0YW5kYnk7CisKICAgICBbcGxheWVyQ29u dHJvbGxlcigpIHNldEhhc0VuYWJsZWRWaWRlbzp0cnVlXTsKICAgICBbcGxheWVyQ29udHJvbGxl cigpIHNldEhhc1ZpZGVvOnRydWVdOwogICAgIFtwbGF5ZXJDb250cm9sbGVyKCkgc2V0Q29udGVu dERpbWVuc2lvbnM6dmlkZW9EaW1lbnNpb25zXTsKQEAgLTk2Miw2ICs5NjQsOCBAQCBib29sIFZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpleGl0RnVsbHNjcmVlbihjb25zdCBJbnRSZWN0 JiBmaW5hbFJlY3QpCiAgICAgaWYgKG1fc3RhbmRieSAmJiBtX2VudGVyaW5nUGljdHVyZUluUGlj dHVyZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgbV9jaGFuZ2luZ1N0YW5kYnlPbmx5 ID0gIW1fY3VycmVudE1vZGUuaGFzVmlkZW8oKSAmJiBtX3N0YW5kYnk7CisKICAgICBtX3Rhcmdl dE1vZGUgPSBIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVOb25lOwog CiAgICAgc2V0SW5saW5lUmVjdChmaW5hbFJlY3QsIHRydWUpOwpAQCAtMTQ5MCw2ICsxNDk0LDcg QEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZG9FbnRlckZ1bGxzY3JlZW4o KQogICAgICAgICB9CiAgICAgICAgIG1fZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyLT5kaWRFbnRl ckZ1bGxzY3JlZW4oc2l6ZSk7CiAgICAgICAgIG1fZW50ZXJpbmdQaWN0dXJlSW5QaWN0dXJlID0g ZmFsc2U7CisgICAgICAgIG1fY2hhbmdpbmdTdGFuZGJ5T25seSA9IGZhbHNlOwogICAgIH0KIAog ICAgIGlmIChtX2N1cnJlbnRNb2RlLmhhc1BpY3R1cmVJblBpY3R1cmUoKSAmJiBtX3ZpZGVvRnVs bHNjcmVlbk1vZGVsICYmICFtX3Jlc3RvcmluZ0Z1bGxzY3JlZW5Gb3JQaWN0dXJlSW5QaWN0dXJl U3RvcCkKQEAgLTE1MzcsNiArMTU0Miw3IEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQ6OmRvRXhpdEZ1bGxzY3JlZW4oKQogICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dl dF9tYWluX3F1ZXVlKCksIFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZlB0cih0aGlzKSwgdGhpc10g ewogICAgICAgICBpZiAobV9mdWxsc2NyZWVuQ2hhbmdlT2JzZXJ2ZXIpCiAgICAgICAgICAgICBt X2Z1bGxzY3JlZW5DaGFuZ2VPYnNlcnZlci0+ZGlkRXhpdEZ1bGxzY3JlZW4oKTsKKyAgICAgICAg bV9jaGFuZ2luZ1N0YW5kYnlPbmx5ID0gZmFsc2U7CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94 eS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFn ZXJQcm94eS5tbQppbmRleCBhYzZjYjEzNjhiMTRmYTIyNGMyZTM0ZjVhZGIzZWE2YWQxM2QzYjc1 Li5jNjkxODQ3MTBmMTkxN2Q1MDg5Yzc2MmUzYjE4ODc0NTM4N2ZmZGUzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHku bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVuTWFu YWdlclByb3h5Lm1tCkBAIC03NjMsNiArNzYzLDExIEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuTWFu YWdlclByb3h5Ojp3aWxsRXhpdEZ1bGxzY3JlZW4oUGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50 CiB2b2lkIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eTo6ZGlkRXhpdEZ1bGxzY3JlZW4oUGxh eWJhY2tTZXNzaW9uQ29udGV4dElkZW50aWZpZXIgY29udGV4dElkKQogewogICAgIG1fcGFnZS0+ c2VuZChNZXNzYWdlczo6VmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6RGlkRXhpdEZ1bGxzY3JlZW4o Y29udGV4dElkKSk7CisKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIGlmIChlbnN1cmVJ bnRlcmZhY2UoY29udGV4dElkKS5jaGFuZ2luZ1N0YW5kYnlPbmx5KCkpCisgICAgICAgIHJldHVy bjsKKyNlbmRpZgogICAgIG1fcGFnZS0+ZGlkRXhpdEZ1bGxzY3JlZW4oKTsKIH0KIApAQCAtNzcz LDYgKzc3OCwxMSBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eTo6ZGlkRW50ZXJG dWxsc2NyZWVuKFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudAogICAgICAgICBvcHRpb25hbFNp emUgPSBzaXplOwogCiAgICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpWaWRlb0Z1bGxzY3JlZW5N YW5hZ2VyOjpEaWRFbnRlckZ1bGxzY3JlZW4oY29udGV4dElkLCBvcHRpb25hbFNpemUpKTsKKwor I2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgaWYgKGVuc3VyZUludGVyZmFjZShjb250ZXh0 SWQpLmNoYW5naW5nU3RhbmRieU9ubHkoKSkKKyAgICAgICAgcmV0dXJuOworI2VuZGlmCiAgICAg bV9wYWdlLT5kaWRFbnRlckZ1bGxzY3JlZW4oKTsKIH0KIAo=