35789 2010-03-05 07:24:24 -0800 OSX: Implement 'preload=none' 2010-03-05 14:25:31 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson oldest_to_newest 196416 0 eric.carlson 2010-03-05 07:24:24 -0800 https://bugs.webkit.org/show_bug.cgi?id=35385 added support for the 'preload' attribute to the media element. That patch only dealt with parsing the attribute and passing it down to the media engine, actually making it work requires support in the media engine. This bug is for the work in the OSX media engine. 196417 1 50095 eric.carlson 2010-03-05 07:26:50 -0800 Created attachment 50095 Proposed patch. 196465 2 50095 adele 2010-03-05 08:52:55 -0800 Comment on attachment 50095 Proposed patch. > @@ -746,7 +775,7 @@ bool MediaPlayerPrivate::hasAudio() cons > bool MediaPlayerPrivate::supportsFullscreen() const > { > #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) > - return true; > + return metaDataAvailable(); > #else > // See <rdar://problem/7389945> > return false; I don't think this change is covered in the ChangeLog - is this related? 196468 3 eric.carlson 2010-03-05 08:55:14 -0800 (In reply to comment #2) > (From update of attachment 50095 [details]) > > @@ -746,7 +775,7 @@ bool MediaPlayerPrivate::hasAudio() cons > > bool MediaPlayerPrivate::supportsFullscreen() const > > { > > #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) > > - return true; > > + return metaDataAvailable(); > > #else > > // See <rdar://problem/7389945> > > return false; > > I don't think this change is covered in the ChangeLog - is this related? Oops, that is for another bug. 196470 4 50095 adele 2010-03-05 09:04:47 -0800 Comment on attachment 50095 Proposed patch. ok- r=me minus that part of the patch. 196476 5 eric.carlson 2010-03-05 09:14:55 -0800 http://trac.webkit.org/changeset/55587 50095 2010-03-05 07:26:50 -0800 2010-03-05 14:25:21 -0800 Proposed patch. patch_3.txt text/plain 13919 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTU1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMTAtMDMtMDQgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzc3MTg0NDI+IEltcGxlbWVudCAncHJlbG9hZD1ub25lJworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU3ODkKKworICAg ICAgICBEb24ndCBsb2FkIGFueSBtZWRpYSBkYXRhIHdoZW4gcHJlbG9hZCBpcyAnbm9uZScuCisK KyAgICAgICAgVGVzdDogbWVkaWEvdmlkZW8tcHJlbG9hZC5odG1sCisKKyAgICAgICAgKiBodG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVu dDo6bG9hZFJlc291cmNlKTogRG9uJ3QgY2FsbCBwbGF5ZXIncyBzZXRQcmVsb2FkIG1ldGhvZAor ICAgICAgICAgICAgd2hlbiBhdXRvcGxheSBpcyBzZXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9NZWRpYVBsYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6 c2V0UHJlbG9hZCk6IFNldCBtX3ByZWxvYWQgc28gd2UgaGF2ZSB0aGUgY29ycmVjdCB2YWx1ZSB3 aGVuCisgICAgICAgICAgICB0aGUgbWVkaWEgZW5naW5lIGlzIGNyZWF0ZWQuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQuaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQubW06Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGU6Ok1lZGlhUGxheWVyUHJpdmF0ZSk6 IEluaXRpYWxpemUgbV9wcmVsb2FkLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlOjpyZXN1bWVMb2FkKTogTmV3LCBraWNrIG9mZiBwb3N0cG9uZWQgYSBsb2FkLgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpsb2FkKTogRG8gbm90aGluZyBpZiBwcmVs b2FkIGlzICdub25lJworICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpsb2Fk SW50ZXJuYWwpOiBOZXcsIGNvbXBsZXRlIGxvYWRpbmcuCisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGU6OnByZXBhcmVUb1BsYXkpOiBOZXcsIHJlc3VtZSBhIHBvc3Rwb25lZCBs b2FkIGFzIHNvbWVvbmUKKyAgICAgICAgICAgIGhhcyBjYWxsZWQgcGxheSgpLgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpzZXRQcmVsb2FkKTogTmV3LCBzZXQgbV9wcmVs b2FkLgorCiAyMDEwLTAzLTA0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIEJ1aWxkIGZpeC4KSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJ KHJldmlzaW9uIDU1NDYzKQorKysgV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02MDEsNyArNjAxLDggQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojps b2FkUmVzb3VyY2UoY29ucwogICAgICAgICBtX3BsYXllciA9IE1lZGlhUGxheWVyOjpjcmVhdGUo dGhpcyk7CiAjZW5kaWYKIAotICAgIG1fcGxheWVyLT5zZXRQcmVsb2FkKG1fcHJlbG9hZCk7Cisg ICAgaWYgKCFhdXRvcGxheSgpKQorICAgICAgICBtX3BsYXllci0+c2V0UHJlbG9hZChtX3ByZWxv YWQpOwogICAgIG1fcGxheWVyLT5zZXRQcmVzZXJ2ZXNQaXRjaChtX3dlYmtpdFByZXNlcnZlc1Bp dGNoKTsKICAgICB1cGRhdGVWb2x1bWUoKTsKIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9NZWRpYVBsYXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9NZWRpYVBsYXllci5jcHAJKHJldmlzaW9uIDU1NDYzKQorKysgV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4OSw2ICs0ODks NyBAQCBNZWRpYVBsYXllcjo6UHJlbG9hZCBNZWRpYVBsYXllcjo6cHJlbG9hCiAKIHZvaWQgTWVk aWFQbGF5ZXI6OnNldFByZWxvYWQoTWVkaWFQbGF5ZXI6OlByZWxvYWQgcHJlbG9hZCkKIHsKKyAg ICBtX3ByZWxvYWQgPSBwcmVsb2FkOwogICAgIG1fcHJpdmF0ZS0+c2V0UHJlbG9hZChwcmVsb2Fk KTsKIH0KIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQ cml2YXRlUVRLaXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21h Yy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5oCShyZXZpc2lvbiA1NTQ2MikKKysrIFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0LmgJKHdvcmtpbmcg Y29weSkKQEAgLTU5LDcgKzU5LDYgQEAgY2xhc3MgTWVkaWFQbGF5ZXJQcml2YXRlIDogcHVibGlj IE1lZGlhUAogcHVibGljOgogICAgIHN0YXRpYyB2b2lkIHJlZ2lzdGVyTWVkaWFFbmdpbmUoTWVk aWFFbmdpbmVSZWdpc3RyYXIpOwogCi0gICAgfk1lZGlhUGxheWVyUHJpdmF0ZSgpOwogCiAgICAg dm9pZCByZXBhaW50KCk7CiAgICAgdm9pZCBsb2FkU3RhdGVDaGFuZ2VkKCk7CkBAIC03MCw2ICs2 OSw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBNZWRpYVBsYXllclByaXZhdGUoTWVkaWFQ bGF5ZXIqKTsKKyAgICB+TWVkaWFQbGF5ZXJQcml2YXRlKCk7CiAKICAgICAvLyBlbmdpbmUgc3Vw cG9ydAogICAgIHN0YXRpYyBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UqIGNyZWF0ZShNZWRp YVBsYXllciogcGxheWVyKTsKQEAgLTg5LDkgKzg5LDEyIEBAIHByaXZhdGU6CiAgICAgCiAgICAg dm9pZCBsb2FkKGNvbnN0IFN0cmluZyYgdXJsKTsKICAgICB2b2lkIGNhbmNlbExvYWQoKTsKKyAg ICB2b2lkIGxvYWRJbnRlcm5hbChjb25zdCBTdHJpbmcmIHVybCk7CisgICAgdm9pZCByZXN1bWVM b2FkKCk7CiAgICAgCiAgICAgdm9pZCBwbGF5KCk7CiAgICAgdm9pZCBwYXVzZSgpOyAgICAKKyAg ICB2b2lkIHByZXBhcmVUb1BsYXkoKTsKICAgICAKICAgICBib29sIHBhdXNlZCgpIGNvbnN0Owog ICAgIGJvb2wgc2Vla2luZygpIGNvbnN0OwpAQCAtMTA3LDYgKzExMCw4IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBoYXNDbG9zZWRDYXB0aW9ucygpIGNvbnN0OwogICAgIHZvaWQgc2V0Q2xvc2VkQ2Fw dGlvbnNWaXNpYmxlKGJvb2wpOwogCisgICAgdm9pZCBzZXRQcmVsb2FkKE1lZGlhUGxheWVyOjpQ cmVsb2FkKTsKKwogICAgIE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgbmV0d29ya1N0YXRlKCkg Y29uc3QgeyByZXR1cm4gbV9uZXR3b3JrU3RhdGU7IH0KICAgICBNZWRpYVBsYXllcjo6UmVhZHlT dGF0ZSByZWFkeVN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9yZWFkeVN0YXRlOyB9CiAgICAgCkBA IC0xNzIsNiArMTc3LDcgQEAgcHJpdmF0ZToKICAgICBSZXRhaW5QdHI8UVRNb3ZpZVZpZXc+IG1f cXRNb3ZpZVZpZXc7CiAgICAgUmV0YWluUHRyPFFUVmlkZW9SZW5kZXJlcldlYktpdE9ubHk+IG1f cXRWaWRlb1JlbmRlcmVyOwogICAgIFJldGFpblB0cjxXZWJDb3JlTW92aWVPYnNlcnZlcj4gbV9v YmpjT2JzZXJ2ZXI7CisgICAgU3RyaW5nIG1fbW92aWVVUkw7CiAgICAgZmxvYXQgbV9zZWVrVG87 CiAgICAgVGltZXI8TWVkaWFQbGF5ZXJQcml2YXRlPiBtX3NlZWtUaW1lcjsKICAgICBNZWRpYVBs YXllcjo6TmV0d29ya1N0YXRlIG1fbmV0d29ya1N0YXRlOwpAQCAtMTg0LDExICsxOTAsMTMgQEAg cHJpdmF0ZToKICAgICBmbG9hdCBtX2NhY2hlZER1cmF0aW9uOwogICAgIGZsb2F0IG1fdGltZVRv UmVzdG9yZTsKICAgICBSZXRhaW5QdHI8UVRNb3ZpZUxheWVyPiBtX3F0VmlkZW9MYXllcjsKKyAg ICBNZWRpYVBsYXllcjo6UHJlbG9hZCBtX3ByZWxvYWQ7CiAgICAgYm9vbCBtX3N0YXJ0ZWRQbGF5 aW5nOwogICAgIGJvb2wgbV9pc1N0cmVhbWluZzsKICAgICBib29sIG1fdmlzaWJsZTsKICAgICBi b29sIG1faGFzVW5zdXBwb3J0ZWRUcmFja3M7CiAgICAgYm9vbCBtX3ZpZGVvRnJhbWVIYXNEcmF3 bjsKKyAgICBib29sIG1fZGVsYXlpbmdMb2FkOwogI2lmIERSQVdfRlJBTUVfUkFURQogICAgIGlu dCAgbV9mcmFtZUNvdW50V2hpbGVQbGF5aW5nOwogICAgIGRvdWJsZSBtX3RpbWVTdGFydGVkUGxh eWluZzsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJp dmF0ZVFUS2l0Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFj L01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tCShyZXZpc2lvbiA1NTQ2MikKKysrIFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tCSh3b3JraW5n IGNvcHkpCkBAIC0yMTEsNiArMjExLDcgQEAgTWVkaWFQbGF5ZXJQcml2YXRlOjpNZWRpYVBsYXll clByaXZhdGUoTQogICAgICwgbV9yZXBvcnRlZER1cmF0aW9uKC0xKQogICAgICwgbV9jYWNoZWRE dXJhdGlvbigtMSkKICAgICAsIG1fdGltZVRvUmVzdG9yZSgtMSkKKyAgICAsIG1fcHJlbG9hZChN ZWRpYVBsYXllcjo6QXV0bykKICAgICAsIG1fc3RhcnRlZFBsYXlpbmcoZmFsc2UpCiAgICAgLCBt X2lzU3RyZWFtaW5nKGZhbHNlKQogICAgICwgbV92aXNpYmxlKGZhbHNlKQpAQCAtNTQ5LDggKzU1 MCwzMCBAQCBRVFRpbWUgTWVkaWFQbGF5ZXJQcml2YXRlOjpjcmVhdGVRVFRpbWUoCiAgICAgcmV0 dXJuIFFUTWFrZVRpbWUodGltZSAqIHRpbWVTY2FsZSwgdGltZVNjYWxlKTsKIH0KIAordm9pZCBN ZWRpYVBsYXllclByaXZhdGU6OnJlc3VtZUxvYWQoKQoreworICAgIG1fZGVsYXlpbmdMb2FkID0g ZmFsc2U7CisKKyAgICBpZiAobV9tb3ZpZVVSTCkKKyAgICAgICAgbG9hZEludGVybmFsKG1fbW92 aWVVUkwpOworfQorCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6bG9hZChjb25zdCBTdHJpbmcm IHVybCkKIHsKKyAgICBtX21vdmllVVJMID0gdXJsOworCisgICAgLy8gSWYgdGhlIGVsZW1lbnQg aXMgbm90IHN1cHBvc2VkIHRvIGxvYWQgYW55IGRhdGEgcmV0dXJuIGltbWVkaWF0ZWx5IGJlY2F1 c2UgUVRLaXQKKyAgICAvLyBkb2Vzbid0IGhhdmUgQVBJIHRvIHRocm90dGxlIGxvYWRpbmcuCisg ICAgaWYgKG1fcHJlbG9hZCA9PSBNZWRpYVBsYXllcjo6Tm9uZSkgeworICAgICAgICBtX2RlbGF5 aW5nTG9hZCA9IHRydWU7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBsb2FkSW50ZXJu YWwodXJsKTsKK30KKwordm9pZCBNZWRpYVBsYXllclByaXZhdGU6OmxvYWRJbnRlcm5hbChjb25z dCBTdHJpbmcmIHVybCkKK3sKICAgICBpZiAobV9uZXR3b3JrU3RhdGUgIT0gTWVkaWFQbGF5ZXI6 OkxvYWRpbmcpIHsKICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6TG9hZGlu ZzsKICAgICAgICAgbV9wbGF5ZXItPm5ldHdvcmtTdGF0ZUNoYW5nZWQoKTsKQEAgLTU3MCw2ICs1 OTMsMTIgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGU6OmxvYWQoY29uc3QgU3RyaQogICAgIFtt X29iamNPYnNlcnZlci5nZXQoKSBzZXREZWxheUNhbGxiYWNrczpOT107CiB9CiAKK3ZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlOjpwcmVwYXJlVG9QbGF5KCkKK3sKKyAgICBpZiAoIW1fcXRNb3ZpZSB8 fCBtX2RlbGF5aW5nTG9hZCkKKyAgICAgICAgcmVzdW1lTG9hZCgpOworfQorCiBQbGF0Zm9ybU1l ZGlhIE1lZGlhUGxheWVyUHJpdmF0ZTo6cGxhdGZvcm1NZWRpYSgpIGNvbnN0CiB7CiAgICAgUGxh dGZvcm1NZWRpYSBwbGFmdGZvcm1NZWRpYSA9IHsgbV9xdE1vdmllLmdldCgpIH07CkBAIC03NDYs NyArNzc1LDcgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGU6Omhhc0F1ZGlvKCkgY29ucwogYm9v bCBNZWRpYVBsYXllclByaXZhdGU6OnN1cHBvcnRzRnVsbHNjcmVlbigpIGNvbnN0CiB7CiAjaWYg IWRlZmluZWQoQlVJTERJTkdfT05fVElHRVIpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BB UkQpCi0gICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIG1ldGFEYXRhQXZhaWxhYmxlKCk7CiAj ZWxzZQogICAgIC8vIFNlZSA8cmRhcjovL3Byb2JsZW0vNzM4OTk0NT4KICAgICByZXR1cm4gZmFs c2U7CkBAIC0xNDM3LDYgKzE0NjYsMTIgQEAgTWVkaWFQbGF5ZXI6Ok1vdmllTG9hZFR5cGUgTWVk aWFQbGF5ZXJQcgogICAgIHJldHVybiBtb3ZpZVR5cGU7CiB9CiAKK3ZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlOjpzZXRQcmVsb2FkKE1lZGlhUGxheWVyOjpQcmVsb2FkIHByZWxvYWQpCit7CisgICAg bV9wcmVsb2FkID0gcHJlbG9hZDsKKyAgICBpZiAobV9kZWxheWluZ0xvYWQgJiYgbV9wcmVsb2Fk ICE9IE1lZGlhUGxheWVyOjpOb25lKQorICAgICAgICByZXN1bWVMb2FkKCk7Cit9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNTU1NTQpCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wMy0w NCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzcxODQ0 Mj4gSW1wbGVtZW50ICdwcmVsb2FkPW5vbmUnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zNTc4OQorCisgICAgICAgIEZ1bmN0aW9uYWwgdGVzdCBvZiB0 aGUgJ3Byb2xvYWQnIGF0dHJpYnV0ZS4KKworICAgICAgICAqIG1lZGlhL3ZpZGVvLXByZWxvYWQt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS92aWRlby1wcmVsb2FkLmh0bWw6 IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9Ta2lwcGVkOiBTa2lwIG9uIFdpbmRvd3Mg Zm9yIG5vdy4KKwogMjAxMC0wMy0wNCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KSW5kZXg6IExheW91dFRlc3RzL21l ZGlhL3ZpZGVvLXByZWxvYWQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L21lZGlhL3ZpZGVvLXByZWxvYWQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvbWVkaWEvdmlkZW8tcHJlbG9hZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0w LDAgKzEsMzYgQEAKK1Rlc3QgdG8gc2VlIGlmIG1lZGlhIGxvYWRzIGF1dG9tYXRpY2FsbHkgd2hl biAncHJlbG9hZCcgaXMgc3BlY2lmaWVkLgorCisKK1dpbGwgbG9hZCAiY29udGVudC9zaWxlbmNl Lm1wZyIgd2l0aCAncHJlbG9hZD1ub25lJywgc2hvdWxkIG5vdCBidWZmZXIgYXV0b21hdGljYWxs eSB1bnRpbCAncGxheSgpJyBpcyBjYWxsZWQKK1JVTih2aWRlby5zZXRBdHRyaWJ1dGUoJ3ByZWxv YWQnLCAnbm9uZScpKQorUlVOKHZpZGVvLnJlbW92ZUF0dHJpYnV0ZSgnYXV0b3BsYXknKSkKK0VW RU5UKGxvYWRzdGFydCkKK2RpZCBub3QgYnVmZmVyIGF1dG9tYXRpY2FsbHkgT0sKK1JVTih2aWRl by5wbGF5KCkpCitFVkVOVChwbGF5KQorRVZFTlQobG9hZGVkbWV0YWRhdGEpCitidWZmZXJlZCBh dXRvbWF0aWNhbGx5IE9LCisKK1dpbGwgbG9hZCAiY29udGVudC9zaWxlbmNlLm1wZyIgd2l0aCAn cHJlbG9hZD1tZXRhZGF0YScsIHNob3VsZCBidWZmZXIgYXV0b21hdGljYWxseSAKK1JVTih2aWRl by5zZXRBdHRyaWJ1dGUoJ3ByZWxvYWQnLCAnbWV0YWRhdGEnKSkKK1JVTih2aWRlby5yZW1vdmVB dHRyaWJ1dGUoJ2F1dG9wbGF5JykpCitFVkVOVChsb2Fkc3RhcnQpCitFVkVOVChsb2FkZWRtZXRh ZGF0YSkKK2J1ZmZlcmVkIGF1dG9tYXRpY2FsbHkgT0sKKworV2lsbCBsb2FkICJjb250ZW50L3Np bGVuY2UubXBnIiB3aXRoICdwcmVsb2FkPWF1dG8nLCBzaG91bGQgYnVmZmVyIGF1dG9tYXRpY2Fs bHkgCitSVU4odmlkZW8uc2V0QXR0cmlidXRlKCdwcmVsb2FkJywgJ2F1dG8nKSkKK1JVTih2aWRl by5yZW1vdmVBdHRyaWJ1dGUoJ2F1dG9wbGF5JykpCitFVkVOVChsb2Fkc3RhcnQpCitFVkVOVChs b2FkZWRtZXRhZGF0YSkKK2J1ZmZlcmVkIGF1dG9tYXRpY2FsbHkgT0sKKworV2lsbCBsb2FkICJj b250ZW50L3NpbGVuY2UubXBnIiB3aXRoICdwcmVsb2FkPW5vbmUnLCBzaG91bGQgYnVmZmVyIGF1 dG9tYXRpY2FsbHkgYmVjYXVzZSBvZiAnYXV0b3BsYXknCitSVU4odmlkZW8uc2V0QXR0cmlidXRl KCdwcmVsb2FkJywgJ25vbmUnKSkKK1JVTih2aWRlby5zZXRBdHRyaWJ1dGUoJ2F1dG9wbGF5Jywg J3RydWUnKSkKK0VWRU5UKGxvYWRzdGFydCkKK0VWRU5UKGxvYWRlZG1ldGFkYXRhKQorYnVmZmVy ZWQgYXV0b21hdGljYWxseSBPSworCitFTkQgT0YgVEVTVAorCkluZGV4OiBMYXlvdXRUZXN0cy9t ZWRpYS92aWRlby1wcmVsb2FkLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEv dmlkZW8tcHJlbG9hZC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdmlk ZW8tcHJlbG9hZC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEyNCBAQAorPCFET0NUWVBF IEhUTUw+CisKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2NyaXB0IHNyYz1tZWRpYS1m aWxlLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz12aWRlby10ZXN0LmpzPjwvc2Ny aXB0PgorCisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICB2YXIgdGltZXIgPSBudWxsOwor ICAgICAgICAgICAgdmFyIG1vdmllSW5mbyA9IAorICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIGN1cnJlbnQgOiAtMSwKKyAgICAgICAgICAgICAgICBtb3ZpZXMgOiAKKyAgICAgICAgICAg ICAgICBbIAorICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICAv LyBzaG91bGQgbm90IGJ1ZmZlciwgJ3ByZWxvYWQnIGlzICdub25lJworICAgICAgICAgICAgICAg ICAgICAgICAgdXJsIDogImNvbnRlbnQvc2lsZW5jZS5tcGciLCAKKyAgICAgICAgICAgICAgICAg ICAgICAgIHByZWxvYWQgOiAibm9uZSIsCisgICAgICAgICAgICAgICAgICAgICAgICBzaG91bGRC dWZmZXIgOiBmYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGF1dG9QbGF5IDogZmFsc2Us CisgICAgICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdGlvbiA6ICJ1bnRpbCAncGxheSgpJyBp cyBjYWxsZWQiLCAKKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAg eworICAgICAgICAgICAgICAgICAgICAgICAgdXJsIDogImNvbnRlbnQvc2lsZW5jZS5tcGciLCAK KyAgICAgICAgICAgICAgICAgICAgICAgIHByZWxvYWQgOiAibWV0YWRhdGEiLAorICAgICAgICAg ICAgICAgICAgICAgICAgc2hvdWxkQnVmZmVyIDogdHJ1ZSwKKyAgICAgICAgICAgICAgICAgICAg ICAgIGF1dG9QbGF5IDogZmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdGlv biA6ICIiLCAKKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgICAgICAgICAgdXJsIDogImNvbnRlbnQvc2lsZW5jZS5tcGciLCAKKyAg ICAgICAgICAgICAgICAgICAgICAgIHByZWxvYWQgOiAiYXV0byIsCisgICAgICAgICAgICAgICAg ICAgICAgICBzaG91bGRCdWZmZXIgOiB0cnVlLAorICAgICAgICAgICAgICAgICAgICAgICAgYXV0 b1BsYXkgOiBmYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGRlc2NyaXB0aW9uIDogIiIs IAorICAgICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgICAgICAgICAvLyBzaG91bGQgYnVmZmVyIGJlY2F1c2UgJ2F1dG9wbGF5JyBpcyBz ZXQKKyAgICAgICAgICAgICAgICAgICAgICAgIHVybCA6ICJjb250ZW50L3NpbGVuY2UubXBnIiwg CisgICAgICAgICAgICAgICAgICAgICAgICBwcmVsb2FkIDogIm5vbmUiLAorICAgICAgICAgICAg ICAgICAgICAgICAgc2hvdWxkQnVmZmVyIDogdHJ1ZSwKKyAgICAgICAgICAgICAgICAgICAgICAg IGF1dG9QbGF5IDogdHJ1ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGRlc2NyaXB0aW9uIDog IiBiZWNhdXNlIG9mICdhdXRvcGxheSciLCAKKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAg ICAgICAgICAgICBdCisgICAgICAgICAgICB9OworICAgICAgICAgICAgdmFyIHRpbWVyID0gbnVs bDsKKworICAgICAgICAgICAgZnVuY3Rpb24gY2hlY2tMb2FkKCkKKyAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICB2YXIgbW92aWUgPSBtb3ZpZUluZm8ubW92aWVzW21vdmllSW5mby5jdXJy ZW50XTsKKworICAgICAgICAgICAgICAgIGxvZ1Jlc3VsdCh0cnVlLCAiZGlkIG5vdCBidWZmZXIg YXV0b21hdGljYWxseSIpOworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIC8vIHN0 YXJ0IHBsYXliYWNrLCB3aGljaCBzaG91bGQgZm9yY2UgZGF0YSB0byBsb2FkCisgICAgICAgICAg ICAgICAgbW92aWUuc2hvdWxkQnVmZmVyID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBydW4oInZp ZGVvLnBsYXkoKSIpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBsb2Fk ZWRtZXRhZGF0YSgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdmFyIG1vdmllID0g bW92aWVJbmZvLm1vdmllc1ttb3ZpZUluZm8uY3VycmVudF07CisKKyAgICAgICAgICAgICAgICBj bGVhclRpbWVvdXQodGltZXIpOworICAgICAgICAgICAgICAgIGxvZ1Jlc3VsdChtb3ZpZS5zaG91 bGRCdWZmZXIsICJidWZmZXJlZCBhdXRvbWF0aWNhbGx5Iik7CisgICAgICAgICAgICAgICAgb3Bl bk5leHRNb3ZpZSgpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBzZXR1 cEF0dHJpYnV0ZShhdHRyLCB2YWx1ZSkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBp ZiAodmFsdWUpCisgICAgICAgICAgICAgICAgICAgIHJ1bigidmlkZW8uc2V0QXR0cmlidXRlKCci ICsgYXR0ciArICInLCAnIiArIHZhbHVlICsgIicpIik7CisgICAgICAgICAgICAgICAgZWxzZQor ICAgICAgICAgICAgICAgICAgICBydW4oInZpZGVvLnJlbW92ZUF0dHJpYnV0ZSgnIiArIGF0dHIg KyAiJykiKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gb3Blbk5leHRN b3ZpZSgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsK KworICAgICAgICAgICAgICAgIG1vdmllSW5mby5jdXJyZW50Kys7CisgICAgICAgICAgICAgICAg aWYgKG1vdmllSW5mby5jdXJyZW50ID49IG1vdmllSW5mby5tb3ZpZXMubGVuZ3RoKQorICAgICAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAgICAg ICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgdmFy IG1vdmllID0gbW92aWVJbmZvLm1vdmllc1ttb3ZpZUluZm8uY3VycmVudF07CisgICAgICAgICAg ICAgICAgdmFyIGRlc2MgPSAiV2lsbCBsb2FkIDxlbT5cIiIrIG1vdmllLnVybCArICJcIjwvZW0+ IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICsgIiB3aXRoIDxlbT4ncHJlbG9hZD0iICsg bW92aWUucHJlbG9hZCArICInPC9lbT4iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyAi LCA8Yj5zaG91bGQiICsgKG1vdmllLnNob3VsZEJ1ZmZlciA/ICIiIDogIiBub3QiKSArICIgPC9i PiBidWZmZXIgYXV0b21hdGljYWxseSAiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyBt b3ZpZS5kZXNjcmlwdGlvbjsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoZGVzYyk7CisK KyAgICAgICAgICAgICAgICBzZXR1cEF0dHJpYnV0ZSgncHJlbG9hZCcsIG1vdmllLnByZWxvYWQp OworICAgICAgICAgICAgICAgIHNldHVwQXR0cmlidXRlKCdhdXRvcGxheScsIG1vdmllLmF1dG9Q bGF5KTsKKworICAgICAgICAgICAgICAgIHZpZGVvLnNyYyA9IG1vdmllLnVybDsKKyAgICAgICAg ICAgICAgICBpZiAobW92aWVJbmZvLmN1cnJlbnQgPiAwKQorICAgICAgICAgICAgICAgICAgICB2 aWRlby5sb2FkKCk7CisgICAgICAgICAgICAgICAgaWYgKCFtb3ZpZS5zaG91bGRCdWZmZXIpCisg ICAgICAgICAgICAgICAgICAgIHRpbWVyID0gc2V0VGltZW91dChjaGVja0xvYWQsIDIwMCk7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGZ1bmN0aW9uIHN0YXJ0KCkK KyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisKKyAg ICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoImVycm9yIik7CisgICAgICAgICAgICAgICAgd2Fp dEZvckV2ZW50KCJsb2Fkc3RhcnQiKTsKKyAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoInBs YXkiKTsKKyAgICAgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoJ2xvYWRlZG1ldGFkYXRhJywgbG9h ZGVkbWV0YWRhdGEpOworICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgb3Blbk5leHRNb3Zp ZSgpOworICAgICAgICAgICAgfQorCisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKwor ICAgIDxib2R5IG9ubG9hZD0ic3RhcnQoKSI+CisgICAgICAgIDxwPlRlc3QgdG8gc2VlIGlmIG1l ZGlhIGxvYWRzIGF1dG9tYXRpY2FsbHkgd2hlbiAncHJlbG9hZCcgaXMgc3BlY2lmaWVkLjwvcD4K KyAgICAgICAgPHZpZGVvIGNvbnRyb2xzID48L3ZpZGVvPgorICAgIDwvYm9keT4KKzwvaHRtbD4K SW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkCShyZXZpc2lvbiA1NTM5NykKKysrIExheW91 dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkCSh3b3JraW5nIGNvcHkpCkBAIC03NzAsMyArNzcw LDYgQEAgZmFzdC9sb2FkZXIvYXBpLXRlc3QtbmV3LXdpbmRvdy1kYXRhLWxvYQogCiAjIER1bXBS ZW5kZXJUcmVlIGNvZGUgdG8gZW5hYmxlIEphdmEgaXMgY3VycmVudGx5IGEgbm8tb3AuIFdpbmRv d3MgZG9lc24ndCBjb21lIHdpdGggSmF2YSBieSBkZWZhdWx0LgogamF2YQorCisjIDxyZGFyOi8v cHJvYmxlbS83NzE4NDQyPiBJbXBsZW1lbnQgJ3ByZWxvYWQ9bm9uZScKK21lZGlhL3ZpZGVvLXBy ZWxvYWQuaHRtbAo=