134768 2014-07-09 09:05:31 -0700 [MSE] http/tests/media/media-source/mediasource-remove.html is failing 2014-07-09 14:37:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble calvaris commit-queue eric.carlson glenn ltilve philipj sergio oldest_to_newest 1021372 0 jer.noble 2014-07-09 09:05:31 -0700 [MSE] http/tests/media/media-source/mediasource-remove.html is failing 1021373 1 234641 jer.noble 2014-07-09 09:06:50 -0700 Created attachment 234641 Patch 1021388 2 234641 eric.carlson 2014-07-09 10:35:08 -0700 Comment on attachment 234641 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234641&action=review > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:579 > + // and the next sync sample frame are removed. But we must start from the first sample in decode order, not > + // presentation order. Having this comment just before the code that calculates and compares removePresentationStart really confused me at first. Maybe put it after? 1021434 3 234641 jer.noble 2014-07-09 13:51:20 -0700 Comment on attachment 234641 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234641&action=review >> Source/WebCore/Modules/mediasource/SourceBuffer.cpp:579 >> + // presentation order. > > Having this comment just before the code that calculates and compares removePresentationStart really confused me at first. Maybe put it after? Sure. 1021448 4 jer.noble 2014-07-09 14:37:43 -0700 Committed r170932: <http://trac.webkit.org/changeset/170932> 234641 2014-07-09 09:06:50 -0700 2014-07-09 13:51:20 -0700 Patch bug-134768-20140709090631.patch text/plain 14898 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwODkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTgxYTIwODNiYjAwMTk2 MTNlMTk1YmI4MzE5MmY3ODI3ZDc3MThiMy4uZWE5ZDE1ZGIzNGFmMTQwNDUxNWIzYmQ2ZmViYWNi MDRlM2RhYzdmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDE0LTA2LTI4ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIGh0dHAvdGVzdHMv bWVkaWEvbWVkaWEtc291cmNlL21lZGlhc291cmNlLXJlbW92ZS5odG1sIGlzIGZhaWxpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDc2OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBtdWx0aXBs ZSBidWdzIGNhdXNpbmcgbWVkaWFzb3VyY2UtcmVtb3ZlLmh0bWwgdG8gZmFpbDoKKworICAgICAg ICBTZXBhcmF0ZSBvdXQgc2V0RHVyYXRpb24oKSBpbnRvIHNldER1cmF0aW9uSW50ZXJuYWwoKSBz byB0aGF0IHN0ZXBzIHdoaWNoIHJlcXVpcmUKKyAgICAgICAgdXMgdG8gcnVuIHRoZSAiZHVyYXRp b24gY2hhbmdlIGFsZ29yaXRobSIgZG9uJ3QgYmFpbCBvdXQgaWYgdGhlIFNvdXJlQnVmZmVyIGlz CisgICAgICAgIGluc2lkZSB1cGRhdGluZygpLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXNv dXJjZS9NZWRpYVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNvdXJjZTo6c2V0 RHVyYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTb3VyY2U6OnNldER1cmF0aW9uSW50 ZXJuYWwpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2UuaDoKKyAg ICAgICAgKiBNb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTb3VyY2VCdWZmZXI6OnNvdXJjZUJ1ZmZlclByaXZhdGVEaWRSZWNlaXZlSW5pdGlh bGl6YXRpb25TZWdtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlcjo6c291cmNl QnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVTYW1wbGUpOgorCisgICAgICAgIFdoZW4gcmVtb3Zpbmcg Y29kZWQgZnJhbWVzLCBkbyBzbyBzdGFydGluZyBmcm9tIHRoZSBmaXJzdCBzYW1wbGUgaW4gdGhl IHJhbmdlIGluCisgICAgICAgIGRlY29kZSBvcmRlciwgc28gdGhhdCBmcmFtZXMgZGVwZW5kYW50 IG9uIHJlbW92ZWQgZnJhbWVzIGFyZSB0aGVtc2VsdmVzIHJlbW92ZWQuIEFkZAorICAgICAgICBh IGNvbnZlbmllbmNlIG1ldGhvZCBpbiBTYW1wbGVNYXAgZmluZFNhbXBsZVdpdGhQcmVzZW50YXRp b25UaW1lKCksIGFuZCByZW5hbWUKKyAgICAgICAgZmluZFNhbXBsZUFmdGVyUHJlc2VudGF0aW9u VGltZSgpIHRvIGZpbmRTYW1wbGVPbk9yQWZ0ZXJQcmVzZW50YXRpb25UaW1lKCkgdG8gY29ycmVj dGx5CisgICAgICAgIHJlZmxlY3Qgd2hhdCB0aGUgbWV0aG9kIGRvZXMsIGFuZCBzaW1wbGlmeSBp dHMgaW1wbGVtZW50YXRpb24gYnkgc2VhcmNoaW5nIHRoZSBtYXAncyBrZXlzCisgICAgICAgIGRp cmVjdGx5LgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UHJlc2VudGF0aW9uT3JkZXJTYW1wbGVNYXA6OmZpbmRTYW1wbGVX aXRoUHJlc2VudGF0aW9uVGltZSk6CisgICAgICAgIChXZWJDb3JlOjpQcmVzZW50YXRpb25PcmRl clNhbXBsZU1hcDo6ZmluZFNhbXBsZU9uT3JBZnRlclByZXNlbnRhdGlvblRpbWUpOgorICAgICAg ICAoV2ViQ29yZTo6RGVjb2RlT3JkZXJTYW1wbGVNYXA6OmZpbmRTeW5jU2FtcGxlQWZ0ZXJQcmVz ZW50YXRpb25UaW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlByZXNlbnRhdGlvbk9yZGVyU2FtcGxl TWFwOjpmaW5kU2FtcGxlQWZ0ZXJQcmVzZW50YXRpb25UaW1lKTogRGVsZXRlZC4KKyAgICAgICAg KiBNb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1hcC5oOgorICAgICAgICAqIE1vZHVsZXMvbWVk aWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRlY29kZVRpbWVD b21wYXJhdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlcjo6cmVtb3ZlQ29kZWRG cmFtZXMpOgorCisgICAgICAgIFRocm93IHRoZSBjb3JyZWN0IGV4Y2VwdGlvbiAoSU5WQUxJRF9T VEFURV9FUlIpIGZyb20gU291cmNlQnVmZmVyOjpyZW1vdmUoKS4KKworICAgICAgICAqIE1vZHVs ZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJj ZUJ1ZmZlcjo6cmVtb3ZlKToKKwogMjAxNC0wNi0yNyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBbTVNFXSBodHRwL3Rlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9t ZWRpYXNvdXJjZS1lbmRvZnN0cmVhbS1pbnZhbGlkZXJyb3IuaHRtbCBpcyBmYWlsaW5nLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlLmNwcApp bmRleCBjYjMwMjkxYWFjODAzNzVhZTcwMjcwNDQ1ZTdlZDUxNmU1OGFiNTFiLi4zZjAyNjViYzBl NDgzYTg1NzhmMTU4MTY4NDc4OGM4ODExYmRiNTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlLmNwcApAQCAtMjc4LDYgKzI3OCwxMSBA QCB2b2lkIE1lZGlhU291cmNlOjpzZXREdXJhdGlvbihkb3VibGUgZHVyYXRpb24sIEV4Y2VwdGlv bkNvZGUmIGVjKQogICAgIH0KIAogICAgIC8vIDQuIFJ1biB0aGUgZHVyYXRpb24gY2hhbmdlIGFs Z29yaXRobSB3aXRoIG5ldyBkdXJhdGlvbiBzZXQgdG8gdGhlIHZhbHVlIGJlaW5nIGFzc2lnbmVk IHRvIHRoaXMgYXR0cmlidXRlLgorICAgIHNldER1cmF0aW9uSW50ZXJuYWwoZHVyYXRpb24pOwor fQorCit2b2lkIE1lZGlhU291cmNlOjpzZXREdXJhdGlvbkludGVybmFsKGRvdWJsZSBkdXJhdGlv bikKK3sKICAgICBtX3ByaXZhdGUtPnNldER1cmF0aW9uKE1lZGlhVGltZTo6Y3JlYXRlV2l0aERv dWJsZShkdXJhdGlvbikpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc291cmNlL01lZGlhU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c291cmNlL01lZGlhU291cmNlLmgKaW5kZXggMjYzZWMyY2FjYmQ0N2ZhZWI3ZDlkYTRmZjEzYWY3 NTA1MThkZWJiMy4uNDA3ZTg4NzE4ODVmNzQyOGNiMTRhYTI5N2VmMTM0YmJkYTQ3YjEyNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2UuaApA QCAtNzksNiArNzksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBtb25pdG9yU291cmNlQnVmZmVycygp OwogCiAgICAgdm9pZCBzZXREdXJhdGlvbihkb3VibGUsIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICB2 b2lkIHNldER1cmF0aW9uSW50ZXJuYWwoZG91YmxlKTsKICAgICBkb3VibGUgY3VycmVudFRpbWUo KSBjb25zdDsKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHJlYWR5U3RhdGUoKSBjb25zdCB7IHJl dHVybiBtX3JlYWR5U3RhdGU7IH0KICAgICB2b2lkIHNldFJlYWR5U3RhdGUoY29uc3QgQXRvbWlj U3RyaW5nJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNl L1NhbXBsZU1hcC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBs ZU1hcC5jcHAKaW5kZXggZGFkMDU2OWYxZTgyM2UxYWZiOTdjNmU1NDA0MGRmNDI5YWMzMjRjMS4u MTA5YzJjY2RkNTNkYWQ1ZTUwYTliZDFjYTA4M2IxMTk0NDY3MzM0YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmNwcApAQCAtMTIyLDYgKzEy MiwxNCBAQCB2b2lkIFNhbXBsZU1hcDo6cmVtb3ZlU2FtcGxlKE1lZGlhU2FtcGxlKiBzYW1wbGUp CiAgICAgbV90b3RhbFNpemUgLT0gc2FtcGxlLT5zaXplSW5CeXRlcygpOwogfQogCitQcmVzZW50 YXRpb25PcmRlclNhbXBsZU1hcDo6aXRlcmF0b3IgUHJlc2VudGF0aW9uT3JkZXJTYW1wbGVNYXA6 OmZpbmRTYW1wbGVXaXRoUHJlc2VudGF0aW9uVGltZShjb25zdCBNZWRpYVRpbWUmIHRpbWUpCit7 CisgICAgYXV0byByYW5nZSA9IG1fc2FtcGxlcy5lcXVhbF9yYW5nZSh0aW1lKTsKKyAgICBpZiAo cmFuZ2UuZmlyc3QgPT0gcmFuZ2Uuc2Vjb25kKQorICAgICAgICByZXR1cm4gZW5kKCk7CisgICAg cmV0dXJuIHJhbmdlLmZpcnN0OworfQorCiBQcmVzZW50YXRpb25PcmRlclNhbXBsZU1hcDo6aXRl cmF0b3IgUHJlc2VudGF0aW9uT3JkZXJTYW1wbGVNYXA6OmZpbmRTYW1wbGVDb250YWluaW5nUHJl c2VudGF0aW9uVGltZShjb25zdCBNZWRpYVRpbWUmIHRpbWUpCiB7CiAgICAgYXV0byByYW5nZSA9 IHN0ZDo6ZXF1YWxfcmFuZ2UoYmVnaW4oKSwgZW5kKCksIHRpbWUsIFNhbXBsZUlzTGVzc1RoYW5N ZWRpYVRpbWVDb21wYXJhdG9yPE1hcFR5cGU+KCkpOwpAQCAtMTMwLDkgKzEzOCw5IEBAIFByZXNl bnRhdGlvbk9yZGVyU2FtcGxlTWFwOjppdGVyYXRvciBQcmVzZW50YXRpb25PcmRlclNhbXBsZU1h cDo6ZmluZFNhbXBsZUNvbnRhCiAgICAgcmV0dXJuIHJhbmdlLmZpcnN0OwogfQogCi1QcmVzZW50 YXRpb25PcmRlclNhbXBsZU1hcDo6aXRlcmF0b3IgUHJlc2VudGF0aW9uT3JkZXJTYW1wbGVNYXA6 OmZpbmRTYW1wbGVBZnRlclByZXNlbnRhdGlvblRpbWUoY29uc3QgTWVkaWFUaW1lJiB0aW1lKQor UHJlc2VudGF0aW9uT3JkZXJTYW1wbGVNYXA6Oml0ZXJhdG9yIFByZXNlbnRhdGlvbk9yZGVyU2Ft cGxlTWFwOjpmaW5kU2FtcGxlT25PckFmdGVyUHJlc2VudGF0aW9uVGltZShjb25zdCBNZWRpYVRp bWUmIHRpbWUpCiB7Ci0gICAgcmV0dXJuIHN0ZDo6bG93ZXJfYm91bmQoYmVnaW4oKSwgZW5kKCks IHRpbWUsIFNhbXBsZUlzTGVzc1RoYW5NZWRpYVRpbWVDb21wYXJhdG9yPE1hcFR5cGU+KCkpOwor ICAgIHJldHVybiBtX3NhbXBsZXMubG93ZXJfYm91bmQodGltZSk7CiB9CiAKIERlY29kZU9yZGVy U2FtcGxlTWFwOjppdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1hcDo6ZmluZFNhbXBsZVdpdGhE ZWNvZGVUaW1lKGNvbnN0IE1lZGlhVGltZSYgdGltZSkKQEAgLTE4NCw3ICsxOTIsNyBAQCBEZWNv ZGVPcmRlclNhbXBsZU1hcDo6cmV2ZXJzZV9pdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1hcDo6 ZmluZFN5bmNTYW1wbGVQcmlvcgogCiBEZWNvZGVPcmRlclNhbXBsZU1hcDo6aXRlcmF0b3IgRGVj b2RlT3JkZXJTYW1wbGVNYXA6OmZpbmRTeW5jU2FtcGxlQWZ0ZXJQcmVzZW50YXRpb25UaW1lKGNv bnN0IE1lZGlhVGltZSYgdGltZSwgY29uc3QgTWVkaWFUaW1lJiB0aHJlc2hvbGQpCiB7Ci0gICAg UHJlc2VudGF0aW9uT3JkZXJTYW1wbGVNYXA6Oml0ZXJhdG9yIGN1cnJlbnRTYW1wbGVQVFMgPSBt X3ByZXNlbnRhdGlvbk9yZGVyLmZpbmRTYW1wbGVBZnRlclByZXNlbnRhdGlvblRpbWUodGltZSk7 CisgICAgUHJlc2VudGF0aW9uT3JkZXJTYW1wbGVNYXA6Oml0ZXJhdG9yIGN1cnJlbnRTYW1wbGVQ VFMgPSBtX3ByZXNlbnRhdGlvbk9yZGVyLmZpbmRTYW1wbGVPbk9yQWZ0ZXJQcmVzZW50YXRpb25U aW1lKHRpbWUpOwogICAgIGlmIChjdXJyZW50U2FtcGxlUFRTID09IG1fcHJlc2VudGF0aW9uT3Jk ZXIuZW5kKCkpCiAgICAgICAgIHJldHVybiBlbmQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuaCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmgKaW5kZXggZjgxNzliYzMwZjQyYzk2ZTg3MzUx MGJjNDVmODQyNjQyYzJlMWI0MC4uY2YxZWFhYTE3ZGM2NmYwZDNhMzI2ZTM4NWVhNTAzNWYyNTRh MTU0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1w bGVNYXAuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1h cC5oCkBAIC01MCw4ICs1MCw5IEBAIHB1YmxpYzoKICAgICByZXZlcnNlX2l0ZXJhdG9yIHJiZWdp bigpIHsgcmV0dXJuIG1fc2FtcGxlcy5yYmVnaW4oKTsgfQogICAgIHJldmVyc2VfaXRlcmF0b3Ig cmVuZCgpIHsgcmV0dXJuIG1fc2FtcGxlcy5yZW5kKCk7IH0KIAorICAgIGl0ZXJhdG9yIGZpbmRT YW1wbGVXaXRoUHJlc2VudGF0aW9uVGltZShjb25zdCBNZWRpYVRpbWUmKTsKICAgICBpdGVyYXRv ciBmaW5kU2FtcGxlQ29udGFpbmluZ1ByZXNlbnRhdGlvblRpbWUoY29uc3QgTWVkaWFUaW1lJik7 Ci0gICAgaXRlcmF0b3IgZmluZFNhbXBsZUFmdGVyUHJlc2VudGF0aW9uVGltZShjb25zdCBNZWRp YVRpbWUmKTsKKyAgICBpdGVyYXRvciBmaW5kU2FtcGxlT25PckFmdGVyUHJlc2VudGF0aW9uVGlt ZShjb25zdCBNZWRpYVRpbWUmKTsKICAgICByZXZlcnNlX2l0ZXJhdG9yIHJldmVyc2VGaW5kU2Ft cGxlQ29udGFpbmluZ1ByZXNlbnRhdGlvblRpbWUoY29uc3QgTWVkaWFUaW1lJik7CiAgICAgcmV2 ZXJzZV9pdGVyYXRvciByZXZlcnNlRmluZFNhbXBsZUJlZm9yZVByZXNlbnRhdGlvblRpbWUoY29u c3QgTWVkaWFUaW1lJik7CiAgICAgaXRlcmF0b3JfcmFuZ2UgZmluZFNhbXBsZXNCZXR3ZWVuUHJl c2VudGF0aW9uVGltZXMoY29uc3QgTWVkaWFUaW1lJiwgY29uc3QgTWVkaWFUaW1lJik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAK aW5kZXggZTI5MTRhNjY5NDk2MDAwMjA5YTliNjM0OGI2Mzg3Nzg2MjdlNDNjNS4uYjRlMDcwYTg0 ZWU1MDQ3ODMwOTg0Y2JjMjg2OTFiZTUwMTEyMjQyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcApAQCAtMjQzLDcgKzI0Myw3 IEBAIHZvaWQgU291cmNlQnVmZmVyOjpyZW1vdmUoZG91YmxlIHN0YXJ0LCBkb3VibGUgZW5kLCBF eGNlcHRpb25Db2RlJiBlYykKICAgICAvLyAgICBJbnZhbGlkU3RhdGVFcnJvciBleGNlcHRpb24g YW5kIGFib3J0IHRoZXNlIHN0ZXBzLgogICAgIC8vIDQuIElmIHRoZSB1cGRhdGluZyBhdHRyaWJ1 dGUgZXF1YWxzIHRydWUsIHRoZW4gdGhyb3cgYW4gSW52YWxpZFN0YXRlRXJyb3IgZXhjZXB0aW9u IGFuZCBhYm9ydCB0aGVzZSBzdGVwcy4KICAgICBpZiAoaXNSZW1vdmVkKCkgfHwgbV91cGRhdGlu ZykgewotICAgICAgICBlYyA9IElOVkFMSURfQUNDRVNTX0VSUjsKKyAgICAgICAgZWMgPSBJTlZB TElEX1NUQVRFX0VSUjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNTQxLDYgKzU0MSwx MSBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVSZW5k ZXJpbmdFcnJvcihTb3VyY2VCdWZmZXJQcml2YQogICAgICAgICBtX3NvdXJjZS0+c3RyZWFtRW5k ZWRXaXRoRXJyb3IoZGVjb2RlRXJyb3IoKSwgSWdub3JhYmxlRXhjZXB0aW9uQ29kZSgpKTsKIH0K IAorc3RhdGljIGJvb2wgZGVjb2RlVGltZUNvbXBhcmF0b3IoY29uc3QgUHJlc2VudGF0aW9uT3Jk ZXJTYW1wbGVNYXA6Ok1hcFR5cGU6OnZhbHVlX3R5cGUmIGEsIGNvbnN0IFByZXNlbnRhdGlvbk9y ZGVyU2FtcGxlTWFwOjpNYXBUeXBlOjp2YWx1ZV90eXBlJiBiKQoreworICAgIHJldHVybiBhLnNl Y29uZC0+ZGVjb2RlVGltZSgpIDwgYi5zZWNvbmQtPmRlY29kZVRpbWUoKTsKK30KKwogdm9pZCBT b3VyY2VCdWZmZXI6OnJlbW92ZUNvZGVkRnJhbWVzKGNvbnN0IE1lZGlhVGltZSYgc3RhcnQsIGNv bnN0IE1lZGlhVGltZSYgZW5kKQogewogICAgIC8vIDMuNS45IENvZGVkIEZyYW1lIFJlbW92YWwg QWxnb3JpdGhtCkBAIC01NjEsMjAgKzU2NiwzNCBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6cmVtb3Zl Q29kZWRGcmFtZXMoY29uc3QgTWVkaWFUaW1lJiBzdGFydCwgY29uc3QgTWVkaWFUaW1lJiBlbgog ICAgICAgICAvLyBOT1RFOiBmaW5kU3luY1NhbXBsZUFmdGVyUHJlc2VudGF0aW9uVGltZSB3aWxs IHJldHVybiB0aGUgbmV4dCBzeW5jIHNhbXBsZSBvbiBvciBhZnRlciB0aGUgcHJlc2VudGF0aW9u IHRpbWUKICAgICAgICAgLy8gb3IgZGVjb2RlT3JkZXIoKS5lbmQoKSBpZiBubyBzeW5jIHNhbXBs ZSBleGlzdHMgYWZ0ZXIgdGhhdCBwcmVzZW50YXRpb24gdGltZS4KICAgICAgICAgRGVjb2RlT3Jk ZXJTYW1wbGVNYXA6Oml0ZXJhdG9yIHJlbW92ZURlY29kZUVuZCA9IHRyYWNrQnVmZmVyLnNhbXBs ZXMuZGVjb2RlT3JkZXIoKS5maW5kU3luY1NhbXBsZUFmdGVyUHJlc2VudGF0aW9uVGltZShlbmQp OworICAgICAgICBQcmVzZW50YXRpb25PcmRlclNhbXBsZU1hcDo6aXRlcmF0b3IgcmVtb3ZlUHJl c2VudGF0aW9uRW5kOworICAgICAgICBpZiAocmVtb3ZlRGVjb2RlRW5kID09IHRyYWNrQnVmZmVy LnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5lbmQoKSkKKyAgICAgICAgICAgIHJlbW92ZVByZXNlbnRh dGlvbkVuZCA9IHRyYWNrQnVmZmVyLnNhbXBsZXMucHJlc2VudGF0aW9uT3JkZXIoKS5lbmQoKTsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgcmVtb3ZlUHJlc2VudGF0aW9uRW5kID0gdHJhY2tC dWZmZXIuc2FtcGxlcy5wcmVzZW50YXRpb25PcmRlcigpLmZpbmRTYW1wbGVXaXRoUHJlc2VudGF0 aW9uVGltZShyZW1vdmVEZWNvZGVFbmQtPnNlY29uZC0+cHJlc2VudGF0aW9uVGltZSgpKTsKIAog ICAgICAgICAvLyAzLjMgUmVtb3ZlIGFsbCBtZWRpYSBkYXRhLCBmcm9tIHRoaXMgdHJhY2sgYnVm ZmVyLCB0aGF0IGNvbnRhaW4gc3RhcnRpbmcgdGltZXN0YW1wcyBncmVhdGVyIHRoYW4gb3IgZXF1 YWwgdG8KICAgICAgICAgLy8gc3RhcnQgYW5kIGxlc3MgdGhhbiB0aGUgcmVtb3ZlIGVuZCB0aW1l c3RhbXAuCiAgICAgICAgIC8vIE5PVEU6IGZyYW1lcyBtdXN0IGJlIHJlbW92ZWQgaW4gZGVjb2Rl IG9yZGVyLCBzbyB0aGF0IGFsbCBkZXBlbmRhbnQgZnJhbWVzIGJldHdlZW4gdGhlIGZyYW1lIHRv IGJlIHJlbW92ZWQKLSAgICAgICAgLy8gYW5kIHRoZSBuZXh0IHN5bmMgc2FtcGxlIGZyYW1lIGFy ZSByZW1vdmVkLgotICAgICAgICBQcmVzZW50YXRpb25PcmRlclNhbXBsZU1hcDo6aXRlcmF0b3Ig cmVtb3ZlUHJlc2VudGFpb25TdGFydCA9IHRyYWNrQnVmZmVyLnNhbXBsZXMucHJlc2VudGF0aW9u T3JkZXIoKS5maW5kU2FtcGxlQWZ0ZXJQcmVzZW50YXRpb25UaW1lKHN0YXJ0KTsKLSAgICAgICAg RGVjb2RlT3JkZXJTYW1wbGVNYXA6Oml0ZXJhdG9yIHJlbW92ZURlY29kZVN0YXJ0ID0gdHJhY2tC dWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmZpbmRTYW1wbGVXaXRoRGVjb2RlVGltZShyZW1v dmVQcmVzZW50YWlvblN0YXJ0LT5zZWNvbmQtPmRlY29kZVRpbWUoKSk7CisgICAgICAgIC8vIGFu ZCB0aGUgbmV4dCBzeW5jIHNhbXBsZSBmcmFtZSBhcmUgcmVtb3ZlZC4gQnV0IHdlIG11c3Qgc3Rh cnQgZnJvbSB0aGUgZmlyc3Qgc2FtcGxlIGluIGRlY29kZSBvcmRlciwgbm90CisgICAgICAgIC8v IHByZXNlbnRhdGlvbiBvcmRlci4KKyAgICAgICAgUHJlc2VudGF0aW9uT3JkZXJTYW1wbGVNYXA6 Oml0ZXJhdG9yIHJlbW92ZVByZXNlbnRhdGlvblN0YXJ0ID0gdHJhY2tCdWZmZXIuc2FtcGxlcy5w cmVzZW50YXRpb25PcmRlcigpLmZpbmRTYW1wbGVPbk9yQWZ0ZXJQcmVzZW50YXRpb25UaW1lKHN0 YXJ0KTsKKworICAgICAgICBpZiAocmVtb3ZlUHJlc2VudGF0aW9uU3RhcnQgPT0gcmVtb3ZlUHJl c2VudGF0aW9uRW5kKQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgUHJlc2VudGF0 aW9uT3JkZXJTYW1wbGVNYXA6Oml0ZXJhdG9yIG1pbkRlY29kZVRpbWVJdGVyID0gc3RkOjptaW5f ZWxlbWVudChyZW1vdmVQcmVzZW50YXRpb25TdGFydCwgcmVtb3ZlUHJlc2VudGF0aW9uRW5kLCBk ZWNvZGVUaW1lQ29tcGFyYXRvcik7CisgICAgICAgIERlY29kZU9yZGVyU2FtcGxlTWFwOjppdGVy YXRvciByZW1vdmVEZWNvZGVTdGFydCA9IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3JkZXIo KS5maW5kU2FtcGxlV2l0aERlY29kZVRpbWUobWluRGVjb2RlVGltZUl0ZXItPnNlY29uZC0+ZGVj b2RlVGltZSgpKTsKKwogICAgICAgICBEZWNvZGVPcmRlclNhbXBsZU1hcDo6TWFwVHlwZSBlcmFz ZWRTYW1wbGVzKHJlbW92ZURlY29kZVN0YXJ0LCByZW1vdmVEZWNvZGVFbmQpOworCiAgICAgICAg IFJlZlB0cjxUaW1lUmFuZ2VzPiBlcmFzZWRSYW5nZXMgPSBUaW1lUmFuZ2VzOjpjcmVhdGUoKTsK ICAgICAgICAgTWVkaWFUaW1lIG1pY3Jvc2Vjb25kKDEsIDEwMDAwMDApOwogICAgICAgICBmb3Ig KGF1dG8gZXJhc2VkSXQgOiBlcmFzZWRTYW1wbGVzKSB7Ci0gICAgICAgICAgICB0cmFja0J1ZmZl ci5zYW1wbGVzLnJlbW92ZVNhbXBsZShlcmFzZWRJdC5zZWNvbmQuZ2V0KCkpOwotICAgICAgICAg ICAgZG91YmxlIHN0YXJ0VGltZSA9IGVyYXNlZEl0LmZpcnN0LnRvRG91YmxlKCk7Ci0gICAgICAg ICAgICBkb3VibGUgZW5kVGltZSA9ICgoZXJhc2VkSXQuZmlyc3QgKyBlcmFzZWRJdC5zZWNvbmQt PmR1cmF0aW9uKCkpICsgbWljcm9zZWNvbmQpLnRvRG91YmxlKCk7CisgICAgICAgICAgICBSZWZQ dHI8TWVkaWFTYW1wbGU+JiBzYW1wbGUgPSBlcmFzZWRJdC5zZWNvbmQ7CisgICAgICAgICAgICB0 cmFja0J1ZmZlci5zYW1wbGVzLnJlbW92ZVNhbXBsZShzYW1wbGUuZ2V0KCkpOworICAgICAgICAg ICAgZG91YmxlIHN0YXJ0VGltZSA9IHNhbXBsZS0+cHJlc2VudGF0aW9uVGltZSgpLnRvRG91Ymxl KCk7CisgICAgICAgICAgICBkb3VibGUgZW5kVGltZSA9IHN0YXJ0VGltZSArIChzYW1wbGUtPmR1 cmF0aW9uKCkgKyBtaWNyb3NlY29uZCkudG9Eb3VibGUoKTsKICAgICAgICAgICAgIGVyYXNlZFJh bmdlcy0+YWRkKHN0YXJ0VGltZSwgZW5kVGltZSk7CiAgICAgICAgIH0KIApAQCAtNjkyLDcgKzcx MSw3IEBAIHZvaWQgU291cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZUlu aXRpYWxpemF0aW9uU2VnbWVudChTb3VyY2VCdWZmCiAgICAgICAgIC8vIOKGsyBPdGhlcndpc2U6 CiAgICAgICAgIC8vICAgUnVuIHRoZSBkdXJhdGlvbiBjaGFuZ2UgYWxnb3JpdGhtIHdpdGggbmV3 IGR1cmF0aW9uIHNldCB0byBwb3NpdGl2ZSBJbmZpbml0eS4KICAgICAgICAgTWVkaWFUaW1lIG5l d0R1cmF0aW9uID0gc2VnbWVudC5kdXJhdGlvbi5pc1ZhbGlkKCkgPyBzZWdtZW50LmR1cmF0aW9u IDogTWVkaWFUaW1lOjpwb3NpdGl2ZUluZmluaXRlVGltZSgpOwotICAgICAgICBtX3NvdXJjZS0+ c2V0RHVyYXRpb24obmV3RHVyYXRpb24udG9Eb3VibGUoKSwgSUdOT1JFX0VYQ0VQVElPTik7Cisg ICAgICAgIG1fc291cmNlLT5zZXREdXJhdGlvbkludGVybmFsKG5ld0R1cmF0aW9uLnRvRG91Ymxl KCkpOwogICAgIH0KIAogICAgIC8vIDIuIElmIHRoZSBpbml0aWFsaXphdGlvbiBzZWdtZW50IGhh cyBubyBhdWRpbywgdmlkZW8sIG9yIHRleHQgdHJhY2tzLCB0aGVuIHJ1biB0aGUgZW5kIG9mIHN0 cmVhbQpAQCAtMTIxNyw3ICsxMjM2LDcgQEAgdm9pZCBTb3VyY2VCdWZmZXI6OnNvdXJjZUJ1ZmZl clByaXZhdGVEaWRSZWNlaXZlU2FtcGxlKFNvdXJjZUJ1ZmZlclByaXZhdGUqLCBQYXMKICAgICAv LyA1LiBJZiB0aGUgbWVkaWEgc2VnbWVudCBjb250YWlucyBkYXRhIGJleW9uZCB0aGUgY3VycmVu dCBkdXJhdGlvbiwgdGhlbiBydW4gdGhlIGR1cmF0aW9uIGNoYW5nZSBhbGdvcml0aG0gd2l0aCBu ZXcKICAgICAvLyBkdXJhdGlvbiBzZXQgdG8gdGhlIG1heGltdW0gb2YgdGhlIGN1cnJlbnQgZHVy YXRpb24gYW5kIHRoZSBoaWdoZXN0IGVuZCB0aW1lc3RhbXAgcmVwb3J0ZWQgYnkgSFRNTE1lZGlh RWxlbWVudC5idWZmZXJlZC4KICAgICBpZiAoaGlnaGVzdFByZXNlbnRhdGlvbkVuZFRpbWVzdGFt cCgpLnRvRG91YmxlKCkgPiBtX3NvdXJjZS0+ZHVyYXRpb24oKSkKLSAgICAgICAgbV9zb3VyY2Ut PnNldER1cmF0aW9uKGhpZ2hlc3RQcmVzZW50YXRpb25FbmRUaW1lc3RhbXAoKS50b0RvdWJsZSgp LCBJZ25vcmFibGVFeGNlcHRpb25Db2RlKCkpOworICAgICAgICBtX3NvdXJjZS0+c2V0RHVyYXRp b25JbnRlcm5hbChoaWdoZXN0UHJlc2VudGF0aW9uRW5kVGltZXN0YW1wKCkudG9Eb3VibGUoKSk7 CiB9CiAKIGJvb2wgU291cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlSGFzQXVkaW8oY29u c3QgU291cmNlQnVmZmVyUHJpdmF0ZSopIGNvbnN0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOGZkYjkwOTMwM2VhOTEyOWU2 YmU1MjA4MjNjZjkyZjgyZDA2ZjBjNS4uMjUxYWJhYjE0NGIxMjJmMzg3M2I0ZDIxOTllZTkwNDll ZGE1NzJiYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTA2LTI4ICBKZXIgTm9ibGUgIDxq ZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIGh0dHAvdGVzdHMvbWVkaWEvbWVk aWEtc291cmNlL21lZGlhc291cmNlLXJlbW92ZS5odG1sIGlzIGZhaWxpbmcuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ3NjgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgbWVkaWFzb3VyY2Ut cmVtb3ZlLmh0bWwgd2l0aCB0aGUgY29ycmVjdCBsb2NhdGlvbnMgb2Ygc3luYy1zYW1wbGVzLgor CisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWFzb3VyY2UtcmVt b3ZlLmh0bWw6CisKIDIwMTQtMDYtMjcgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+ CiAKICAgICAgICAgW01TRV0gaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWFzb3Vy Y2UtZW5kb2ZzdHJlYW0taW52YWxpZGVycm9yLmh0bWwgaXMgZmFpbGluZy4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhc291cmNlLXJl bW92ZS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVk aWFzb3VyY2UtcmVtb3ZlLmh0bWwKaW5kZXggMzk1NjQ0MWI2MWU3ZmEwNzVjOGY2OTNiMTBmZjMy Mjc0YjU0YTEyZC4uOTUxOTljMWQxMzFmNWQxMzAxMDNjYzdlZTU5YjU3YzgwZjcxYjg0MiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWFz b3VyY2UtcmVtb3ZlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRp YS1zb3VyY2UvbWVkaWFzb3VyY2UtcmVtb3ZlLmh0bWwKQEAgLTE4Nyw3ICsxODcsNyBAQAogICAg ICAgICAgIHsKICAgICAgICAgICAgICAgdmFyIGV4cGVjdGF0aW9ucyA9IHsKICAgICAgICAgICAg ICAgICB3ZWJtOiAoInsgWzMuMTg3LCAiICsgZHVyYXRpb24gKyAiKSB9IiksCi0gICAgICAgICAg ICAgICAgbXA0OiAoInsgWzMuMDIxLCAiICsgZHVyYXRpb24gKyAiKSB9IiksCisgICAgICAgICAg ICAgICAgbXA0OiAoInsgWzMuMjI4LCAiICsgZHVyYXRpb24gKyAiKSB9IiksCiAgICAgICAgICAg ICAgIH07CiAKICAgICAgICAgICAgICAgLy8gTm90ZTogUmFuZ2UgZG9lc24ndCBzdGFydCBleGFj dGx5IGF0IHRoZSBlbmQgb2YgdGhlIHJlbW92ZSByYW5nZSBiZWNhdXNlIHRoZXJlIGlzbid0CkBA IC0xOTksNyArMTk5LDcgQEAKICAgICAgICAgICB7CiAgICAgICAgICAgICAgIHZhciBleHBlY3Rh dGlvbnMgPSB7CiAgICAgICAgICAgICAgICAgd2VibTogKCJ7IFswLjAwMCwgMS4wMTIpIFszLjE4 NywgIiArIGR1cmF0aW9uICsgIikgfSIpLAotICAgICAgICAgICAgICAgIG1wNDogKCJ7IFswLjAw MCwgMS4wMjIpIFszLjAyMSwgIiArIGR1cmF0aW9uICsgIikgfSIpLAorICAgICAgICAgICAgICAg IG1wNDogKCJ7IFswLjAwMCwgMS4wMjkpIFszLjIyOCwgIiArIGR1cmF0aW9uICsgIikgfSIpLAog ICAgICAgICAgICAgICB9OwogCiAgICAgICAgICAgICAgIC8vIE5vdGU6IFRoZSBmaXJzdCByZXN1 bHRpbmcgcmFuZ2UgZW5kcyBzbGlnaHRseSBhZnRlciBzdGFydCBiZWNhdXNlIHRoZSByZW1vdmFs IGFsZ29yaXRobSBvbmx5IHJlbW92ZXMKQEAgLTIxMiw3ICsyMTIsNyBAQAogICAgICAgICAgIHsK ICAgICAgICAgICAgICAgdmFyIGV4cGVjdGF0aW9ucyA9IHsKICAgICAgICAgICAgICAgICB3ZWJt OiAieyBbMC4wMDAsIDEuMDEyKSB9IiwKLSAgICAgICAgICAgICAgICBtcDQ6ICJ7IFswLjAwMCwg MS4wMjIpIH0iLAorICAgICAgICAgICAgICAgIG1wNDogInsgWzAuMDAwLCAxLjAyOSkgfSIsCiAg ICAgICAgICAgICAgIH07CiAKICAgICAgICAgICAgICAgcmVtb3ZlQW5kQ2hlY2tCdWZmZXJlZFJh bmdlcyh0ZXN0LCBzb3VyY2VCdWZmZXIsIDEsIE51bWJlci5QT1NJVElWRV9JTkZJTklUWSwgZXhw ZWN0YXRpb25zW3N1YlR5cGVdKTsK