170404 2017-04-03 10:02:38 -0700 [MediaStream] Video doesn't render in fullscreen on iOS 2017-04-05 11:34:27 -0700 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified ASSIGNED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue sam webkit-bug-importer youennf oldest_to_newest 1293668 0 eric.carlson 2017-04-03 10:02:38 -0700 Video doesn't render in fullscreen on iOS 1293694 1 306086 eric.carlson 2017-04-03 11:10:57 -0700 Created attachment 306086 Proposed patch. 1293703 2 306086 sam 2017-04-03 11:29:55 -0700 Comment on attachment 306086 Proposed patch. Can this be tested? If not, is there a bug tracking adding infrastructure to test this kind of thing? 1293704 3 webkit-bug-importer 2017-04-03 11:30:35 -0700 <rdar://problem/31407253> 1293738 4 306086 youennf 2017-04-03 12:24:31 -0700 Comment on attachment 306086 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=306086&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:-56 > -#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE) PLATFORM(COCOA)? > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:1112 > + scheduleDeferredTask([this] { Should we protect ´this'? If so, should the m_backgroundLayer check be done here? 1293739 5 youennf 2017-04-03 12:24:59 -0700 Any chance for some kind of test? 1293982 6 eric.carlson 2017-04-03 20:30:01 -0700 (In reply to Sam Weinig from comment #2) > Comment on attachment 306086 [details] > Proposed patch. > > Can this be tested? If not, is there a bug tracking adding infrastructure > to test this kind of thing? It can't be tested now, but I will file a bug and note it in the ChangeLog. 1293983 7 306086 eric.carlson 2017-04-03 20:30:16 -0700 Comment on attachment 306086 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=306086&action=review >> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:-56 >> -#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE) > > PLATFORM(COCOA)? Yep, good idea. >> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:1112 >> + scheduleDeferredTask([this] { > > Should we protect ´this'? > If so, should the m_backgroundLayer check be done here? scheduleDeferredTask creates a weak pointer, so that is done automatically. Good point about the m_backgroundLayer check, it should be done inside of the lambda. 1294169 8 306086 eric.carlson 2017-04-04 14:16:14 -0700 Comment on attachment 306086 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=306086&action=review >>> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:-56 >>> -#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE) >> >> PLATFORM(COCOA)? > > Yep, good idea. Actually that won't work because not all versions of macOS support PiP. 1294563 9 306298 eric.carlson 2017-04-05 10:54:12 -0700 Created attachment 306298 Patch for landing. 1294577 10 306298 commit-queue 2017-04-05 11:34:27 -0700 Comment on attachment 306298 Patch for landing. Clearing flags on attachment: 306298 Committed r214953: <http://trac.webkit.org/changeset/214953> 306086 2017-04-03 11:10:57 -0700 2017-04-03 12:24:31 -0700 Proposed patch. ios_fullscreen_patch_2.txt text/plain 9264 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNDc5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA0LTAzICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0g VmlkZW8gZG9lc24ndCByZW5kZXIgaW4gZnVsbHNjcmVlbiBvbiBpT1MKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDQwNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLmg6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVh bUFWRk9iakMpOiBJbmNsdWRlCisgICAgICAgIHZpZGVvIGZ1bGxzY3JlZW4gbWFuYWdlciBvbiBp T1MgdG9vLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1B VkZPYmpDOjp2aWRlb1RyYW5zZm9ybWF0aW9uTWF0cml4KTogQWRkIHBhcmFtYXRlcgorICAgICAg ICB0byBmb3JjZSB0cmFuc2Zvcm0gcmVjYWxjdWxhdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6ZW5xdWV1ZVZpZGVvU2FtcGxlKTog UmVzdHJ1Y3R1cmUgY29kZSBzaW5jZQorICAgICAgICB0aGUgZGlzcGxheSBsYXllciByZXNpemUg aGFwcGVucyBlbHNld2hlcmUuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVN ZWRpYVN0cmVhbUFWRk9iakM6OmVuc3VyZUxheWVycyk6IEluY2x1ZGUgdmlkZW8gZnVsbHNjcmVl bgorICAgICAgICBtYW5hZ2VyIG9uIGlPUyB0b28uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OmRlc3Ryb3lMYXllcnMpOiBEaXR0by4KKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6cGxh dGZvcm1MYXllcik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaWRlb0Z1bGxzY3JlZW5MYXllcik6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpiYWNr Z3JvdW5kTGF5ZXJCb3VuZHNDaGFuZ2VkKTogQ2hhbmdlIHRoZQorICAgICAgICBkaXNwbGF5IGxh eWVyIHNpemUgYW5kIHBvc2l0aW9uIGltbWVkaWF0ZWx5IGluc3RlYWQgb2Ygd2FpdGluZyBmb3Ig dGhlIG5leHQgc2FtcGxlIGJ1ZmZlcgorICAgICAgICBzbyB0aGUgZGlzcGxheSBpcyBjb3JyZWN0 IHdoZW4gZnVsbHNjcmVlbiBtb2RlIGNoYW5nZXMgd2hlbiBwYXVzZWQuCisKIDIwMTctMDQtMDMg IFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVu dCBzdHJva2UtbWl0ZXJsaW1pdC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2Jq Qy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCShyZXZp c2lvbiAyMTQ3OTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaAkod29ya2lu ZyBjb3B5KQpAQCAtNTMsNyArNTMsNyBAQCBjbGFzcyBNZWRpYVNvdXJjZVByaXZhdGVDbGllbnQ7 CiBjbGFzcyBQaXhlbEJ1ZmZlckNvbmZvcm1lckNWOwogY2xhc3MgVmlkZW9UcmFja1ByaXZhdGVN ZWRpYVN0cmVhbTsKIAotI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRB VElPTl9NT0RFKQorI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykgJiYgRU5BQkxF KFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKSkKIGNsYXNzIFZpZGVvRnVsbHNjcmVlbkxheWVyTWFu YWdlcjsKICNlbmRpZgogCkBAIC0yMDQsNyArMjA0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNh bXBsZUJ1ZmZlclVwZGF0ZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmLCBNZWRpYVNhbXBsZSYp IG92ZXJyaWRlOwogICAgIHZvaWQgcmVhZHlTdGF0ZUNoYW5nZWQoTWVkaWFTdHJlYW1UcmFja1By aXZhdGUmKSBvdmVycmlkZTsKIAotI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BS RVNFTlRBVElPTl9NT0RFKQorI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykgJiYg RU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKSkKICAgICB2b2lkIHNldFZpZGVvRnVsbHNj cmVlbkxheWVyKFBsYXRmb3JtTGF5ZXIqLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gY29tcGxldGlv bkhhbmRsZXIpIG92ZXJyaWRlOwogICAgIHZvaWQgc2V0VmlkZW9GdWxsc2NyZWVuRnJhbWUoRmxv YXRSZWN0KSBvdmVycmlkZTsKICNlbmRpZgpAQCAtMjEzLDcgKzIxMyw3IEBAIHByaXZhdGU6CiAK ICAgICBBdWRpb1NvdXJjZVByb3ZpZGVyKiBhdWRpb1NvdXJjZVByb3ZpZGVyKCkgZmluYWw7CiAK LSAgICBDR0FmZmluZVRyYW5zZm9ybSB2aWRlb1RyYW5zZm9ybWF0aW9uTWF0cml4KE1lZGlhU2Ft cGxlJik7CisgICAgQ0dBZmZpbmVUcmFuc2Zvcm0gdmlkZW9UcmFuc2Zvcm1hdGlvbk1hdHJpeChN ZWRpYVNhbXBsZSYsIGJvb2wgZm9yY2VVcGRhdGUgPSBmYWxzZSk7CiAKICAgICBNZWRpYVBsYXll ciogbV9wbGF5ZXIgeyBudWxscHRyIH07CiAgICAgV2Vha1B0ckZhY3Rvcnk8TWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDPiBtX3dlYWtQdHJGYWN0b3J5OwpAQCAtMjU5LDkgKzI1 OSw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3BlbmRpbmdTZWxlY3RlZFRyYWNrQ2hlY2sgeyBm YWxzZSB9OwogICAgIGJvb2wgbV9zaG91bGREaXNwbGF5Rmlyc3RWaWRlb0ZyYW1lIHsgZmFsc2Ug fTsKICAgICBib29sIG1fdHJhbnNmb3JtSXNWYWxpZCB7IGZhbHNlIH07Ci0gICAgYm9vbCBtX3Zp ZGVvU2l6ZUNoYW5nZWQ7CiAKLSNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVT RU5UQVRJT05fTU9ERSkKKyNpZiBQTEFURk9STShJT1MpIHx8IChQTEFURk9STShNQUMpICYmIEVO QUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCiAgICAgc3RkOjp1bmlxdWVfcHRyPFZpZGVv RnVsbHNjcmVlbkxheWVyTWFuYWdlcj4gbV92aWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXI7CiAj ZW5kaWYKIH07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCShyZXZpc2lvbiAyMTQ3 OTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0JKHdvcmtpbmcgY29weSkK QEAgLTQ0LDcgKzQ0LDcgQEAKICNpbXBvcnQgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW1wb3J0IDx3 dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAotI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVP X1BSRVNFTlRBVElPTl9NT0RFKQorI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykg JiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKSkKICNpbXBvcnQgIlZpZGVvRnVsbHNj cmVlbkxheWVyTWFuYWdlci5oIgogI2VuZGlmCiAKQEAgLTE5MCw3ICsxOTAsNyBAQCBNZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6Ok1lCiAgICAgLCBtX3dlYWtQdHJGYWN0b3J5 KHRoaXMpCiAgICAgLCBtX3N0YXR1c0NoYW5nZUxpc3RlbmVyKGFkb3B0TlMoW1tXZWJBVlNhbXBs ZUJ1ZmZlclN0YXR1c0NoYW5nZUxpc3RlbmVyIGFsbG9jXSBpbml0V2l0aFBhcmVudDp0aGlzXSkp CiAgICAgLCBtX2Nsb2NrKENsb2NrOjpjcmVhdGUoKSkKLSNpZiBQTEFURk9STShNQUMpICYmIEVO QUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKKyNpZiBQTEFURk9STShJT1MpIHx8IChQTEFU Rk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCiAgICAgLCBtX3Zp ZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcihWaWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXI6OmNy ZWF0ZSgpKQogI2VuZGlmCiB7CkBAIC0zMDIsOSArMzAyLDkgQEAgTWVkaWFUaW1lIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU3RyZWFtQQogICAgIHJldHVybiB0aW1lbGluZU9mZnNldDsKIH0KIAot Q0dBZmZpbmVUcmFuc2Zvcm0gTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjp2 aWRlb1RyYW5zZm9ybWF0aW9uTWF0cml4KE1lZGlhU2FtcGxlJiBzYW1wbGUpCitDR0FmZmluZVRy YW5zZm9ybSBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnZpZGVvVHJhbnNm b3JtYXRpb25NYXRyaXgoTWVkaWFTYW1wbGUmIHNhbXBsZSwgYm9vbCBmb3JjZVVwZGF0ZSkKIHsK LSAgICBpZiAobV90cmFuc2Zvcm1Jc1ZhbGlkKQorICAgIGlmICghZm9yY2VVcGRhdGUgJiYgbV90 cmFuc2Zvcm1Jc1ZhbGlkKQogICAgICAgICByZXR1cm4gbV92aWRlb1RyYW5zZm9ybTsKIAogICAg IENNU2FtcGxlQnVmZmVyUmVmIHNhbXBsZUJ1ZmZlciA9IHNhbXBsZS5wbGF0Zm9ybVNhbXBsZSgp LnNhbXBsZS5jbVNhbXBsZUJ1ZmZlcjsKQEAgLTM3MywxOSArMzczLDggQEAgdm9pZCBNZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iagogICAgICAgICBpZiAoc2FtcGxlLnZpZGVvT3Jp ZW50YXRpb24oKSAhPSBtX3ZpZGVvT3JpZW50YXRpb24gfHwgc2FtcGxlLnZpZGVvTWlycm9yZWQo KSAhPSBtX3ZpZGVvTWlycm9yZWQpIHsKICAgICAgICAgICAgIG1fdmlkZW9PcmllbnRhdGlvbiA9 IHNhbXBsZS52aWRlb09yaWVudGF0aW9uKCk7CiAgICAgICAgICAgICBtX3ZpZGVvTWlycm9yZWQg PSBzYW1wbGUudmlkZW9NaXJyb3JlZCgpOwotICAgICAgICAgICAgbV90cmFuc2Zvcm1Jc1ZhbGlk ID0gZmFsc2U7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAobV92aWRlb1NpemVDaGFuZ2VkIHx8 ICFtX3RyYW5zZm9ybUlzVmFsaWQpIHsKICAgICAgICAgICAgIHJ1bldpdGhvdXRBbmltYXRpb25z KFt0aGlzLCAmc2FtcGxlXSB7Ci0gICAgICAgICAgICAgICAgYXV0byBiYWNrZ3JvdW5kQm91bmRz ID0gbV9iYWNrZ3JvdW5kTGF5ZXIuZ2V0KCkuYm91bmRzOwotICAgICAgICAgICAgICAgIGF1dG8g dmlkZW9Cb3VuZHMgPSBiYWNrZ3JvdW5kQm91bmRzOwotICAgICAgICAgICAgICAgIGlmIChtX3Zp ZGVvT3JpZW50YXRpb24gPT0gTWVkaWFTYW1wbGU6OlZpZGVvT3JpZW50YXRpb246OkxhbmRzY2Fw ZVJpZ2h0IHx8IG1fdmlkZW9PcmllbnRhdGlvbiA9PSBNZWRpYVNhbXBsZTo6VmlkZW9PcmllbnRh dGlvbjo6TGFuZHNjYXBlTGVmdCkKLSAgICAgICAgICAgICAgICAgICAgc3RkOjpzd2FwKHZpZGVv Qm91bmRzLnNpemUud2lkdGgsIHZpZGVvQm91bmRzLnNpemUuaGVpZ2h0KTsKLSAgICAgICAgICAg ICAgICBtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKS5ib3VuZHMgPSB2aWRlb0JvdW5k czsKLSAgICAgICAgICAgICAgICBtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKS5wb3Np dGlvbiA9IHsgYmFja2dyb3VuZEJvdW5kcy5zaXplLndpZHRoIC8gMiwgYmFja2dyb3VuZEJvdW5k cy5zaXplLmhlaWdodCAvIDJ9OwotICAgICAgICAgICAgICAgIG1fc2FtcGxlQnVmZmVyRGlzcGxh eUxheWVyLmdldCgpLmFmZmluZVRyYW5zZm9ybSA9IHZpZGVvVHJhbnNmb3JtYXRpb25NYXRyaXgo c2FtcGxlKTsKLSAgICAgICAgICAgICAgICBtX3ZpZGVvU2l6ZUNoYW5nZWQgPSBmYWxzZTsKKyAg ICAgICAgICAgICAgICBtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKS5hZmZpbmVUcmFu c2Zvcm0gPSB2aWRlb1RyYW5zZm9ybWF0aW9uTWF0cml4KHNhbXBsZSwgdHJ1ZSk7CiAgICAgICAg ICAgICB9KTsKICAgICAgICAgfQogCkBAIC00OTIsNyArNDgxLDcgQEAgdm9pZCBNZWRpYVBsYXll clByaXZhdGVNZWRpYVN0cmVhbUFWRk9iagogCiAgICAgdXBkYXRlUmVuZGVyaW5nTW9kZSgpOwog ICAgIAotI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RF KQorI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BS RVNFTlRBVElPTl9NT0RFKSkKICAgICBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+c2V0 VmlkZW9MYXllcihtX2JhY2tncm91bmRMYXllci5nZXQoKSwgc25hcHBlZEludFJlY3QobV9wbGF5 ZXItPmNsaWVudCgpLm1lZGlhUGxheWVyQ29udGVudEJveFJlY3QoKSkuc2l6ZSgpKTsKICNlbmRp ZgogfQpAQCAtNTEwLDcgKzQ5OSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJl YW1BVkZPYmoKIAogICAgIHVwZGF0ZVJlbmRlcmluZ01vZGUoKTsKICAgICAKLSNpZiBQTEFURk9S TShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKKyNpZiBQTEFURk9STShJ T1MpIHx8IChQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkp CiAgICAgbV92aWRlb0Z1bGxzY3JlZW5MYXllck1hbmFnZXItPmRpZERlc3Ryb3lWaWRlb0xheWVy KCk7CiAjZW5kaWYKIH0KQEAgLTU3MCw3ICs1NTksNyBAQCBQbGF0Zm9ybUxheWVyKiBNZWRpYVBs YXllclByaXZhdGVNZWRpYVN0CiAgICAgaWYgKCFtX2JhY2tncm91bmRMYXllciB8fCBtX2Rpc3Bs YXlNb2RlID09IE5vbmUpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0jaWYgUExBVEZPUk0o TUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpCisjaWYgUExBVEZPUk0oSU9T KSB8fCAoUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpKQog ICAgIHJldHVybiBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+dmlkZW9JbmxpbmVMYXll cigpOwogI2Vsc2UKICAgICByZXR1cm4gbV9iYWNrZ3JvdW5kTGF5ZXIuZ2V0KCk7CkBAIC04NjEs OSArODUwLDE0IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmoKICAg ICB9KTsKIH0KIAotI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElP Tl9NT0RFKQotdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnNldFZp ZGVvRnVsbHNjcmVlbkxheWVyKFBsYXRmb3JtTGF5ZXIgKnZpZGVvRnVsbHNjcmVlbkxheWVyLCBz dGQ6OmZ1bmN0aW9uPHZvaWQoKT4gY29tcGxldGlvbkhhbmRsZXIpCisjaWYgUExBVEZPUk0oSU9T KSB8fCAoUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpKQor dm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnNldFZpZGVvRnVsbHNj cmVlbkxheWVyKFBsYXRmb3JtTGF5ZXIqIHZpZGVvRnVsbHNjcmVlbkxheWVyLCBzdGQ6OmZ1bmN0 aW9uPHZvaWQoKT4gY29tcGxldGlvbkhhbmRsZXIpCiB7CisgICAgaWYgKG1fdmlkZW9GdWxsc2Ny ZWVuTGF5ZXJNYW5hZ2VyLT52aWRlb0Z1bGxzY3JlZW5MYXllcigpID09IHZpZGVvRnVsbHNjcmVl bkxheWVyKSB7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CisgICAgICAgIHJldHVybjsK KyAgICB9CisKICAgICBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+c2V0VmlkZW9GdWxs c2NyZWVuTGF5ZXIodmlkZW9GdWxsc2NyZWVuTGF5ZXIsIGNvbXBsZXRpb25IYW5kbGVyKTsKIH0K IApAQCAtMTExNSw3ICsxMTA5LDE2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJl YW1BVkZPYmoKICAgICBpZiAoIW1fYmFja2dyb3VuZExheWVyIHx8ICFtX3NhbXBsZUJ1ZmZlckRp c3BsYXlMYXllcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV92aWRlb1NpemVDaGFuZ2VkID0g dHJ1ZTsKKyAgICBzY2hlZHVsZURlZmVycmVkVGFzayhbdGhpc10geworICAgICAgICBydW5XaXRo b3V0QW5pbWF0aW9ucyhbdGhpc10geworICAgICAgICAgICAgYXV0byBiYWNrZ3JvdW5kQm91bmRz ID0gbV9iYWNrZ3JvdW5kTGF5ZXIuZ2V0KCkuYm91bmRzOworICAgICAgICAgICAgYXV0byB2aWRl b0JvdW5kcyA9IGJhY2tncm91bmRCb3VuZHM7CisgICAgICAgICAgICBpZiAobV92aWRlb09yaWVu dGF0aW9uID09IE1lZGlhU2FtcGxlOjpWaWRlb09yaWVudGF0aW9uOjpMYW5kc2NhcGVSaWdodCB8 fCBtX3ZpZGVvT3JpZW50YXRpb24gPT0gTWVkaWFTYW1wbGU6OlZpZGVvT3JpZW50YXRpb246Okxh bmRzY2FwZUxlZnQpCisgICAgICAgICAgICAgICAgc3RkOjpzd2FwKHZpZGVvQm91bmRzLnNpemUu d2lkdGgsIHZpZGVvQm91bmRzLnNpemUuaGVpZ2h0KTsKKyAgICAgICAgICAgIG1fc2FtcGxlQnVm ZmVyRGlzcGxheUxheWVyLmdldCgpLmJvdW5kcyA9IHZpZGVvQm91bmRzOworICAgICAgICAgICAg bV9zYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIuZ2V0KCkucG9zaXRpb24gPSB7IGJhY2tncm91bmRC b3VuZHMuc2l6ZS53aWR0aCAvIDIsIGJhY2tncm91bmRCb3VuZHMuc2l6ZS5oZWlnaHQgLyAyfTsK KyAgICAgICAgfSk7CisgICAgfSk7CiB9CiAKIH0K 306298 2017-04-05 10:54:12 -0700 2017-04-05 11:34:27 -0700 Patch for landing. ios_fullscreen_patch_4.txt text/plain 9946 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNDk0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE3LTA0LTA1ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0g VmlkZW8gZG9lc24ndCByZW5kZXIgaW4gZnVsbHNjcmVlbiBvbiBpT1MKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MDQwNAorCisgICAgICAgIFJldmll d2VkIGJ5IFlvdWVubiBGYWJsZXQuCisgICAgICAgIAorICAgICAgICBObyBuZXcgdGVzdHMsIGZp bGVkIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA1MTIuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclBy aXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW06 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6 Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQyk6IEluY2x1ZGUKKyAgICAgICAg dmlkZW8gZnVsbHNjcmVlbiBtYW5hZ2VyIG9uIGlPUyB0b28uCisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnZpZGVvVHJhbnNmb3JtYXRpb25N YXRyaXgpOiBBZGQgcGFyYW1hdGVyCisgICAgICAgIHRvIGZvcmNlIHRyYW5zZm9ybSByZWNhbGN1 bGF0aW9uLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1B VkZPYmpDOjplbnF1ZXVlVmlkZW9TYW1wbGUpOiBSZXN0cnVjdHVyZSBjb2RlIHNpbmNlCisgICAg ICAgIHRoZSBkaXNwbGF5IGxheWVyIHJlc2l6ZSBoYXBwZW5zIGVsc2V3aGVyZS4KKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6ZW5zdXJlTGF5 ZXJzKTogSW5jbHVkZSB2aWRlbyBmdWxsc2NyZWVuCisgICAgICAgIG1hbmFnZXIgb24gaU9TIHRv by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2Jq Qzo6ZGVzdHJveUxheWVycyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpwbGF0Zm9ybUxheWVyKTogRGl0dG8uCisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnNldFZpZGVv RnVsbHNjcmVlbkxheWVyKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OmJhY2tncm91bmRMYXllckJvdW5kc0NoYW5nZWQpOiBD aGFuZ2UgdGhlCisgICAgICAgIGRpc3BsYXkgbGF5ZXIgc2l6ZSBhbmQgcG9zaXRpb24gaW1tZWRp YXRlbHkgaW5zdGVhZCBvZiB3YWl0aW5nIGZvciB0aGUgbmV4dCBzYW1wbGUgYnVmZmVyCisgICAg ICAgIHNvIHRoZSBkaXNwbGF5IGlzIGNvcnJlY3Qgd2hlbiBmdWxsc2NyZWVuIG1vZGUgY2hhbmdl cyB3aGVuIHBhdXNlZC4KKwogMjAxNy0wNC0wNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgogCiAgICAgICAgIF9ibGFuayAvIF9zZWxmIC8gX3BhcmVudCAvIF90b3AgYnJvd3Npbmcg Y29udGV4dCBuYW1lcyBzaG91bGQgYmUgY2FzZS1pbnNlbnNpdGl2ZQpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2 YXRlTWVkaWFTdHJlYW1BVkZPYmpDLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFT dHJlYW1BVkZPYmpDLmgJKHJldmlzaW9uIDIxNDk0NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3Ry ZWFtQVZGT2JqQy5oCSh3b3JraW5nIGNvcHkpCkBAIC01Myw3ICs1Myw3IEBAIGNsYXNzIE1lZGlh U291cmNlUHJpdmF0ZUNsaWVudDsKIGNsYXNzIFBpeGVsQnVmZmVyQ29uZm9ybWVyQ1Y7CiBjbGFz cyBWaWRlb1RyYWNrUHJpdmF0ZU1lZGlhU3RyZWFtOwogCi0jaWYgUExBVEZPUk0oTUFDKSAmJiBF TkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpCisjaWYgUExBVEZPUk0oSU9TKSB8fCAoUExB VEZPUk0oTUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpKQogY2xhc3MgVmlk ZW9GdWxsc2NyZWVuTGF5ZXJNYW5hZ2VyOwogI2VuZGlmCiAKQEAgLTE3Miw2ICsxNzIsNyBAQCBw cml2YXRlOgogICAgIHZvaWQgdXBkYXRlVHJhY2tzKCk7CiAgICAgdm9pZCB1cGRhdGVSZW5kZXJp bmdNb2RlKCk7CiAgICAgdm9pZCBjaGVja1NlbGVjdGVkVmlkZW9UcmFjaygpOworICAgIHZvaWQg dXBkYXRlRGlzcGxheUxheWVyKCk7CiAKICAgICB2b2lkIHNjaGVkdWxlRGVmZXJyZWRUYXNrKEZ1 bmN0aW9uPHZvaWQgKCk+JiYpOwogCkBAIC0yMDYsNyArMjA3LDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHNhbXBsZUJ1ZmZlclVwZGF0ZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmLCBNZWRpYVNh bXBsZSYpIG92ZXJyaWRlOwogICAgIHZvaWQgcmVhZHlTdGF0ZUNoYW5nZWQoTWVkaWFTdHJlYW1U cmFja1ByaXZhdGUmKSBvdmVycmlkZTsKIAotI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJ REVPX1BSRVNFTlRBVElPTl9NT0RFKQorI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1B QykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKSkKICAgICB2b2lkIHNldFZpZGVv RnVsbHNjcmVlbkxheWVyKFBsYXRmb3JtTGF5ZXIqLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gY29t cGxldGlvbkhhbmRsZXIpIG92ZXJyaWRlOwogICAgIHZvaWQgc2V0VmlkZW9GdWxsc2NyZWVuRnJh bWUoRmxvYXRSZWN0KSBvdmVycmlkZTsKICNlbmRpZgpAQCAtMjE1LDcgKzIxNiw3IEBAIHByaXZh dGU6CiAKICAgICBBdWRpb1NvdXJjZVByb3ZpZGVyKiBhdWRpb1NvdXJjZVByb3ZpZGVyKCkgZmlu YWw7CiAKLSAgICBDR0FmZmluZVRyYW5zZm9ybSB2aWRlb1RyYW5zZm9ybWF0aW9uTWF0cml4KE1l ZGlhU2FtcGxlJik7CisgICAgQ0dBZmZpbmVUcmFuc2Zvcm0gdmlkZW9UcmFuc2Zvcm1hdGlvbk1h dHJpeChNZWRpYVNhbXBsZSYsIGJvb2wgZm9yY2VVcGRhdGUgPSBmYWxzZSk7CiAKICAgICBNZWRp YVBsYXllciogbV9wbGF5ZXIgeyBudWxscHRyIH07CiAgICAgV2Vha1B0ckZhY3Rvcnk8TWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDPiBtX3dlYWtQdHJGYWN0b3J5OwpAQCAtMjYx LDkgKzI2Miw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3BlbmRpbmdTZWxlY3RlZFRyYWNrQ2hl Y2sgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9zaG91bGREaXNwbGF5Rmlyc3RWaWRlb0ZyYW1lIHsg ZmFsc2UgfTsKICAgICBib29sIG1fdHJhbnNmb3JtSXNWYWxpZCB7IGZhbHNlIH07Ci0gICAgYm9v bCBtX3ZpZGVvU2l6ZUNoYW5nZWQ7CiAKLSNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURF T19QUkVTRU5UQVRJT05fTU9ERSkKKyNpZiBQTEFURk9STShJT1MpIHx8IChQTEFURk9STShNQUMp ICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCiAgICAgc3RkOjp1bmlxdWVfcHRy PFZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcj4gbV92aWRlb0Z1bGxzY3JlZW5MYXllck1hbmFn ZXI7CiAjZW5kaWYKIH07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCShyZXZpc2lv biAyMTQ5NDUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0JKHdvcmtpbmcg Y29weSkKQEAgLTQ0LDcgKzQ0LDcgQEAKICNpbXBvcnQgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW1w b3J0IDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAotI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxF KFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKQorI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JN KE1BQykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKSkKICNpbXBvcnQgIlZpZGVv RnVsbHNjcmVlbkxheWVyTWFuYWdlci5oIgogI2VuZGlmCiAKQEAgLTE5MCw3ICsxOTAsNyBAQCBN ZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6Ok1lCiAgICAgLCBtX3dlYWtQdHJG YWN0b3J5KHRoaXMpCiAgICAgLCBtX3N0YXR1c0NoYW5nZUxpc3RlbmVyKGFkb3B0TlMoW1tXZWJB VlNhbXBsZUJ1ZmZlclN0YXR1c0NoYW5nZUxpc3RlbmVyIGFsbG9jXSBpbml0V2l0aFBhcmVudDp0 aGlzXSkpCiAgICAgLCBtX2Nsb2NrKENsb2NrOjpjcmVhdGUoKSkKLSNpZiBQTEFURk9STShNQUMp ICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKKyNpZiBQTEFURk9STShJT1MpIHx8 IChQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCiAgICAg LCBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlcihWaWRlb0Z1bGxzY3JlZW5MYXllck1hbmFn ZXI6OmNyZWF0ZSgpKQogI2VuZGlmCiB7CkBAIC0zMDIsOSArMzAyLDkgQEAgTWVkaWFUaW1lIE1l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQQogICAgIHJldHVybiB0aW1lbGluZU9mZnNldDsK IH0KIAotQ0dBZmZpbmVUcmFuc2Zvcm0gTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZP YmpDOjp2aWRlb1RyYW5zZm9ybWF0aW9uTWF0cml4KE1lZGlhU2FtcGxlJiBzYW1wbGUpCitDR0Fm ZmluZVRyYW5zZm9ybSBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnZpZGVv VHJhbnNmb3JtYXRpb25NYXRyaXgoTWVkaWFTYW1wbGUmIHNhbXBsZSwgYm9vbCBmb3JjZVVwZGF0 ZSkKIHsKLSAgICBpZiAobV90cmFuc2Zvcm1Jc1ZhbGlkKQorICAgIGlmICghZm9yY2VVcGRhdGUg JiYgbV90cmFuc2Zvcm1Jc1ZhbGlkKQogICAgICAgICByZXR1cm4gbV92aWRlb1RyYW5zZm9ybTsK IAogICAgIENNU2FtcGxlQnVmZmVyUmVmIHNhbXBsZUJ1ZmZlciA9IHNhbXBsZS5wbGF0Zm9ybVNh bXBsZSgpLnNhbXBsZS5jbVNhbXBsZUJ1ZmZlcjsKQEAgLTM3MywxOSArMzczLDkgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iagogICAgICAgICBpZiAoc2FtcGxlLnZp ZGVvT3JpZW50YXRpb24oKSAhPSBtX3ZpZGVvT3JpZW50YXRpb24gfHwgc2FtcGxlLnZpZGVvTWly cm9yZWQoKSAhPSBtX3ZpZGVvTWlycm9yZWQpIHsKICAgICAgICAgICAgIG1fdmlkZW9PcmllbnRh dGlvbiA9IHNhbXBsZS52aWRlb09yaWVudGF0aW9uKCk7CiAgICAgICAgICAgICBtX3ZpZGVvTWly cm9yZWQgPSBzYW1wbGUudmlkZW9NaXJyb3JlZCgpOwotICAgICAgICAgICAgbV90cmFuc2Zvcm1J c1ZhbGlkID0gZmFsc2U7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAobV92aWRlb1NpemVDaGFu Z2VkIHx8ICFtX3RyYW5zZm9ybUlzVmFsaWQpIHsKICAgICAgICAgICAgIHJ1bldpdGhvdXRBbmlt YXRpb25zKFt0aGlzLCAmc2FtcGxlXSB7Ci0gICAgICAgICAgICAgICAgYXV0byBiYWNrZ3JvdW5k Qm91bmRzID0gbV9iYWNrZ3JvdW5kTGF5ZXIuZ2V0KCkuYm91bmRzOwotICAgICAgICAgICAgICAg IGF1dG8gdmlkZW9Cb3VuZHMgPSBiYWNrZ3JvdW5kQm91bmRzOwotICAgICAgICAgICAgICAgIGlm IChtX3ZpZGVvT3JpZW50YXRpb24gPT0gTWVkaWFTYW1wbGU6OlZpZGVvT3JpZW50YXRpb246Okxh bmRzY2FwZVJpZ2h0IHx8IG1fdmlkZW9PcmllbnRhdGlvbiA9PSBNZWRpYVNhbXBsZTo6VmlkZW9P cmllbnRhdGlvbjo6TGFuZHNjYXBlTGVmdCkKLSAgICAgICAgICAgICAgICAgICAgc3RkOjpzd2Fw KHZpZGVvQm91bmRzLnNpemUud2lkdGgsIHZpZGVvQm91bmRzLnNpemUuaGVpZ2h0KTsKLSAgICAg ICAgICAgICAgICBtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKS5ib3VuZHMgPSB2aWRl b0JvdW5kczsKLSAgICAgICAgICAgICAgICBtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQo KS5wb3NpdGlvbiA9IHsgYmFja2dyb3VuZEJvdW5kcy5zaXplLndpZHRoIC8gMiwgYmFja2dyb3Vu ZEJvdW5kcy5zaXplLmhlaWdodCAvIDJ9OwotICAgICAgICAgICAgICAgIG1fc2FtcGxlQnVmZmVy RGlzcGxheUxheWVyLmdldCgpLmFmZmluZVRyYW5zZm9ybSA9IHZpZGVvVHJhbnNmb3JtYXRpb25N YXRyaXgoc2FtcGxlKTsKLSAgICAgICAgICAgICAgICBtX3ZpZGVvU2l6ZUNoYW5nZWQgPSBmYWxz ZTsKKyAgICAgICAgICAgICAgICBtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKS5hZmZp bmVUcmFuc2Zvcm0gPSB2aWRlb1RyYW5zZm9ybWF0aW9uTWF0cml4KHNhbXBsZSwgdHJ1ZSk7Cisg ICAgICAgICAgICAgICAgdXBkYXRlRGlzcGxheUxheWVyKCk7CiAgICAgICAgICAgICB9KTsKICAg ICAgICAgfQogCkBAIC00OTEsOCArNDgxLDkgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRp YVN0cmVhbUFWRk9iagogI2VuZGlmCiAKICAgICB1cGRhdGVSZW5kZXJpbmdNb2RlKCk7Ci0gICAg Ci0jaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpCisg ICAgdXBkYXRlRGlzcGxheUxheWVyKCk7CisKKyNpZiBQTEFURk9STShJT1MpIHx8IChQTEFURk9S TShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCiAgICAgbV92aWRlb0Z1 bGxzY3JlZW5MYXllck1hbmFnZXItPnNldFZpZGVvTGF5ZXIobV9iYWNrZ3JvdW5kTGF5ZXIuZ2V0 KCksIHNuYXBwZWRJbnRSZWN0KG1fcGxheWVyLT5jbGllbnQoKS5tZWRpYVBsYXllckNvbnRlbnRC b3hSZWN0KCkpLnNpemUoKSk7CiAjZW5kaWYKIH0KQEAgLTUxMCw3ICs1MDEsNyBAQCB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqCiAKICAgICB1cGRhdGVSZW5kZXJpbmdN b2RlKCk7CiAgICAgCi0jaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFU SU9OX01PREUpCisjaWYgUExBVEZPUk0oSU9TKSB8fCAoUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUo VklERU9fUFJFU0VOVEFUSU9OX01PREUpKQogICAgIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXJNYW5h Z2VyLT5kaWREZXN0cm95VmlkZW9MYXllcigpOwogI2VuZGlmCiB9CkBAIC01NzgsNyArNTY5LDcg QEAgUGxhdGZvcm1MYXllciogTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdAogICAgIGlmICghbV9i YWNrZ3JvdW5kTGF5ZXIgfHwgbV9kaXNwbGF5TW9kZSA9PSBOb25lKQogICAgICAgICByZXR1cm4g bnVsbHB0cjsKIAotI2lmIFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElP Tl9NT0RFKQorI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJ REVPX1BSRVNFTlRBVElPTl9NT0RFKSkKICAgICByZXR1cm4gbV92aWRlb0Z1bGxzY3JlZW5MYXll ck1hbmFnZXItPnZpZGVvSW5saW5lTGF5ZXIoKTsKICNlbHNlCiAgICAgcmV0dXJuIG1fYmFja2dy b3VuZExheWVyLmdldCgpOwpAQCAtODY5LDkgKzg2MCwxNCBAQCB2b2lkIE1lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU3RyZWFtQVZGT2JqCiAgICAgfSk7CiB9CiAKLSNpZiBQTEFURk9STShNQUMpICYm IEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaWRlb0Z1bGxzY3JlZW5MYXllcihQbGF0Zm9ybUxheWVy ICp2aWRlb0Z1bGxzY3JlZW5MYXllciwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGNvbXBsZXRpb25I YW5kbGVyKQorI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJ REVPX1BSRVNFTlRBVElPTl9NT0RFKSkKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJl YW1BVkZPYmpDOjpzZXRWaWRlb0Z1bGxzY3JlZW5MYXllcihQbGF0Zm9ybUxheWVyKiB2aWRlb0Z1 bGxzY3JlZW5MYXllciwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGNvbXBsZXRpb25IYW5kbGVyKQog eworICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbkxheWVyTWFuYWdlci0+dmlkZW9GdWxsc2NyZWVu TGF5ZXIoKSA9PSB2aWRlb0Z1bGxzY3JlZW5MYXllcikgeworICAgICAgICBjb21wbGV0aW9uSGFu ZGxlcigpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgbV92aWRlb0Z1bGxzY3JlZW5M YXllck1hbmFnZXItPnNldFZpZGVvRnVsbHNjcmVlbkxheWVyKHZpZGVvRnVsbHNjcmVlbkxheWVy LCBjb21wbGV0aW9uSGFuZGxlcik7CiB9CiAKQEAgLTExMTgsMTIgKzExMTQsMjcgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iagogICAgIHBpeGVsQnVmZmVyQ29uZm9y bWVyID0gbnVsbHB0cjsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFW Rk9iakM6OmJhY2tncm91bmRMYXllckJvdW5kc0NoYW5nZWQoKQordm9pZCBNZWRpYVBsYXllclBy aXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnVwZGF0ZURpc3BsYXlMYXllcigpCiB7CiAgICAgaWYg KCFtX2JhY2tncm91bmRMYXllciB8fCAhbV9zYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIpCiAgICAg ICAgIHJldHVybjsKIAotICAgIG1fdmlkZW9TaXplQ2hhbmdlZCA9IHRydWU7CisgICAgYXV0byBi YWNrZ3JvdW5kQm91bmRzID0gbV9iYWNrZ3JvdW5kTGF5ZXIuZ2V0KCkuYm91bmRzOworICAgIGF1 dG8gdmlkZW9Cb3VuZHMgPSBiYWNrZ3JvdW5kQm91bmRzOworICAgIGlmIChtX3ZpZGVvT3JpZW50 YXRpb24gPT0gTWVkaWFTYW1wbGU6OlZpZGVvT3JpZW50YXRpb246OkxhbmRzY2FwZVJpZ2h0IHx8 IG1fdmlkZW9PcmllbnRhdGlvbiA9PSBNZWRpYVNhbXBsZTo6VmlkZW9PcmllbnRhdGlvbjo6TGFu ZHNjYXBlTGVmdCkKKyAgICAgICAgc3RkOjpzd2FwKHZpZGVvQm91bmRzLnNpemUud2lkdGgsIHZp ZGVvQm91bmRzLnNpemUuaGVpZ2h0KTsKKworICAgIG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVy LmdldCgpLmJvdW5kcyA9IHZpZGVvQm91bmRzOworICAgIG1fc2FtcGxlQnVmZmVyRGlzcGxheUxh eWVyLmdldCgpLnBvc2l0aW9uID0geyBiYWNrZ3JvdW5kQm91bmRzLnNpemUud2lkdGggLyAyLCBi YWNrZ3JvdW5kQm91bmRzLnNpemUuaGVpZ2h0IC8gMn07Cit9CisKK3ZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpiYWNrZ3JvdW5kTGF5ZXJCb3VuZHNDaGFuZ2VkKCkK K3sKKyAgICBzY2hlZHVsZURlZmVycmVkVGFzayhbdGhpc10geworICAgICAgICBydW5XaXRob3V0 QW5pbWF0aW9ucyhbdGhpc10geworICAgICAgICAgICAgdXBkYXRlRGlzcGxheUxheWVyKCk7Cisg ICAgICAgIH0pOworICAgIH0pOwogfQogCiB9Cg==