212729 2020-06-03 21:55:36 -0700 A YouTube video gets stuck after rapidly tapping on touchbar’s PIP button 2020-06-05 09:57:07 -0700 1 1 1 Unclassified WebKit Media Safari Technology Preview Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 202425 1 peng.liu6 peng.liu6 darin eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1658978 0 peng.liu6 2020-06-03 21:55:36 -0700 Picture-in-picture for a YouTube video gets stuck after rapidly tapping on touchbar’s PIP button. 1658981 1 peng.liu6 2020-06-03 22:00:18 -0700 *** Bug 212727 has been marked as a duplicate of this bug. *** 1658984 2 peng.liu6 2020-06-03 22:01:13 -0700 *** Bug 212728 has been marked as a duplicate of this bug. *** 1658985 3 peng.liu6 2020-06-03 22:02:50 -0700 <rdar://problem/54407450> 1658987 4 400996 peng.liu6 2020-06-03 22:11:54 -0700 Created attachment 400996 Patch 1659413 5 400996 darin 2020-06-04 16:56:46 -0700 Comment on attachment 400996 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400996&action=review > Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm:37 > #import "HTMLElement.h" > #import "HTMLMediaElement.h" > +#import "HTMLVideoElement.h" Don’t need HTMLElement.h or HTMLMediaElement.h if we are including HTMLVideoElement.h. > Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm:319 > + ASSERT(is<HTMLVideoElement>(*m_mediaElement)); > + if (is<HTMLVideoElement>(*m_mediaElement)) { I’d do early return rather than nesting everything in an if statement. > Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm:320 > + HTMLVideoElement& asVideo = downcast<HTMLVideoElement>(*m_mediaElement); I’d write this: auto& element = downcast<HTMLVideoElement>(*m_mediaElement); And then I would use element exclusively in the rest of the function, and not use m_mediaElement at all. 1659457 6 401111 peng.liu6 2020-06-04 20:01:24 -0700 Created attachment 401111 Revise the patch based on Darin's comments 1659458 7 401112 peng.liu6 2020-06-04 20:06:42 -0700 Created attachment 401112 Revise the patch based on Darin's comments - prepare for landing 1659459 8 400996 peng.liu6 2020-06-04 20:09:02 -0700 Comment on attachment 400996 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400996&action=review >> Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm:37 >> +#import "HTMLVideoElement.h" > > Don’t need HTMLElement.h or HTMLMediaElement.h if we are including HTMLVideoElement.h. Right. Fixed. >> Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm:319 >> + if (is<HTMLVideoElement>(*m_mediaElement)) { > > I’d do early return rather than nesting everything in an if statement. Good point. Updated the patch. >> Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm:320 >> + HTMLVideoElement& asVideo = downcast<HTMLVideoElement>(*m_mediaElement); > > I’d write this: > > auto& element = downcast<HTMLVideoElement>(*m_mediaElement); > > And then I would use element exclusively in the rest of the function, and not use m_mediaElement at all. Make sense! Updated the patch. 1659489 9 ews-feeder 2020-06-04 22:52:27 -0700 Committed r262599: <https://trac.webkit.org/changeset/262599> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401112. 400996 2020-06-03 22:11:54 -0700 2020-06-04 16:56:46 -0700 Patch bug-212729-20200603221153.patch text/plain 2643 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTE4N2U0YmM3ZTU3NjA0 NGFhMWNlM2EzNGJjYzZhNmI5ZGQyMWQ1NC4uNTRjY2NiMDk2Y2U5ZTBhMGM3NTA5ZThkNmY2MjE5 NjRjODI1N2Y0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA2LTAzICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgQSBZb3VUdWJlIHZpZGVvIGdl dHMgc3R1Y2sgYWZ0ZXIgcmFwaWRseSB0YXBwaW5nIG9uIHRvdWNoYmFy4oCZcyBQSVAgYnV0dG9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI3MjkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWxsIEhU TUxWaWRlb0VsZW1lbnQ6OnNldEZ1bGxzY3JlZW5Nb2RlKCkgaW5zdGVhZCBvZiBIVE1MTWVkaWFF bGVtZW50OjplbnRlckZ1bGxzY3JlZW4oKQorICAgICAgICBhbmQgSFRNTE1lZGlhRWxlbWVudDo6 ZXhpdEZ1bGxzY3JlZW4oKSB0byB0b2dnbGUgcGljdHVyZS1pbi1waWN0dXJlIG1vZGUuCisgICAg ICAgIEhUTUxWaWRlb0VsZW1lbnQ6OnNldEZ1bGxzY3JlZW5Nb2RlKCkgaXMgcm9idXN0IHVuZGVy IHN0cmVzcyB0ZXN0IGFmdGVyIHIyNjI0NTYuCisKKyAgICAgICAgTWFudWFsbHkgdGVzdGVkLgor CisgICAgICAgICogcGxhdGZvcm0vY29jb2EvUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1l bnQubW06CisgICAgICAgIChXZWJDb3JlOjpQbGF5YmFja1Nlc3Npb25Nb2RlbE1lZGlhRWxlbWVu dDo6dG9nZ2xlUGljdHVyZUluUGljdHVyZSk6CisKIDIwMjAtMDYtMDMgIFBpbmtpIEd5YW5jaGFu ZGFuaSAgPHBneWFuY2hhbmRhbmlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbGVhc2UgQXNzZXJ0 IEAgV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OlJlbmRlclRyZWVCdWlsZGVyCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QbGF5YmFja1Nlc3Npb25Nb2RlbE1l ZGlhRWxlbWVudC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1BsYXliYWNrU2Vz c2lvbk1vZGVsTWVkaWFFbGVtZW50Lm1tCmluZGV4IDZmNDBjNTAyMDZjZjI3OGM5M2ZlNDk2NWFj Y2JkMjBmMjcxYzAwYWEuLjM1YThlNzU5MmQ1M2VkMTgyZTk1OGRiYzhkZjg0NzI1Y2RmZDg1OTUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1BsYXliYWNrU2Vzc2lv bk1vZGVsTWVkaWFFbGVtZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29h L1BsYXliYWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50Lm1tCkBAIC0zNCw2ICszNCw3IEBACiAj aW1wb3J0ICJFdmVudE5hbWVzLmgiCiAjaW1wb3J0ICJIVE1MRWxlbWVudC5oIgogI2ltcG9ydCAi SFRNTE1lZGlhRWxlbWVudC5oIgorI2ltcG9ydCAiSFRNTFZpZGVvRWxlbWVudC5oIgogI2ltcG9y dCAiTG9nZ2luZy5oIgogI2ltcG9ydCAiTWVkaWFDb250cm9sc0hvc3QuaCIKICNpbXBvcnQgIk1l ZGlhU2VsZWN0aW9uT3B0aW9uLmgiCkBAIC0zMTQsMTAgKzMxNSwxNCBAQCB2b2lkIFBsYXliYWNr U2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50OjpzZWxlY3RMZWdpYmxlTWVkaWFPcHRpb24odWludDY0 X3QgaW5kZXgpCiAKIHZvaWQgUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1lbnQ6OnRvZ2ds ZVBpY3R1cmVJblBpY3R1cmUoKQogewotICAgIGlmIChtX21lZGlhRWxlbWVudC0+ZnVsbHNjcmVl bk1vZGUoKSA9PSBNZWRpYVBsYXllckVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUlu UGljdHVyZSkKLSAgICAgICAgbV9tZWRpYUVsZW1lbnQtPmV4aXRGdWxsc2NyZWVuKCk7Ci0gICAg ZWxzZQotICAgICAgICBtX21lZGlhRWxlbWVudC0+ZW50ZXJGdWxsc2NyZWVuKE1lZGlhUGxheWVy RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVQaWN0dXJlSW5QaWN0dXJlKTsKKyAgICBBU1NFUlQo aXM8SFRNTFZpZGVvRWxlbWVudD4oKm1fbWVkaWFFbGVtZW50KSk7CisgICAgaWYgKGlzPEhUTUxW aWRlb0VsZW1lbnQ+KCptX21lZGlhRWxlbWVudCkpIHsKKyAgICAgICAgSFRNTFZpZGVvRWxlbWVu dCYgYXNWaWRlbyA9IGRvd25jYXN0PEhUTUxWaWRlb0VsZW1lbnQ+KCptX21lZGlhRWxlbWVudCk7 CisgICAgICAgIGlmIChtX21lZGlhRWxlbWVudC0+ZnVsbHNjcmVlbk1vZGUoKSA9PSBNZWRpYVBs YXllckVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUluUGljdHVyZSkKKyAgICAgICAg ICAgIGFzVmlkZW8uc2V0RnVsbHNjcmVlbk1vZGUoTWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9GdWxs c2NyZWVuTW9kZU5vbmUpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBhc1ZpZGVvLnNldEZ1 bGxzY3JlZW5Nb2RlKE1lZGlhUGxheWVyRW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVQaWN0dXJl SW5QaWN0dXJlKTsKKyAgICB9CiB9CiAKIHZvaWQgUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVs ZW1lbnQ6OnRvZ2dsZU11dGVkKCkK 401111 2020-06-04 20:01:24 -0700 2020-06-04 20:03:05 -0700 Revise the patch based on Darin's comments bug-212729-20200604200123.patch text/plain 2640 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzVmOGE5ZWVmMDc3ZGQw ZWVmZTRmZGFmNmFkMGQ0NzVlZTcxNzNjMy4uYzI5MmMxNjZiZTM0NDVkODk0N2VlYWI1MjJkYTRm NWFjMjM5YTZmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA2LTA0ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgQSBZb3VUdWJlIHZpZGVvIGdl dHMgc3R1Y2sgYWZ0ZXIgcmFwaWRseSB0YXBwaW5nIG9uIHRvdWNoYmFy4oCZcyBQSVAgYnV0dG9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI3MjkK KworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBDYWxsIEhUTUxW aWRlb0VsZW1lbnQ6OnNldEZ1bGxzY3JlZW5Nb2RlKCkgaW5zdGVhZCBvZiBIVE1MTWVkaWFFbGVt ZW50OjplbnRlckZ1bGxzY3JlZW4oKQorICAgICAgICBhbmQgSFRNTE1lZGlhRWxlbWVudDo6ZXhp dEZ1bGxzY3JlZW4oKSB0byB0b2dnbGUgcGljdHVyZS1pbi1waWN0dXJlIG1vZGUuCisgICAgICAg IEhUTUxWaWRlb0VsZW1lbnQ6OnNldEZ1bGxzY3JlZW5Nb2RlKCkgaXMgcm9idXN0IHVuZGVyIHN0 cmVzcyB0ZXN0IGFmdGVyIHIyNjI0NTYuCisKKyAgICAgICAgTWFudWFsbHkgdGVzdGVkLgorCisg ICAgICAgICogcGxhdGZvcm0vY29jb2EvUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1lbnQu bW06CisgICAgICAgIChXZWJDb3JlOjpQbGF5YmFja1Nlc3Npb25Nb2RlbE1lZGlhRWxlbWVudDo6 dG9nZ2xlUGljdHVyZUluUGljdHVyZSk6CisKIDIwMjAtMDYtMDQgIFJvc3MgS2lyc2xpbmcgIDxy b3NzLmtpcnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAgIFtQbGF5U3RhdGlvbl0gVW5yZXZpZXdl ZCByZXZlcnQgb2YgYnVpbGQgZml4LiBNaXNzaW5nIGluY2x1ZGUgd2FzIG5vdCB0aGUgY2F1c2Uu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QbGF5YmFja1Nlc3Np b25Nb2RlbE1lZGlhRWxlbWVudC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1Bs YXliYWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50Lm1tCmluZGV4IDZmNDBjNTAyMDZjZjI3OGM5 M2ZlNDk2NWFjY2JkMjBmMjcxYzAwYWEuLmFmNDIyZTAwN2FlMDg3MjBlYWE0M2M3OTU0MDBhZTBj ZDY0ZTZhNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1BsYXli YWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NvY29hL1BsYXliYWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50Lm1tCkBAIC0zMyw3ICsz Myw3IEBACiAjaW1wb3J0ICJFdmVudExpc3RlbmVyLmgiCiAjaW1wb3J0ICJFdmVudE5hbWVzLmgi CiAjaW1wb3J0ICJIVE1MRWxlbWVudC5oIgotI2ltcG9ydCAiSFRNTE1lZGlhRWxlbWVudC5oIgor I2ltcG9ydCAiSFRNTFZpZGVvRWxlbWVudC5oIgogI2ltcG9ydCAiTG9nZ2luZy5oIgogI2ltcG9y dCAiTWVkaWFDb250cm9sc0hvc3QuaCIKICNpbXBvcnQgIk1lZGlhU2VsZWN0aW9uT3B0aW9uLmgi CkBAIC0zMTQsMTAgKzMxNCwxNSBAQCB2b2lkIFBsYXliYWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVt ZW50OjpzZWxlY3RMZWdpYmxlTWVkaWFPcHRpb24odWludDY0X3QgaW5kZXgpCiAKIHZvaWQgUGxh eWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1lbnQ6OnRvZ2dsZVBpY3R1cmVJblBpY3R1cmUoKQog ewotICAgIGlmIChtX21lZGlhRWxlbWVudC0+ZnVsbHNjcmVlbk1vZGUoKSA9PSBNZWRpYVBsYXll ckVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUluUGljdHVyZSkKLSAgICAgICAgbV9t ZWRpYUVsZW1lbnQtPmV4aXRGdWxsc2NyZWVuKCk7CisgICAgQVNTRVJUKGlzPEhUTUxWaWRlb0Vs ZW1lbnQ+KCptX21lZGlhRWxlbWVudCkpOworICAgIGlmICghaXM8SFRNTFZpZGVvRWxlbWVudD4o Km1fbWVkaWFFbGVtZW50KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgYXV0byYgZWxlbWVudCA9 IGRvd25jYXN0PEhUTUxWaWRlb0VsZW1lbnQ+KCptX21lZGlhRWxlbWVudCk7CisgICAgaWYgKGVs ZW1lbnQuZnVsbHNjcmVlbk1vZGUoKSA9PSBNZWRpYVBsYXllckVudW1zOjpWaWRlb0Z1bGxzY3Jl ZW5Nb2RlUGljdHVyZUluUGljdHVyZSkKKyAgICAgICAgZWxlbWVudC5zZXRGdWxsc2NyZWVuTW9k ZShNZWRpYVBsYXllckVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSk7CiAgICAgZWxzZQot ICAgICAgICBtX21lZGlhRWxlbWVudC0+ZW50ZXJGdWxsc2NyZWVuKE1lZGlhUGxheWVyRW51bXM6 OlZpZGVvRnVsbHNjcmVlbk1vZGVQaWN0dXJlSW5QaWN0dXJlKTsKKyAgICAgICAgZWxlbWVudC5z ZXRGdWxsc2NyZWVuTW9kZShNZWRpYVBsYXllckVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlUGlj dHVyZUluUGljdHVyZSk7CiB9CiAKIHZvaWQgUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1l bnQ6OnRvZ2dsZU11dGVkKCkK 401112 2020-06-04 20:06:42 -0700 2020-06-04 22:52:28 -0700 Revise the patch based on Darin's comments - prepare for landing bug-212729-20200604200641.patch text/plain 2659 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzVmOGE5ZWVmMDc3ZGQw ZWVmZTRmZGFmNmFkMGQ0NzVlZTcxNzNjMy4uYzI5MmMxNjZiZTM0NDVkODk0N2VlYWI1MjJkYTRm NWFjMjM5YTZmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA2LTA0ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgQSBZb3VUdWJlIHZpZGVvIGdl dHMgc3R1Y2sgYWZ0ZXIgcmFwaWRseSB0YXBwaW5nIG9uIHRvdWNoYmFy4oCZcyBQSVAgYnV0dG9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI3MjkK KworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBDYWxsIEhUTUxW aWRlb0VsZW1lbnQ6OnNldEZ1bGxzY3JlZW5Nb2RlKCkgaW5zdGVhZCBvZiBIVE1MTWVkaWFFbGVt ZW50OjplbnRlckZ1bGxzY3JlZW4oKQorICAgICAgICBhbmQgSFRNTE1lZGlhRWxlbWVudDo6ZXhp dEZ1bGxzY3JlZW4oKSB0byB0b2dnbGUgcGljdHVyZS1pbi1waWN0dXJlIG1vZGUuCisgICAgICAg IEhUTUxWaWRlb0VsZW1lbnQ6OnNldEZ1bGxzY3JlZW5Nb2RlKCkgaXMgcm9idXN0IHVuZGVyIHN0 cmVzcyB0ZXN0IGFmdGVyIHIyNjI0NTYuCisKKyAgICAgICAgTWFudWFsbHkgdGVzdGVkLgorCisg ICAgICAgICogcGxhdGZvcm0vY29jb2EvUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1lbnQu bW06CisgICAgICAgIChXZWJDb3JlOjpQbGF5YmFja1Nlc3Npb25Nb2RlbE1lZGlhRWxlbWVudDo6 dG9nZ2xlUGljdHVyZUluUGljdHVyZSk6CisKIDIwMjAtMDYtMDQgIFJvc3MgS2lyc2xpbmcgIDxy b3NzLmtpcnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAgIFtQbGF5U3RhdGlvbl0gVW5yZXZpZXdl ZCByZXZlcnQgb2YgYnVpbGQgZml4LiBNaXNzaW5nIGluY2x1ZGUgd2FzIG5vdCB0aGUgY2F1c2Uu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QbGF5YmFja1Nlc3Np b25Nb2RlbE1lZGlhRWxlbWVudC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1Bs YXliYWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50Lm1tCmluZGV4IDZmNDBjNTAyMDZjZjI3OGM5 M2ZlNDk2NWFjY2JkMjBmMjcxYzAwYWEuLjI1ZjY4MzA1OTA4NGUyMmVmNTE5YWE2M2VjNGVlNTRj YzY1MjNkODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1BsYXli YWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NvY29hL1BsYXliYWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50Lm1tCkBAIC0zMiw4ICsz Miw3IEBACiAjaW1wb3J0ICJFdmVudC5oIgogI2ltcG9ydCAiRXZlbnRMaXN0ZW5lci5oIgogI2lt cG9ydCAiRXZlbnROYW1lcy5oIgotI2ltcG9ydCAiSFRNTEVsZW1lbnQuaCIKLSNpbXBvcnQgIkhU TUxNZWRpYUVsZW1lbnQuaCIKKyNpbXBvcnQgIkhUTUxWaWRlb0VsZW1lbnQuaCIKICNpbXBvcnQg IkxvZ2dpbmcuaCIKICNpbXBvcnQgIk1lZGlhQ29udHJvbHNIb3N0LmgiCiAjaW1wb3J0ICJNZWRp YVNlbGVjdGlvbk9wdGlvbi5oIgpAQCAtMzE0LDEwICszMTMsMTUgQEAgdm9pZCBQbGF5YmFja1Nl c3Npb25Nb2RlbE1lZGlhRWxlbWVudDo6c2VsZWN0TGVnaWJsZU1lZGlhT3B0aW9uKHVpbnQ2NF90 IGluZGV4KQogCiB2b2lkIFBsYXliYWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50Ojp0b2dnbGVQ aWN0dXJlSW5QaWN0dXJlKCkKIHsKLSAgICBpZiAobV9tZWRpYUVsZW1lbnQtPmZ1bGxzY3JlZW5N b2RlKCkgPT0gTWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZVBpY3R1cmVJblBp Y3R1cmUpCi0gICAgICAgIG1fbWVkaWFFbGVtZW50LT5leGl0RnVsbHNjcmVlbigpOworICAgIEFT U0VSVChpczxIVE1MVmlkZW9FbGVtZW50PigqbV9tZWRpYUVsZW1lbnQpKTsKKyAgICBpZiAoIWlz PEhUTUxWaWRlb0VsZW1lbnQ+KCptX21lZGlhRWxlbWVudCkpCisgICAgICAgIHJldHVybjsKKwor ICAgIGF1dG8mIGVsZW1lbnQgPSBkb3duY2FzdDxIVE1MVmlkZW9FbGVtZW50PigqbV9tZWRpYUVs ZW1lbnQpOworICAgIGlmIChlbGVtZW50LmZ1bGxzY3JlZW5Nb2RlKCkgPT0gTWVkaWFQbGF5ZXJF bnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZVBpY3R1cmVJblBpY3R1cmUpCisgICAgICAgIGVsZW1l bnQuc2V0RnVsbHNjcmVlbk1vZGUoTWVkaWFQbGF5ZXJFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9k ZU5vbmUpOwogICAgIGVsc2UKLSAgICAgICAgbV9tZWRpYUVsZW1lbnQtPmVudGVyRnVsbHNjcmVl bihNZWRpYVBsYXllckVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlUGljdHVyZUluUGljdHVyZSk7 CisgICAgICAgIGVsZW1lbnQuc2V0RnVsbHNjcmVlbk1vZGUoTWVkaWFQbGF5ZXJFbnVtczo6Vmlk ZW9GdWxsc2NyZWVuTW9kZVBpY3R1cmVJblBpY3R1cmUpOwogfQogCiB2b2lkIFBsYXliYWNrU2Vz c2lvbk1vZGVsTWVkaWFFbGVtZW50Ojp0b2dnbGVNdXRlZCgpCg==