173462 2017-06-16 02:43:29 -0700 Handle timeout of prepareForPictureInPictureStopWithCompletionHandler. 2017-11-02 11:44:51 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue eric.carlson jer.noble webkit-bug-importer oldest_to_newest 1319905 0 jeremyj-wk 2017-06-16 02:43:29 -0700 Handle timeout of prepareForPictureInPictureStopWithCompletionHandler. 1319906 1 jeremyj-wk 2017-06-16 02:44:25 -0700 rdar://problem/32128170 1319910 2 313066 jeremyj-wk 2017-06-16 02:48:28 -0700 Created attachment 313066 Patch 1320095 3 313066 jer.noble 2017-06-16 12:50:34 -0700 Comment on attachment 313066 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=313066&action=review Looks good; just a couple of tiny nits. > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:918 > - > + Whitespace. > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:957 > - > + Whitespace. > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:1004 > - LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::watchdogTimerFired(%p) - no exit fullscreen response in %gs; forcing fullscreen hidden.", this, defaultWatchdogTimerInterval); > + LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::watchdogTimerFired(%p) - no exit fullscreen; forcing fullscreen hidden.", this); Is this intentional? 1320109 4 jeremyj-wk 2017-06-16 13:06:49 -0700 (In reply to Jer Noble from comment #3) > Comment on attachment 313066 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=313066&action=review > > Looks good; just a couple of tiny nits. > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:918 > > - > > + > > Whitespace. > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:957 > > - > > + > > Whitespace. > > > Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm:1004 > > - LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::watchdogTimerFired(%p) - no exit fullscreen response in %gs; forcing fullscreen hidden.", this, defaultWatchdogTimerInterval); > > + LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::watchdogTimerFired(%p) - no exit fullscreen; forcing fullscreen hidden.", this); > > Is this intentional? I put this back in, but did defaultWatchdogTimerInterval.value() to convert to a double. 1320168 5 313132 jeremyj-wk 2017-06-16 14:22:14 -0700 Created attachment 313132 Patch for landing. 1320218 6 313132 commit-queue 2017-06-16 15:56:48 -0700 Comment on attachment 313132 Patch for landing. Clearing flags on attachment: 313132 Committed r218422: <http://trac.webkit.org/changeset/218422> 313066 2017-06-16 02:48:28 -0700 2017-06-16 12:50:34 -0700 Patch bug-173462-20170616024828.patch text/plain 5768 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4MzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzliNWRkODNkZmZjZmUw ZDhkYTU3OTQwZTdmYWJjOTgxZWU1YzgxMC4uMmU5YmIxNGNkNGNiYTUxNWE2NmY0OGFkY2Y4MDBl M2VjNDllNjEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA2LTE2ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBIYW5kbGUgdGltZW91dCBv ZiBwcmVwYXJlRm9yUGljdHVyZUluUGljdHVyZVN0b3BXaXRoQ29tcGxldGlvbkhhbmRsZXIuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM0NjIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVz dHMgYmVjYXVzZSBubyBlZmZlY3Qgb24gdGhlIERPTS4KKworICAgICAgICBJZiBXZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6cHJlcGFyZUZvclBpY3R1cmVJblBpY3R1cmVTdG9wV2l0 aENvbXBsZXRpb25IYW5kbGVyIGRvZXNuJ3QgcmVzcG9uZCBmYXN0IGVub3VnaCwKKyAgICAgICAg dGhlIGNhbGxlciB3aWxsIHRpbWVvdXQgYW5kIGNhbGwgd2lsbC9kaWRTdG9wUGljdHVyZUluUGlj dHVyZS4KKworICAgICAgICBUaGlzIGlzIGdldHRpbmcgZnVsbHNjcmVlbiBzdGF0ZSBjb25mdXNl ZC4KKworICAgICAgICBUaGlzIGNoYW5nZSBrZWVwcyBzdGF0ZSBjb25zaXN0ZW50IGJ5IGhhbmRs aW5nIHdpbGwvZGlkU3RvcFBpY3R1cmVJblBpY3R1cmUgcG9zc2libHkgYmVpbmcgY2FsbGVkIGJl Zm9yZSAKKyAgICAgICAgcHJlcGFyZUZvclBpY3R1cmVJblBpY3R1cmVTdG9wV2l0aENvbXBsZXRp b25IYW5kbGVyIGNhbGxzIGl0cyBjYWxsYmFjay4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9X ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oOgorICAgICAgICAqIHBsYXRmb3JtL2lv cy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKFdlYlZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3aWxsU3RvcFBpY3R1cmVJblBpY3R1cmUpOgorICAg ICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRpZFN0b3BQaWN0dXJlSW5Q aWN0dXJlKToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpwcmVw YXJlRm9yUGljdHVyZUluUGljdHVyZVN0b3BXaXRoQ29tcGxldGlvbkhhbmRsZXIpOgorICAgICAg ICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OndhdGNoZG9nVGltZXJGaXJlZCk6 CisKIDIwMTctMDYtMTUgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAg ICAgICBSRUdSRVNTSU9OOiBBaXJQbGF5IGJ1dHRvbiBpcyBpbmNvcnJlY3RseSBoaWdobGlnaHRl ZCBpbiBpbmxpbmUgYW5kIGZ1bGxzY3JlZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LmgKaW5k ZXggOWYyOWVmYWVkNDRlNzJlNTc3OGIyNDNiYmQyZjdjNGUzNTlhNWZkNy4uNzBjZTVkODFmMGQ0 Njk2NDY3MTM5ZGUzYTY5NzAxY2ZkZDEyNTQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 LmgKQEAgLTE0Nyw2ICsxNDcsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBtX3dpcmVsZXNzVmlk ZW9QbGF5YmFja0Rpc2FibGVkIHsgdHJ1ZSB9OwogICAgIGJvb2wgbV9zaG91bGRSZXR1cm5Ub0Z1 bGxzY3JlZW5XaGVuU3RvcHBpbmdQaVAgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9zaG91bGRSZXR1 cm5Ub0Z1bGxzY3JlZW5BZnRlckVudGVyaW5nRm9yZWdyb3VuZCB7IGZhbHNlIH07CisgICAgYm9v bCBtX3Jlc3RvcmluZ0Z1bGxzY3JlZW5Gb3JQaWN0dXJlSW5QaWN0dXJlU3RvcCB7IGZhbHNlIH07 CiAKICAgICB2b2lkIGRvRW50ZXJGdWxsc2NyZWVuKCk7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1t IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZUFWS2l0Lm1tCmluZGV4IGViMTIxZTFhOTJmMTAzYmNhZTc1N2Q3ZDQ0NmY1ODVjMjBlNWVkZGUu Ljc3NzlhODRmNzgxZDNiMTgzYTY4MGYzOWFiYmM3YmFkZTFkMmQ3ZDQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlQVZLaXQubW0KQEAgLTkwOSwxMCArOTA5LDEzIEBAIHZvaWQgV2ViVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmZhaWxlZFRvU3RhcnRQaWN0dXJlSW5QaWN0dXJlKCkKIAog dm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2lsbFN0b3BQaWN0dXJlSW5Q aWN0dXJlKCkKIHsKKyAgICBtX3Nob3VsZFJldHVyblRvRnVsbHNjcmVlbldoZW5TdG9wcGluZ1Bp UCA9IGZhbHNlOworICAgIG1fc2hvdWxkUmV0dXJuVG9GdWxsc2NyZWVuQWZ0ZXJFbnRlcmluZ0Zv cmVncm91bmQgPSBmYWxzZTsKKyAgICAKICAgICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3aWxsU3RvcFBpY3R1cmVJblBpY3R1cmUoJXApIiwgdGhp cyk7Ci0gICAgaWYgKGhhc01vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3Jl ZW5Nb2RlU3RhbmRhcmQpKQorICAgIGlmIChoYXNNb2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6 VmlkZW9GdWxsc2NyZWVuTW9kZVN0YW5kYXJkKSB8fCBtX3Jlc3RvcmluZ0Z1bGxzY3JlZW5Gb3JQ aWN0dXJlSW5QaWN0dXJlU3RvcCkKICAgICAgICAgcmV0dXJuOwotCisgICAgCiAgICAgW21fd2lu ZG93IHNldEhpZGRlbjpOT107CiAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNl dEhpZGRlbjpOT107CiAKQEAgLTkyMywxMyArOTI2LDEwIEBAIHZvaWQgV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ6OndpbGxTdG9wUGljdHVyZUluUGljdHVyZSgpCiB2b2lkIFdlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpkaWRTdG9wUGljdHVyZUluUGljdHVyZSgpCiB7 CiAgICAgTE9HKEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6 ZGlkU3RvcFBpY3R1cmVJblBpY3R1cmUoJXApIiwgdGhpcyk7Ci0gICAgaWYgKGhhc01vZGUoSFRN TE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlU3RhbmRhcmQpKSB7CisgICAg aWYgKGhhc01vZGUoSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlU3Rh bmRhcmQpIHx8IG1fcmVzdG9yaW5nRnVsbHNjcmVlbkZvclBpY3R1cmVJblBpY3R1cmVTdG9wKSB7 CiAgICAgICAgIC8vIEFTU1VNUFRJT046IHdlIGFyZSBleGl0aW5nIHBpcCBiZWNhdXNlIHdlIGFy ZSBlbnRlcmluZyBmdWxsc2NyZWVuCiAgICAgICAgIGNsZWFyTW9kZShIVE1MTWVkaWFFbGVtZW50 RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVQaWN0dXJlSW5QaWN0dXJlKTsKICAgICAgICAgW21f cGxheWVyVmlld0NvbnRyb2xsZXIgc2V0U2hvd3NQbGF5YmFja0NvbnRyb2xzOllFU107Ci0KLSAg ICAgICAgaWYgKG1fZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyKQotICAgICAgICAgICAgbV9mdWxs c2NyZWVuQ2hhbmdlT2JzZXJ2ZXItPmRpZEVudGVyRnVsbHNjcmVlbigpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCkBAIC05NTAsMTQgKzk1MCwxNyBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0OjpwcmVwYXJlRm9yUGljdHVyZUluUGljdHVyZVN0b3BXaXRoQ29tcGxl dAogICAgIGlmIChtX3Nob3VsZFJldHVyblRvRnVsbHNjcmVlbldoZW5TdG9wcGluZ1BpUCB8fCBt X3Nob3VsZFJldHVyblRvRnVsbHNjcmVlbkFmdGVyRW50ZXJpbmdGb3JlZ3JvdW5kKSB7CiAgICAg ICAgIG1fc2hvdWxkUmV0dXJuVG9GdWxsc2NyZWVuV2hlblN0b3BwaW5nUGlQID0gZmFsc2U7CiAg ICAgICAgIG1fc2hvdWxkUmV0dXJuVG9GdWxsc2NyZWVuQWZ0ZXJFbnRlcmluZ0ZvcmVncm91bmQg PSBmYWxzZTsKLQotICAgICAgICAvLyBBU1NVTVBUSU9OOiB3ZSBhcmUgZXhpdGluZyBwaXAgYmVj YXVzZSB3ZSBhcmUgZW50ZXJpbmcgZnVsbHNjcmVlbgorICAgICAgICBtX3Jlc3RvcmluZ0Z1bGxz Y3JlZW5Gb3JQaWN0dXJlSW5QaWN0dXJlU3RvcCA9IHRydWU7CisgICAgICAgIAogICAgICAgICBb bV93aW5kb3cgc2V0SGlkZGVuOk5PXTsKICAgICAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVy IHZpZXddIHNldEhpZGRlbjpOT107Ci0KKyAgICAgICAgCiAgICAgICAgIFttX3BsYXllclZpZXdD b250cm9sbGVyIGVudGVyRnVsbFNjcmVlbkFuaW1hdGVkOllFUyBjb21wbGV0aW9uSGFuZGxlcjpe KEJPT0wgc3VjY2VzcywgTlNFcnJvciopIHsKKyAgICAgICAgICAgIG1fcmVzdG9yaW5nRnVsbHNj cmVlbkZvclBpY3R1cmVJblBpY3R1cmVTdG9wID0gZmFsc2U7CiAgICAgICAgICAgICBzZXRNb2Rl KEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZVN0YW5kYXJkKTsKICAg ICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHN1Y2Nlc3MpOworICAgICAgICAgICAgaWYgKG1f ZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyKQorICAgICAgICAgICAgICAgIG1fZnVsbHNjcmVlbkNo YW5nZU9ic2VydmVyLT5kaWRFbnRlckZ1bGxzY3JlZW4oKTsKICAgICAgICAgfV07CiAgICAgICAg IHJldHVybjsKICAgICB9CkBAIC05OTgsNyArMTAwMSw3IEBAIGJvb2wgV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ6OnNob3VsZEV4aXRGdWxsc2NyZWVuV2l0aFJlYXNvbihXZWJWaWRl b0Z1CiAKIE5PX1JFVFVSTl9EVUVfVE9fQVNTRVJUIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQ6OndhdGNoZG9nVGltZXJGaXJlZCgpCiB7Ci0gICAgTE9HKEZ1bGxzY3JlZW4s ICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2F0Y2hkb2dUaW1lckZpcmVkKCVw KSAtIG5vIGV4aXQgZnVsbHNjcmVlbiByZXNwb25zZSBpbiAlZ3M7IGZvcmNpbmcgZnVsbHNjcmVl biBoaWRkZW4uIiwgdGhpcywgZGVmYXVsdFdhdGNoZG9nVGltZXJJbnRlcnZhbCk7CisgICAgTE9H KEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2F0Y2hkb2dU aW1lckZpcmVkKCVwKSAtIG5vIGV4aXQgZnVsbHNjcmVlbjsgZm9yY2luZyBmdWxsc2NyZWVuIGhp ZGRlbi4iLCB0aGlzKTsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICBbbV93aW5kb3cg c2V0SGlkZGVuOllFU107CiAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNldEhp ZGRlbjpZRVNdOwo= 313132 2017-06-16 14:22:14 -0700 2017-06-16 15:56:48 -0700 Patch for landing. bug-173462-20170616142213.patch text/plain 5765 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4Mzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzliNWRkODNkZmZjZmUw ZDhkYTU3OTQwZTdmYWJjOTgxZWU1YzgxMC4uYmEzNWE5NmNjZWZkNjkwZTc1Mzk2OWRmNWViOWY1 NjQ5YzY2ZDQ5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTA2LTE2ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBIYW5kbGUgdGltZW91dCBv ZiBwcmVwYXJlRm9yUGljdHVyZUluUGljdHVyZVN0b3BXaXRoQ29tcGxldGlvbkhhbmRsZXIuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM0NjIKKyAg ICAgICAgcmRhcjovL3Byb2JsZW0vMzIxMjgxNzAKKworICAgICAgICBSZXZpZXdlZCBieSBKZXIg Tm9ibGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2Ugbm8gZWZmZWN0IG9uIHRoZSBE T00uCisKKyAgICAgICAgSWYgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnByZXBh cmVGb3JQaWN0dXJlSW5QaWN0dXJlU3RvcFdpdGhDb21wbGV0aW9uSGFuZGxlciBkb2Vzbid0IHJl c3BvbmQgZmFzdCBlbm91Z2gsCisgICAgICAgIHRoZSBjYWxsZXIgd2lsbCB0aW1lb3V0IGFuZCBj YWxsIHdpbGwvZGlkU3RvcFBpY3R1cmVJblBpY3R1cmUuCisKKyAgICAgICAgVGhpcyBpcyBnZXR0 aW5nIGZ1bGxzY3JlZW4gc3RhdGUgY29uZnVzZWQuCisKKyAgICAgICAgVGhpcyBjaGFuZ2Uga2Vl cHMgc3RhdGUgY29uc2lzdGVudCBieSBoYW5kbGluZyB3aWxsL2RpZFN0b3BQaWN0dXJlSW5QaWN0 dXJlIHBvc3NpYmx5IGJlaW5nIGNhbGxlZCBiZWZvcmUKKyAgICAgICAgcHJlcGFyZUZvclBpY3R1 cmVJblBpY3R1cmVTdG9wV2l0aENvbXBsZXRpb25IYW5kbGVyIGNhbGxzIGl0cyBjYWxsYmFjay4K KworICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktp dC5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VB VktpdC5tbToKKyAgICAgICAgKFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Ojp3aWxs U3RvcFBpY3R1cmVJblBpY3R1cmUpOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJm YWNlQVZLaXQ6OmRpZFN0b3BQaWN0dXJlSW5QaWN0dXJlKToKKyAgICAgICAgKFdlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0OjpwcmVwYXJlRm9yUGljdHVyZUluUGljdHVyZVN0b3BXaXRo Q29tcGxldGlvbkhhbmRsZXIpOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQ6OndhdGNoZG9nVGltZXJGaXJlZCk6CisKIDIwMTctMDYtMTUgIEFudG9pbmUgUXVpbnQg IDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiBBaXJQbGF5IGJ1dHRv biBpcyBpbmNvcnJlY3RseSBoaWdobGlnaHRlZCBpbiBpbmxpbmUgYW5kIGZ1bGxzY3JlZW4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVs bHNjcmVlbkludGVyZmFjZUFWS2l0LmgKaW5kZXggOWYyOWVmYWVkNDRlNzJlNTc3OGIyNDNiYmQy ZjdjNGUzNTlhNWZkNy4uNzBjZTVkODFmMGQ0Njk2NDY3MTM5ZGUzYTY5NzAxY2ZkZDEyNTQyMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LmgKQEAgLTE0Nyw2ICsxNDcsNyBAQCBwcm90ZWN0 ZWQ6CiAgICAgYm9vbCBtX3dpcmVsZXNzVmlkZW9QbGF5YmFja0Rpc2FibGVkIHsgdHJ1ZSB9Owog ICAgIGJvb2wgbV9zaG91bGRSZXR1cm5Ub0Z1bGxzY3JlZW5XaGVuU3RvcHBpbmdQaVAgeyBmYWxz ZSB9OwogICAgIGJvb2wgbV9zaG91bGRSZXR1cm5Ub0Z1bGxzY3JlZW5BZnRlckVudGVyaW5nRm9y ZWdyb3VuZCB7IGZhbHNlIH07CisgICAgYm9vbCBtX3Jlc3RvcmluZ0Z1bGxzY3JlZW5Gb3JQaWN0 dXJlSW5QaWN0dXJlU3RvcCB7IGZhbHNlIH07CiAKICAgICB2b2lkIGRvRW50ZXJGdWxsc2NyZWVu KCk7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IGViMTIxZTFhOTJmMTAz YmNhZTc1N2Q3ZDQ0NmY1ODVjMjBlNWVkZGUuLjIzNGI3Y2FhMWI3MTYyYWQ2OTk5MTA2Y2ZmNzA3 ZjVkZWFlM2M2ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTkwOSw4ICs5 MDksMTEgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6ZmFpbGVkVG9T dGFydFBpY3R1cmVJblBpY3R1cmUoKQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZUFWS2l0Ojp3aWxsU3RvcFBpY3R1cmVJblBpY3R1cmUoKQogeworICAgIG1fc2hvdWxkUmV0dXJu VG9GdWxsc2NyZWVuV2hlblN0b3BwaW5nUGlQID0gZmFsc2U7CisgICAgbV9zaG91bGRSZXR1cm5U b0Z1bGxzY3JlZW5BZnRlckVudGVyaW5nRm9yZWdyb3VuZCA9IGZhbHNlOworCiAgICAgTE9HKEZ1 bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2lsbFN0b3BQaWN0 dXJlSW5QaWN0dXJlKCVwKSIsIHRoaXMpOwotICAgIGlmIChoYXNNb2RlKEhUTUxNZWRpYUVsZW1l bnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZVN0YW5kYXJkKSkKKyAgICBpZiAoaGFzTW9kZShI VE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGVTdGFuZGFyZCkgfHwgbV9y ZXN0b3JpbmdGdWxsc2NyZWVuRm9yUGljdHVyZUluUGljdHVyZVN0b3ApCiAgICAgICAgIHJldHVy bjsKIAogICAgIFttX3dpbmRvdyBzZXRIaWRkZW46Tk9dOwpAQCAtOTIzLDEzICs5MjYsMTAgQEAg dm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2lsbFN0b3BQaWN0dXJlSW5Q aWN0dXJlKCkKIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmRpZFN0b3BQ aWN0dXJlSW5QaWN0dXJlKCkKIHsKICAgICBMT0coRnVsbHNjcmVlbiwgIldlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0OjpkaWRTdG9wUGljdHVyZUluUGljdHVyZSglcCkiLCB0aGlzKTsK LSAgICBpZiAoaGFzTW9kZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1v ZGVTdGFuZGFyZCkpIHsKKyAgICBpZiAoaGFzTW9kZShIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZp ZGVvRnVsbHNjcmVlbk1vZGVTdGFuZGFyZCkgfHwgbV9yZXN0b3JpbmdGdWxsc2NyZWVuRm9yUGlj dHVyZUluUGljdHVyZVN0b3ApIHsKICAgICAgICAgLy8gQVNTVU1QVElPTjogd2UgYXJlIGV4aXRp bmcgcGlwIGJlY2F1c2Ugd2UgYXJlIGVudGVyaW5nIGZ1bGxzY3JlZW4KICAgICAgICAgY2xlYXJN b2RlKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZVBpY3R1cmVJblBp Y3R1cmUpOwogICAgICAgICBbbV9wbGF5ZXJWaWV3Q29udHJvbGxlciBzZXRTaG93c1BsYXliYWNr Q29udHJvbHM6WUVTXTsKLQotICAgICAgICBpZiAobV9mdWxsc2NyZWVuQ2hhbmdlT2JzZXJ2ZXIp Ci0gICAgICAgICAgICBtX2Z1bGxzY3JlZW5DaGFuZ2VPYnNlcnZlci0+ZGlkRW50ZXJGdWxsc2Ny ZWVuKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTk1MCwxNCArOTUwLDE3IEBAIHZv aWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnByZXBhcmVGb3JQaWN0dXJlSW5Q aWN0dXJlU3RvcFdpdGhDb21wbGV0CiAgICAgaWYgKG1fc2hvdWxkUmV0dXJuVG9GdWxsc2NyZWVu V2hlblN0b3BwaW5nUGlQIHx8IG1fc2hvdWxkUmV0dXJuVG9GdWxsc2NyZWVuQWZ0ZXJFbnRlcmlu Z0ZvcmVncm91bmQpIHsKICAgICAgICAgbV9zaG91bGRSZXR1cm5Ub0Z1bGxzY3JlZW5XaGVuU3Rv cHBpbmdQaVAgPSBmYWxzZTsKICAgICAgICAgbV9zaG91bGRSZXR1cm5Ub0Z1bGxzY3JlZW5BZnRl ckVudGVyaW5nRm9yZWdyb3VuZCA9IGZhbHNlOworICAgICAgICBtX3Jlc3RvcmluZ0Z1bGxzY3Jl ZW5Gb3JQaWN0dXJlSW5QaWN0dXJlU3RvcCA9IHRydWU7CiAKLSAgICAgICAgLy8gQVNTVU1QVElP Tjogd2UgYXJlIGV4aXRpbmcgcGlwIGJlY2F1c2Ugd2UgYXJlIGVudGVyaW5nIGZ1bGxzY3JlZW4K ICAgICAgICAgW21fd2luZG93IHNldEhpZGRlbjpOT107CiAgICAgICAgIFtbbV9wbGF5ZXJWaWV3 Q29udHJvbGxlciB2aWV3XSBzZXRIaWRkZW46Tk9dOwogCiAgICAgICAgIFttX3BsYXllclZpZXdD b250cm9sbGVyIGVudGVyRnVsbFNjcmVlbkFuaW1hdGVkOllFUyBjb21wbGV0aW9uSGFuZGxlcjpe KEJPT0wgc3VjY2VzcywgTlNFcnJvciopIHsKKyAgICAgICAgICAgIG1fcmVzdG9yaW5nRnVsbHNj cmVlbkZvclBpY3R1cmVJblBpY3R1cmVTdG9wID0gZmFsc2U7CiAgICAgICAgICAgICBzZXRNb2Rl KEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZVN0YW5kYXJkKTsKICAg ICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHN1Y2Nlc3MpOworICAgICAgICAgICAgaWYgKG1f ZnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyKQorICAgICAgICAgICAgICAgIG1fZnVsbHNjcmVlbkNo YW5nZU9ic2VydmVyLT5kaWRFbnRlckZ1bGxzY3JlZW4oKTsKICAgICAgICAgfV07CiAgICAgICAg IHJldHVybjsKICAgICB9CkBAIC05OTgsNyArMTAwMSw3IEBAIGJvb2wgV2ViVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQ6OnNob3VsZEV4aXRGdWxsc2NyZWVuV2l0aFJlYXNvbihXZWJWaWRl b0Z1CiAKIE5PX1JFVFVSTl9EVUVfVE9fQVNTRVJUIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQ6OndhdGNoZG9nVGltZXJGaXJlZCgpCiB7Ci0gICAgTE9HKEZ1bGxzY3JlZW4s ICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2F0Y2hkb2dUaW1lckZpcmVkKCVw KSAtIG5vIGV4aXQgZnVsbHNjcmVlbiByZXNwb25zZSBpbiAlZ3M7IGZvcmNpbmcgZnVsbHNjcmVl biBoaWRkZW4uIiwgdGhpcywgZGVmYXVsdFdhdGNoZG9nVGltZXJJbnRlcnZhbCk7CisgICAgTE9H KEZ1bGxzY3JlZW4sICJXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdDo6d2F0Y2hkb2dU aW1lckZpcmVkKCVwKSAtIG5vIGV4aXQgZnVsbHNjcmVlbiByZXNwb25zZSBpbiAlZ3M7IGZvcmNp bmcgZnVsbHNjcmVlbiBoaWRkZW4uIiwgdGhpcywgZGVmYXVsdFdhdGNoZG9nVGltZXJJbnRlcnZh bC52YWx1ZSgpKTsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICBbbV93aW5kb3cgc2V0 SGlkZGVuOllFU107CiAgICAgW1ttX3BsYXllclZpZXdDb250cm9sbGVyIHZpZXddIHNldEhpZGRl bjpZRVNdOwo=