63198 2011-06-22 16:06:51 -0700 Use create() method for AsyncAudioDecoder::DecodingTask 2011-06-22 17:02:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 crogers crogers dglazkov levin webkit.review.bot oldest_to_newest 425701 0 crogers 2011-06-22 16:06:51 -0700 Use create() method for AsyncAudioDecoder 425707 1 98259 crogers 2011-06-22 16:10:37 -0700 Created attachment 98259 Patch 425708 2 crogers 2011-06-22 16:11:34 -0700 This addresses a missed review comment by David Levin. 425719 3 98259 levin 2011-06-22 16:26:30 -0700 Comment on attachment 98259 Patch Miscommunication. 425731 4 98264 crogers 2011-06-22 16:41:54 -0700 Created attachment 98264 Patch 425732 5 crogers 2011-06-22 16:44:01 -0700 sorry David, uploading one more patch with the create method implementation in the .cpp file 425733 6 98264 webkit.review.bot 2011-06-22 16:46:09 -0700 Comment on attachment 98264 Patch Attachment 98264 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/8926722 425735 7 98264 levin 2011-06-22 16:47:15 -0700 Comment on attachment 98264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98264&action=review Feel free to do your move to the cpp file on checkin (and the chromium build fix). > Source/WebCore/webaudio/AsyncAudioDecoder.h:56 > + static OwnPtr<DecodingTask> create(ArrayBuffer* audioData, double sampleRate, PassRefPtr<AudioBufferCallback> successCallback, PassRefPtr<AudioBufferCallback> errorCallback) Return type should be PassOwnPtr. (I thought we checked this, but if not, I'll add a style check quickly.) 425737 8 98265 crogers 2011-06-22 16:52:01 -0700 Created attachment 98265 Patch 425740 9 98265 levin 2011-06-22 16:53:33 -0700 Comment on attachment 98265 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98265&action=review > Source/WebCore/webaudio/AsyncAudioDecoder.h:56 > + static OwnPtr<DecodingTask> create(ArrayBuffer* audioData, double sampleRate, PassRefPtr<AudioBufferCallback> successCallback, PassRefPtr<AudioBufferCallback> errorCallback); PassOwnPtr :) Filed bug https://bugs.webkit.org/show_bug.cgi?id=63204 (I'll have a patch up soon.) 425750 10 crogers 2011-06-22 17:02:09 -0700 Committed r89499: <http://trac.webkit.org/changeset/89499> 98259 2011-06-22 16:10:37 -0700 2011-06-22 16:41:50 -0700 Patch bug-63198-20110622161036.patch text/plain 3196 crogers SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5NDkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDYtMjIgIENocmlzIFJv Z2VycyAgPGNyb2dlcnNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2UgY3JlYXRlKCkgbWV0aG9kIGZvciBBc3luY0F1ZGlvRGVj b2RlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjMx OTgKKworICAgICAgICBObyBuZXcgdGVzdHMuICBUaGlzIG1ha2VzIG5vIGNoYW5nZXMgdG8gdGhl IEpTIEFQSS4KKworICAgICAgICAqIHdlYmF1ZGlvL0FzeW5jQXVkaW9EZWNvZGVyLmg6CisgICAg ICAgIChXZWJDb3JlOjpBc3luY0F1ZGlvRGVjb2Rlcjo6Y3JlYXRlKToKKyAgICAgICAgKiB3ZWJh dWRpby9BdWRpb0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9Db250ZXh0Ojpj b25zdHJ1Y3RDb21tb24pOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9Db250ZXh0OjpkZWNvZGVB dWRpb0RhdGEpOgorICAgICAgICAqIHdlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oOgorCiAyMDExLTA2 LTIyICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmlr b2xhcyBaaW1tZXJtYW5uLgpJbmRleDogU291cmNlL1dlYkNvcmUvd2ViYXVkaW8vQXN5bmNBdWRp b0RlY29kZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS93ZWJhdWRpby9Bc3luY0F1 ZGlvRGVjb2Rlci5oCShyZXZpc2lvbiA4OTQ5MCkKKysrIFNvdXJjZS9XZWJDb3JlL3dlYmF1ZGlv L0FzeW5jQXVkaW9EZWNvZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDE0ICs0MSwyMSBAQCBj bGFzcyBBdWRpb0J1ZmZlckNhbGxiYWNrOwogLy8gVXBvbiBzdWNjZXNzZnVsIGRlY29kaW5nLCBh IGNvbXBsZXRpb24gY2FsbGJhY2sgd2lsbCBiZSBpbnZva2VkIHdpdGggdGhlIGRlY29kZWQgUENN IGRhdGEgaW4gYW4gQXVkaW9CdWZmZXIuCiAKIGNsYXNzIEFzeW5jQXVkaW9EZWNvZGVyIHsKKyAg ICBXVEZfTUFLRV9OT05DT1BZQUJMRShBc3luY0F1ZGlvRGVjb2Rlcik7CiBwdWJsaWM6Ci0gICAg QXN5bmNBdWRpb0RlY29kZXIoKTsKKyAgICBzdGF0aWMgUGFzc093blB0cjxBc3luY0F1ZGlvRGVj b2Rlcj4gY3JlYXRlKCkKKyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgQXN5bmNB dWRpb0RlY29kZXIoKSk7CisgICAgfQorICAgIAogICAgIH5Bc3luY0F1ZGlvRGVjb2RlcigpOwog CiAgICAgLy8gTXVzdCBiZSBjYWxsZWQgb24gdGhlIG1haW4gdGhyZWFkLgogICAgIHZvaWQgZGVj b2RlQXN5bmMoQXJyYXlCdWZmZXIqIGF1ZGlvRGF0YSwgZG91YmxlIHNhbXBsZVJhdGUsIFBhc3NS ZWZQdHI8QXVkaW9CdWZmZXJDYWxsYmFjaz4gc3VjY2Vzc0NhbGxiYWNrLCBQYXNzUmVmUHRyPEF1 ZGlvQnVmZmVyQ2FsbGJhY2s+IGVycm9yQ2FsbGJhY2spOwogCiBwcml2YXRlOgorICAgIEFzeW5j QXVkaW9EZWNvZGVyKCk7CisKICAgICBjbGFzcyBEZWNvZGluZ1Rhc2sgewogICAgICAgICBXVEZf TUFLRV9OT05DT1BZQUJMRShEZWNvZGluZ1Rhc2spOwogICAgIHB1YmxpYzoKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcAkocmV2aXNpb24gODk0OTApCisrKyBT b3VyY2UvV2ViQ29yZS93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xNDAsNiArMTQwLDcgQEAgdm9pZCBBdWRpb0NvbnRleHQ6OmNvbnN0cnVjdENvbW1vbigpCiAg ICAgCiAgICAgRkZURnJhbWU6OmluaXRpYWxpemUoKTsKICAgICAKKyAgICBtX2F1ZGlvRGVjb2Rl ciA9IEFzeW5jQXVkaW9EZWNvZGVyOjpjcmVhdGUoKTsgICAgCiAgICAgbV9saXN0ZW5lciA9IEF1 ZGlvTGlzdGVuZXI6OmNyZWF0ZSgpOwogICAgIG1fdGVtcG9yYXJ5TW9ub0J1cyA9IGFkb3B0UHRy KG5ldyBBdWRpb0J1cygxLCBBdWRpb05vZGU6OlByb2Nlc3NpbmdTaXplSW5GcmFtZXMpKTsKICAg ICBtX3RlbXBvcmFyeVN0ZXJlb0J1cyA9IGFkb3B0UHRyKG5ldyBBdWRpb0J1cygyLCBBdWRpb05v ZGU6OlByb2Nlc3NpbmdTaXplSW5GcmFtZXMpKTsKQEAgLTI1NCw3ICsyNTUsNyBAQCB2b2lkIEF1 ZGlvQ29udGV4dDo6ZGVjb2RlQXVkaW9EYXRhKEFycmF5CiAgICAgICAgIGVjID0gU1lOVEFYX0VS UjsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBtX2F1ZGlvRGVjb2Rlci5kZWNvZGVBc3lu YyhhdWRpb0RhdGEsIHNhbXBsZVJhdGUoKSwgc3VjY2Vzc0NhbGxiYWNrLCBlcnJvckNhbGxiYWNr KTsKKyAgICBtX2F1ZGlvRGVjb2Rlci0+ZGVjb2RlQXN5bmMoYXVkaW9EYXRhLCBzYW1wbGVSYXRl KCksIHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjayk7CiB9CiAKIFBhc3NSZWZQdHI8QXVk aW9CdWZmZXJTb3VyY2VOb2RlPiBBdWRpb0NvbnRleHQ6OmNyZWF0ZUJ1ZmZlclNvdXJjZSgpCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS93ZWJhdWRpby9BdWRpb0NvbnRleHQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS93ZWJhdWRpby9BdWRpb0NvbnRleHQuaAkocmV2aXNpb24gODk0OTAp CisrKyBTb3VyY2UvV2ViQ29yZS93ZWJhdWRpby9BdWRpb0NvbnRleHQuaAkod29ya2luZyBjb3B5 KQpAQCAtMjk3LDcgKzI5Nyw3IEBAIHByaXZhdGU6CiAgICAgCiAgICAgYm9vbCBtX2lzT2ZmbGlu ZUNvbnRleHQ7CiAKLSAgICBBc3luY0F1ZGlvRGVjb2RlciBtX2F1ZGlvRGVjb2RlcjsKKyAgICBP d25QdHI8QXN5bmNBdWRpb0RlY29kZXI+IG1fYXVkaW9EZWNvZGVyOwogfTsKIAogfSAvLyBXZWJD b3JlCg== 98264 2011-06-22 16:41:54 -0700 2011-06-22 16:51:58 -0700 Patch bug-63198-20110622164152.patch text/plain 3100 crogers SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5NDkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDYtMjIgIENocmlzIFJv Z2VycyAgPGNyb2dlcnNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2UgY3JlYXRlKCkgbWV0aG9kIGZvciBBc3luY0F1ZGlvRGVj b2Rlcjo6RGVjb2RpbmdUYXNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02MzE5OAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gIFRoaXMgbWFrZXMgbm8g Y2hhbmdlcyB0byB0aGUgSlMgQVBJLgorCisgICAgICAgICogd2ViYXVkaW8vQXN5bmNBdWRpb0Rl Y29kZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jQXVkaW9EZWNvZGVyOjpjcmVhdGUpOgor ICAgICAgICAqIHdlYmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpB dWRpb0NvbnRleHQ6OmNvbnN0cnVjdENvbW1vbik6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb0Nv bnRleHQ6OmRlY29kZUF1ZGlvRGF0YSk6CisgICAgICAgICogd2ViYXVkaW8vQXVkaW9Db250ZXh0 Lmg6CisKIDIwMTEtMDYtMjIgIFJvYiBCdWlzICA8cmJ1aXNAcmltLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS93ZWJh dWRpby9Bc3luY0F1ZGlvRGVjb2Rlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv d2ViYXVkaW8vQXN5bmNBdWRpb0RlY29kZXIuY3BwCShyZXZpc2lvbiA4OTQ5MCkKKysrIFNvdXJj ZS9XZWJDb3JlL3dlYmF1ZGlvL0FzeW5jQXVkaW9EZWNvZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNjAsNyArNjAsNyBAQCB2b2lkIEFzeW5jQXVkaW9EZWNvZGVyOjpkZWNvZGVBc3luYyhBcnJh CiAgICAgaWYgKCFhdWRpb0RhdGEpCiAgICAgICAgIHJldHVybjsKIAotICAgIE93blB0cjxEZWNv ZGluZ1Rhc2s+IGRlY29kaW5nVGFzayA9IGFkb3B0UHRyKG5ldyBEZWNvZGluZ1Rhc2soYXVkaW9E YXRhLCBzYW1wbGVSYXRlLCBzdWNjZXNzQ2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spKTsKKyAgICBP d25QdHI8RGVjb2RpbmdUYXNrPiBkZWNvZGluZ1Rhc2sgPSBEZWNvZGluZ1Rhc2s6OmNyZWF0ZShh dWRpb0RhdGEsIHNhbXBsZVJhdGUsIHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjayk7CiAg ICAgbV9xdWV1ZS5hcHBlbmQoZGVjb2RpbmdUYXNrLnJlbGVhc2UoKSk7IC8vIG5vdGUgdGhhdCBv d25lcnNoaXAgb2YgdGhlIHRhc2sgaXMgZWZmZWN0aXZlbHkgdGFrZW4gYnkgdGhlIHF1ZXVlLgog fQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS93ZWJhdWRpby9Bc3luY0F1ZGlvRGVjb2Rlci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3dlYmF1ZGlvL0FzeW5jQXVkaW9EZWNvZGVyLmgJ KHJldmlzaW9uIDg5NDkwKQorKysgU291cmNlL1dlYkNvcmUvd2ViYXVkaW8vQXN5bmNBdWRpb0Rl Y29kZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQCBjbGFzcyBBdWRpb0J1ZmZl ckNhbGxiYWNrOwogLy8gVXBvbiBzdWNjZXNzZnVsIGRlY29kaW5nLCBhIGNvbXBsZXRpb24gY2Fs bGJhY2sgd2lsbCBiZSBpbnZva2VkIHdpdGggdGhlIGRlY29kZWQgUENNIGRhdGEgaW4gYW4gQXVk aW9CdWZmZXIuCiAKIGNsYXNzIEFzeW5jQXVkaW9EZWNvZGVyIHsKKyAgICBXVEZfTUFLRV9OT05D T1BZQUJMRShBc3luY0F1ZGlvRGVjb2Rlcik7CiBwdWJsaWM6CiAgICAgQXN5bmNBdWRpb0RlY29k ZXIoKTsKICAgICB+QXN5bmNBdWRpb0RlY29kZXIoKTsKQEAgLTUyLDExICs1MywxNiBAQCBwcml2 YXRlOgogICAgIGNsYXNzIERlY29kaW5nVGFzayB7CiAgICAgICAgIFdURl9NQUtFX05PTkNPUFlB QkxFKERlY29kaW5nVGFzayk7CiAgICAgcHVibGljOgotICAgICAgICBEZWNvZGluZ1Rhc2soQXJy YXlCdWZmZXIqIGF1ZGlvRGF0YSwgZG91YmxlIHNhbXBsZVJhdGUsIFBhc3NSZWZQdHI8QXVkaW9C dWZmZXJDYWxsYmFjaz4gc3VjY2Vzc0NhbGxiYWNrLCBQYXNzUmVmUHRyPEF1ZGlvQnVmZmVyQ2Fs bGJhY2s+IGVycm9yQ2FsbGJhY2spOwotICAgICAgICAKKyAgICAgICAgc3RhdGljIE93blB0cjxE ZWNvZGluZ1Rhc2s+IGNyZWF0ZShBcnJheUJ1ZmZlciogYXVkaW9EYXRhLCBkb3VibGUgc2FtcGxl UmF0ZSwgUGFzc1JlZlB0cjxBdWRpb0J1ZmZlckNhbGxiYWNrPiBzdWNjZXNzQ2FsbGJhY2ssIFBh c3NSZWZQdHI8QXVkaW9CdWZmZXJDYWxsYmFjaz4gZXJyb3JDYWxsYmFjaykKKyAgICAgICAgewor ICAgICAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBEZWNvZGluZ1Rhc2soYXVkaW9EYXRhLCBz YW1wbGVSYXRlLCBzdWNjZXNzQ2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spKTsKKyAgICAgICAgfQor CiAgICAgICAgIHZvaWQgZGVjb2RlKCk7CiAgICAgICAgIAogICAgIHByaXZhdGU6CisgICAgICAg IERlY29kaW5nVGFzayhBcnJheUJ1ZmZlciogYXVkaW9EYXRhLCBkb3VibGUgc2FtcGxlUmF0ZSwg UGFzc1JlZlB0cjxBdWRpb0J1ZmZlckNhbGxiYWNrPiBzdWNjZXNzQ2FsbGJhY2ssIFBhc3NSZWZQ dHI8QXVkaW9CdWZmZXJDYWxsYmFjaz4gZXJyb3JDYWxsYmFjayk7CisKICAgICAgICAgQXJyYXlC dWZmZXIqIGF1ZGlvRGF0YSgpIHsgcmV0dXJuIG1fYXVkaW9EYXRhLmdldCgpOyB9CiAgICAgICAg IGRvdWJsZSBzYW1wbGVSYXRlKCkgY29uc3QgeyByZXR1cm4gbV9zYW1wbGVSYXRlOyB9CiAgICAg ICAgIEF1ZGlvQnVmZmVyQ2FsbGJhY2sqIHN1Y2Nlc3NDYWxsYmFjaygpIHsgcmV0dXJuIG1fc3Vj Y2Vzc0NhbGxiYWNrLmdldCgpOyB9Cg== 98265 2011-06-22 16:52:01 -0700 2011-06-22 16:53:33 -0700 Patch bug-63198-20110622165200.patch text/plain 3612 crogers SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5NDkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDYtMjIgIENocmlzIFJv Z2VycyAgPGNyb2dlcnNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2UgY3JlYXRlKCkgbWV0aG9kIGZvciBBc3luY0F1ZGlvRGVj b2Rlcjo6RGVjb2RpbmdUYXNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02MzE5OAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gIFRoaXMgbWFrZXMgbm8g Y2hhbmdlcyB0byB0aGUgSlMgQVBJLgorCisgICAgICAgICogd2ViYXVkaW8vQXN5bmNBdWRpb0Rl Y29kZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jQXVkaW9EZWNvZGVyOjpjcmVhdGUpOgor ICAgICAgICAqIHdlYmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpB dWRpb0NvbnRleHQ6OmNvbnN0cnVjdENvbW1vbik6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb0Nv bnRleHQ6OmRlY29kZUF1ZGlvRGF0YSk6CisgICAgICAgICogd2ViYXVkaW8vQXVkaW9Db250ZXh0 Lmg6CisKIDIwMTEtMDYtMjIgIFJvYiBCdWlzICA8cmJ1aXNAcmltLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS93ZWJh dWRpby9Bc3luY0F1ZGlvRGVjb2Rlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv d2ViYXVkaW8vQXN5bmNBdWRpb0RlY29kZXIuY3BwCShyZXZpc2lvbiA4OTQ5MCkKKysrIFNvdXJj ZS9XZWJDb3JlL3dlYmF1ZGlvL0FzeW5jQXVkaW9EZWNvZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNjAsNyArNjAsNyBAQCB2b2lkIEFzeW5jQXVkaW9EZWNvZGVyOjpkZWNvZGVBc3luYyhBcnJh CiAgICAgaWYgKCFhdWRpb0RhdGEpCiAgICAgICAgIHJldHVybjsKIAotICAgIE93blB0cjxEZWNv ZGluZ1Rhc2s+IGRlY29kaW5nVGFzayA9IGFkb3B0UHRyKG5ldyBEZWNvZGluZ1Rhc2soYXVkaW9E YXRhLCBzYW1wbGVSYXRlLCBzdWNjZXNzQ2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spKTsKKyAgICBP d25QdHI8RGVjb2RpbmdUYXNrPiBkZWNvZGluZ1Rhc2sgPSBEZWNvZGluZ1Rhc2s6OmNyZWF0ZShh dWRpb0RhdGEsIHNhbXBsZVJhdGUsIHN1Y2Nlc3NDYWxsYmFjaywgZXJyb3JDYWxsYmFjayk7CiAg ICAgbV9xdWV1ZS5hcHBlbmQoZGVjb2RpbmdUYXNrLnJlbGVhc2UoKSk7IC8vIG5vdGUgdGhhdCBv d25lcnNoaXAgb2YgdGhlIHRhc2sgaXMgZWZmZWN0aXZlbHkgdGFrZW4gYnkgdGhlIHF1ZXVlLgog fQogCkBAIC05MCw2ICs5MCwxMSBAQCB2b2lkIEFzeW5jQXVkaW9EZWNvZGVyOjpydW5Mb29wKCkK ICAgICB9CiB9CiAKK093blB0cjxBc3luY0F1ZGlvRGVjb2Rlcjo6RGVjb2RpbmdUYXNrPiBBc3lu Y0F1ZGlvRGVjb2Rlcjo6RGVjb2RpbmdUYXNrOjpjcmVhdGUoQXJyYXlCdWZmZXIqIGF1ZGlvRGF0 YSwgZG91YmxlIHNhbXBsZVJhdGUsIFBhc3NSZWZQdHI8QXVkaW9CdWZmZXJDYWxsYmFjaz4gc3Vj Y2Vzc0NhbGxiYWNrLCBQYXNzUmVmUHRyPEF1ZGlvQnVmZmVyQ2FsbGJhY2s+IGVycm9yQ2FsbGJh Y2spCit7CisgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBEZWNvZGluZ1Rhc2soYXVkaW9EYXRhLCBz YW1wbGVSYXRlLCBzdWNjZXNzQ2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spKTsKK30KKwogQXN5bmNB dWRpb0RlY29kZXI6OkRlY29kaW5nVGFzazo6RGVjb2RpbmdUYXNrKEFycmF5QnVmZmVyKiBhdWRp b0RhdGEsIGRvdWJsZSBzYW1wbGVSYXRlLCBQYXNzUmVmUHRyPEF1ZGlvQnVmZmVyQ2FsbGJhY2s+ IHN1Y2Nlc3NDYWxsYmFjaywgUGFzc1JlZlB0cjxBdWRpb0J1ZmZlckNhbGxiYWNrPiBlcnJvckNh bGxiYWNrKQogICAgIDogbV9hdWRpb0RhdGEoYXVkaW9EYXRhKQogICAgICwgbV9zYW1wbGVSYXRl KHNhbXBsZVJhdGUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS93ZWJhdWRpby9Bc3luY0F1ZGlvRGVj b2Rlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3dlYmF1ZGlvL0FzeW5jQXVkaW9E ZWNvZGVyLmgJKHJldmlzaW9uIDg5NDkwKQorKysgU291cmNlL1dlYkNvcmUvd2ViYXVkaW8vQXN5 bmNBdWRpb0RlY29kZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQCBjbGFzcyBB dWRpb0J1ZmZlckNhbGxiYWNrOwogLy8gVXBvbiBzdWNjZXNzZnVsIGRlY29kaW5nLCBhIGNvbXBs ZXRpb24gY2FsbGJhY2sgd2lsbCBiZSBpbnZva2VkIHdpdGggdGhlIGRlY29kZWQgUENNIGRhdGEg aW4gYW4gQXVkaW9CdWZmZXIuCiAKIGNsYXNzIEFzeW5jQXVkaW9EZWNvZGVyIHsKKyAgICBXVEZf TUFLRV9OT05DT1BZQUJMRShBc3luY0F1ZGlvRGVjb2Rlcik7CiBwdWJsaWM6CiAgICAgQXN5bmNB dWRpb0RlY29kZXIoKTsKICAgICB+QXN5bmNBdWRpb0RlY29kZXIoKTsKQEAgLTUyLDExICs1Mywx MyBAQCBwcml2YXRlOgogICAgIGNsYXNzIERlY29kaW5nVGFzayB7CiAgICAgICAgIFdURl9NQUtF X05PTkNPUFlBQkxFKERlY29kaW5nVGFzayk7CiAgICAgcHVibGljOgotICAgICAgICBEZWNvZGlu Z1Rhc2soQXJyYXlCdWZmZXIqIGF1ZGlvRGF0YSwgZG91YmxlIHNhbXBsZVJhdGUsIFBhc3NSZWZQ dHI8QXVkaW9CdWZmZXJDYWxsYmFjaz4gc3VjY2Vzc0NhbGxiYWNrLCBQYXNzUmVmUHRyPEF1ZGlv QnVmZmVyQ2FsbGJhY2s+IGVycm9yQ2FsbGJhY2spOwotICAgICAgICAKKyAgICAgICAgc3RhdGlj IE93blB0cjxEZWNvZGluZ1Rhc2s+IGNyZWF0ZShBcnJheUJ1ZmZlciogYXVkaW9EYXRhLCBkb3Vi bGUgc2FtcGxlUmF0ZSwgUGFzc1JlZlB0cjxBdWRpb0J1ZmZlckNhbGxiYWNrPiBzdWNjZXNzQ2Fs bGJhY2ssIFBhc3NSZWZQdHI8QXVkaW9CdWZmZXJDYWxsYmFjaz4gZXJyb3JDYWxsYmFjayk7CisK ICAgICAgICAgdm9pZCBkZWNvZGUoKTsKICAgICAgICAgCiAgICAgcHJpdmF0ZToKKyAgICAgICAg RGVjb2RpbmdUYXNrKEFycmF5QnVmZmVyKiBhdWRpb0RhdGEsIGRvdWJsZSBzYW1wbGVSYXRlLCBQ YXNzUmVmUHRyPEF1ZGlvQnVmZmVyQ2FsbGJhY2s+IHN1Y2Nlc3NDYWxsYmFjaywgUGFzc1JlZlB0 cjxBdWRpb0J1ZmZlckNhbGxiYWNrPiBlcnJvckNhbGxiYWNrKTsKKwogICAgICAgICBBcnJheUJ1 ZmZlciogYXVkaW9EYXRhKCkgeyByZXR1cm4gbV9hdWRpb0RhdGEuZ2V0KCk7IH0KICAgICAgICAg ZG91YmxlIHNhbXBsZVJhdGUoKSBjb25zdCB7IHJldHVybiBtX3NhbXBsZVJhdGU7IH0KICAgICAg ICAgQXVkaW9CdWZmZXJDYWxsYmFjayogc3VjY2Vzc0NhbGxiYWNrKCkgeyByZXR1cm4gbV9zdWNj ZXNzQ2FsbGJhY2suZ2V0KCk7IH0K