116540 2013-05-21 08:25:59 -0700 Implement overlap-avoidance for in-band text track cues. 2013-05-21 10:16:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson esprehn+autocc glenn oldest_to_newest 891776 0 jer.noble 2013-05-21 08:25:59 -0700 Implement overlap-avoidance for in-band text track cues. 891792 1 202434 jer.noble 2013-05-21 08:44:44 -0700 Created attachment 202434 Patch 891801 2 202434 eric.carlson 2013-05-21 08:51:34 -0700 Comment on attachment 202434 Patch Sweet! 891868 3 jer.noble 2013-05-21 10:16:09 -0700 Committed r150453: <http://trac.webkit.org/changeset/150453> 891869 4 jer.noble 2013-05-21 10:16:16 -0700 <rdar://problem/13518825> 202434 2013-05-21 08:44:44 -0700 2013-05-21 08:51:33 -0700 Patch bug-116540-20130521084332.patch text/plain 9436 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRkNzNhNDZjMWRmZDM4 NWQwZTY1MTRlMTM1ZDgyNTZjNjE3ODc1MS4uMzcyNWExNjc3NWJkZmY3N2U3ZGI2NDUyMDQ2OWU2 NGI3ZTMxYmNjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEzLTA1LTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEltcGxlbWVudCBvdmVybGFw LWF2b2lkYW5jZSBmb3IgaW4tYmFuZCB0ZXh0IHRyYWNrIGN1ZXMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY1NDAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbi1iYW5kIChvciBHZW5lcmljKSBjdWVz IG5lZWQgc3BlY2lhbCBjYXNpbmcgZm9yIGNlcnRhaW4gZmVhdHVyZXMKKyAgICAgICAgcHJlc2Vu dCBpbiBpbi1iYW5kIHRyYWNrcywgbGlrZSBwYWludC1vbiBhbmQgcm9sbC11cCBtb2Rlcy4gVG8g YXZvaWQKKyAgICAgICAgdGhlIHByb2JsZW0gb2Ygb3ZlcmxhcCBhdm9pZGFuY2UgZm9yY2luZyBh IGNhcHRpb24gbWVhbnQgdG8gYXBwZWFyCisgICAgICAgIGJlbG93IGEgY3VlIHRvIGFwcGVhciBh Ym92ZSBpdCB3aGVuIGEgbGFyZ2VyIGZvbnQgc2l6ZSBpcyBzZWxlY3RlZCwKKyAgICAgICAgaW1w b3NlIGFuIGFkZGl0aW9uYWwgc29ydCBvcmRlcmluZyBmb3IgImdlbmVyaWMgY3VlcyIuIEluc3Rl YWQgb2YKKyAgICAgICAgY3VlcyBiZWluZyBvcmRlcmVkIGJ5IHRoZSBvcmRlciB0aGV5IGFwcGVh ciBpbiB0aGUgdHJhY2ssICJnZW5lcmljCisgICAgICAgIGN1ZXMiIGZ1cnRoZXIgc29ydGVkIGJ5 IHRoZWlyIHBvc2l0aW9uIHdpdGhpbiB0aGUgdmlkZW8gYXJlYSwgc3VjaAorICAgICAgICB0aGF0 IGN1ZXMgYXQgdGhlIGJvdHRvbSBvZiB0aGUgdmlkZW8gYXJlYSBhcHBlYXIgZmlyc3QsIGFuZCBs YXRlcgorICAgICAgICBjdWVzIGFyZSBwdXNoZWQgdXAgdG8gYXZvaWQgdGhlbSwgcHJlc2Vydmlu ZyB0aGUgZGVzaXJlZCBhcHBhcmVudAorICAgICAgICBvcmRlcmluZy4KKworICAgICAgICAqIGh0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wYXJlQ3VlSW50 ZXJ2YWwpOiBBZGRlZDsgd3JhcHBlciBhcm91bmQKKyAgICAgICAgICAgIFRleHRUcmFja0N1ZTo6 aXNPcmRlcmVkQmVmb3JlLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6dXBk YXRlQWN0aXZlVGV4dFRyYWNrQ3Vlcyk6CisgICAgICAgICAgICBBZnRlciBjcmVhdGluZyB0aGUg bGlzdCBvZiBjdXJyZW50IGN1ZXMsIHNvcnQgdGhlbS4KKyAgICAgICAgKiBodG1sL3RyYWNrL1Rl eHRUcmFja0N1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0VHJhY2tDdWU6OmlzT3JkZXJl ZEJlZm9yZSk6IEFkZGVkOyBpbXBsZW1lbnRhdGlvbiBtb3ZlZAorICAgICAgICAgICAgZnJvbSBU ZXh0VHJhY2tDdWVMaXN0OjphZGQoKS4KKyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFja0N1 ZS5oOgorICAgICAgICAqIGh0bWwvdHJhY2svVGV4dFRyYWNrQ3VlR2VuZXJpYy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpUZXh0VHJhY2tDdWVHZW5lcmljOjppc09yZGVyZWRCZWZvcmUpOiBBZGRl ZCBvdmVycmlkZTsKKyAgICAgICAgICAgIGltcG9zZSBhZGRpdGlvbmFsIG9yZWRyaW5nIG9uIGdl bmVyaWMgY3Vlcy4KKyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMuaDoK KyAgICAgICAgKiBodG1sL3RyYWNrL1RleHRUcmFja0N1ZUxpc3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VGV4dFRyYWNrQ3VlTGlzdDo6YWRkKTogTW92ZWQgb3JkZXJpbmcgdGVzdCBpbnRvCisg ICAgICAgICAgICBpc09yZGVyZWRCZWZvcmUoKS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGV4dFRyYWNrQ3VlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRUcmFja0N1ZTo6 cmVwb3NpdGlvbkdlbmVyaWNDdWUpOgorICAgICAgICAgICAgQ2FsbCByZXBvc2l0aW9uQ3VlU25h cFRvTGluZXNOb3RTZXQoKSBhZnRlciBwb3NpdGlvbmluZyB0aGUgY3VlLgorCiAyMDEzLTA1LTIw ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBv dmVybGFwIGF2b2lkYW5jZSBmb3IgY3VlcyB3aXRoIHNuYXAtdG8tbGluZXMgZmxhZyBub3Qgc2V0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCAxNWYyNmJhOGRl ZGE3NTJiMjRiOTAxOTA1ZWI0ODNiNDhkZTFmZjY1Li5hMWQ0YjBhZDQ5MjNkMjJmZjc2M2YxZTg2 NzYzNDU4NTZmODkxNzE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAKQEAgLTExMTYsNiArMTExNiwxMSBAQCBzdGF0aWMgYm9vbCBldmVudFRpbWVDdWVDb21wYXJl KGNvbnN0IHN0ZDo6cGFpcjxkb3VibGUsIFRleHRUcmFja0N1ZSo+JiBhLAogICAgIHJldHVybiBh LnNlY29uZC0+Y3VlSW5kZXgoKSAtIGIuc2Vjb25kLT5jdWVJbmRleCgpIDwgMDsKIH0KIAorc3Rh dGljIGJvb2wgY29tcGFyZUN1ZUludGVydmFsKGNvbnN0IEN1ZUludGVydmFsJiBvbmUsIGNvbnN0 IEN1ZUludGVydmFsJiB0d28pCit7CisgICAgcmV0dXJuIG9uZS5kYXRhKCktPmlzT3JkZXJlZEJl Zm9yZSh0d28uZGF0YSgpKTsKK307CisKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVB Y3RpdmVUZXh0VHJhY2tDdWVzKGRvdWJsZSBtb3ZpZVRpbWUpCiB7CkBAIC0xMTM4LDggKzExNDMs MTAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVBY3RpdmVUZXh0VHJhY2tDdWVzKGRv dWJsZSBtb3ZpZVRpbWUpCiAKICAgICAvLyBUaGUgdXNlciBhZ2VudCBtdXN0IHN5bmNocm9ub3Vz bHkgdW5zZXQgW3RoZSB0ZXh0IHRyYWNrIGN1ZSBhY3RpdmVdIGZsYWcKICAgICAvLyB3aGVuZXZl ciAuLi4gdGhlIG1lZGlhIGVsZW1lbnQncyByZWFkeVN0YXRlIGlzIGNoYW5nZWQgYmFjayB0byBI QVZFX05PVEhJTkcuCi0gICAgaWYgKG1fcmVhZHlTdGF0ZSAhPSBIQVZFX05PVEhJTkcgJiYgbV9w bGF5ZXIpCisgICAgaWYgKG1fcmVhZHlTdGF0ZSAhPSBIQVZFX05PVEhJTkcgJiYgbV9wbGF5ZXIp IHsKICAgICAgICAgY3VycmVudEN1ZXMgPSBtX2N1ZVRyZWUuYWxsT3ZlcmxhcHMobV9jdWVUcmVl LmNyZWF0ZUludGVydmFsKG1vdmllVGltZSwgbW92aWVUaW1lKSk7CisgICAgICAgIHN0ZDo6c29y dChjdXJyZW50Q3Vlcy5iZWdpbigpLCBjdXJyZW50Q3Vlcy5lbmQoKSwgJmNvbXBhcmVDdWVJbnRl cnZhbCk7CisgICAgfQogCiAgICAgQ3VlTGlzdCBwcmV2aW91c0N1ZXM7CiAgICAgQ3VlTGlzdCBt aXNzZWRDdWVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJh Y2tDdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWUuY3BwCmlu ZGV4IGRhZTZiODM0NWFiYzhmYjZlNDJjMWNhMTVkYTIzZWFiYjU4YjUwZmMuLjViZDU2NDEyZTk1 N2ZlMmEyYmVmMjhkMjJmNzZkY2Q2ZjUwMzlhMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3Ry YWNrL1RleHRUcmFja0N1ZS5jcHAKQEAgLTExOTUsNiArMTE5NSwxMiBAQCBib29sIFRleHRUcmFj a0N1ZTo6aXNFcXVhbChjb25zdCBUZXh0VHJhY2tDdWUmIGN1ZSwgQ3VlTWF0Y2hSdWxlcyBtYXRj aCkgY29uc3QKICAgICAKICAgICByZXR1cm4gdHJ1ZTsKIH0KKworYm9vbCBUZXh0VHJhY2tDdWU6 OmlzT3JkZXJlZEJlZm9yZShjb25zdCBUZXh0VHJhY2tDdWUqIG90aGVyKSBjb25zdAoreworICAg IHJldHVybiBzdGFydFRpbWUoKSA8IG90aGVyLT5zdGFydFRpbWUoKSB8fCAoc3RhcnRUaW1lKCkg PT0gb3RoZXItPnN0YXJ0VGltZSgpICYmIGVuZFRpbWUoKSA+IG90aGVyLT5lbmRUaW1lKCkpOwor fQorCiB2b2lkIFRleHRUcmFja0N1ZTo6c2V0Rm9udFNpemUoaW50IGZvbnRTaXplLCBjb25zdCBJ bnRTaXplJiwgYm9vbCBpbXBvcnRhbnQpCiB7CiAgICAgaWYgKCFoYXNEaXNwbGF5VHJlZSgpIHx8 ICFmb250U2l6ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRy YWNrQ3VlLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5oCmluZGV4 IGE3ZjA5YmQ2MzAwMzFhMGE1NzIyYTMyZWQ2NmM3ZGQ5YzdmMTYzMjguLjcyNGU3OGJlMDVmYTBh OTU5MGFmNWYyNmNiZTYzZjRhYjVmNDZjZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9U ZXh0VHJhY2tDdWUuaApAQCAtMTUxLDYgKzE1MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIG1hcmtG dXR1cmVBbmRQYXN0Tm9kZXMoQ29udGFpbmVyTm9kZSosIGRvdWJsZSwgZG91YmxlKTsKIAogICAg IGludCBjYWxjdWxhdGVDb21wdXRlZExpbmVQb3NpdGlvbigpOworICAgIHN0ZDo6cGFpcjxkb3Vi bGUsIGRvdWJsZT4gZ2V0UG9zaXRpb25Db29yZGluYXRlcygpIGNvbnN0OwogCiAgICAgdmlydHVh bCBjb25zdCBBdG9taWNTdHJpbmcmIGludGVyZmFjZU5hbWUoKSBjb25zdDsKICAgICB2aXJ0dWFs IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSBjb25zdDsK QEAgLTE4NCw2ICsxODUsOCBAQCBwdWJsaWM6CiAgICAgfTsKICAgICB2aXJ0dWFsIGJvb2wgaXNF cXVhbChjb25zdCBUZXh0VHJhY2tDdWUmLCBDdWVNYXRjaFJ1bGVzKSBjb25zdDsKIAorICAgIHZp cnR1YWwgYm9vbCBpc09yZGVyZWRCZWZvcmUoY29uc3QgVGV4dFRyYWNrQ3VlKikgY29uc3Q7CisK ICAgICBlbnVtIEN1ZVR5cGUgewogICAgICAgICBHZW5lcmljLAogICAgICAgICBXZWJWVFQKQEAg LTIxNCw3ICsyMTcsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgY3JlYXRlV2ViVlRUTm9kZVRyZWUo KTsKICAgICB2b2lkIGNvcHlXZWJWVFROb2RlVG9ET01UcmVlKENvbnRhaW5lck5vZGUqIFdlYlZU VE5vZGUsIENvbnRhaW5lck5vZGUqIHJvb3QpOwogCi0gICAgc3RkOjpwYWlyPGRvdWJsZSwgZG91 YmxlPiBnZXRQb3NpdGlvbkNvb3JkaW5hdGVzKCkgY29uc3Q7CiAgICAgdm9pZCBwYXJzZVNldHRp bmdzKGNvbnN0IFN0cmluZyYpOwogCiAgICAgdm9pZCBkZXRlcm1pbmVUZXh0RGlyZWN0aW9uKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVy aWMuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmljLmNw cAppbmRleCBlOTdhZTI1MjNhMTJlZTkwMGVmYjI0ZjBmN2Q2MWY1NDE5NWRhNDAyLi5kODcxMjcx YmY5YmQzMjE0OTEyZjdmYWNmOTIxMzY3ZWRjNTJlODRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZUdlbmVyaWMuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlR2VuZXJpYy5jcHAKQEAgLTE3Miw2ICsxNzIsMjEg QEAgYm9vbCBUZXh0VHJhY2tDdWVHZW5lcmljOjppc0VxdWFsKGNvbnN0IFRleHRUcmFja0N1ZSYg Y3VlLCBUZXh0VHJhY2tDdWU6OkN1ZU1hdGMKIAogICAgIHJldHVybiBUZXh0VHJhY2tDdWU6Omlz RXF1YWwoY3VlLCBtYXRjaCk7CiB9CisKK2Jvb2wgVGV4dFRyYWNrQ3VlR2VuZXJpYzo6aXNPcmRl cmVkQmVmb3JlKGNvbnN0IFRleHRUcmFja0N1ZSogdGhhdCkgY29uc3QKK3sKKyAgICBpZiAoVGV4 dFRyYWNrQ3VlOjppc09yZGVyZWRCZWZvcmUodGhhdCkpCisgICAgICAgIHJldHVybiB0cnVlOwor CisgICAgaWYgKHRoYXQtPmN1ZVR5cGUoKSA9PSBXZWJWVFQgJiYgc3RhcnRUaW1lKCkgPT0gdGhh dC0+c3RhcnRUaW1lKCkgJiYgZW5kVGltZSgpID09IHRoYXQtPmVuZFRpbWUoKSkgeworICAgICAg ICAvLyBGdXJ0aGVyIG9yZGVyIGdlbmVyaWMgY3VlcyBieSB0aGVpciBjYWxjdWxhdGVkIGxpbmUg dmFsdWUuCisgICAgICAgIHN0ZDo6cGFpcjxkb3VibGUsIGRvdWJsZT4gdGhpc1Bvc2l0aW9uID0g Z2V0UG9zaXRpb25Db29yZGluYXRlcygpOworICAgICAgICBzdGQ6OnBhaXI8ZG91YmxlLCBkb3Vi bGU+IHRoYXRQb3NpdGlvbiA9IHRoYXQtPmdldFBvc2l0aW9uQ29vcmRpbmF0ZXMoKTsKKyAgICAg ICAgcmV0dXJuIHRoaXNQb3NpdGlvbi5zZWNvbmQgPiB0aGF0UG9zaXRpb24uc2Vjb25kIHx8ICh0 aGlzUG9zaXRpb24uc2Vjb25kID09IHRoYXRQb3NpdGlvbi5zZWNvbmQgJiYgdGhpc1Bvc2l0aW9u LmZpcnN0IDwgdGhhdFBvc2l0aW9uLmZpcnN0KTsKKyAgICB9CisKKyAgICByZXR1cm4gZmFsc2U7 Cit9CiAgICAgCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlR2VuZXJpYy5oIGIvU291cmNlL1dlYkNvcmUv aHRtbC90cmFjay9UZXh0VHJhY2tDdWVHZW5lcmljLmgKaW5kZXggMDViNTI5YzlmMmU5ZDViMGIy MmMxMWM1NmNlYWQ4ZTNjYWY4OTU3NC4uZDliYmE4NjlkYmJjMmY3Zjg2NTU1ODNjZjk4MDU5YWI4 NjBiMWQ5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tD dWVHZW5lcmljLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0VHJhY2tDdWVH ZW5lcmljLmgKQEAgLTc4LDYgKzc4LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgVGV4dFRyYWNr Q3VlOjpDdWVUeXBlIGN1ZVR5cGUoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBUZXh0VHJhY2tD dWU6OkdlbmVyaWM7IH0KIAogcHJpdmF0ZToKKyAgICB2aXJ0dWFsIGJvb2wgaXNPcmRlcmVkQmVm b3JlKGNvbnN0IFRleHRUcmFja0N1ZSopIGNvbnN0IE9WRVJSSURFOworCiAgICAgVGV4dFRyYWNr Q3VlR2VuZXJpYyhTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgZG91YmxlIHN0YXJ0LCBkb3VibGUg ZW5kLCBjb25zdCBTdHJpbmcmKTsKICAgICAKICAgICBDb2xvciBtX2ZvcmVncm91bmRDb2xvcjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlTGlzdC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZUxpc3QuY3BwCmluZGV4 IGU4Njk1YWZjMzYyM2Y4ZWM4MWMzZTBhZDBmZTUzMDdiOGU3ZTIyMmEuLmY1NDUxZjVmMDk5ZjM5 ZjdjODViNTMyOGJjMmRjZmQ5ZThiZjBkMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvdHJhY2svVGV4dFRyYWNrQ3VlTGlzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC90 cmFjay9UZXh0VHJhY2tDdWVMaXN0LmNwcApAQCAtMTAxLDcgKzEwMSw3IEBAIGJvb2wgVGV4dFRy YWNrQ3VlTGlzdDo6YWRkKFBhc3NSZWZQdHI8VGV4dFRyYWNrQ3VlPiBwcnBDdWUsIHNpemVfdCBz dGFydCwgc2l6ZV90CiAgICAgfQogCiAgICAgc2l6ZV90IGluZGV4ID0gKHN0YXJ0ICsgZW5kKSAv IDI7Ci0gICAgaWYgKGN1ZS0+c3RhcnRUaW1lKCkgPCBtX2xpc3RbaW5kZXhdLT5zdGFydFRpbWUo KSB8fCAoY3VlLT5zdGFydFRpbWUoKSA9PSBtX2xpc3RbaW5kZXhdLT5zdGFydFRpbWUoKSAmJiBj dWUtPmVuZFRpbWUoKSA+IG1fbGlzdFtpbmRleF0tPmVuZFRpbWUoKSkpCisgICAgaWYgKGN1ZS0+ aXNPcmRlcmVkQmVmb3JlKG1fbGlzdFtpbmRleF0uZ2V0KCkpKQogICAgICAgICByZXR1cm4gYWRk KGN1ZS5yZWxlYXNlKCksIHN0YXJ0LCBpbmRleCk7CiAKICAgICByZXR1cm4gYWRkKGN1ZS5yZWxl YXNlKCksIGluZGV4ICsgMSwgZW5kKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUZXh0VHJhY2tDdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHRUcmFja0N1ZS5jcHAKaW5kZXggYmM2Y2FjN2I5YTQ0N2M1MTgzMWY3NTQ0YmJhMDI0 MGQwNWVjZjg3OS4uMTFjZjNhMjRiZWJkNjdiNDlhM2M5NmFmNzEyMzc1OWIzZDAyZDA5NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRUcmFja0N1ZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRUcmFja0N1ZS5jcHAKQEAg LTMyMSwyMCArMzIxLDE2IEBAIHZvaWQgUmVuZGVyVGV4dFRyYWNrQ3VlOjpyZXBvc2l0aW9uQ3Vl U25hcFRvTGluZXNTZXQoKQogCiB2b2lkIFJlbmRlclRleHRUcmFja0N1ZTo6cmVwb3NpdGlvbkdl bmVyaWNDdWUoKQogewotICAgIFRleHRUcmFja0N1ZUdlbmVyaWMqIGN1ZSA9IHN0YXRpY19jYXN0 PFRleHRUcmFja0N1ZUdlbmVyaWMqPihtX2N1ZSk7Ci0gICAgaWYgKCFjdWUtPnVzZURlZmF1bHRQ b3NpdGlvbigpKQotICAgICAgICByZXR1cm47Ci0KICAgICBBU1NFUlQoZmlyc3RDaGlsZCgpKTsK LQorICAgIEFTU0VSVChtX2N1ZS0+Y3VlVHlwZSgpID09IFRleHRUcmFja0N1ZTo6V2ViVlRUKTsK ICAgICBJbmxpbmVGbG93Qm94KiBmaXJzdExpbmVCb3ggPSB0b1JlbmRlcklubGluZShmaXJzdENo aWxkKCkpLT5maXJzdExpbmVCb3goKTsKLSAgICBpZiAoIWZpcnN0TGluZUJveCkKLSAgICAgICAg cmV0dXJuOwotCi0gICAgTGF5b3V0VW5pdCBwYXJlbnRXaWR0aCA9IGNvbnRhaW5pbmdCbG9jaygp LT5sb2dpY2FsV2lkdGgoKTsKLSAgICBMYXlvdXRVbml0IHdpZHRoID0gZmlyc3RMaW5lQm94LT53 aWR0aCgpOwotICAgIExheW91dFVuaXQgcmlnaHQgPSAocGFyZW50V2lkdGggLyAyKSAtICh3aWR0 aCAvIDIpOwotICAgIHNldFgocmlnaHQpOworICAgIGlmIChzdGF0aWNfY2FzdDxUZXh0VHJhY2tD dWVHZW5lcmljKj4obV9jdWUpLT51c2VEZWZhdWx0UG9zaXRpb24oKSAmJiBmaXJzdExpbmVCb3gp IHsKKyAgICAgICAgTGF5b3V0VW5pdCBwYXJlbnRXaWR0aCA9IGNvbnRhaW5pbmdCbG9jaygpLT5s b2dpY2FsV2lkdGgoKTsKKyAgICAgICAgTGF5b3V0VW5pdCB3aWR0aCA9IGZpcnN0TGluZUJveC0+ d2lkdGgoKTsKKyAgICAgICAgTGF5b3V0VW5pdCByaWdodCA9IChwYXJlbnRXaWR0aCAvIDIpIC0g KHdpZHRoIC8gMik7CisgICAgICAgIHNldFgocmlnaHQpOworICAgIH0KKyAgICByZXBvc2l0aW9u Q3VlU25hcFRvTGluZXNOb3RTZXQoKTsKIH0KIAogdm9pZCBSZW5kZXJUZXh0VHJhY2tDdWU6OnJl cG9zaXRpb25DdWVTbmFwVG9MaW5lc05vdFNldCgpCg==