182497 2018-02-05 11:28:37 -0800 [iOS] VideoFullscreenInterfaceAVKit should not ignore errors 2018-02-05 22:08:02 -0800 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=182507 https://bugs.webkit.org/show_bug.cgi?id=182527 InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue jer.noble webkit-bug-importer wilander oldest_to_newest 1396420 0 eric.carlson 2018-02-05 11:28:37 -0800 Don't ignore errors returned by -[AVPlayerViewController enterFullScreenAnimated:completionHandler:] or -[AVPlayerViewController exitFullScreenAnimated:completionHandler:]. 1396421 1 eric.carlson 2018-02-05 11:29:15 -0800 <rdar://problem/36986898> 1396461 2 333109 eric.carlson 2018-02-05 12:29:24 -0800 Created attachment 333109 Patch 1396477 3 333109 commit-queue 2018-02-05 12:59:02 -0800 Comment on attachment 333109 Patch Clearing flags on attachment: 333109 Committed r228115: <https://trac.webkit.org/changeset/228115> 1396478 4 commit-queue 2018-02-05 12:59:03 -0800 All reviewed patches have been landed. Closing bug. 1396508 5 wilander 2018-02-05 13:36:23 -0800 I'm fixing the iOS build. 1396514 6 wilander 2018-02-05 13:42:40 -0800 Build fix in r228119: <https://trac.webkit.org/changeset/228119>. 333109 2018-02-05 12:29:24 -0800 2018-02-05 12:59:02 -0800 Patch bug-182497-20180205122923.patch text/plain 14160 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4MTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTAwZGY1Njg1NjljOTA3 YzVlNWM4MmQ3OTllNzNkMzMyMjc3NzFmMS4uYTEwY2EwMzJmMTgwYWY3MjI5YTNlMGI3NWM0YWNh YWZkZjM4ZWQxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTAyLTA1ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0IHNob3VsZCBub3QgaWdub3JlIGVycm9ycworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNDk3CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8zNjk4Njg5OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIEFsd2F5cyBjYWxsIGxheW91dElmTmVlZGVkIGJl Zm9yZSBjYWxsaW5nIC1bQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBlbnRlckZ1bGxTY3JlZW5Bbmlt YXRlZDpjb21wbGV0aW9uSGFuZGxlcl0KKyAgICAgICAgb3IgLVtBVlBsYXllclZpZXdDb250cm9s bGVyIGV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6Y29tcGxldGlvbkhhbmRsZXJdIGJlY2F1c2UgdGhl eSBib3RoIGZhaWwKKyAgICAgICAgaWYgdGhlIHZpZXcgbmVlZHMgbGF5b3V0LiBBbHNvIGRvbid0 IGlnbm9yZSBlcnJvcnMgcmV0dXJuZWQgYnkgdGhvc2UgY2FsbHMuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLCB0aGUgZmFpbHVyZSBpcyBub24gZGV0ZXJtaW5pc3RpYyBhbmQgSSB3YXMgbm90IGFi bGUgdG8gcmVwcm9kdWNlIGluIGEgdGVzdC4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9WaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKFZpZGVvRnVsbHNjcmVlbklu dGVyZmFjZUFWS2l0OjphcHBsaWNhdGlvbkRpZEJlY29tZUFjdGl2ZSk6CisgICAgICAgIChWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZW50ZXJGdWxsc2NyZWVuU3RhbmRhcmQpOgorICAg ICAgICAoVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKToKKyAg ICAgICAgKFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpjbGVhbnVwRnVsbHNjcmVlbik6 CisgICAgICAgIChWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZGlkU3RhcnRQaWN0dXJl SW5QaWN0dXJlKToKKyAgICAgICAgKFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpwcmVw YXJlRm9yUGljdHVyZUluUGljdHVyZVN0b3BXaXRoQ29tcGxldGlvbkhhbmRsZXIpOgorICAgICAg ICAoVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRvRW50ZXJGdWxsc2NyZWVuKToKKyAg ICAgICAgKFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpleGl0RnVsbHNjcmVlbkhhbmRs ZXIpOgorICAgICAgICAoVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVyRnVsbHNj cmVlbkhhbmRsZXIpOgorCiAyMDE4LTAyLTA1ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxl LmNvbT4KIAogICAgICAgICBVc2UgZG93bmNhc3QgaW4gY3JlYXRlTGlua1ByZWxvYWRSZXNvdXJj ZUNsaWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Zp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IDljYjk0NzdiMjdkNDljNTBkNzM4 YzQzNzVhMmUwYTE1YWQxNjMwNGIuLjcxMWMyZDE2OGYwZjVmZWNhZjAyNTJmZTY0OWM3YWE5NjU5 Njg2ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTU5MCw3ICs1OTAsMTMgQEAgdm9p ZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6YXBwbGljYXRpb25EaWRCZWNvbWVBY3Rp dmUoKQogICAgIC8vIElmIHdlIGFyZSBib3RoIGluIFBpUCBhbmQgaW4gRnVsbHNjcmVlbiAoaS5l LiwgdmlhIGF1dG8tUGlQKSwgYW5kIHdlIGRpZCBub3Qgc3RvcCBmdWxsc2NyZWVuIHVwb24gcmV0 dXJuaW5nLCBpdCBtdXN0IGJlCiAgICAgLy8gYmVjYXVzZSB0aGUgb3JpZ2luYXRpbmcgdmlldyBp cyBub3QgdmlzaWJsZSwgc28gaGlkZSB0aGUgZnVsbHNjcmVlbiB3aW5kb3cuCiAgICAgaWYgKG1f Y3VycmVudE1vZGUuaGFzRnVsbHNjcmVlbigpICYmIG1fY3VycmVudE1vZGUuaGFzUGljdHVyZUlu UGljdHVyZSgpKSB7Ci0gICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIGV4aXRGdWxsU2Ny ZWVuQW5pbWF0ZWQ6Tk8gY29tcGxldGlvbkhhbmRsZXI6W3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVm UHRyKHRoaXMpLCB0aGlzXSAoQk9PTCwgTlNFcnJvciAqKSB7CisgICAgICAgIFtbbV9wbGF5ZXJW aWV3Q29udHJvbGxlciB2aWV3XSBsYXlvdXRJZk5lZWRlZF07CisgICAgICAgIFttX3BsYXllclZp ZXdDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6Tk8gY29tcGxldGlvbkhhbmRsZXI6 W3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmUHRyKHRoaXMpLCB0aGlzXSAoQk9PTCBzdWNjZXNzLCBO U0Vycm9yKiBlcnJvcikgeworICAgICAgICAgICAgaWYgKCFzdWNjZXNzKSB7CisgICAgICAgICAg ICAgICAgV1RGTG9nQWx3YXlzKCItW0FWUGxheWVyVmlld0NvbnRyb2xsZXIgZXhpdEZ1bGxTY3Jl ZW5BbmltYXRlZDpjb21wbGV0aW9uSGFuZGxlcjpdIGZhaWxlZCB3aXRoIGVycm9yICVzIiwgW1tl cnJvciBsb2NhbGl6ZWREZXNjcmlwdGlvbl0gVVRGOFN0cmluZ10pOworICAgICAgICAgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBbbV93 aW5kb3cgc2V0SGlkZGVuOllFU107CiAgICAgICAgICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xs ZXIgdmlld10gc2V0SGlkZGVuOllFU107CiAgICAgICAgIH1dOwpAQCAtNzEzLDggKzcxOSwxNSBA QCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW5TdGFu ZGFyZCgpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBbbV9wbGF5ZXJWaWV3Q29udHJv bGxlciBlbnRlckZ1bGxTY3JlZW5BbmltYXRlZDpZRVMgY29tcGxldGlvbkhhbmRsZXI6W3RoaXMs IHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmUHRyKHRoaXMpXSAoQk9PTCBzdWNjZWVkZWQsIE5TRXJy b3IqKSB7Ci0gICAgICAgIFVOVVNFRF9QQVJBTShzdWNjZWVkZWQpOworICAgIFtbbV9wbGF5ZXJW aWV3Q29udHJvbGxlciB2aWV3XSBsYXlvdXRJZk5lZWRlZF07CisgICAgW21fcGxheWVyVmlld0Nv bnRyb2xsZXIgZW50ZXJGdWxsU2NyZWVuQW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb25IYW5kbGVyOlt0 aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZlB0cih0aGlzKV0gKEJPT0wgc3VjY2VlZGVkLCBO U0Vycm9yKiBlcnJvcikgeworICAgICAgICBpZiAoIXN1Y2NlZWRlZCkgeworICAgICAgICAgICAg V1RGTG9nQWx3YXlzKCItW0FWUGxheWVyVmlld0NvbnRyb2xsZXIgZW50ZXJGdWxsU2NyZWVuQW5p bWF0ZWQ6Y29tcGxldGlvbkhhbmRsZXI6XSBmYWlsZWQgd2l0aCBlcnJvciAlcyIsIFtbZXJyb3Ig bG9jYWxpemVkRGVzY3JpcHRpb25dIFVURjhTdHJpbmddKTsKKyAgICAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgbV92aWRlb0Z1bGxzY3JlZW5Nb2RlbC0+cmVxdWVz dEZ1bGxzY3JlZW5Nb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9k ZU5vbmUsIFlFUyk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKwogICAgICAgICBM T0coRnVsbHNjcmVlbiwgIlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxz Y3JlZW5TdGFuZGFyZCAtIGxhbWJkYSglcCkgLSBzdWNjZWVkZWQoJXMpIiwgdGhpcywgYm9vbFN0 cmluZyhzdWNjZWVkZWQpKTsKICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgc2V0U2hv d3NQbGF5YmFja0NvbnRyb2xzOllFU107CiAKQEAgLTc0MiwyMCArNzU1LDMwIEBAIHZvaWQgVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmV4aXRGdWxsc2NyZWVuKGNvbnN0IEludFJlY3Qm IGZpbmFsUmVjdCkKICAgICBXZWJBVlBsYXllckxheWVyICpwbGF5ZXJMYXllciA9IChXZWJBVlBs YXllckxheWVyICopW21fcGxheWVyTGF5ZXJWaWV3IHBsYXllckxheWVyXTsKICAgICBpZiAoW3Bs YXllckxheWVyIHZpZGVvR3Jhdml0eV0gIT0gZ2V0QVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFz cGVjdCgpKQogICAgICAgICBbcGxheWVyTGF5ZXIgc2V0VmlkZW9HcmF2aXR5OmdldEFWTGF5ZXJW aWRlb0dyYXZpdHlSZXNpemVBc3BlY3QoKV07Ci0gICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVy IHZpZXddIGxheW91dElmTmVlZGVkXTsKIAorICAgIFtbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2 aWV3XSBsYXlvdXRJZk5lZWRlZF07CiAgICAgaWYgKG1fY3VycmVudE1vZGUuaXNQaWN0dXJlSW5Q aWN0dXJlKCkpIHsKICAgICAgICAgbV9zaG91bGRSZXR1cm5Ub0Z1bGxzY3JlZW5XaGVuU3RvcHBp bmdQaVAgPSBmYWxzZTsKICAgICAgICAgW21fd2luZG93IHNldEhpZGRlbjpOT107CiAgICAgICAg IFttX3BsYXllclZpZXdDb250cm9sbGVyIHN0b3BQaWN0dXJlSW5QaWN0dXJlXTsKICAgICB9IGVs c2UgaWYgKG1fY3VycmVudE1vZGUuaGFzUGljdHVyZUluUGljdHVyZSgpICYmIG1fY3VycmVudE1v ZGUuaGFzRnVsbHNjcmVlbigpKSB7Ci0gICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIGV4 aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6Tk8gY29tcGxldGlvbkhhbmRsZXI6W3Byb3RlY3RlZFRoaXMg PSBtYWtlUmVmUHRyKHRoaXMpLCB0aGlzXSAoQk9PTCwgTlNFcnJvciopIHsKKyAgICAgICAgW21f cGxheWVyVmlld0NvbnRyb2xsZXIgZXhpdEZ1bGxTY3JlZW5BbmltYXRlZDpOTyBjb21wbGV0aW9u SGFuZGxlcjpbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWZQdHIodGhpcyksIHRoaXNdIChCT09MIHN1 Y2Nlc3MsIE5TRXJyb3IqIGVycm9yKSB7CisgICAgICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKKyAg ICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIi1bQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0 RnVsbFNjcmVlbkFuaW1hdGVkOmNvbXBsZXRpb25IYW5kbGVyOl0gZmFpbGVkIHdpdGggZXJyb3Ig JXMiLCBbW2Vycm9yIGxvY2FsaXplZERlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSk7CisgICAgICAg ICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICB9CisKICAgICAgICAg ICAgIGNsZWFyTW9kZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVT dGFuZGFyZCk7CiAgICAgICAgICAgICBbbV93aW5kb3cgc2V0SGlkZGVuOk5PXTsKICAgICAgICAg ICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIHN0b3BQaWN0dXJlSW5QaWN0dXJlXTsKICAgICAg ICAgfV07CiAgICAgfSBlbHNlIGlmIChtX2N1cnJlbnRNb2RlLmlzRnVsbHNjcmVlbigpKSB7Ci0g ICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6WUVT IGNvbXBsZXRpb25IYW5kbGVyOltwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZlB0cih0aGlzKSwgdGhp c10gKEJPT0wsIE5TRXJyb3IqKSBtdXRhYmxlIHsKKyAgICAgICAgW21fcGxheWVyVmlld0NvbnRy b2xsZXIgZXhpdEZ1bGxTY3JlZW5BbmltYXRlZDpZRVMgY29tcGxldGlvbkhhbmRsZXI6W3Byb3Rl Y3RlZFRoaXMgPSBtYWtlUmVmUHRyKHRoaXMpLCB0aGlzXSAoQk9PTCBzdWNjZXNzLCBOU0Vycm9y KiBlcnJvcikgbXV0YWJsZSB7CisgICAgICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKKyAgICAgICAg ICAgICAgICBXVEZMb2dBbHdheXMoIi1bQVZQbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNj cmVlbkFuaW1hdGVkOmNvbXBsZXRpb25IYW5kbGVyOl0gZmFpbGVkIHdpdGggZXJyb3IgJXMiLCBb W2Vycm9yIGxvY2FsaXplZERlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSk7CisgICAgICAgICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIG1f ZXhpdENvbXBsZXRlZCA9IHRydWU7CiAKICAgICAgICAgICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2lu XTsKQEAgLTc4Niw4ICs4MDksMTUgQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dDo6Y2xlYW51cEZ1bGxzY3JlZW4oKQogICAgIAogICAgIGlmIChtX2N1cnJlbnRNb2RlLmhhc1Bp Y3R1cmVJblBpY3R1cmUoKSkKICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgc3RvcFBp Y3R1cmVJblBpY3R1cmVdOwotICAgIGlmIChtX2N1cnJlbnRNb2RlLmhhc0Z1bGxzY3JlZW4oKSkK LSAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgZXhpdEZ1bGxTY3JlZW5BbmltYXRlZDpO TyBjb21wbGV0aW9uSGFuZGxlcjpbXSAoQk9PTCwgTlNFcnJvciAqKSB7IH1dOworICAgIGlmICht X2N1cnJlbnRNb2RlLmhhc0Z1bGxzY3JlZW4oKSkgeworICAgICAgICBbW21fcGxheWVyVmlld0Nv bnRyb2xsZXIgdmlld10gbGF5b3V0SWZOZWVkZWRdOworICAgICAgICBbbV9wbGF5ZXJWaWV3Q29u dHJvbGxlciBleGl0RnVsbFNjcmVlbkFuaW1hdGVkOk5PIGNvbXBsZXRpb25IYW5kbGVyOltdIChC T09MIHN1Y2Nlc3MsIE5TRXJyb3IqIGVycm9yKSB7CisgICAgICAgICAgICBpZiAoIXN1Y2Nlc3Mp IHsKKyAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIi1bQVZQbGF5ZXJWaWV3Q29udHJvbGxl ciBleGl0RnVsbFNjcmVlbkFuaW1hdGVkOmNvbXBsZXRpb25IYW5kbGVyOl0gZmFpbGVkIHdpdGgg ZXJyb3IgJXMiLCBbW2Vycm9yIGxvY2FsaXplZERlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSk7Cisg ICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICB9CisgICAg ICAgIH1dOworICAgIH0KICAgICAKICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10g cmVtb3ZlRnJvbVN1cGVydmlld107CiAgICAgaWYgKG1fdmlld0NvbnRyb2xsZXIpCkBAIC04NzIs NyArOTAyLDEyIEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRpZFN0YXJ0 UGljdHVyZUluUGljdHVyZSgpCiAKICAgICBpZiAobV9jdXJyZW50TW9kZS5oYXNGdWxsc2NyZWVu KCkpIHsKICAgICAgICAgaWYgKCFbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBwaWN0dXJlSW5QaWN0 dXJlV2FzU3RhcnRlZFdoZW5FbnRlcmluZ0JhY2tncm91bmRdKSB7Ci0gICAgICAgICAgICBbbV9w bGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkFuaW1hdGVkOllFUyBjb21wbGV0aW9u SGFuZGxlcjpbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWZQdHIodGhpcyksIHRoaXNdIChCT09MLCBO U0Vycm9yICopIHsKKyAgICAgICAgICAgIFtbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciB2aWV3XSBs YXlvdXRJZk5lZWRlZF07CisgICAgICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0 RnVsbFNjcmVlbkFuaW1hdGVkOllFUyBjb21wbGV0aW9uSGFuZGxlcjpbcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWZQdHIodGhpcyksIHRoaXNdIChCT09MIHN1Y2Nlc3MsIE5TRXJyb3IqIGVycm9yKSB7 CisgICAgICAgICAgICAgICAgaWYgKCFzdWNjZXNzKSB7CisgICAgICAgICAgICAgICAgICAgIFdU RkxvZ0Fsd2F5cygiLVtBVlBsYXllclZpZXdDb250cm9sbGVyIGV4aXRGdWxsU2NyZWVuQW5pbWF0 ZWQ6Y29tcGxldGlvbkhhbmRsZXI6XSBmYWlsZWQgd2l0aCBlcnJvciAlcyIsIFtbZXJyb3IgbG9j YWxpemVkRGVzY3JpcHRpb25dIFVURjhTdHJpbmddKTsKKyAgICAgICAgICAgICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIFtt X3dpbmRvdyBzZXRIaWRkZW46WUVTXTsKICAgICAgICAgICAgICAgICBbW21fcGxheWVyVmlld0Nv bnRyb2xsZXIgdmlld10gc2V0SGlkZGVuOllFU107CiAgICAgICAgICAgICB9XTsKQEAgLTk1NCwx MSArOTg5LDE4IEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnByZXBhcmVG b3JQaWN0dXJlSW5QaWN0dXJlU3RvcFdpdGhDb21wbGV0aW9uCiAgICAgICAgIFttX3dpbmRvdyBz ZXRIaWRkZW46Tk9dOwogICAgICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gc2V0 SGlkZGVuOk5PXTsKIAotICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBlbnRlckZ1bGxT Y3JlZW5BbmltYXRlZDpZRVMgY29tcGxldGlvbkhhbmRsZXI6XihCT09MIHN1Y2Nlc3MsIE5TRXJy b3IgKmVycm9yKSB7Ci0gICAgICAgICAgICBVTlVTRURfUEFSQU0oZXJyb3IpOworICAgICAgICBb W21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gbGF5b3V0SWZOZWVkZWRdOworICAgICAgICBb bV9wbGF5ZXJWaWV3Q29udHJvbGxlciBlbnRlckZ1bGxTY3JlZW5BbmltYXRlZDpZRVMgY29tcGxl dGlvbkhhbmRsZXI6XihCT09MIHN1Y2NlZWRlZCwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAg ICAgIGlmICghc3VjY2VlZGVkKSB7CisgICAgICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCItW0FW UGxheWVyVmlld0NvbnRyb2xsZXIgZW50ZXJGdWxsU2NyZWVuQW5pbWF0ZWQ6Y29tcGxldGlvbkhh bmRsZXI6XSBmYWlsZWQgd2l0aCBlcnJvciAlcyIsIFtbZXJyb3IgbG9jYWxpemVkRGVzY3JpcHRp b25dIFVURjhTdHJpbmddKTsKKyAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK KyAgICAgICAgICAgICAgICBtX3ZpZGVvRnVsbHNjcmVlbk1vZGVsLT5yZXF1ZXN0RnVsbHNjcmVl bk1vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSwgWUVT KTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKICAgICAgICAgICAg IG1fcmVzdG9yaW5nRnVsbHNjcmVlbkZvclBpY3R1cmVJblBpY3R1cmVTdG9wID0gZmFsc2U7CiAg ICAgICAgICAgICBzZXRNb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVu TW9kZVN0YW5kYXJkKTsKLSAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHN1Y2Nlc3MpOwor ICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoc3VjY2VlZGVkKTsKICAgICAgICAgICAgIGlm IChtX2Z1bGxzY3JlZW5DaGFuZ2VPYnNlcnZlcikKICAgICAgICAgICAgICAgICBtX2Z1bGxzY3Jl ZW5DaGFuZ2VPYnNlcnZlci0+ZGlkRW50ZXJGdWxsc2NyZWVuKCk7CiAgICAgICAgIH1dOwpAQCAt MTAwNiw2ICsxMDQ4LDcgQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6YXBw bGljYXRpb25EaWRCZWNvbWVBY3RpdmUoKQogICAgIC8vIElmIHdlIGFyZSBib3RoIGluIFBpUCBh bmQgaW4gRnVsbHNjcmVlbiAoaS5lLiwgdmlhIGF1dG8tUGlQKSwgYW5kIHdlIGRpZCBub3Qgc3Rv cCBmdWxsc2NyZWVuIHVwb24gcmV0dXJuaW5nLCBpdCBtdXN0IGJlCiAgICAgLy8gYmVjYXVzZSB0 aGUgb3JpZ2luYXRpbmcgdmlldyBpcyBub3QgdmlzaWJsZSwgc28gaGlkZSB0aGUgZnVsbHNjcmVl biB3aW5kb3cuCiAgICAgaWYgKG1fY3VycmVudE1vZGUuaGFzRnVsbHNjcmVlbigpICYmIG1fY3Vy cmVudE1vZGUuaGFzUGljdHVyZUluUGljdHVyZSgpKSB7CisgICAgICAgIFtbbV9wbGF5ZXJWaWV3 Q29udHJvbGxlciB2aWV3XSBsYXlvdXRJZk5lZWRlZF07CiAgICAgICAgIFttX3BsYXllclZpZXdD b250cm9sbGVyIGV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6Tk8gY29tcGxldGlvbkhhbmRsZXI6W3By b3RlY3RlZFRoaXMgPSBtYWtlUmVmUHRyKHRoaXMpLCB0aGlzXSAoQk9PTCBzdWNjZXNzLCBOU0Vy cm9yICplcnJvcikgewogICAgICAgICAgICAgZXhpdEZ1bGxzY3JlZW5IYW5kbGVyKHN1Y2Nlc3Ms IGVycm9yKTsKICAgICAgICAgfV07CkBAIC0xMDY2LDggKzExMDksMTUgQEAgdm9pZCBWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6Y2xlYW51cEZ1bGxzY3JlZW4oKQogICAgIAogICAgIGlm IChtX2N1cnJlbnRNb2RlLmhhc1BpY3R1cmVJblBpY3R1cmUoKSkKICAgICAgICAgW21fcGxheWVy Vmlld0NvbnRyb2xsZXIgc3RvcFBpY3R1cmVJblBpY3R1cmVdOwotICAgIGlmIChtX2N1cnJlbnRN b2RlLmhhc0Z1bGxzY3JlZW4oKSkKLSAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgZXhp dEZ1bGxTY3JlZW5BbmltYXRlZDpOTyBjb21wbGV0aW9uSGFuZGxlcjpbXSAoQk9PTCwgTlNFcnJv ciAqKSB7IH1dOworICAgIGlmIChtX2N1cnJlbnRNb2RlLmhhc0Z1bGxzY3JlZW4oKSkgeworICAg ICAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gbGF5b3V0SWZOZWVkZWRdOworICAg ICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkFuaW1hdGVkOk5PIGNv bXBsZXRpb25IYW5kbGVyOltdIChCT09MIHN1Y2Nlc3MsIE5TRXJyb3IqIGVycm9yKSB7CisgICAg ICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKKyAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIi1b QVZQbGF5ZXJWaWV3Q29udHJvbGxlciBleGl0RnVsbFNjcmVlbkFuaW1hdGVkOmNvbXBsZXRpb25I YW5kbGVyOl0gZmFpbGVkIHdpdGggZXJyb3IgJXMiLCBbW2Vycm9yIGxvY2FsaXplZERlc2NyaXB0 aW9uXSBVVEY4U3RyaW5nXSk7CisgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgICAgICAgICB9CisgICAgICAgIH1dOworICAgIH0KICAgICAKICAgICBbW21fcGxheWVy Vmlld0NvbnRyb2xsZXIgdmlld10gcmVtb3ZlRnJvbVN1cGVydmlld107CiAgICAgaWYgKG1fdmll d0NvbnRyb2xsZXIpCkBAIC0xMTUzLDYgKzEyMDMsNyBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbklu dGVyZmFjZUFWS2l0OjpkaWRTdGFydFBpY3R1cmVJblBpY3R1cmUoKQogCiAgICAgaWYgKG1fY3Vy cmVudE1vZGUuaGFzRnVsbHNjcmVlbigpKSB7CiAgICAgICAgIGlmICghW21fcGxheWVyVmlld0Nv bnRyb2xsZXIgcGljdHVyZUluUGljdHVyZVdhc1N0YXJ0ZWRXaGVuRW50ZXJpbmdCYWNrZ3JvdW5k XSkgeworICAgICAgICAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIGxheW91dElm TmVlZGVkXTsKICAgICAgICAgICAgIFttX3BsYXllclZpZXdDb250cm9sbGVyIGV4aXRGdWxsU2Ny ZWVuQW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb25IYW5kbGVyOltwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZlB0cih0aGlzKSwgdGhpc10gKEJPT0wgc3VjY2VzcywgTlNFcnJvciAqZXJyb3IpIHsKICAgICAg ICAgICAgICAgICBleGl0RnVsbHNjcmVlbkhhbmRsZXIoc3VjY2VzcywgZXJyb3IpOwogICAgICAg ICAgICAgfV07CkBAIC0xMjM1LDYgKzEyODYsNyBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0OjpwcmVwYXJlRm9yUGljdHVyZUluUGljdHVyZVN0b3BXaXRoQ29tcGxldGlvbgog ICAgICAgICBbbV93aW5kb3cgc2V0SGlkZGVuOk5PXTsKICAgICAgICAgW1ttX3BsYXllclZpZXdD b250cm9sbGVyIHZpZXddIHNldEhpZGRlbjpOT107CiAKKyAgICAgICAgW1ttX3BsYXllclZpZXdD b250cm9sbGVyIHZpZXddIGxheW91dElmTmVlZGVkXTsKICAgICAgICAgW21fcGxheWVyVmlld0Nv bnRyb2xsZXIgZW50ZXJGdWxsU2NyZWVuQW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb25IYW5kbGVyOl4o Qk9PTCBzdWNjZXNzLCBOU0Vycm9yICplcnJvcikgewogICAgICAgICAgICAgZW50ZXJGdWxsc2Ny ZWVuSGFuZGxlcihzdWNjZXNzLCBlcnJvcik7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihzdWNjZXNzKTsKQEAgLTE0MTgsNiArMTQ3MCw3IEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQ6OmRvRW50ZXJGdWxsc2NyZWVuKCkKIHsKICAgICBtX3N0YW5kYnkgPSBtX3Rh cmdldFN0YW5kYnk7CiAKKyAgICBbW21fcGxheWVyVmlld0NvbnRyb2xsZXIgdmlld10gbGF5b3V0 SWZOZWVkZWRdOwogICAgIGlmIChtX3RhcmdldE1vZGUuaGFzRnVsbHNjcmVlbigpICYmICFtX2N1 cnJlbnRNb2RlLmhhc0Z1bGxzY3JlZW4oKSkgewogICAgICAgICBtX2VudGVyRnVsbHNjcmVlbk5l ZWRzRW50ZXJGdWxsc2NyZWVuID0gdHJ1ZTsKICAgICAgICAgW21fcGxheWVyVmlld0NvbnRyb2xs ZXIgZW50ZXJGdWxsU2NyZWVuQW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb25IYW5kbGVyOlt0aGlzLCBw cm90ZWN0ZWRUaGlzID0gbWFrZVJlZlB0cih0aGlzKV0gKEJPT0wgc3VjY2VzcywgTlNFcnJvciAq ZXJyb3IpIHsKQEAgLTE1MDEsOCArMTU1NCwxMyBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0Ojpkb0V4aXRGdWxsc2NyZWVuKCkKICAgICB9KTsKIH0KIAotdm9pZCBWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZXhpdEZ1bGxzY3JlZW5IYW5kbGVyKEJPT0wgc3VjY2Vz cywgTlNFcnJvciAqKQordm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZXhpdEZ1 bGxzY3JlZW5IYW5kbGVyKEJPT0wgc3VjY2VzcywgTlNFcnJvciogZXJyb3IpCiB7CisgICAgaWYg KCFzdWNjZXNzKSB7CisgICAgICAgIFdURkxvZ0Fsd2F5cygiLVtBVlBsYXllclZpZXdDb250cm9s bGVyIGV4aXRGdWxsU2NyZWVuQW5pbWF0ZWQ6Y29tcGxldGlvbkhhbmRsZXI6XSBmYWlsZWQgd2l0 aCBlcnJvciAlcyIsIFtbZXJyb3IgbG9jYWxpemVkRGVzY3JpcHRpb25dIFVURjhTdHJpbmddKTsK KyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgfQorCiAgICAgVU5VU0VEX1BBUkFN KHN1Y2Nlc3MpOwogICAgIExPRyhGdWxsc2NyZWVuLCAiVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQ6OmRpZEV4aXRGdWxsc2NyZWVuKCVwKSAtICVkIiwgdGhpcywgc3VjY2Vzcyk7CiAKQEAg LTE1MjYsMTEgKzE1ODQsMTYgQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6 ZXhpdEZ1bGxzY3JlZW5IYW5kbGVyKEJPT0wgc3VjY2VzcywgTlNFcnJvcgogICAgICAgICBkb0V4 aXRGdWxsc2NyZWVuKCk7CiB9CiAKLXZvaWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6 OmVudGVyRnVsbHNjcmVlbkhhbmRsZXIoQk9PTCBzdWNjZXNzLCBOU0Vycm9yICopCit2b2lkIFZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjplbnRlckZ1bGxzY3JlZW5IYW5kbGVyKEJPT0wg c3VjY2VzcywgTlNFcnJvciogZXJyb3IpCiB7Ci0gICAgVU5VU0VEX1BBUkFNKHN1Y2Nlc3MpOwot ICAgIExPRyhGdWxsc2NyZWVuLCAiVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmVudGVy RnVsbHNjcmVlblN0YW5kYXJkIC0gbGFtYmRhKCVwKSAtIHN1Y2Nlc3MoJXMpIiwgdGhpcywgYm9v bFN0cmluZyhzdWNjZXNzKSk7CisgICAgaWYgKCFzdWNjZWVkZWQpIHsKKyAgICAgICAgV1RGTG9n QWx3YXlzKCItW0FWUGxheWVyVmlld0NvbnRyb2xsZXIgZW50ZXJGdWxsU2NyZWVuQW5pbWF0ZWQ6 Y29tcGxldGlvbkhhbmRsZXI6XSBmYWlsZWQgd2l0aCBlcnJvciAlcyIsIFtbZXJyb3IgbG9jYWxp emVkRGVzY3JpcHRpb25dIFVURjhTdHJpbmddKTsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CisgICAgICAgIG1fdmlkZW9GdWxsc2NyZWVuTW9kZWwtPnJlcXVlc3RGdWxsc2NyZWVuTW9k ZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVOb25lLCBZRVMpOwor ICAgICAgICByZXR1cm47CisgICAgfQogCisgICAgTE9HKEZ1bGxzY3JlZW4sICJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VBVktpdDo6ZW50ZXJGdWxsc2NyZWVuU3RhbmRhcmQgLSBsYW1iZGEoJXAp IiwgdGhpcyk7CiAgICAgc2V0TW9kZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNj cmVlbk1vZGVTdGFuZGFyZCk7CiAgICAgW21fcGxheWVyVmlld0NvbnRyb2xsZXIgc2V0U2hvd3NQ bGF5YmFja0NvbnRyb2xzOllFU107CiAK