115200 2013-04-25 13:03:45 -0700 [Mac] in-band cues sometimes have incorrect duration 2013-04-26 08:16:56 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue dino esprehn+autocc jer.noble oldest_to_newest 881524 0 eric.carlson 2013-04-25 13:03:45 -0700 In-band cues delivered during seeking should be displayed but discarded as soon as the next cue is delivered, because not all cues in a track are delivered during a seek. 881529 1 199743 eric.carlson 2013-04-25 13:14:53 -0700 Created attachment 199743 Proposed patch 881905 2 199743 commit-queue 2013-04-26 08:16:54 -0700 Comment on attachment 199743 Proposed patch Clearing flags on attachment: 199743 Committed r149187: <http://trac.webkit.org/changeset/149187> 881906 3 commit-queue 2013-04-26 08:16:56 -0700 All reviewed patches have been landed. Closing bug. 199743 2013-04-25 13:14:53 -0700 2013-04-26 08:16:54 -0700 Proposed patch patch_2.txt text/plain 11923 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0OTEzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEzLTA0LTI1ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIGluLWJhbmQg Y3VlcyBzb21ldGltZXMgaGF2ZSBpbmNvcnJlY3QgZHVyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTIwMAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhpcyBpcyBub3Qg cG9zc2libGUgdG8gdGVzdCBpbiBEUlQuCisKKyAgICAgICAgKiBodG1sL3RyYWNrL0luYmFuZFRl eHRUcmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmJhbmRUZXh0VHJhY2s6OmFkZEdlbmVy aWNDdWUpOiBEb24ndCBhZGQgY29tcGxldGVkIGN1ZXMgdG8gdGhlIG1hcC4KKyAgICAgICAgKFdl YkNvcmU6OkluYmFuZFRleHRUcmFjazo6cmVtb3ZlR2VuZXJpY0N1ZSk6IExvZyB3aGVuIGEgY3Vl IGlzIHJlbW92ZWQgZnJvbSB0aGUgdHJhY2suCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpJbmJhbmRUZXh0VHJhY2tQcml2YXRl QVZGKTogSW5pdGlhbGl6ZSBtX3BlbmRpbmdDdWVTdGF0dXMuCisgICAgICAgIChXZWJDb3JlOjpJ bmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQ3VlKTogTmV2ZXIgY2FsbCB1cGRhdGUo KSBvbiBhIGN1ZSB0aGF0IGlzIGRlbGl2ZXJlZAorICAgICAgICAgICAgd2hpbGUgc2Vla2luZy4K KyAgICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OmJlZ2luU2Vla2lu Zyk6IEZsdXNoIGFsbCBpbmNvbXBsZXRlIGN1ZXMsIHJlbWVtYmVyIHRoYXQgCisgICAgICAgICAg ICB3ZSBhcmUgc2Vla2luZy4KKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZh dGVBVkY6OnJlc2V0Q3VlVmFsdWVzKTogCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL0luYmFuZFRleHRUcmFja1ByaXZhdGVBVkYuaDoKKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpz ZWVrKTogQ2FsbCB0cmFjay0+YmVnaW5TZWVraW5nKCkgaW5zdGVhZCBvZiByZXNldEN1ZVZhbHVl cygpLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpz ZWVrQ29tcGxldGVkKTogQ2FsbCB0cmFjay0+ZW5kU2Vla2luZygpLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFW Rk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGT2Jq Qzo6a2luZCk6IEluY2x1ZGUgY2xhc3MgbmFtZSBpbiBLaW5kIGVudW0gdmFsdWVzIHRvIAorICAg ICAgICAgICAgYXZvaWQgY29tcGlsZSBlcnJvci4KKwogMjAxMy0wNC0yNSAgSm9zZXBoIFBlY29y YXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQgbG9nIGV4Y2VwdGlvbiBzaG91bGQgaW5jbHVkZSBhIGNvbHVtbiBudW1iZXIKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kVGV4dFRyYWNrLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0luYmFuZFRleHRUcmFjay5jcHAJKHJldmlzaW9u IDE0ODk5NykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kVGV4dFRyYWNrLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjMyLDcgKzIzMiw4IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNr OjphZGRHZW5lcmljQ3VlKEluYmEKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIG1fY3Vl TWFwLmFkZChjdWVEYXRhLmdldCgpLCBjdWUuZ2V0KCkpOworICAgIGlmIChjdWVEYXRhLT5zdGF0 dXMoKSAhPSBHZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpCisgICAgICAgIG1fY3VlTWFwLmFkZChj dWVEYXRhLmdldCgpLCBjdWUuZ2V0KCkpOwogCiAgICAgYWRkQ3VlKGN1ZSk7CiB9CkBAIC0yNTIs OSArMjUzLDEwIEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrOjp1cGRhdGVHZW5lcmljQ3VlKEkKIHZv aWQgSW5iYW5kVGV4dFRyYWNrOjpyZW1vdmVHZW5lcmljQ3VlKEluYmFuZFRleHRUcmFja1ByaXZh dGUqLCBHZW5lcmljQ3VlRGF0YSogY3VlRGF0YSkKIHsKICAgICBSZWZQdHI8VGV4dFRyYWNrQ3Vl R2VuZXJpYz4gY3VlID0gbV9jdWVNYXAuZmluZChjdWVEYXRhKTsKLSAgICBpZiAoY3VlKQorICAg IGlmIChjdWUpIHsKKyAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kVGV4dFRyYWNrOjpyZW1vdmVH ZW5lcmljQ3VlIHJlbW92aW5nIGN1ZTogc3RhcnQ9JS4yZiwgZW5kPSUuMmYsIGNvbnRlbnQ9XCIl c1wiXG4iLCBjdWVEYXRhLT5zdGFydFRpbWUoKSwgY3VlRGF0YS0+ZW5kVGltZSgpLCBjdWVEYXRh LT5jb250ZW50KCkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJlbW92ZUN1ZShjdWUuZ2V0KCks IElHTk9SRV9FWENFUFRJT04pOwotICAgIGVsc2UKKyAgICB9IGVsc2UKICAgICAgICAgbV9jdWVN YXAucmVtb3ZlKGN1ZURhdGEpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0lu YmFuZFRleHRUcmFja1ByaXZhdGVBVkYuY3BwCShyZXZpc2lvbiAxNDg5OTcpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJp dmF0ZUFWRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg5LDkgKzg5LDEwIEBAIEFWRkluYmFuZFRy YWNrUGFyZW50Ojp+QVZGSW5iYW5kVHJhY2tQYXIKIAogSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFW Rjo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRihBVkZJbmJhbmRUcmFja1BhcmVudCogb3duZXIp CiAgICAgOiBtX293bmVyKG93bmVyKQorICAgICwgbV9wZW5kaW5nQ3VlU3RhdHVzKE5vbmUpCiAg ICAgLCBtX2luZGV4KDApCi0gICAgLCBtX2hhdmVQYXJ0aWFsQ3VlKGZhbHNlKQogICAgICwgbV9o YXNCZWVuUmVwb3J0ZWQoZmFsc2UpCisgICAgLCBtX3NlZWtpbmcoZmFsc2UpCiB7CiB9CiAKQEAg LTMzMiw4ICszMzMsMTAgQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNz QwogewogICAgIGlmICghY2xpZW50KCkpCiAgICAgICAgIHJldHVybjsKLSAgICAKLSAgICBpZiAo bV9oYXZlUGFydGlhbEN1ZSkgeworCisgICAgTE9HKE1lZGlhLCAiSW5iYW5kVGV4dFRyYWNrUHJp dmF0ZUFWRjo6cHJvY2Vzc0N1ZSAtICVsaSBjdWVzIGF0IHRpbWUgJS4yZlxuIiwgQ0ZBcnJheUdl dENvdW50KGF0dHJpYnV0ZWRTdHJpbmdzKSwgdGltZSk7CisKKyAgICBpZiAobV9wZW5kaW5nQ3Vl U3RhdHVzICE9IE5vbmUpIHsKICAgICAgICAgLy8gQ3VlcyBkbyBub3QgaGF2ZSBhbiBleHBsaWNp dCBkdXJhdGlvbiwgdGhleSBhcmUgZGlzcGxheWVkIHVudGlsIHRoZSBuZXh0ICJjdWUiICh3aGlj aCBtaWdodCBiZSBlbXB0eSkgaXMgZW1pdHRlZC4KICAgICAgICAgbV9jdXJyZW50Q3VlRW5kVGlt ZSA9IHRpbWU7CiAKQEAgLTM0MSwxMSArMzQ0LDE3IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJp dmF0ZUFWRjo6cHJvY2Vzc0MKICAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9j dWVzLnNpemUoKTsgaSsrKSB7CiAgICAgICAgICAgICAgICAgR2VuZXJpY0N1ZURhdGEqIGN1ZURh dGEgPSBtX2N1ZXNbaV0uZ2V0KCk7CiAKLSAgICAgICAgICAgICAgICBjdWVEYXRhLT5zZXRFbmRU aW1lKG1fY3VycmVudEN1ZUVuZFRpbWUpOwotICAgICAgICAgICAgICAgIGN1ZURhdGEtPnNldFN0 YXR1cyhHZW5lcmljQ3VlRGF0YTo6Q29tcGxldGUpOwotCi0gICAgICAgICAgICAgICAgTE9HKE1l ZGlhLCAiSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0N1ZSglcCkgLSAgdXBkYXRp bmcgY3VlOiBzdGFydD0lLjJmLCBlbmQ9JS4yZiwgY29udGVudD1cIiVzXCIiLCB0aGlzLCBjdWVE YXRhLT5zdGFydFRpbWUoKSwgbV9jdXJyZW50Q3VlRW5kVGltZSwgY3VlRGF0YS0+Y29udGVudCgp LnV0ZjgoKS5kYXRhKCkpOwotICAgICAgICAgICAgICAgIGNsaWVudCgpLT51cGRhdGVHZW5lcmlj Q3VlKHRoaXMsIGN1ZURhdGEpOworICAgICAgICAgICAgICAgIGlmIChtX3BlbmRpbmdDdWVTdGF0 dXMgPT0gVmFsaWQpIHsKKyAgICAgICAgICAgICAgICAgICAgY3VlRGF0YS0+c2V0RW5kVGltZSht X2N1cnJlbnRDdWVFbmRUaW1lKTsKKyAgICAgICAgICAgICAgICAgICAgY3VlRGF0YS0+c2V0U3Rh dHVzKEdlbmVyaWNDdWVEYXRhOjpDb21wbGV0ZSk7CisKKyAgICAgICAgICAgICAgICAgICAgTE9H KE1lZGlhLCAiSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0N1ZSglcCkgLSB1cGRh dGluZyBjdWU6IHN0YXJ0PSUuMmYsIGVuZD0lLjJmLCBjb250ZW50PVwiJXNcIiIsIHRoaXMsIGN1 ZURhdGEtPnN0YXJ0VGltZSgpLCBtX2N1cnJlbnRDdWVFbmRUaW1lLCBjdWVEYXRhLT5jb250ZW50 KCkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICAgICAgICAgIGNsaWVudCgpLT51cGRhdGVH ZW5lcmljQ3VlKHRoaXMsIGN1ZURhdGEpOworICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAg ICAgICAgICAgICAgICAgIC8vIFdlIGhhdmUgdG8gYXNzdW1lIHRoYXQgdGhlIGltcGxpY2l0IGR1 cmF0aW9uIGlzIGludmFsaWQgZm9yIGN1ZXMgZGVsaXZlcmVkIGR1cmluZyBhIHNlZWsgYmVjYXVz ZSB0aGUgQVZGIGRlY29kZSBwaXBlbGluZSBtYXkgbm90CisgICAgICAgICAgICAgICAgICAgIC8v IHNlZSBldmVyeSBjdWUsIHNvIERPIE5PVCB1cGRhdGUgY3VlIGR1cmF0aW9uIHdoaWxlIHNlZWtp bmcuCisgICAgICAgICAgICAgICAgICAgIExPRyhNZWRpYSwgIkluYmFuZFRleHRUcmFja1ByaXZh dGVBVkY6OnByb2Nlc3NDdWUoJXApIC0gaWdub3JpbmcgY3VlIGRlbGl2ZXJlZCBkdXJpbmcgc2Vl azogc3RhcnQ9JS4yZiwgZW5kPSUuMmYsIGNvbnRlbnQ9XCIlc1wiIiwgdGhpcywgY3VlRGF0YS0+ c3RhcnRUaW1lKCksIG1fY3VycmVudEN1ZUVuZFRpbWUsIGN1ZURhdGEtPmNvbnRlbnQoKS51dGY4 KCkuZGF0YSgpKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0g ZWxzZQogICAgICAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6 cHJvY2Vzc0N1ZSBuZWdhdGl2ZSBsZW5ndGggY3VlKHMpIGlnbm9yZWQ6IHN0YXJ0PSUuMmYsIGVu ZD0lLjJmXG4iLCBtX2N1cnJlbnRDdWVTdGFydFRpbWUsIG1fY3VycmVudEN1ZUVuZFRpbWUpOwpA QCAtMzc1LDcgKzM4NCw3IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vz c0MKIAogICAgICAgICBtX2N1cnJlbnRDdWVTdGFydFRpbWUgPSB0aW1lOwogICAgICAgICBjdWVE YXRhLT5zZXRTdGFydFRpbWUobV9jdXJyZW50Q3VlU3RhcnRUaW1lKTsKLSAgICAgICAgY3VlRGF0 YS0+c2V0RW5kVGltZShudW1lcmljX2xpbWl0czxkb3VibGU+OjppbmZpbml0eSgpKTsgLy8gZHVy YXRpb24KKyAgICAgICAgY3VlRGF0YS0+c2V0RW5kVGltZShudW1lcmljX2xpbWl0czxkb3VibGU+ OjppbmZpbml0eSgpKTsKICAgICAgICAgCiAgICAgICAgIC8vIEFWRm91bmRhdGlvbiBjdWUgInBv c2l0aW9uIiBpcyB0byB0aGUgY2VudGVyIG9mIHRoZSB0ZXh0IHNvIGFkanVzdCByZWxhdGl2ZSB0 byB0aGUgZWRnZSBiZWNhdXNlIHdlIHdpbGwgdXNlIGl0IHRvCiAgICAgICAgIC8vIHNldCBDU1Mg ImxlZnQiLgpAQCAtMzg3LDEwICszOTYsMTkgQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRl QVZGOjpwcm9jZXNzQwogICAgICAgICBjdWVEYXRhLT5zZXRTdGF0dXMoR2VuZXJpY0N1ZURhdGE6 OlBhcnRpYWwpOwogICAgICAgICBjbGllbnQoKS0+YWRkR2VuZXJpY0N1ZSh0aGlzLCBjdWVEYXRh LnJlbGVhc2UoKSk7CiAKLSAgICAgICAgbV9oYXZlUGFydGlhbEN1ZSA9IHRydWU7CisgICAgICAg IG1fcGVuZGluZ0N1ZVN0YXR1cyA9IHNlZWtpbmcoKSA/IERlbGl2ZXJlZER1cmluZ1NlZWsgOiBW YWxpZDsKICAgICB9CiB9CiAKK3ZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6YmVnaW5T ZWVraW5nKCkKK3sKKyAgICAvLyBGb3JnZXQgYW55IHBhcnRpYWxseSBhY2N1bXVsYXRlZCBjdWUg ZGF0YSBhcyB0aGUgc2VlayBjb3VsZCBiZSB0byBhIHRpbWUgb3V0c2lkZSBvZiB0aGUgY3VlJ3MK KyAgICAvLyByYW5nZSwgd2hpY2ggd2lsbCBtZWFuIHRoYXQgdGhlIG5leHQgY3VlIGRlbGl2ZXJl ZCB3aWxsIHJlc3VsdCBpbiB0aGUgY3VycmVudCBjdWUgZ2V0dGluZyB0aGUKKyAgICAvLyBpbmNv cnJlY3QgZHVyYXRpb24uCisgICAgcmVzZXRDdWVWYWx1ZXMoKTsKKyAgICBtX3NlZWtpbmcgPSB0 cnVlOworfQorCiB2b2lkIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OmRpc2Nvbm5lY3QoKQog ewogICAgIG1fb3duZXIgPSAwOwpAQCAtMzk5LDcgKzQxNyw3IEBAIHZvaWQgSW5iYW5kVGV4dFRy YWNrUHJpdmF0ZUFWRjo6ZGlzY29ubmUKIAogdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZG OjpyZXNldEN1ZVZhbHVlcygpCiB7Ci0gICAgaWYgKG1faGF2ZVBhcnRpYWxDdWUgJiYgIW1fY3Vy cmVudEN1ZUVuZFRpbWUpCisgICAgaWYgKG1fY3VycmVudEN1ZUVuZFRpbWUgJiYgbV9jdWVzLnNp emUoKSkKICAgICAgICAgTE9HKE1lZGlhLCAiSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cmVz ZXRDdWVWYWx1ZXMgZmx1c2hpbmcgZGF0YSBmb3IgY3Vlczogc3RhcnQ9JS4yZlxuIiwgbV9jdXJy ZW50Q3VlU3RhcnRUaW1lKTsKIAogICAgIGlmIChjbGllbnQoKSkgewpAQCAtNDA4LDcgKzQyNiw3 IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cmVzZXRDdWUKICAgICB9CiAKICAg ICBtX2N1ZXMucmVzaXplKDApOwotICAgIG1faGF2ZVBhcnRpYWxDdWUgPSBmYWxzZTsKKyAgICBt X3BlbmRpbmdDdWVTdGF0dXMgPSBOb25lOwogICAgIG1fY3VycmVudEN1ZVN0YXJ0VGltZSA9IDA7 CiAgICAgbV9jdXJyZW50Q3VlRW5kVGltZSA9IDA7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGLmgJKHJldmlzaW9uIDE0ODk5NykKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0VHJh Y2tQcml2YXRlQVZGLmgJKHdvcmtpbmcgY29weSkKQEAgLTU5LDYgKzU5LDEwIEBAIHB1YmxpYzoK ICAgICB2b2lkIHByb2Nlc3NDdWUoQ0ZBcnJheVJlZiwgZG91YmxlKTsKICAgICB2b2lkIHJlc2V0 Q3VlVmFsdWVzKCk7CiAKKyAgICB2b2lkIGJlZ2luU2Vla2luZygpOworICAgIHZvaWQgZW5kU2Vl a2luZygpIHsgbV9zZWVraW5nID0gZmFsc2U7IH0KKyAgICBib29sIHNlZWtpbmcoKSBjb25zdCB7 IHJldHVybiBtX3NlZWtpbmc7IH0KKwogcHJvdGVjdGVkOgogICAgIEluYmFuZFRleHRUcmFja1By aXZhdGVBVkYoQVZGSW5iYW5kVHJhY2tQYXJlbnQqKTsKIApAQCAtNjgsMTEgKzcyLDE4IEBAIHBy b3RlY3RlZDoKICAgICBkb3VibGUgbV9jdXJyZW50Q3VlRW5kVGltZTsKIAogICAgIFZlY3RvcjxS ZWZQdHI8R2VuZXJpY0N1ZURhdGE+ID4gbV9jdWVzOwotCiAgICAgQVZGSW5iYW5kVHJhY2tQYXJl bnQqIG1fb3duZXI7CisKKyAgICBlbnVtIFBlbmRpbmdDdWVTdGF0dXMgeworICAgICAgICBOb25l LAorICAgICAgICBEZWxpdmVyZWREdXJpbmdTZWVrLAorICAgICAgICBWYWxpZAorICAgIH07Cisg ICAgUGVuZGluZ0N1ZVN0YXR1cyBtX3BlbmRpbmdDdWVTdGF0dXM7CisKICAgICBpbnQgbV9pbmRl eDsKLSAgICBib29sIG1faGF2ZVBhcnRpYWxDdWU7CiAgICAgYm9vbCBtX2hhc0JlZW5SZXBvcnRl ZDsKKyAgICBib29sIG1fc2Vla2luZzsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb24uY3BwCShyZXZpc2lvbiAxNDg5OTcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjY4LDExICsyNjgsOCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbjo6c2VlCiAgICAgICAgIHJldHVybjsKIAogI2lmIEhBVkUoQVZGT1VOREFU SU9OX1RFWFRfVFJBQ0tfU1VQUE9SVCkKLSAgICAvLyBGb3JnZXQgYW55IHBhcnRpYWxseSBhY2N1 bXVsYXRlZCBjdWUgZGF0YSBhcyB0aGUgc2VlayBjb3VsZCBiZSB0byBhIHRpbWUgb3V0c2lkZSBv ZiB0aGUgY3VlJ3MKLSAgICAvLyByYW5nZSwgd2hpY2ggd2lsbCBtZWFuIHRoYXQgdGhlIG5leHQg Y3VlIGRlbGl2ZXJlZCB3aWxsIHJlc3VsdCBpbiB0aGUgY3VycmVudCBjdWUgZ2V0dGluZyB0aGUK LSAgICAvLyBpbmNvcnJlY3QgZHVyYXRpb24uCiAgICAgaWYgKGN1cnJlbnRUcmFjaygpKQotICAg ICAgICBjdXJyZW50VHJhY2soKS0+cmVzZXRDdWVWYWx1ZXMoKTsKKyAgICAgICAgY3VycmVudFRy YWNrKCktPmJlZ2luU2Vla2luZygpOwogI2VuZGlmCiAgICAgCiAgICAgTE9HKE1lZGlhLCAiTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpzZWVrKCVwKSAtIHNlZWtpbmcgdG8gJWYiLCB0 aGlzLCB0aW1lKTsKQEAgLTU5Nyw2ICs1OTQsMTEgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb246OnNlZQogICAgIExPRyhNZWRpYSwgIk1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbjo6c2Vla0NvbXBsZXRlZCglcCkgLSBmaW5pc2hlZCA9ICVkIiwgdGhpcywgZmluaXNo ZWQpOwogICAgIFVOVVNFRF9QQVJBTShmaW5pc2hlZCk7CiAKKyNpZiBIQVZFKEFWRk9VTkRBVElP Tl9URVhUX1RSQUNLX1NVUFBPUlQpCisgICAgaWYgKGN1cnJlbnRUcmFjaygpKQorICAgICAgICBj dXJyZW50VHJhY2soKS0+ZW5kU2Vla2luZygpOworI2VuZGlmCisKICAgICBtX3NlZWtUbyA9IE1l ZGlhUGxheWVyOjppbnZhbGlkVGltZSgpOwogICAgIHVwZGF0ZVN0YXRlcygpOwogICAgIG1fcGxh eWVyLT50aW1lQ2hhbmdlZCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRk9iakMubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRk9iakMubW0JKHJldmlzaW9uIDE0ODk5NykK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0lu YmFuZFRleHRUcmFja1ByaXZhdGVBVkZPYmpDLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05NiwyOCAr OTYsMjggQEAgdm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGT2JqQzo6ZGlzYwogSW5iYW5k VGV4dFRyYWNrUHJpdmF0ZTo6S2luZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGT2JqQzo6a2lu ZCgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX21lZGlhU2VsZWN0aW9uT3B0aW9uKQotICAgICAgICBy ZXR1cm4gTm9uZTsKKyAgICAgICAgcmV0dXJuIEluYmFuZFRleHRUcmFja1ByaXZhdGU6Ok5vbmU7 CiAKICAgICBOU1N0cmluZyAqbWVkaWFUeXBlID0gW21fbWVkaWFTZWxlY3Rpb25PcHRpb24gbWVk aWFUeXBlXTsKICAgICAKICAgICBpZiAoW21lZGlhVHlwZSBpc0VxdWFsVG9TdHJpbmc6QVZNZWRp YVR5cGVDbG9zZWRDYXB0aW9uXSkKLSAgICAgICAgcmV0dXJuIENhcHRpb25zOworICAgICAgICBy ZXR1cm4gSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZTo6Q2FwdGlvbnM7CiAgICAgaWYgKFttZWRpYVR5 cGUgaXNFcXVhbFRvU3RyaW5nOkFWTWVkaWFUeXBlU3VidGl0bGVdKSB7CiAKICAgICAgICAgaWYg KFttX21lZGlhU2VsZWN0aW9uT3B0aW9uIGhhc01lZGlhQ2hhcmFjdGVyaXN0aWM6QVZNZWRpYUNo YXJhY3RlcmlzdGljQ29udGFpbnNPbmx5Rm9yY2VkU3VidGl0bGVzXSkKLSAgICAgICAgICAgIHJl dHVybiBGb3JjZWQ7CisgICAgICAgICAgICByZXR1cm4gSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZTo6 Rm9yY2VkOwogCiAgICAgICAgIC8vIEFuICJTREgiIHRyYWNrIGlzIGEgc3VidGl0bGUgdHJhY2sg Y3JlYXRlZCBmb3IgdGhlIGRlYWYgb3IgaGFyZC1vZi1oZWFyaW5nLiAiY2FwdGlvbnMiIGluIFdl YlZUVCBhcmUKICAgICAgICAgLy8gImxhYmVsZWQgYXMgYXBwcm9wcmlhdGUgZm9yIHRoZSBoYXJk LW9mLWhlYXJpbmciLCBzbyB0YWcgU0RIIHN1dGl0bGVzIGFzICJjYXB0aW9ucyIuCiAgICAgICAg IGlmIChbbV9tZWRpYVNlbGVjdGlvbk9wdGlvbiBoYXNNZWRpYUNoYXJhY3RlcmlzdGljOkFWTWVk aWFDaGFyYWN0ZXJpc3RpY1RyYW5zY3JpYmVzU3Bva2VuRGlhbG9nRm9yQWNjZXNzaWJpbGl0eV0p Ci0gICAgICAgICAgICByZXR1cm4gQ2FwdGlvbnM7CisgICAgICAgICAgICByZXR1cm4gSW5iYW5k VGV4dFRyYWNrUHJpdmF0ZTo6Q2FwdGlvbnM7CiAgICAgICAgIGlmIChbbV9tZWRpYVNlbGVjdGlv bk9wdGlvbiBoYXNNZWRpYUNoYXJhY3RlcmlzdGljOkFWTWVkaWFDaGFyYWN0ZXJpc3RpY0Rlc2Ny aWJlc011c2ljQW5kU291bmRGb3JBY2Nlc3NpYmlsaXR5XSkKLSAgICAgICAgICAgIHJldHVybiBD YXB0aW9uczsKKyAgICAgICAgICAgIHJldHVybiBJbmJhbmRUZXh0VHJhY2tQcml2YXRlOjpDYXB0 aW9uczsKICAgICAgICAgCi0gICAgICAgIHJldHVybiBTdWJ0aXRsZXM7CisgICAgICAgIHJldHVy biBJbmJhbmRUZXh0VHJhY2tQcml2YXRlOjpTdWJ0aXRsZXM7CiAgICAgfQogCi0gICAgcmV0dXJu IENhcHRpb25zOworICAgIHJldHVybiBJbmJhbmRUZXh0VHJhY2tQcml2YXRlOjpDYXB0aW9uczsK IH0KIAogYm9vbCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGT2JqQzo6aXNDbG9zZWRDYXB0aW9u cygpIGNvbnN0Cg==