129926 2014-03-07 14:59:46 -0800 Add Remote Control command support to HTMLMediaElement 2014-03-14 10:23:07 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble eric.carlson oldest_to_newest 988373 0 jer.noble 2014-03-07 14:59:46 -0800 Add Remote Control command support to HTLMediaElement 988375 1 226172 jer.noble 2014-03-07 15:04:55 -0800 Created attachment 226172 Patch 990165 2 226172 eric.carlson 2014-03-13 14:37:47 -0700 Comment on attachment 226172 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226172&action=review > Source/WebCore/html/HTMLMediaElement.cpp:3059 > + } else > + setPlaybackRate(nextScanRate()); > +} Do we really want to increase the scan rate to infinity (and beyond)? > Source/WebCore/html/HTMLMediaElement.cpp:5937 > + { } // Do nothing Nit: I don't think "{ }" is necessary, won't a semi-colon work? 990167 3 jer.noble 2014-03-13 14:47:07 -0700 (In reply to comment #2) > (From update of attachment 226172 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=226172&action=review > > > Source/WebCore/html/HTMLMediaElement.cpp:3059 > > + } else > > + setPlaybackRate(nextScanRate()); > > +} > > Do we really want to increase the scan rate to infinity (and beyond)? We'll max out at ScanMaximumRate (8x) inside of nextScanRate(). > > Source/WebCore/html/HTMLMediaElement.cpp:5937 > > + { } // Do nothing > > Nit: I don't think "{ }" is necessary, won't a semi-colon work? Clang++ complains about only a semicolon, and explicitly suggests "{ }" for an empty statement. 990194 4 226172 eric.carlson 2014-03-13 16:08:33 -0700 Comment on attachment 226172 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226172&action=review >>> Source/WebCore/html/HTMLMediaElement.cpp:3059 >>> +} >> >> Do we really want to increase the scan rate to infinity (and beyond)? > > We'll max out at ScanMaximumRate (8x) inside of nextScanRate(). Oops, I looked right past that! 990547 5 jer.noble 2014-03-14 10:23:07 -0700 Committed r165628: <http://trac.webkit.org/changeset/165628> 226172 2014-03-07 15:04:55 -0800 2014-03-13 16:08:33 -0700 Patch bug-129926-20140307150506.patch text/plain 13496 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDBlYjAzYmY0NzJhZjQ4 N2E3MTgyZjM1NDE0OTIwMDcwZTc3MmJiYi4uYjQ2NDRhYjQ2YzVhYjk4NmYyY2RkYzAyZTU4NThk ZmYzMzlhMWQyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE0LTAzLTA3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIEFkZCBSZW1vdGUgQ29udHJv bCBjb21tYW5kIHN1cHBvcnQgdG8gSFRMTWVkaWFFbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk5MjYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdXBwb3J0IHRoZSBuZXcgTWVkaWFTZXNzaW9u IHJlbW90ZSBjb250cm9sIGNvbW1hbmRzIGJ5IHB1bGxpbmcgaW4gY29kZSBmcm9tCisgICAgICAg IE1lZGlhQ29udHJvbEVsZW1lbnRUeXBlcyB0byBjb250cm9sIHNjYW5uaW5nLgorCisgICAgICAg ICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6OkhUTUxNZWRpYUVsZW1lbnQpOgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxl bWVudC5oOgorICAgICAgICAqIGh0bWwvTWVkaWFDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKE1l ZGlhQ29udHJvbGxlcjo6YmVnaW5TY2FubmluZyk6IE1vdmVkIGZyb20gTWVkaWFDb250cm9sRWxl bWVudFR5cGVzLgorICAgICAgICAoTWVkaWFDb250cm9sbGVyOjplbmRTY2FubmluZyk6IERpdHRv LgorICAgICAgICAqIGh0bWwvTWVkaWFDb250cm9sbGVyLmg6CisgICAgICAgICogaHRtbC9NZWRp YUNvbnRyb2xsZXJJbnRlcmZhY2UuaDoKKworICAgICAgICBSZW1vdmUgYWxsIHRoZSBzY2Fubmlu ZyBjb2RlIGZyb20gTWVkaWFDb250cm9sU2Vla0J1dHRvbkVsZW1lbnQuCisgICAgICAgICogaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudFR5cGVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhQ29udHJvbFNlZWtCdXR0b25FbGVtZW50OjpNZWRpYUNvbnRyb2xTZWVrQnV0dG9uRWxl bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xTZWVrQnV0dG9uRWxlbWVudDo6 c2V0QWN0aXZlKToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50VHlw ZXMuaDoKKworMjAxNC0wMy0wNyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKwog ICAgICAgICBBZGQgcmVtb3RlIGNvbnRyb2wgY29tbWFuZCBzdXBwb3J0IHRvIE1lZGlhU2Vzc2lv bi4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTkw MwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCA2N2MzZWU1 OTY5NzBjY2Y1NDUxZTE5MzZhYjkyN2I0YTkyMjQ1MjNjLi41ZGZiYjMyZTJhYzk4NDU2M2E4ZDBk ZTQ5NDZlZmIyY2RkN2Y4ODlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAKQEAgLTE0Niw2ICsxNDYsMTEgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitzdGF0 aWMgY29uc3QgZG91YmxlIFNlZWtSZXBlYXREZWxheSA9IDAuMTsKK3N0YXRpYyBjb25zdCBkb3Vi bGUgU2Vla1RpbWUgPSAwLjI7CitzdGF0aWMgY29uc3QgZG91YmxlIFNjYW5SZXBlYXREZWxheSA9 IDEuNTsKK3N0YXRpYyBjb25zdCBkb3VibGUgU2Nhbk1heGltdW1SYXRlID0gODsKKwogc3RhdGlj IHZvaWQgc2V0RmxhZ3ModW5zaWduZWQmIHZhbHVlLCB1bnNpZ25lZCBmbGFncykKIHsKICAgICB2 YWx1ZSB8PSBmbGFnczsKQEAgLTI2MSw2ICsyNjYsNyBAQCBIVE1MTWVkaWFFbGVtZW50OjpIVE1M TWVkaWFFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUsIERvY3VtZW50JiBkb2N1 bQogICAgICwgbV9sb2FkVGltZXIodGhpcywgJkhUTUxNZWRpYUVsZW1lbnQ6OmxvYWRUaW1lckZp cmVkKQogICAgICwgbV9wcm9ncmVzc0V2ZW50VGltZXIodGhpcywgJkhUTUxNZWRpYUVsZW1lbnQ6 OnByb2dyZXNzRXZlbnRUaW1lckZpcmVkKQogICAgICwgbV9wbGF5YmFja1Byb2dyZXNzVGltZXIo dGhpcywgJkhUTUxNZWRpYUVsZW1lbnQ6OnBsYXliYWNrUHJvZ3Jlc3NUaW1lckZpcmVkKQorICAg ICwgbV9zY2FuVGltZXIodGhpcywgJkhUTUxNZWRpYUVsZW1lbnQ6OnNjYW5UaW1lckZpcmVkKQog ICAgICwgbV9wbGF5ZWRUaW1lUmFuZ2VzKCkKICAgICAsIG1fYXN5bmNFdmVudFF1ZXVlKCp0aGlz KQogICAgICwgbV9wbGF5YmFja1JhdGUoMS4wZikKQEAgLTI5MSw2ICsyOTcsOSBAQCBIVE1MTWVk aWFFbGVtZW50OjpIVE1MTWVkaWFFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUs IERvY3VtZW50JiBkb2N1bQogICAgICwgbV9mcmFnbWVudFN0YXJ0VGltZShNZWRpYVBsYXllcjo6 aW52YWxpZFRpbWUoKSkKICAgICAsIG1fZnJhZ21lbnRFbmRUaW1lKE1lZGlhUGxheWVyOjppbnZh bGlkVGltZSgpKQogICAgICwgbV9wZW5kaW5nQWN0aW9uRmxhZ3MoMCkKKyAgICAsIG1fYWN0aW9u QWZ0ZXJTY2FuKE5vdGhpbmcpCisgICAgLCBtX3NjYW5UeXBlKFNjYW4pCisgICAgLCBtX3NjYW5E aXJlY3Rpb24oRm9yd2FyZCkKICAgICAsIG1fcGxheWluZyhmYWxzZSkKICAgICAsIG1faXNXYWl0 aW5nVW50aWxNZWRpYUNhblN0YXJ0KGZhbHNlKQogICAgICwgbV9zaG91bGREZWxheUxvYWRFdmVu dChmYWxzZSkKQEAgLTI5OTksNiArMzAwOCw1NiBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmVu ZFNjcnViYmluZygpCiAgICAgICAgIHNldFBhdXNlZEludGVybmFsKGZhbHNlKTsKIH0KIAordm9p ZCBIVE1MTWVkaWFFbGVtZW50OjpiZWdpblNjYW5uaW5nKFNjYW5EaXJlY3Rpb24gZGlyZWN0aW9u KQoreworICAgIG1fc2NhblR5cGUgPSBzdXBwb3J0c1NjYW5uaW5nKCkgPyBTY2FuIDogU2VlazsK KyAgICBtX3NjYW5EaXJlY3Rpb24gPSBkaXJlY3Rpb247CisKKyAgICBpZiAobV9zY2FuVHlwZSA9 PSBTZWVrKSB7CisgICAgICAgIC8vIFNjYW5uaW5nIGJ5IHNlZWtpbmcgcmVxdWlyZXMgdGhlIHZp ZGVvIHRvIGJlIHBhdXNlZCBkdXJpbmcgc2Nhbm5pbmcuCisgICAgICAgIG1fYWN0aW9uQWZ0ZXJT Y2FuID0gcGF1c2VkKCkgPyBOb3RoaW5nIDogUGxheTsKKyAgICAgICAgcGF1c2UoKTsKKyAgICB9 IGVsc2UgeworICAgICAgICAvLyBTY2FubmluZyBieSBzY2FubmluZyByZXF1aXJlcyB0aGUgdmlk ZW8gdG8gYmUgcGxheWluZyBkdXJpbmcgc2Nhbm5pbmdpbmcuCisgICAgICAgIG1fYWN0aW9uQWZ0 ZXJTY2FuID0gcGF1c2VkKCkgPyBQYXVzZSA6IE5vdGhpbmc7CisgICAgICAgIHBsYXkoKTsKKyAg ICAgICAgc2V0UGxheWJhY2tSYXRlKG5leHRTY2FuUmF0ZSgpKTsKKyAgICB9CisKKyAgICBtX3Nj YW5UaW1lci5zdGFydCgwLCBtX3NjYW5UeXBlID09IFNlZWsgPyBTZWVrUmVwZWF0RGVsYXkgOiBT Y2FuUmVwZWF0RGVsYXkpOworfQorCit2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmVuZFNjYW5uaW5n KCkKK3sKKyAgICBpZiAobV9zY2FuVHlwZSA9PSBTY2FuKQorICAgICAgICBzZXRQbGF5YmFja1Jh dGUoZGVmYXVsdFBsYXliYWNrUmF0ZSgpKTsKKworICAgIGlmIChtX2FjdGlvbkFmdGVyU2NhbiA9 PSBQbGF5KQorICAgICAgICBwbGF5KCk7CisgICAgZWxzZSBpZiAobV9hY3Rpb25BZnRlclNjYW4g PT0gUGF1c2UpCisgICAgICAgIHBhdXNlKCk7CisKKyAgICBpZiAobV9zY2FuVGltZXIuaXNBY3Rp dmUoKSkKKyAgICAgICAgbV9zY2FuVGltZXIuc3RvcCgpOworfQorCitkb3VibGUgSFRNTE1lZGlh RWxlbWVudDo6bmV4dFNjYW5SYXRlKCkKK3sKKyAgICBkb3VibGUgcmF0ZSA9IHN0ZDo6bWluKFNj YW5NYXhpbXVtUmF0ZSwgZmFicyhwbGF5YmFja1JhdGUoKSAqIDIpKTsKKyAgICBpZiAobV9zY2Fu RGlyZWN0aW9uID09IEJhY2t3YXJkKQorICAgICAgICByYXRlICo9IC0xOworICAgIHJldHVybiBy YXRlOworfQorCit2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNjYW5UaW1lckZpcmVkKFRpbWVyPEhU TUxNZWRpYUVsZW1lbnQ+JikKK3sKKyAgICBpZiAobV9zY2FuVHlwZSA9PSBTZWVrKSB7CisgICAg ICAgIGRvdWJsZSBzZWVrVGltZSA9IG1fc2NhbkRpcmVjdGlvbiA9PSBGb3J3YXJkID8gU2Vla1Rp bWUgOiAtU2Vla1RpbWU7CisgICAgICAgIHNldEN1cnJlbnRUaW1lKGN1cnJlbnRUaW1lKCkgKyBz ZWVrVGltZSk7CisgICAgfSBlbHNlCisgICAgICAgIHNldFBsYXliYWNrUmF0ZShuZXh0U2NhblJh dGUoKSk7Cit9CisKIC8vIFRoZSBzcGVjIHNheXMgdG8gZmlyZSBwZXJpb2RpYyB0aW1ldXBkYXRl IGV2ZW50cyAodGhvc2Ugc2VudCB3aGlsZSBwbGF5aW5nKSBldmVyeQogLy8gIjE1IHRvIDI1MG1z Iiwgd2UgY2hvb3NlIHRoZSBzbG93ZXN0IGZyZXF1ZW5jeQogc3RhdGljIGNvbnN0IGRvdWJsZSBt YXhUaW1ldXBkYXRlRXZlbnRGcmVxdWVuY3kgPSAwLjI1OwpAQCAtNTg1NCw3ICs1OTEzLDI5IEBA IHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cmVzdW1lUGxheWJhY2soKQogCiB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OmRpZFJlY2VpdmVSZW1vdGVDb250cm9sQ29tbWFuZChNZWRpYVNlc3Npb246OlJl bW90ZUNvbnRyb2xDb21tYW5kVHlwZSBjb21tYW5kKQogewotICAgIFVOVVNFRF9QQVJBTShjb21t YW5kKTsKKyAgICBzd2l0Y2ggKGNvbW1hbmQpIHsKKyAgICBjYXNlIE1lZGlhU2Vzc2lvbjo6UGxh eUNvbW1hbmQ6CisgICAgICAgIHBsYXkoKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBNZWRp YVNlc3Npb246OlBhdXNlQ29tbWFuZDoKKyAgICAgICAgcGF1c2UoKTsKKyAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBNZWRpYVNlc3Npb246OlRvZ2dsZVBsYXlQYXVzZUNvbW1hbmQ6CisgICAgICAg IGNhblBsYXkoKSA/IHBsYXkoKSA6IHBhdXNlKCk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug TWVkaWFTZXNzaW9uOjpCZWdpblNlZWtpbmdCYWNrd2FyZENvbW1hbmQ6CisgICAgICAgIGJlZ2lu U2Nhbm5pbmcoQmFja3dhcmQpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIE1lZGlhU2Vzc2lv bjo6QmVnaW5TZWVraW5nRm9yd2FyZENvbW1hbmQ6CisgICAgICAgIGJlZ2luU2Nhbm5pbmcoRm9y d2FyZCk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTWVkaWFTZXNzaW9uOjpFbmRTZWVraW5n QmFja3dhcmRDb21tYW5kOgorICAgIGNhc2UgTWVkaWFTZXNzaW9uOjpFbmRTZWVraW5nRm9yd2Fy ZENvbW1hbmQ6CisgICAgICAgIGVuZFNjYW5uaW5nKCk7CisgICAgICAgIGJyZWFrOworICAgIGRl ZmF1bHQ6CisgICAgICAgIHsgfSAvLyBEbyBub3RoaW5nCisgICAgfQogfQogCiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDc1ZWQzMDZlYjBlMjZhMWQyNjk3YWM3 MjBmMTVmNjJjNjZlOTc5YjcuLjA3MzdmMGZlODczYzU2YzJiYzQyYThjZjU3MWU2MmRkNTMxMzll MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCkBAIC0yNDgsNyArMjQ4 LDExIEBAIHB1YmxpYzoKICAgICB2b2lkIHRvZ2dsZVBsYXlTdGF0ZSgpOwogICAgIHZpcnR1YWwg dm9pZCBiZWdpblNjcnViYmluZygpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBlbmRTY3J1 YmJpbmcoKSBvdmVycmlkZTsKLSAgICAKKworICAgIHZpcnR1YWwgdm9pZCBiZWdpblNjYW5uaW5n KFNjYW5EaXJlY3Rpb24pIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBlbmRTY2FubmluZygp IG92ZXJyaWRlOworICAgIGRvdWJsZSBuZXh0U2NhblJhdGUoKTsKKwogICAgIHZpcnR1YWwgYm9v bCBjYW5QbGF5KCkgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICBkb3VibGUgcGVyY2VudExvYWRlZCgp IGNvbnN0OwpAQCAtNTgyLDYgKzU4Niw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBsb2FkVGltZXJG aXJlZChUaW1lcjxIVE1MTWVkaWFFbGVtZW50PiYpOwogICAgIHZvaWQgcHJvZ3Jlc3NFdmVudFRp bWVyRmlyZWQoVGltZXI8SFRNTE1lZGlhRWxlbWVudD4mKTsKICAgICB2b2lkIHBsYXliYWNrUHJv Z3Jlc3NUaW1lckZpcmVkKFRpbWVyPEhUTUxNZWRpYUVsZW1lbnQ+Jik7CisgICAgdm9pZCBzY2Fu VGltZXJGaXJlZChUaW1lcjxIVE1MTWVkaWFFbGVtZW50PiYpOwogICAgIHZvaWQgc3RhcnRQbGF5 YmFja1Byb2dyZXNzVGltZXIoKTsKICAgICB2b2lkIHN0YXJ0UHJvZ3Jlc3NFdmVudFRpbWVyKCk7 CiAgICAgdm9pZCBzdG9wUGVyaW9kaWNUaW1lcnMoKTsKQEAgLTY5OCw2ICs3MDMsNyBAQCBwcml2 YXRlOgogICAgIFRpbWVyPEhUTUxNZWRpYUVsZW1lbnQ+IG1fbG9hZFRpbWVyOwogICAgIFRpbWVy PEhUTUxNZWRpYUVsZW1lbnQ+IG1fcHJvZ3Jlc3NFdmVudFRpbWVyOwogICAgIFRpbWVyPEhUTUxN ZWRpYUVsZW1lbnQ+IG1fcGxheWJhY2tQcm9ncmVzc1RpbWVyOworICAgIFRpbWVyPEhUTUxNZWRp YUVsZW1lbnQ+IG1fc2NhblRpbWVyOwogICAgIFJlZlB0cjxUaW1lUmFuZ2VzPiBtX3BsYXllZFRp bWVSYW5nZXM7CiAgICAgR2VuZXJpY0V2ZW50UXVldWUgbV9hc3luY0V2ZW50UXVldWU7CiAKQEAg LTc1OCw2ICs3NjQsMTUgQEAgcHJpdmF0ZToKICAgICB0eXBlZGVmIHVuc2lnbmVkIFBlbmRpbmdB Y3Rpb25GbGFnczsKICAgICBQZW5kaW5nQWN0aW9uRmxhZ3MgbV9wZW5kaW5nQWN0aW9uRmxhZ3M7 CiAKKyAgICBlbnVtIEFjdGlvbkFmdGVyU2NhblR5cGUgeworICAgICAgICBOb3RoaW5nLCBQbGF5 LCBQYXVzZQorICAgIH07CisgICAgQWN0aW9uQWZ0ZXJTY2FuVHlwZSBtX2FjdGlvbkFmdGVyU2Nh bjsKKworICAgIGVudW0gU2NhblR5cGUgeyBTZWVrLCBTY2FuIH07CisgICAgU2NhblR5cGUgbV9z Y2FuVHlwZTsKKyAgICBTY2FuRGlyZWN0aW9uIG1fc2NhbkRpcmVjdGlvbjsKKwogICAgIGJvb2wg bV9wbGF5aW5nIDogMTsKICAgICBib29sIG1faXNXYWl0aW5nVW50aWxNZWRpYUNhblN0YXJ0IDog MTsKICAgICBib29sIG1fc2hvdWxkRGVsYXlMb2FkRXZlbnQgOiAxOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9NZWRpYUNvbnRyb2xsZXIuY3BwCmluZGV4IGU1NDI2ODM3OWMzY2Q1YmUxYjM4Zjk4MzQ5Njhj ZDEwNzgyMDdhZGUuLjdlNGJhYWExZmNlZDhlYTdkYzc3OWYwOTRkNGNiOGViYjJhOWJiMzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFDb250cm9sbGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL01lZGlhQ29udHJvbGxlci5jcHAKQEAgLTYxMiw2ICs2MTIsMTgg QEAgdm9pZCBNZWRpYUNvbnRyb2xsZXI6OmVuZFNjcnViYmluZygpCiAgICAgICAgIG1fY2xvY2st PnN0YXJ0KCk7CiB9CiAKK3ZvaWQgTWVkaWFDb250cm9sbGVyOjpiZWdpblNjYW5uaW5nKFNjYW5E aXJlY3Rpb24gZGlyZWN0aW9uKQoreworICAgIGZvciAoYXV0byYgbWVkaWFFbGVtZW50IDogbV9t ZWRpYUVsZW1lbnRzKQorICAgICAgICBtZWRpYUVsZW1lbnQtPmJlZ2luU2Nhbm5pbmcoZGlyZWN0 aW9uKTsKK30KKwordm9pZCBNZWRpYUNvbnRyb2xsZXI6OmVuZFNjYW5uaW5nKCkKK3sKKyAgICBm b3IgKGF1dG8mIG1lZGlhRWxlbWVudCA6IG1fbWVkaWFFbGVtZW50cykKKyAgICAgICAgbWVkaWFF bGVtZW50LT5lbmRTY2FubmluZygpOworfQorCiBib29sIE1lZGlhQ29udHJvbGxlcjo6Y2FuUGxh eSgpIGNvbnN0CiB7CiAgICAgaWYgKG1fcGF1c2VkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9NZWRpYUNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFDb250 cm9sbGVyLmgKaW5kZXggMWU3YmQ4YTJlMWNkY2JkMzllNTBlNWRkYTVkYjk4ODQ1Y2E1NWNkNC4u MDZhZmQwZjM5OTFmYzkyMjE2ZWQ3MjcwZTYxYWZkMjI5ZTU1MmE4MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL01lZGlhQ29udHJvbGxlci5oCkBAIC05OCw2ICs5OCw4IEBAIHB1YmxpYzoKICAgICAKICAg ICB2aXJ0dWFsIHZvaWQgYmVnaW5TY3J1YmJpbmcoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZv aWQgZW5kU2NydWJiaW5nKCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGJlZ2luU2Nhbm5p bmcoU2NhbkRpcmVjdGlvbikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGVuZFNjYW5uaW5n KCkgb3ZlcnJpZGU7CiAgICAgCiAgICAgdmlydHVhbCBib29sIGNhblBsYXkoKSBjb25zdCBvdmVy cmlkZTsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFDb250cm9s bGVySW50ZXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhQ29udHJvbGxlckludGVy ZmFjZS5oCmluZGV4IGFmYmRlMGFhM2NmMGNlMGNhOTNjM2NhODY5Y2FjNTQ3NDJhYzQ0Y2IuLjZm YjQxOWY5NTIyZDRhMDVkYmQ4YTZkMGI2ZWJmYzZhOWE2ZjFkMWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvTWVkaWFDb250cm9sbGVySW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9NZWRpYUNvbnRyb2xsZXJJbnRlcmZhY2UuaApAQCAtODQsNiArODQsMTMgQEAg cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBiZWdpblNjcnViYmluZygpID0gMDsKICAgICB2aXJ0 dWFsIHZvaWQgZW5kU2NydWJiaW5nKCkgPSAwOwogCisgICAgZW51bSBTY2FuRGlyZWN0aW9uIHsK KyAgICAgICAgQmFja3dhcmQsCisgICAgICAgIEZvcndhcmQsCisgICAgfTsKKyAgICB2aXJ0dWFs IHZvaWQgYmVnaW5TY2FubmluZyhTY2FuRGlyZWN0aW9uKSA9IDA7CisgICAgdmlydHVhbCB2b2lk IGVuZFNjYW5uaW5nKCkgPSAwOworCiAgICAgdmlydHVhbCBib29sIGNhblBsYXkoKSBjb25zdCA9 IDA7CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNMaXZlU3RyZWFtKCkgY29uc3QgPSAwOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudFR5cGVz LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBl cy5jcHAKaW5kZXggNGQ1NGE0OTJjNjY1Nzc4NTRjNzYzMTYxODgyOGQ0ZDRmMDNiMjlhOS4uMWQ2 NGUyNDQ5OTBjMjA1MjMxMjliYjU4YTI5NTEwNjEzYTVlYzdlNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudFR5cGVzLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50VHlwZXMuY3BwCkBA IC00NiwxMiArNDYsNiBAQCB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCiBjbGFzcyBFdmVu dDsKIAotLy8gRklYTUU6IFRoZXNlIGNvbnN0YW50cyBtYXkgbmVlZCB0byBiZSB0d2Vha2VkIHRv IGJldHRlciBtYXRjaCB0aGUgc2Vla2luZyBpbiB0aGUgUXVpY2tUaW1lIHBsdWctaW4uCi1zdGF0 aWMgY29uc3QgZG91YmxlIGNTa2lwUmVwZWF0RGVsYXkgPSAwLjE7Ci1zdGF0aWMgY29uc3QgZG91 YmxlIGNTa2lwVGltZSA9IDAuMjsKLXN0YXRpYyBjb25zdCBkb3VibGUgY1NjYW5SZXBlYXREZWxh eSA9IDEuNTsKLXN0YXRpYyBjb25zdCBkb3VibGUgY1NjYW5NYXhpbXVtUmF0ZSA9IDg7Ci0KIEhU TUxNZWRpYUVsZW1lbnQqIHBhcmVudE1lZGlhRWxlbWVudChOb2RlKiBub2RlKQogewogICAgIGlm ICghbm9kZSkKQEAgLTE2OCw5ICsxNjIsNiBAQCB2b2lkIE1lZGlhQ29udHJvbE11dGVCdXR0b25F bGVtZW50Ojp1cGRhdGVEaXNwbGF5VHlwZSgpCiAKIE1lZGlhQ29udHJvbFNlZWtCdXR0b25FbGVt ZW50OjpNZWRpYUNvbnRyb2xTZWVrQnV0dG9uRWxlbWVudChEb2N1bWVudCYgZG9jdW1lbnQsIE1l ZGlhQ29udHJvbEVsZW1lbnRUeXBlIGRpc3BsYXlUeXBlKQogICAgIDogTWVkaWFDb250cm9sSW5w dXRFbGVtZW50KGRvY3VtZW50LCBkaXNwbGF5VHlwZSkKLSAgICAsIG1fYWN0aW9uT25TdG9wKE5v dGhpbmcpCi0gICAgLCBtX3NlZWtUeXBlKFNraXApCi0gICAgLCBtX3NlZWtUaW1lcih0aGlzLCAm TWVkaWFDb250cm9sU2Vla0J1dHRvbkVsZW1lbnQ6OnNlZWtUaW1lckZpcmVkKQogewogfQogCkBA IC0xODgsNjIgKzE3OSwxMyBAQCB2b2lkIE1lZGlhQ29udHJvbFNlZWtCdXR0b25FbGVtZW50Ojpz ZXRBY3RpdmUoYm9vbCBmbGFnLCBib29sIHBhdXNlKQogICAgICAgICByZXR1cm47CiAKICAgICBp ZiAoZmxhZykKLSAgICAgICAgc3RhcnRUaW1lcigpOworICAgICAgICBtZWRpYUNvbnRyb2xsZXIo KS0+YmVnaW5TY2FubmluZyhpc0ZvcndhcmRCdXR0b24oKSA/IE1lZGlhQ29udHJvbGxlckludGVy ZmFjZTo6Rm9yd2FyZCA6IE1lZGlhQ29udHJvbGxlckludGVyZmFjZTo6QmFja3dhcmQpOwogICAg IGVsc2UKLSAgICAgICAgc3RvcFRpbWVyKCk7CisgICAgICAgIG1lZGlhQ29udHJvbGxlcigpLT5l bmRTY2FubmluZygpOwogCiAgICAgTWVkaWFDb250cm9sSW5wdXRFbGVtZW50OjpzZXRBY3RpdmUo ZmxhZywgcGF1c2UpOwogfQogCi12b2lkIE1lZGlhQ29udHJvbFNlZWtCdXR0b25FbGVtZW50Ojpz dGFydFRpbWVyKCkKLXsKLSAgICBtX3NlZWtUeXBlID0gbWVkaWFDb250cm9sbGVyKCktPnN1cHBv cnRzU2Nhbm5pbmcoKSA/IFNjYW4gOiBTa2lwOwotCi0gICAgaWYgKG1fc2Vla1R5cGUgPT0gU2tp cCkgewotICAgICAgICAvLyBTZWVraW5nIGJ5IHNraXBwaW5nIHJlcXVpcmVzIHRoZSB2aWRlbyB0 byBiZSBwYXVzZWQgZHVyaW5nIHNlZWtpbmcuCi0gICAgICAgIG1fYWN0aW9uT25TdG9wID0gbWVk aWFDb250cm9sbGVyKCktPnBhdXNlZCgpID8gTm90aGluZyA6IFBsYXk7Ci0gICAgICAgIG1lZGlh Q29udHJvbGxlcigpLT5wYXVzZSgpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIFNlZWtpbmcg Ynkgc2Nhbm5pbmcgcmVxdWlyZXMgdGhlIHZpZGVvIHRvIGJlIHBsYXlpbmcgZHVyaW5nIHNlZWtp bmcuCi0gICAgICAgIG1fYWN0aW9uT25TdG9wID0gbWVkaWFDb250cm9sbGVyKCktPnBhdXNlZCgp ID8gUGF1c2UgOiBOb3RoaW5nOwotICAgICAgICBtZWRpYUNvbnRyb2xsZXIoKS0+cGxheSgpOwot ICAgICAgICBtZWRpYUNvbnRyb2xsZXIoKS0+c2V0UGxheWJhY2tSYXRlKG5leHRSYXRlKCkpOwot ICAgIH0KLQotICAgIG1fc2Vla1RpbWVyLnN0YXJ0KDAsIG1fc2Vla1R5cGUgPT0gU2tpcCA/IGNT a2lwUmVwZWF0RGVsYXkgOiBjU2NhblJlcGVhdERlbGF5KTsKLX0KLQotdm9pZCBNZWRpYUNvbnRy b2xTZWVrQnV0dG9uRWxlbWVudDo6c3RvcFRpbWVyKCkKLXsKLSAgICBpZiAobV9zZWVrVHlwZSA9 PSBTY2FuKQotICAgICAgICBtZWRpYUNvbnRyb2xsZXIoKS0+c2V0UGxheWJhY2tSYXRlKG1lZGlh Q29udHJvbGxlcigpLT5kZWZhdWx0UGxheWJhY2tSYXRlKCkpOwotCi0gICAgaWYgKG1fYWN0aW9u T25TdG9wID09IFBsYXkpCi0gICAgICAgIG1lZGlhQ29udHJvbGxlcigpLT5wbGF5KCk7Ci0gICAg ZWxzZSBpZiAobV9hY3Rpb25PblN0b3AgPT0gUGF1c2UpCi0gICAgICAgIG1lZGlhQ29udHJvbGxl cigpLT5wYXVzZSgpOwotCi0gICAgaWYgKG1fc2Vla1RpbWVyLmlzQWN0aXZlKCkpCi0gICAgICAg IG1fc2Vla1RpbWVyLnN0b3AoKTsKLX0KLQotZG91YmxlIE1lZGlhQ29udHJvbFNlZWtCdXR0b25F bGVtZW50OjpuZXh0UmF0ZSgpIGNvbnN0Ci17Ci0gICAgZG91YmxlIHJhdGUgPSBzdGQ6Om1pbihj U2Nhbk1heGltdW1SYXRlLCBmYWJzKG1lZGlhQ29udHJvbGxlcigpLT5wbGF5YmFja1JhdGUoKSAq IDIpKTsKLSAgICBpZiAoIWlzRm9yd2FyZEJ1dHRvbigpKQotICAgICAgICByYXRlICo9IC0xOwot ICAgIHJldHVybiByYXRlOwotfQotCi12b2lkIE1lZGlhQ29udHJvbFNlZWtCdXR0b25FbGVtZW50 OjpzZWVrVGltZXJGaXJlZChUaW1lcjxNZWRpYUNvbnRyb2xTZWVrQnV0dG9uRWxlbWVudD4mKQot ewotICAgIGlmIChtX3NlZWtUeXBlID09IFNraXApIHsKLSAgICAgICAgZG91YmxlIHNraXBUaW1l ID0gaXNGb3J3YXJkQnV0dG9uKCkgPyBjU2tpcFRpbWUgOiAtY1NraXBUaW1lOwotICAgICAgICBt ZWRpYUNvbnRyb2xsZXIoKS0+c2V0Q3VycmVudFRpbWUobWVkaWFDb250cm9sbGVyKCktPmN1cnJl bnRUaW1lKCkgKyBza2lwVGltZSk7Ci0gICAgfSBlbHNlCi0gICAgICAgIG1lZGlhQ29udHJvbGxl cigpLT5zZXRQbGF5YmFja1JhdGUobmV4dFJhdGUoKSk7Ci19Ci0KIC8vIC0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIAogTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyRWxlbWVudDo6TWVkaWFD b250cm9sVm9sdW1lU2xpZGVyRWxlbWVudChEb2N1bWVudCYgZG9jdW1lbnQpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50VHlwZXMuaCBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5oCmlu ZGV4IGQ0ZTRjMDdhYWI2MzliZWUyNTQ1ZDEzYTAwNTYwMTc2ZTFhMWYyNjkuLjUyNjViMjY0MzY1 ZDQxMzk5ZjQ1MWE0ODI1ODVmYjM5NDg3OGIwMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5oCkBAIC0xNzAsMTcgKzE3 MCw2IEBAIHByb3RlY3RlZDoKIAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc2V0QWN0aXZl KGJvb2wgLypmbGFnKi8gPSB0cnVlLCBib29sIC8qcGF1c2UqLyA9IGZhbHNlKSBvdmVycmlkZSBm aW5hbDsKLQotICAgIHZvaWQgc3RhcnRUaW1lcigpOwotICAgIHZvaWQgc3RvcFRpbWVyKCk7Ci0g ICAgZG91YmxlIG5leHRSYXRlKCkgY29uc3Q7Ci0gICAgdm9pZCBzZWVrVGltZXJGaXJlZChUaW1l cjxNZWRpYUNvbnRyb2xTZWVrQnV0dG9uRWxlbWVudD4mKTsKLQotICAgIGVudW0gQWN0aW9uVHlw ZSB7IE5vdGhpbmcsIFBsYXksIFBhdXNlIH07Ci0gICAgQWN0aW9uVHlwZSBtX2FjdGlvbk9uU3Rv cDsKLSAgICBlbnVtIFNlZWtUeXBlIHsgU2tpcCwgU2NhbiB9OwotICAgIFNlZWtUeXBlIG1fc2Vl a1R5cGU7Ci0gICAgVGltZXI8TWVkaWFDb250cm9sU2Vla0J1dHRvbkVsZW1lbnQ+IG1fc2Vla1Rp bWVyOwogfTsKIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo=