162621 2016-09-27 09:41:35 -0700 Related videos on YouTube (and YouTube playlists) cause media controls to disappear 2016-09-27 12:42:09 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue jer.noble webkit-bug-importer oldest_to_newest 1233903 0 wenson_hsieh 2016-09-27 09:41:35 -0700 Related videos on YouTube (and YouTube playlists) cause media controls to disappear 1233904 1 wenson_hsieh 2016-09-27 09:42:05 -0700 <rdar://problem/28484193> 1233913 2 289960 wenson_hsieh 2016-09-27 09:55:13 -0700 Created attachment 289960 Patch 1233944 3 289960 jer.noble 2016-09-27 10:28:18 -0700 Comment on attachment 289960 Patch Just an observation: the heuristics for now playing and the controls manager are diverging enough that we should consider splitting them up (rather than leaving them both in MediaElementSession::canShowControlsManager(). 1233972 4 wenson_hsieh 2016-09-27 10:57:36 -0700 (In reply to comment #3) > Comment on attachment 289960 [details] > Patch > > Just an observation: the heuristics for now playing and the controls manager > are diverging enough that we should consider splitting them up (rather than > leaving them both in MediaElementSession::canShowControlsManager(). I agree! We should have a canShowNowPlaying() that we can consult. I think currently the two codepaths are in an awkward state where about half of the checks are still common to both purposes, but I think splitting them out will give us more flexibility in the future, and we should refactor this soon. 1234009 5 289994 wenson_hsieh 2016-09-27 12:09:22 -0700 Created attachment 289994 Patch for landing 1234023 6 289994 commit-queue 2016-09-27 12:42:05 -0700 Comment on attachment 289994 Patch for landing Clearing flags on attachment: 289994 Committed r206454: <http://trac.webkit.org/changeset/206454> 1234024 7 commit-queue 2016-09-27 12:42:09 -0700 All reviewed patches have been landed. Closing bug. 289960 2016-09-27 09:55:13 -0700 2016-09-27 12:09:19 -0700 Patch bug-162621-20160927095215.patch text/plain 7193 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTEyYmFmZWU2NmI0NTMw NTFhNWUyOTIwYTQ4ZmIzYzY1OGE0ODU1YS4uMmQ4M2RlMGRkNmEyY2IwODUyYTAzOGUzOWI3NzYw MDRlM2ZiYTc1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTA5LTI3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFJlbGF0ZWQgdmlk ZW9zIG9uIFlvdVR1YmUgKGFuZCBZb3VUdWJlIHBsYXlsaXN0cykgY2F1c2UgbWVkaWEgY29udHJv bHMgdG8gZGlzYXBwZWFyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjI2MjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4NDg0MTkzPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR3ZWFrcyB0aGUgbWFp biBjb250ZW50IG1lZGlhIGhldXJpc3RpYyBmb3IgYmV0dGVyIE5vdyBQbGF5aW5nIGJlaGF2aW9y IG9uIFlvdVR1YmUgYnkgbWFraW5nIHRoZSBmb2xsb3dpbmcKKyAgICAgICAgY2hhbmdlczoKKyAg ICAgICAgLSBSZW1vdmUgdGhlIHN0cmljdCByZXF1aXJlbWVudCBmb3IgYXVkaW8gdG8gYmUgYWN0 aXZlbHkgcGxheWluZyBmb3IgdGhlIHNlc3Npb24gdG8gYmUgYWJsZSB0byBzaG93CisgICAgICAg ICAgY29udHJvbHMgZm9yIHRoZSBwdXJwb3NlIG9mIE5vdyBQbGF5aW5nLCBtYWtpbmcgaXQgdGhl IHNhbWUgYXMgb3VyIHBvbGljeSBmb3IgdGhlIGNvbnRyb2xzIG1hbmFnZXIuCisgICAgICAgIC0g TWFrZSBwbGF5YmFjayByZXF1aXJlbWVudCByZXN0cmljdGlvbnMgYXBwbHkgb25seSBmb3IgdGhl IGNvbnRyb2xzIG1hbmFnZXIuIFZpZGVvcyB0aGF0IGRvIG5vdAorICAgICAgICAgIGF1dG9wbGF5 IHdpbGwgc3RpbGwgaGF2ZSB0aGUgY29ycmVjdCBiZWhhdmlvciB3aXRoIHJlc3BlY3QgdG8gTm93 IFBsYXlpbmcsIHNpbmNlIHdlIHdpbGwgYmFpbCBpbiB0aGUKKyAgICAgICAgICBoYXNFdmVyTm90 aWZpZWRBYm91dFBsYXlpbmcoKSBjaGVjay4KKyAgICAgICAgLSBPbmx5IGNvbnNpZGVyIHRoZSBt YWluIGNvbnRlbnQgaGV1cmlzdGljIGFzIHByZXZlbnRpbmcgbWVkaWEgY29udHJvbHMgZnJvbSBz aG93aW5nIHVwIGZvciB0aGUgcHVycG9zZXMKKyAgICAgICAgICBvZiB0aGUgY29udHJvbHMgbWFu YWdlci4gTm93IFBsYXlpbmcgc2hvdWxkIGluc3RlYWQgYWNjb3VudCBmb3IgdGhpcyBieSBwcmVm ZXJyaW5nIGVsZW1lbnRzIGxhcmdlCisgICAgICAgICAgZW5vdWdoIGZvciBtYWluIGNvbnRlbnQg YWZ0ZXIgY29sbGVjdGluZyBhbGwgb2YgdGhlIGNhbmRpZGF0ZSBzZXNzaW9ucy4KKworICAgICAg ICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjptZWRpYUVs ZW1lbnRTZXNzaW9uSW5mb0ZvclNlc3Npb24pOgorICAgICAgICAoV2ViQ29yZTo6cHJlZmVyTWVk aWFDb250cm9sc0ZvckNhbmRpZGF0ZVNlc3Npb25PdmVyT3RoZXJDYW5kaWRhdGVTZXNzaW9uKToK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVBsYXlTdGF0ZSk6Cisg ICAgICAgICogaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhRWxlbWVudFNlc3Npb246OmNhblNob3dDb250cm9sc01hbmFnZXIpOgorCiAyMDE2LTA5 LTI2ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIElm IHlvdSBwbGF5IGEgeW91dHViZSB2aWRlbyBmcm9tIG5vdyBwbGF5aW5nIGFmdGVyIGl0IGZpbmlz aGVkIGluIFNhZmFyaSwgY29udHJvbHMgZGlzYXBwZWFyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M TWVkaWFFbGVtZW50LmNwcAppbmRleCAyYWVmMmQwMzQ2ZjhhZTA5NzI1ZDM2ODU0M2U5ZWVhMDk5 MzYxMzQwLi42NGM4MTg3NDhkNWI3ZTEzNmY3NDcwM2VlNzRmNjRiNGFlOTc3Y2UwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTM1MCw2ICszNTAsNyBAQCBz dGF0aWMgdWludDY0X3QgbmV4dEVsZW1lbnRJRCgpCiAKIHN0cnVjdCBNZWRpYUVsZW1lbnRTZXNz aW9uSW5mbyB7CiAgICAgY29uc3QgTWVkaWFFbGVtZW50U2Vzc2lvbiogc2Vzc2lvbjsKKyAgICBN ZWRpYUVsZW1lbnRTZXNzaW9uOjpQbGF5YmFja0NvbnRyb2xzUHVycG9zZSBwdXJwb3NlOwogCiAg ICAgZG91YmxlIHRpbWVPZkxhc3RVc2VySW50ZXJhY3Rpb247CiAgICAgYm9vbCBjYW5TaG93Q29u dHJvbHNNYW5hZ2VyIDogMTsKQEAgLTM2Myw2ICszNjQsNyBAQCBzdGF0aWMgTWVkaWFFbGVtZW50 U2Vzc2lvbkluZm8gbWVkaWFFbGVtZW50U2Vzc2lvbkluZm9Gb3JTZXNzaW9uKGNvbnN0IE1lZGlh RWxlbQogICAgIGNvbnN0IEhUTUxNZWRpYUVsZW1lbnQmIGVsZW1lbnQgPSBzZXNzaW9uLmVsZW1l bnQoKTsKICAgICByZXR1cm4gewogICAgICAgICAmc2Vzc2lvbiwKKyAgICAgICAgcHVycG9zZSwK ICAgICAgICAgc2Vzc2lvbi5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSgpLAogICAgICAg ICBzZXNzaW9uLmNhblNob3dDb250cm9sc01hbmFnZXIocHVycG9zZSksCiAgICAgICAgIGVsZW1l bnQuaXNGdWxsc2NyZWVuKCkgfHwgZWxlbWVudC5pc1Zpc2libGVJblZpZXdwb3J0KCksCkBAIC0z NzMsMTAgKzM3NSwxNyBAQCBzdGF0aWMgTWVkaWFFbGVtZW50U2Vzc2lvbkluZm8gbWVkaWFFbGVt ZW50U2Vzc2lvbkluZm9Gb3JTZXNzaW9uKGNvbnN0IE1lZGlhRWxlbQogCiBzdGF0aWMgYm9vbCBw cmVmZXJNZWRpYUNvbnRyb2xzRm9yQ2FuZGlkYXRlU2Vzc2lvbk92ZXJPdGhlckNhbmRpZGF0ZVNl c3Npb24oY29uc3QgTWVkaWFFbGVtZW50U2Vzc2lvbkluZm8mIHNlc3Npb24sIGNvbnN0IE1lZGlh RWxlbWVudFNlc3Npb25JbmZvJiBvdGhlclNlc3Npb24pCiB7Ci0gICAgLy8gUHJpb3JpdGl6ZSB2 aXNpYmxlIG1lZGlhIG92ZXIgb2Zmc2NyZWVuIG1lZGlhLgotICAgIGlmIChzZXNzaW9uLmlzVmlz aWJsZUluVmlld3BvcnRPckZ1bGxzY3JlZW4gIT0gb3RoZXJTZXNzaW9uLmlzVmlzaWJsZUluVmll d3BvcnRPckZ1bGxzY3JlZW4pCisgICAgTWVkaWFFbGVtZW50U2Vzc2lvbjo6UGxheWJhY2tDb250 cm9sc1B1cnBvc2UgcHVycG9zZSA9IHNlc3Npb24ucHVycG9zZTsKKyAgICBBU1NFUlQocHVycG9z ZSA9PSBvdGhlclNlc3Npb24ucHVycG9zZSk7CisKKyAgICAvLyBGb3IgdGhlIGNvbnRyb2xzIG1h bmFnZXIsIHByaW9yaXRpemUgdmlzaWJsZSBtZWRpYSBvdmVyIG9mZnNjcmVlbiBtZWRpYS4KKyAg ICBpZiAocHVycG9zZSA9PSBNZWRpYUVsZW1lbnRTZXNzaW9uOjpQbGF5YmFja0NvbnRyb2xzUHVy cG9zZTo6Q29udHJvbHNNYW5hZ2VyICYmIHNlc3Npb24uaXNWaXNpYmxlSW5WaWV3cG9ydE9yRnVs bHNjcmVlbiAhPSBvdGhlclNlc3Npb24uaXNWaXNpYmxlSW5WaWV3cG9ydE9yRnVsbHNjcmVlbikK ICAgICAgICAgcmV0dXJuIHNlc3Npb24uaXNWaXNpYmxlSW5WaWV3cG9ydE9yRnVsbHNjcmVlbjsK IAorICAgIC8vIEZvciBOb3cgUGxheWluZywgcHJpb3JpdGl6ZSBlbGVtZW50cyB0aGF0IHdvdWxk IG5vcm1hbGx5IHNhdGlzZnkgbWFpbiBjb250ZW50LgorICAgIGlmIChwdXJwb3NlID09IE1lZGlh RWxlbWVudFNlc3Npb246OlBsYXliYWNrQ29udHJvbHNQdXJwb3NlOjpOb3dQbGF5aW5nICYmIHNl c3Npb24uaXNMYXJnZUVub3VnaEZvck1haW5Db250ZW50ICE9IG90aGVyU2Vzc2lvbi5pc0xhcmdl RW5vdWdoRm9yTWFpbkNvbnRlbnQpCisgICAgICAgIHJldHVybiBzZXNzaW9uLmlzTGFyZ2VFbm91 Z2hGb3JNYWluQ29udGVudDsKKwogICAgIC8vIEFzIGEgdGllYnJlYWtlciwgcHJpb3JpdGl6ZSBl bGVtZW50cyB0aGF0IHRoZSB1c2VyIHJlY2VudGx5IGludGVyYWN0ZWQgd2l0aC4KICAgICByZXR1 cm4gc2Vzc2lvbi50aW1lT2ZMYXN0VXNlckludGVyYWN0aW9uID4gb3RoZXJTZXNzaW9uLnRpbWVP Zkxhc3RVc2VySW50ZXJhY3Rpb247CiB9CkBAIC01MTAyLDYgKzUxMTEsOSBAQCB2b2lkIEhUTUxN ZWRpYUVsZW1lbnQ6OnVwZGF0ZVBsYXlTdGF0ZShVcGRhdGVTdGF0ZSB1cGRhdGVTdGF0ZSkKICAg ICAKICAgICB1cGRhdGVNZWRpYUNvbnRyb2xsZXIoKTsKICAgICB1cGRhdGVSZW5kZXJlcigpOwor CisgICAgbV9oYXNFdmVySGFkQXVkaW8gfD0gaGFzQXVkaW8oKTsKKyAgICBtX2hhc0V2ZXJIYWRW aWRlbyB8PSBoYXNWaWRlbygpOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFBsYXlp bmcoYm9vbCBwbGF5aW5nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVs ZW1lbnRTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lv bi5jcHAKaW5kZXggOWJiNmY5NzA3ZjNiMWM1NWU3ZTg3NmU2NDJkOTcyOTIxNzFiM2E4ZC4uOGU4 MTQwNzg4MDA5YTg1NGIyMTFjMGZkNDY0YTU4MzJmYjZlY2NkNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwCkBAIC0yMzMsOCArMjMzLDcgQEAgYm9vbCBN ZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5TaG93Q29udHJvbHNNYW5hZ2VyKFBsYXliYWNrQ29udHJv bHNQdXJwb3NlIHB1cnBvc2UKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIGJv b2wgbWVldHNBdWRpb1RyYWNrUmVxdWlyZW1lbnRzID0gbV9lbGVtZW50Lmhhc0F1ZGlvKCkgfHwg KHB1cnBvc2UgPT0gUGxheWJhY2tDb250cm9sc1B1cnBvc2U6OkNvbnRyb2xzTWFuYWdlciAmJiBt X2VsZW1lbnQuaGFzRXZlckhhZEF1ZGlvKCkpOwotICAgIGlmICghbWVldHNBdWRpb1RyYWNrUmVx dWlyZW1lbnRzKSB7CisgICAgaWYgKCFtX2VsZW1lbnQuaGFzQXVkaW8oKSAmJiAhbV9lbGVtZW50 Lmhhc0V2ZXJIYWRBdWRpbygpKSB7CiAgICAgICAgIExPRyhNZWRpYSwgIk1lZGlhRWxlbWVudFNl c3Npb246OmNhblNob3dDb250cm9sc01hbmFnZXIgLSByZXR1cm5pbmcgRkFMU0U6IE5vIGF1ZGlv Iik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CkBAIC0yNTksNyArMjU4LDcgQEAgYm9v bCBNZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5TaG93Q29udHJvbHNNYW5hZ2VyKFBsYXliYWNrQ29u dHJvbHNQdXJwb3NlIHB1cnBvc2UKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAg aWYgKGhhc0JlaGF2aW9yUmVzdHJpY3Rpb24oUmVxdWlyZVBsYXliYWNrVG9Db250cm9sQ29udHJv bHNNYW5hZ2VyKSAmJiAhbV9lbGVtZW50LmlzUGxheWluZygpKSB7CisgICAgaWYgKHB1cnBvc2Ug PT0gUGxheWJhY2tDb250cm9sc1B1cnBvc2U6OkNvbnRyb2xzTWFuYWdlciAmJiBoYXNCZWhhdmlv clJlc3RyaWN0aW9uKFJlcXVpcmVQbGF5YmFja1RvQ29udHJvbENvbnRyb2xzTWFuYWdlcikgJiYg IW1fZWxlbWVudC5pc1BsYXlpbmcoKSkgewogICAgICAgICBMT0coTWVkaWEsICJNZWRpYUVsZW1l bnRTZXNzaW9uOjpjYW5TaG93Q29udHJvbHNNYW5hZ2VyIC0gcmV0dXJuaW5nIEZBTFNFOiBOZWVk cyB0byBiZSBwbGF5aW5nIik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CkBAIC0yNzQs MTMgKzI3MywxNCBAQCBib29sIE1lZGlhRWxlbWVudFNlc3Npb246OmNhblNob3dDb250cm9sc01h bmFnZXIoUGxheWJhY2tDb250cm9sc1B1cnBvc2UgcHVycG9zZQogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgfQogCi0gICAgaWYgKG1fZWxlbWVudC5pc1ZpZGVvKCkpIHsKKyAgICAvLyBPbmx5 IGFsbG93IHRoZSBtYWluIGNvbnRlbnQgaGV1cmlzdGljIHRvIGZvcmJpZCB2aWRlb3MgZnJvbSBz aG93aW5nIHVwIGlmIG91ciBwdXJwb3NlIGlzIHRoZSBjb250cm9scyBtYW5hZ2VyLgorICAgIGlm IChwdXJwb3NlID09IFBsYXliYWNrQ29udHJvbHNQdXJwb3NlOjpDb250cm9sc01hbmFnZXIgJiYg bV9lbGVtZW50LmlzVmlkZW8oKSkgewogICAgICAgICBpZiAoIW1fZWxlbWVudC5yZW5kZXJlcigp KSB7CiAgICAgICAgICAgICBMT0coTWVkaWEsICJNZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5TaG93 Q29udHJvbHNNYW5hZ2VyIC0gcmV0dXJuaW5nIEZBTFNFOiBObyByZW5kZXJlciIpOwogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKHB1cnBvc2UgPT0g UGxheWJhY2tDb250cm9sc1B1cnBvc2U6OkNvbnRyb2xzTWFuYWdlciAmJiAhbV9lbGVtZW50Lmhh c1ZpZGVvKCkgJiYgIW1fZWxlbWVudC5oYXNFdmVySGFkVmlkZW8oKSkgeworICAgICAgICBpZiAo IW1fZWxlbWVudC5oYXNWaWRlbygpICYmICFtX2VsZW1lbnQuaGFzRXZlckhhZFZpZGVvKCkpIHsK ICAgICAgICAgICAgIExPRyhNZWRpYSwgIk1lZGlhRWxlbWVudFNlc3Npb246OmNhblNob3dDb250 cm9sc01hbmFnZXIgLSByZXR1cm5pbmcgRkFMU0U6IE5vIHZpZGVvIik7CiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KQEAgLTI5MSw2ICsyOTEsMTEgQEAgYm9vbCBNZWRpYUVs ZW1lbnRTZXNzaW9uOjpjYW5TaG93Q29udHJvbHNNYW5hZ2VyKFBsYXliYWNrQ29udHJvbHNQdXJw b3NlIHB1cnBvc2UKICAgICAgICAgfQogICAgIH0KIAorICAgIGlmIChwdXJwb3NlID09IFBsYXli YWNrQ29udHJvbHNQdXJwb3NlOjpOb3dQbGF5aW5nKSB7CisgICAgICAgIExPRyhNZWRpYSwgIk1l ZGlhRWxlbWVudFNlc3Npb246OmNhblNob3dDb250cm9sc01hbmFnZXIgLSByZXR1cm5pbmcgVFJV RTogUG90ZW50aWFsbHkgcGxheXMgYXVkaW8iKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAg fQorCiAgICAgTE9HKE1lZGlhLCAiTWVkaWFFbGVtZW50U2Vzc2lvbjo6Y2FuU2hvd0NvbnRyb2xz TWFuYWdlciAtIHJldHVybmluZyBGQUxTRTogTm8gdXNlciBnZXN0dXJlIik7CiAgICAgcmV0dXJu IGZhbHNlOwogfQo= 289994 2016-09-27 12:09:22 -0700 2016-09-27 12:42:05 -0700 Patch for landing bug-162621-20160927120624.patch text/plain 8008 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NDQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmZlZTQ3ZDZiYzgyNTIy Yjg0ZmIwOWViMGNmNWFjMDg3MzQ5Nzk5Yy4uMjM2NWI3MTU5ODNmMzM5ODVjODNiZTg3YTM3NWNk OGJhNjc2NzA5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDE2LTA5LTI3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCisgICAgICAgIFJlbGF0ZWQgdmlk ZW9zIG9uIFlvdVR1YmUgKGFuZCBZb3VUdWJlIHBsYXlsaXN0cykgY2F1c2UgbWVkaWEgY29udHJv bHMgdG8gZGlzYXBwZWFyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjI2MjEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4NDg0MTkzPgorCisgICAg ICAgIFJldmlld2VkIGJ5IEplciBOb2JsZS4KKworICAgICAgICBUd2Vha3MgdGhlIG1haW4gY29u dGVudCBtZWRpYSBoZXVyaXN0aWMgZm9yIGJldHRlciBOb3cgUGxheWluZyBiZWhhdmlvciBvbiBZ b3VUdWJlIGJ5IG1ha2luZyB0aGUgZm9sbG93aW5nCisgICAgICAgIGNoYW5nZXM6CisgICAgICAg IC0gUmVtb3ZlIHRoZSBzdHJpY3QgcmVxdWlyZW1lbnQgZm9yIGF1ZGlvIHRvIGJlIGFjdGl2ZWx5 IHBsYXlpbmcgZm9yIHRoZSBzZXNzaW9uIHRvIGJlIGFibGUgdG8gc2hvdworICAgICAgICAgIGNv bnRyb2xzIGZvciB0aGUgcHVycG9zZSBvZiBOb3cgUGxheWluZywgbWFraW5nIGl0IHRoZSBzYW1l IGFzIG91ciBwb2xpY3kgZm9yIHRoZSBjb250cm9scyBtYW5hZ2VyLgorICAgICAgICAtIE1ha2Ug cGxheWJhY2sgcmVxdWlyZW1lbnQgcmVzdHJpY3Rpb25zIGFwcGx5IG9ubHkgZm9yIHRoZSBjb250 cm9scyBtYW5hZ2VyLiBWaWRlb3MgdGhhdCBkbyBub3QKKyAgICAgICAgICBhdXRvcGxheSB3aWxs IHN0aWxsIGhhdmUgdGhlIGNvcnJlY3QgYmVoYXZpb3Igd2l0aCByZXNwZWN0IHRvIE5vdyBQbGF5 aW5nLCBzaW5jZSB3ZSB3aWxsIGJhaWwgaW4gdGhlCisgICAgICAgICAgaGFzRXZlck5vdGlmaWVk QWJvdXRQbGF5aW5nKCkgY2hlY2suCisgICAgICAgIC0gT25seSBjb25zaWRlciB0aGUgbWFpbiBj b250ZW50IGhldXJpc3RpYyBhcyBwcmV2ZW50aW5nIG1lZGlhIGNvbnRyb2xzIGZyb20gc2hvd2lu ZyB1cCBmb3IgdGhlIHB1cnBvc2VzCisgICAgICAgICAgb2YgdGhlIGNvbnRyb2xzIG1hbmFnZXIu IE5vdyBQbGF5aW5nIHNob3VsZCBpbnN0ZWFkIGFjY291bnQgZm9yIHRoaXMgYnkgcHJlZmVycmlu ZyBlbGVtZW50cyBsYXJnZQorICAgICAgICAgIGVub3VnaCBmb3IgbWFpbiBjb250ZW50IGFmdGVy IGNvbGxlY3RpbmcgYWxsIG9mIHRoZSBjYW5kaWRhdGUgc2Vzc2lvbnMuCisKKyAgICAgICAgKiBo dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bWVkaWFFbGVtZW50 U2Vzc2lvbkluZm9Gb3JTZXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OnByZWZlck1lZGlhQ29u dHJvbHNGb3JDYW5kaWRhdGVTZXNzaW9uT3Zlck90aGVyQ2FuZGlkYXRlU2Vzc2lvbik6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVQbGF5U3RhdGUpOgorICAgICAg ICAqIGh0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YUVsZW1lbnRTZXNzaW9uOjpjYW5TaG93Q29udHJvbHNNYW5hZ2VyKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9hdWRpby9tYWMvTWVkaWFTZXNzaW9uTWFuYWdlck1hYy5tbToKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhU2Vzc2lvbk1hbmFnZXJNYWM6OnNlc3Npb25XaWxsQmVnaW5QbGF5YmFjayk6CisK KzIwMTYtMDktMjcgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKICAg ICAgICAgU29tZSBOb3cgUGxheWluZyBiZWhhdmlvciBpcyBicm9rZW4gYWZ0ZXIgcjIwNjMxNQog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYyNjI1CiAg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yODQ5Njc1NT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuY3BwCmluZGV4IDgwZjM5Nzc3MzIxYTExMGU1ZDBkNGI2OTdhNWJmYTNjYjI1 NzgxNzIuLmJmNjQ5MjE2YmY4NTEyZTM2ZWFlZGUzMDQxMTUyYjhjMTUwZTNmMDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtMzMyLDYgKzMzMiw3IEBAIHN0 YXRpYyB1aW50NjRfdCBuZXh0RWxlbWVudElEKCkKIAogc3RydWN0IE1lZGlhRWxlbWVudFNlc3Np b25JbmZvIHsKICAgICBjb25zdCBNZWRpYUVsZW1lbnRTZXNzaW9uKiBzZXNzaW9uOworICAgIE1l ZGlhRWxlbWVudFNlc3Npb246OlBsYXliYWNrQ29udHJvbHNQdXJwb3NlIHB1cnBvc2U7CiAKICAg ICBkb3VibGUgdGltZU9mTGFzdFVzZXJJbnRlcmFjdGlvbjsKICAgICBib29sIGNhblNob3dDb250 cm9sc01hbmFnZXIgOiAxOwpAQCAtMzQ1LDYgKzM0Niw3IEBAIHN0YXRpYyBNZWRpYUVsZW1lbnRT ZXNzaW9uSW5mbyBtZWRpYUVsZW1lbnRTZXNzaW9uSW5mb0ZvclNlc3Npb24oY29uc3QgTWVkaWFF bGVtCiAgICAgY29uc3QgSFRNTE1lZGlhRWxlbWVudCYgZWxlbWVudCA9IHNlc3Npb24uZWxlbWVu dCgpOwogICAgIHJldHVybiB7CiAgICAgICAgICZzZXNzaW9uLAorICAgICAgICBwdXJwb3NlLAog ICAgICAgICBzZXNzaW9uLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lKCksCiAgICAgICAg IHNlc3Npb24uY2FuU2hvd0NvbnRyb2xzTWFuYWdlcihwdXJwb3NlKSwKICAgICAgICAgZWxlbWVu dC5pc0Z1bGxzY3JlZW4oKSB8fCBlbGVtZW50LmlzVmlzaWJsZUluVmlld3BvcnQoKSwKQEAgLTM1 NSwxMCArMzU3LDE3IEBAIHN0YXRpYyBNZWRpYUVsZW1lbnRTZXNzaW9uSW5mbyBtZWRpYUVsZW1l bnRTZXNzaW9uSW5mb0ZvclNlc3Npb24oY29uc3QgTWVkaWFFbGVtCiAKIHN0YXRpYyBib29sIHBy ZWZlck1lZGlhQ29udHJvbHNGb3JDYW5kaWRhdGVTZXNzaW9uT3Zlck90aGVyQ2FuZGlkYXRlU2Vz c2lvbihjb25zdCBNZWRpYUVsZW1lbnRTZXNzaW9uSW5mbyYgc2Vzc2lvbiwgY29uc3QgTWVkaWFF bGVtZW50U2Vzc2lvbkluZm8mIG90aGVyU2Vzc2lvbikKIHsKLSAgICAvLyBQcmlvcml0aXplIHZp c2libGUgbWVkaWEgb3ZlciBvZmZzY3JlZW4gbWVkaWEuCi0gICAgaWYgKHNlc3Npb24uaXNWaXNp YmxlSW5WaWV3cG9ydE9yRnVsbHNjcmVlbiAhPSBvdGhlclNlc3Npb24uaXNWaXNpYmxlSW5WaWV3 cG9ydE9yRnVsbHNjcmVlbikKKyAgICBNZWRpYUVsZW1lbnRTZXNzaW9uOjpQbGF5YmFja0NvbnRy b2xzUHVycG9zZSBwdXJwb3NlID0gc2Vzc2lvbi5wdXJwb3NlOworICAgIEFTU0VSVChwdXJwb3Nl ID09IG90aGVyU2Vzc2lvbi5wdXJwb3NlKTsKKworICAgIC8vIEZvciB0aGUgY29udHJvbHMgbWFu YWdlciwgcHJpb3JpdGl6ZSB2aXNpYmxlIG1lZGlhIG92ZXIgb2Zmc2NyZWVuIG1lZGlhLgorICAg IGlmIChwdXJwb3NlID09IE1lZGlhRWxlbWVudFNlc3Npb246OlBsYXliYWNrQ29udHJvbHNQdXJw b3NlOjpDb250cm9sc01hbmFnZXIgJiYgc2Vzc2lvbi5pc1Zpc2libGVJblZpZXdwb3J0T3JGdWxs c2NyZWVuICE9IG90aGVyU2Vzc2lvbi5pc1Zpc2libGVJblZpZXdwb3J0T3JGdWxsc2NyZWVuKQog ICAgICAgICByZXR1cm4gc2Vzc2lvbi5pc1Zpc2libGVJblZpZXdwb3J0T3JGdWxsc2NyZWVuOwog CisgICAgLy8gRm9yIE5vdyBQbGF5aW5nLCBwcmlvcml0aXplIGVsZW1lbnRzIHRoYXQgd291bGQg bm9ybWFsbHkgc2F0aXNmeSBtYWluIGNvbnRlbnQuCisgICAgaWYgKHB1cnBvc2UgPT0gTWVkaWFF bGVtZW50U2Vzc2lvbjo6UGxheWJhY2tDb250cm9sc1B1cnBvc2U6Ok5vd1BsYXlpbmcgJiYgc2Vz c2lvbi5pc0xhcmdlRW5vdWdoRm9yTWFpbkNvbnRlbnQgIT0gb3RoZXJTZXNzaW9uLmlzTGFyZ2VF bm91Z2hGb3JNYWluQ29udGVudCkKKyAgICAgICAgcmV0dXJuIHNlc3Npb24uaXNMYXJnZUVub3Vn aEZvck1haW5Db250ZW50OworCiAgICAgLy8gQXMgYSB0aWVicmVha2VyLCBwcmlvcml0aXplIGVs ZW1lbnRzIHRoYXQgdGhlIHVzZXIgcmVjZW50bHkgaW50ZXJhY3RlZCB3aXRoLgogICAgIHJldHVy biBzZXNzaW9uLnRpbWVPZkxhc3RVc2VySW50ZXJhY3Rpb24gPiBvdGhlclNlc3Npb24udGltZU9m TGFzdFVzZXJJbnRlcmFjdGlvbjsKIH0KQEAgLTUwMTMsNiArNTAyMiw5IEBAIHZvaWQgSFRNTE1l ZGlhRWxlbWVudDo6dXBkYXRlUGxheVN0YXRlKFVwZGF0ZVN0YXRlIHVwZGF0ZVN0YXRlKQogICAg IAogICAgIHVwZGF0ZU1lZGlhQ29udHJvbGxlcigpOwogICAgIHVwZGF0ZVJlbmRlcmVyKCk7CisK KyAgICBtX2hhc0V2ZXJIYWRBdWRpbyB8PSBoYXNBdWRpbygpOworICAgIG1faGFzRXZlckhhZFZp ZGVvIHw9IGhhc1ZpZGVvKCk7CiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0UGxheWlu Zyhib29sIHBsYXlpbmcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxl bWVudFNlc3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9u LmNwcAppbmRleCA0MWFiZDUwZmE0NmU5Mjg2YzA4MTc4NzAxNWQxMjdlZmVkYzNmZGI4Li5jYjJj YzZkZGMyZTVkOWY3NzIyYmY3YjE0NjBmMjhiMGZkYmYwMTAxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAKQEAgLTIzMyw4ICsyMzMsNyBAQCBib29sIE1l ZGlhRWxlbWVudFNlc3Npb246OmNhblNob3dDb250cm9sc01hbmFnZXIoUGxheWJhY2tDb250cm9s c1B1cnBvc2UgcHVycG9zZQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgYm9v bCBtZWV0c0F1ZGlvVHJhY2tSZXF1aXJlbWVudHMgPSBtX2VsZW1lbnQuaGFzQXVkaW8oKSB8fCAo cHVycG9zZSA9PSBQbGF5YmFja0NvbnRyb2xzUHVycG9zZTo6Q29udHJvbHNNYW5hZ2VyICYmIG1f ZWxlbWVudC5oYXNFdmVySGFkQXVkaW8oKSk7Ci0gICAgaWYgKCFtZWV0c0F1ZGlvVHJhY2tSZXF1 aXJlbWVudHMpIHsKKyAgICBpZiAoIW1fZWxlbWVudC5oYXNBdWRpbygpICYmICFtX2VsZW1lbnQu aGFzRXZlckhhZEF1ZGlvKCkpIHsKICAgICAgICAgTE9HKE1lZGlhLCAiTWVkaWFFbGVtZW50U2Vz c2lvbjo6Y2FuU2hvd0NvbnRyb2xzTWFuYWdlciAtIHJldHVybmluZyBGQUxTRTogTm8gYXVkaW8i KTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTI1OSw3ICsyNTgsNyBAQCBib29s IE1lZGlhRWxlbWVudFNlc3Npb246OmNhblNob3dDb250cm9sc01hbmFnZXIoUGxheWJhY2tDb250 cm9sc1B1cnBvc2UgcHVycG9zZQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBp ZiAoaGFzQmVoYXZpb3JSZXN0cmljdGlvbihSZXF1aXJlUGxheWJhY2tUb0NvbnRyb2xDb250cm9s c01hbmFnZXIpICYmICFtX2VsZW1lbnQuaXNQbGF5aW5nKCkpIHsKKyAgICBpZiAocHVycG9zZSA9 PSBQbGF5YmFja0NvbnRyb2xzUHVycG9zZTo6Q29udHJvbHNNYW5hZ2VyICYmIGhhc0JlaGF2aW9y UmVzdHJpY3Rpb24oUmVxdWlyZVBsYXliYWNrVG9Db250cm9sQ29udHJvbHNNYW5hZ2VyKSAmJiAh bV9lbGVtZW50LmlzUGxheWluZygpKSB7CiAgICAgICAgIExPRyhNZWRpYSwgIk1lZGlhRWxlbWVu dFNlc3Npb246OmNhblNob3dDb250cm9sc01hbmFnZXIgLSByZXR1cm5pbmcgRkFMU0U6IE5lZWRz IHRvIGJlIHBsYXlpbmciKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTI3NCwx MyArMjczLDE0IEBAIGJvb2wgTWVkaWFFbGVtZW50U2Vzc2lvbjo6Y2FuU2hvd0NvbnRyb2xzTWFu YWdlcihQbGF5YmFja0NvbnRyb2xzUHVycG9zZSBwdXJwb3NlCiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICB9CiAKLSAgICBpZiAobV9lbGVtZW50LmlzVmlkZW8oKSkgeworICAgIC8vIE9ubHkg YWxsb3cgdGhlIG1haW4gY29udGVudCBoZXVyaXN0aWMgdG8gZm9yYmlkIHZpZGVvcyBmcm9tIHNo b3dpbmcgdXAgaWYgb3VyIHB1cnBvc2UgaXMgdGhlIGNvbnRyb2xzIG1hbmFnZXIuCisgICAgaWYg KHB1cnBvc2UgPT0gUGxheWJhY2tDb250cm9sc1B1cnBvc2U6OkNvbnRyb2xzTWFuYWdlciAmJiBt X2VsZW1lbnQuaXNWaWRlbygpKSB7CiAgICAgICAgIGlmICghbV9lbGVtZW50LnJlbmRlcmVyKCkp IHsKICAgICAgICAgICAgIExPRyhNZWRpYSwgIk1lZGlhRWxlbWVudFNlc3Npb246OmNhblNob3dD b250cm9sc01hbmFnZXIgLSByZXR1cm5pbmcgRkFMU0U6IE5vIHJlbmRlcmVyIik7CiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAocHVycG9zZSA9PSBQ bGF5YmFja0NvbnRyb2xzUHVycG9zZTo6Q29udHJvbHNNYW5hZ2VyICYmICFtX2VsZW1lbnQuaGFz VmlkZW8oKSAmJiAhbV9lbGVtZW50Lmhhc0V2ZXJIYWRWaWRlbygpKSB7CisgICAgICAgIGlmICgh bV9lbGVtZW50Lmhhc1ZpZGVvKCkgJiYgIW1fZWxlbWVudC5oYXNFdmVySGFkVmlkZW8oKSkgewog ICAgICAgICAgICAgTE9HKE1lZGlhLCAiTWVkaWFFbGVtZW50U2Vzc2lvbjo6Y2FuU2hvd0NvbnRy b2xzTWFuYWdlciAtIHJldHVybmluZyBGQUxTRTogTm8gdmlkZW8iKTsKICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgfQpAQCAtMjkxLDYgKzI5MSwxMSBAQCBib29sIE1lZGlhRWxl bWVudFNlc3Npb246OmNhblNob3dDb250cm9sc01hbmFnZXIoUGxheWJhY2tDb250cm9sc1B1cnBv c2UgcHVycG9zZQogICAgICAgICB9CiAgICAgfQogCisgICAgaWYgKHB1cnBvc2UgPT0gUGxheWJh Y2tDb250cm9sc1B1cnBvc2U6Ok5vd1BsYXlpbmcpIHsKKyAgICAgICAgTE9HKE1lZGlhLCAiTWVk aWFFbGVtZW50U2Vzc2lvbjo6Y2FuU2hvd0NvbnRyb2xzTWFuYWdlciAtIHJldHVybmluZyBUUlVF OiBQb3RlbnRpYWxseSBwbGF5cyBhdWRpbyIpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9 CisKICAgICBMT0coTWVkaWEsICJNZWRpYUVsZW1lbnRTZXNzaW9uOjpjYW5TaG93Q29udHJvbHNN YW5hZ2VyIC0gcmV0dXJuaW5nIEZBTFNFOiBObyB1c2VyIGdlc3R1cmUiKTsKICAgICByZXR1cm4g ZmFsc2U7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9tYWMv TWVkaWFTZXNzaW9uTWFuYWdlck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlv L21hYy9NZWRpYVNlc3Npb25NYW5hZ2VyTWFjLm1tCmluZGV4IDQwNTQ5MTIwZDk3ZjA2MzFhYTU0 MmRjNDRiYzg5MzM4YmNmZGU3M2IuLjE1NGQzMzRlZDY0YjRlYzNiZTQwYTM2MGZjZTgyMWI4YWMx MDczZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL21hYy9NZWRp YVNlc3Npb25NYW5hZ2VyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlv L21hYy9NZWRpYVNlc3Npb25NYW5hZ2VyTWFjLm1tCkBAIC04MSw3ICs4MSw3IEBAIGJvb2wgTWVk aWFTZXNzaW9uTWFuYWdlck1hYzo6c2Vzc2lvbldpbGxCZWdpblBsYXliYWNrKFBsYXRmb3JtTWVk aWFTZXNzaW9uJiBzZXNzCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIExPRyhNZWRpYSwg Ik1lZGlhU2Vzc2lvbk1hbmFnZXJNYWM6OnNlc3Npb25XaWxsQmVnaW5QbGF5YmFjayIpOwotICAg IHVwZGF0ZU5vd1BsYXlpbmdJbmZvKCk7CisgICAgc2NoZWR1bGVVcGRhdGVOb3dQbGF5aW5nSW5m bygpOwogICAgIHJldHVybiB0cnVlOwogfQogCg==