162967 2016-10-05 05:35:57 -0700 [Readable Streams API] Align function names with spec 2016-10-05 09:48:51 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 romain.wkt romain.wkt calvaris commit-queue youennf oldest_to_newest 1236607 0 romain.wkt 2016-10-05 05:35:57 -0700 Readable Streams API implementation has globally been aligned with latest spec, but functions names were not always updated in order to ease patch review. In some cases, this leads to inconsistencies (e.g. enqueueInReadableStream takes a controller argument whereas its name suggests it works on a stream). Aligning with spec names would make code more coherent and ease comparison between implementation and spec. 1236608 1 290706 romain.wkt 2016-10-05 05:51:32 -0700 Created attachment 290706 Patch 1236671 2 290706 commit-queue 2016-10-05 09:48:48 -0700 Comment on attachment 290706 Patch Clearing flags on attachment: 290706 Committed r206814: <http://trac.webkit.org/changeset/206814> 1236672 3 commit-queue 2016-10-05 09:48:51 -0700 All reviewed patches have been landed. Closing bug. 290706 2016-10-05 05:51:32 -0700 2016-10-05 09:48:48 -0700 Patch bug-162967-20161005144819.patch text/plain 14328 romain.wkt U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2ODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQzYTAxYWEyZGY2M2Fl OTU2OTgyZjAyMjk0NTQzMGFhMTA0ZmJmNS4uNTdkNjFkOTE3YzZkNmNlMjU4MmNlMmFlMjQ1ZGM0 N2ExZTMxY2ZmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE2LTEwLTA1ICBSb21h aW4gQmVsbGVzc29ydCAgPHJvbWFpbi5iZWxsZXNzb3J0QGNyZi5jYW5vbi5mcj4KKworICAgICAg ICBbUmVhZGFibGUgU3RyZWFtcyBBUEldIEFsaWduIGZ1bmN0aW9uIG5hbWVzIHdpdGggc3BlYwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYyOTY3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxpZ24gZnVu Y3Rpb24gbmFtZXMgd2l0aCBzcGVjLiBCZWhhdmlvdXIgd2FzIGFscmVhZHkgaW4gbGluZSB3aXRo IHNwZWMsIGJ1dCBwcmV2aW91cyBmdW5jdGlvbiBuYW1lcyBoYWQKKyAgICAgICAgc29tZXRpbWVz IGJlZW4gcHJlc2VydmVkIHRvIHRyYWNrIHRoZSBjaGFuZ2VzIG1vcmUgZWFzaWx5LiBUaGlzIGxl ZCB0byBzb21lIGluY29uc2lzdGVuY2llcyAoZm9yIGluc3RhbmNlLAorICAgICAgICBlbnF1ZXVl SW5SZWFkYWJsZVN0cmVhbSB3YXMgc3RpbGwgdXNlZCBldmVuIHRob3VnaCBpdCB3b3JrcyBvbiBh IGNvbnRyb2xsZXIgaW5zdGVhZCBvZiBhIHN0cmVhbSkgYW5kIGl0CisgICAgICAgIGFsc28gbWFk ZSBpdCBtb3JlIGRpZmZpY3VsdCB0byBjb21wYXJlIHNwZWMgYW5kIGltcGxlbWVudGF0aW9uLgor CisgICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvdXIuCisKKyAgICAgICAgKiBNb2R1bGVzL2Zl dGNoL0ZldGNoSW50ZXJuYWxzLmpzOgorICAgICAgICAoY29uc3VtZVN0cmVhbSk6IFVwZGF0ZWQg d2l0aCBuZXcgZnVuY3Rpb24gbmFtZXMuCisgICAgICAgICogTW9kdWxlcy9mZXRjaC9GZXRjaFJl c3BvbnNlLmpzOgorICAgICAgICAoY2xvbmUpOiBVcGRhdGVkIHdpdGggbmV3IGZ1bmN0aW9uIG5h bWVzLgorICAgICAgICAqIE1vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbS5qczoKKyAgICAg ICAgKHRlZSk6IFVwZGF0ZWQgd2l0aCBuZXcgZnVuY3Rpb24gbmFtZXMuCisgICAgICAgICogTW9k dWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXIuanM6CisgICAgICAg IChlbnF1ZXVlKTogVXBkYXRlZCB3aXRoIG5ldyBmdW5jdGlvbiBuYW1lcy4KKyAgICAgICAgKGVy cm9yKTogVXBkYXRlZCB3aXRoIG5ldyBmdW5jdGlvbiBuYW1lcy4KKyAgICAgICAgKiBNb2R1bGVz L3N0cmVhbXMvUmVhZGFibGVTdHJlYW1EZWZhdWx0UmVhZGVyLmpzOgorICAgICAgICAocmVhZCk6 IFVwZGF0ZWQgd2l0aCBuZXcgZnVuY3Rpb24gbmFtZXMuCisgICAgICAgICogTW9kdWxlcy9zdHJl YW1zL1JlYWRhYmxlU3RyZWFtSW50ZXJuYWxzLmpzOgorICAgICAgICAocHJpdmF0ZUluaXRpYWxp emVSZWFkYWJsZVN0cmVhbURlZmF1bHRDb250cm9sbGVyKTogVXBkYXRlZCB3aXRoIG5ldyBmdW5j dGlvbiBuYW1lcy4KKyAgICAgICAgKHJlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXJFcnJv cik6IFVwZGF0ZWQgd2l0aCBuZXcgZnVuY3Rpb24gbmFtZXMuCisgICAgICAgIChyZWFkYWJsZVN0 cmVhbVRlZSk6IFVwZGF0ZWQgd2l0aCBuZXcgZnVuY3Rpb24gbmFtZXMuCisgICAgICAgIChyZWFk YWJsZVN0cmVhbVRlZVB1bGxGdW5jdGlvbik6IFVwZGF0ZWQgd2l0aCBuZXcgZnVuY3Rpb24gbmFt ZXMuCisgICAgICAgIChyZWFkYWJsZVN0cmVhbVRlZUJyYW5jaDJDYW5jZWxGdW5jdGlvbik6IFVw ZGF0ZWQgd2l0aCBuZXcgZnVuY3Rpb24gbmFtZXMuCisgICAgICAgIChyZWFkYWJsZVN0cmVhbUVy cm9yKTogVXBkYXRlZCB3aXRoIG5ldyBmdW5jdGlvbiBuYW1lcy4KKyAgICAgICAgKHJlYWRhYmxl U3RyZWFtQ2FuY2VsKTogVXBkYXRlZCB3aXRoIG5ldyBmdW5jdGlvbiBuYW1lcy4KKyAgICAgICAg KHJlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXJQdWxsKTogVXBkYXRlZCB3aXRoIG5ldyBm dW5jdGlvbiBuYW1lcy4KKyAgICAgICAgKHJlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXJD bG9zZSk6IFVwZGF0ZWQgd2l0aCBuZXcgZnVuY3Rpb24gbmFtZXMuCisgICAgICAgIChyZWFkYWJs ZVN0cmVhbUNsb3NlKTogVXBkYXRlZCB3aXRoIG5ldyBmdW5jdGlvbiBuYW1lcy4KKyAgICAgICAg KHJlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXJFbnF1ZXVlKTogVXBkYXRlZCB3aXRoIG5l dyBmdW5jdGlvbiBuYW1lcy4KKyAgICAgICAgKHJlYWRhYmxlU3RyZWFtRGVmYXVsdFJlYWRlclJl YWQpOiBVcGRhdGVkIHdpdGggbmV3IGZ1bmN0aW9uIG5hbWVzLgorCiAyMDE2LTEwLTA1ICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbU09VUF0g TW92ZSByZXF1ZXN0IEhUVFAgYm9keSBoYW5kbGluZyB0byBSZXNvdXJjZVJlcXVlc3RTb3VwIGFu ZCBzaW1wbGlmeSBpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9G ZXRjaEludGVybmFscy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hJbnRl cm5hbHMuanMKaW5kZXggNDM4ZWFjNDQ0YmI4MWQyZTkzMzkxZWEwMTY2Mzc5NDlhMzVjYTFiZS4u ODY4MzI3N2Y3OGY2NmMxMGM5YWY1ZGE0ZGMyNmUzODVmM2VkYTc2NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaEludGVybmFscy5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoSW50ZXJuYWxzLmpzCkBAIC02OCw5ICs2OCw5IEBA IGZ1bmN0aW9uIGNvbnN1bWVTdHJlYW0ocmVzcG9uc2UsIHR5cGUpCiAgICAgICAgICAgICBpZiAo cmVzdWx0LmRvbmUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIEBSZXNwb25zZS5wcm90b3R5cGUu QGZpbmlzaENvbnN1bWluZ1N0cmVhbS5AY2FsbChyZXNwb25zZSk7CiAgICAgICAgICAgICBAUmVz cG9uc2UucHJvdG90eXBlLkBjb25zdW1lQ2h1bmsuQGNhbGwocmVzcG9uc2UsIHJlc3VsdC52YWx1 ZSk7Ci0gICAgICAgICAgICByZXR1cm4gQFByb21pc2UucHJvdG90eXBlLkB0aGVuLkBjYWxsKEBy ZWFkRnJvbVJlYWRhYmxlU3RyZWFtRGVmYXVsdFJlYWRlcihyZWFkZXIpLCBwdWxsKTsKKyAgICAg ICAgICAgIHJldHVybiBAUHJvbWlzZS5wcm90b3R5cGUuQHRoZW4uQGNhbGwoQHJlYWRhYmxlU3Ry ZWFtRGVmYXVsdFJlYWRlclJlYWQocmVhZGVyKSwgcHVsbCk7CiAgICAgICAgIH0KLSAgICAgICAg cmV0dXJuIEBQcm9taXNlLnByb3RvdHlwZS5AdGhlbi5AY2FsbChAcmVhZEZyb21SZWFkYWJsZVN0 cmVhbURlZmF1bHRSZWFkZXIocmVhZGVyKSwgcHVsbCk7CisgICAgICAgIHJldHVybiBAUHJvbWlz ZS5wcm90b3R5cGUuQHRoZW4uQGNhbGwoQHJlYWRhYmxlU3RyZWFtRGVmYXVsdFJlYWRlclJlYWQo cmVhZGVyKSwgcHVsbCk7CiAgICAgfSBjYXRjaChlKSB7CiAgICAgICAgIHJldHVybiBAUHJvbWlz ZS5AcmVqZWN0KGUpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv ZmV0Y2gvRmV0Y2hSZXNwb25zZS5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0 Y2hSZXNwb25zZS5qcwppbmRleCA4MGQ1ZDMxYjkxMzMwM2U3NzBmYTMyMzg2OWUyN2FlODNmYzZk ZGIyLi4zYjYxZDIzMzY5YTc1NDIyZGQyYzFjMWQ4NDcwY2FlMzZiYzBkNTlhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoUmVzcG9uc2UuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaFJlc3BvbnNlLmpzCkBAIC0xMDcsNyArMTA3 LDcgQEAgZnVuY3Rpb24gY2xvbmUoKQogICAgIH0KIAogICAgIGlmICh0aGlzLkBib2R5KSB7Ci0g ICAgICAgIHZhciB0ZWVkUmVhZGFibGVTdHJlYW1zID0gQHRlZVJlYWRhYmxlU3RyZWFtKHRoaXMu QGJvZHksIHRydWUpOworICAgICAgICB2YXIgdGVlZFJlYWRhYmxlU3RyZWFtcyA9IEByZWFkYWJs ZVN0cmVhbVRlZSh0aGlzLkBib2R5LCB0cnVlKTsKICAgICAgICAgdGhpcy5AYm9keSA9IHRlZWRS ZWFkYWJsZVN0cmVhbXNbMF07CiAgICAgICAgIGNsb25lZC5AYm9keSA9IHRlZWRSZWFkYWJsZVN0 cmVhbXNbMV07CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJl YW1zL1JlYWRhYmxlU3RyZWFtLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1Jl YWRhYmxlU3RyZWFtLmpzCmluZGV4IGRkNzAyNmJmNThmZmMyMzM0MTNkNDgxMDg5MzBhY2I4OGEw MTNiYzIuLmFiYzMyNzNhMjY5MGU5YWJiMmJkYzljYWJmNDc1OTc1MTlmMmQxN2EgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbS5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uanMKQEAgLTIw Niw3ICsyMDYsNyBAQCBmdW5jdGlvbiB0ZWUoKQogICAgIGlmICghQGlzUmVhZGFibGVTdHJlYW0o dGhpcykpCiAgICAgICAgIHRocm93IEBtYWtlVGhpc1R5cGVFcnJvcigiUmVhZGFibGVTdHJlYW0i LCAidGVlIik7CiAKLSAgICByZXR1cm4gQHRlZVJlYWRhYmxlU3RyZWFtKHRoaXMsIGZhbHNlKTsK KyAgICByZXR1cm4gQHJlYWRhYmxlU3RyZWFtVGVlKHRoaXMsIGZhbHNlKTsKIH0KIAogZnVuY3Rp b24gbG9ja2VkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9S ZWFkYWJsZVN0cmVhbURlZmF1bHRDb250cm9sbGVyLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXIuanMKaW5kZXggOGNiY2Nl NzBmM2YwNGEwNjQ5OGUxZmVlYmY5M2ZmNjI4NjgyOWM5Yy4uMDc1NGUyYjcwMjRhMDg1MzlmYzcy MmFhNGRmZmFlNzA0MjgyZDVmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9z dHJlYW1zL1JlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXIuanMKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXIuanMK QEAgLTM4LDcgKzM4LDcgQEAgZnVuY3Rpb24gZW5xdWV1ZShjaHVuaykKICAgICBpZiAodGhpcy5A Y29udHJvbGxlZFJlYWRhYmxlU3RyZWFtLkBzdGF0ZSAhPT0gQHN0cmVhbVJlYWRhYmxlKQogICAg ICAgICB0aHJvdyBuZXcgQFR5cGVFcnJvcigiUmVhZGFibGVTdHJlYW0gaXMgbm90IHJlYWRhYmxl Iik7CiAKLSAgICByZXR1cm4gQGVucXVldWVJblJlYWRhYmxlU3RyZWFtKHRoaXMsIGNodW5rKTsK KyAgICByZXR1cm4gQHJlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXJFbnF1ZXVlKHRoaXMs IGNodW5rKTsKIH0KIAogZnVuY3Rpb24gZXJyb3IoZXJyb3IpCkBAIC01Miw3ICs1Miw3IEBAIGZ1 bmN0aW9uIGVycm9yKGVycm9yKQogICAgIGlmIChzdHJlYW0uQHN0YXRlICE9PSBAc3RyZWFtUmVh ZGFibGUpCiAgICAgICAgIHRocm93IG5ldyBAVHlwZUVycm9yKCJSZWFkYWJsZVN0cmVhbSBpcyBu b3QgcmVhZGFibGUiKTsKIAotICAgIEBlcnJvclJlYWRhYmxlU3RyZWFtKHN0cmVhbSwgZXJyb3Ip OworICAgIEByZWFkYWJsZVN0cmVhbUVycm9yKHN0cmVhbSwgZXJyb3IpOwogfQogCiBmdW5jdGlv biBjbG9zZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVh ZGFibGVTdHJlYW1EZWZhdWx0UmVhZGVyLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJl YW1zL1JlYWRhYmxlU3RyZWFtRGVmYXVsdFJlYWRlci5qcwppbmRleCAzMTk1ZjA5ZjgxN2MzMDZk ZGI1NDU1NjY3MDQ5NDJiODM1YzQ3OWFmLi5kNWFjMWY1ZjE2ODUxNzI3YWU2NWZkY2E4ODhjYTgx ZmQ2MWI5YjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVh ZGFibGVTdHJlYW1EZWZhdWx0UmVhZGVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv c3RyZWFtcy9SZWFkYWJsZVN0cmVhbURlZmF1bHRSZWFkZXIuanMKQEAgLTQ3LDcgKzQ3LDcgQEAg ZnVuY3Rpb24gcmVhZCgpCiAgICAgaWYgKCF0aGlzLkBvd25lclJlYWRhYmxlU3RyZWFtKQogICAg ICAgICByZXR1cm4gQFByb21pc2UuQHJlamVjdChuZXcgQFR5cGVFcnJvcigicmVhZCgpIGNhbGxl ZCBvbiBhIHJlYWRlciBvd25lZCBieSBubyByZWFkYWJsZSBzdHJlYW0iKSk7CiAKLSAgICByZXR1 cm4gQHJlYWRGcm9tUmVhZGFibGVTdHJlYW1EZWZhdWx0UmVhZGVyKHRoaXMpOworICAgIHJldHVy biBAcmVhZGFibGVTdHJlYW1EZWZhdWx0UmVhZGVyUmVhZCh0aGlzKTsKIH0KIAogZnVuY3Rpb24g cmVsZWFzZUxvY2soKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1z L1JlYWRhYmxlU3RyZWFtSW50ZXJuYWxzLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJl YW1zL1JlYWRhYmxlU3RyZWFtSW50ZXJuYWxzLmpzCmluZGV4IGIyZThhZmJhN2Y5ZWZmZWM1YzZk ZTk4OTQ5YjkyYWRjNjVkZDI2ZDMuLmY2OGVhY2QwZmRmNGEyYmExZTI4YTg2NDcwOWM4YmRjYWIx YzlhZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJs ZVN0cmVhbUludGVybmFscy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMv UmVhZGFibGVTdHJlYW1JbnRlcm5hbHMuanMKQEAgLTc2LDcgKzc2LDcgQEAgZnVuY3Rpb24gcHJp dmF0ZUluaXRpYWxpemVSZWFkYWJsZVN0cmVhbURlZmF1bHRDb250cm9sbGVyKHN0cmVhbSwgdW5k ZXJseWluZ1NvdXIKICAgICBjb25zdCBjb250cm9sbGVyID0gdGhpczsKICAgICBjb25zdCBzdGFy dFJlc3VsdCA9IEBwcm9taXNlSW52b2tlT3JOb29wTm9DYXRjaCh1bmRlcmx5aW5nU291cmNlLCAi c3RhcnQiLCBbdGhpc10pLkB0aGVuKCgpID0+IHsKICAgICAgICAgY29udHJvbGxlci5Ac3RhcnRl ZCA9IHRydWU7Ci0gICAgICAgIEByZXF1ZXN0UmVhZGFibGVTdHJlYW1QdWxsKGNvbnRyb2xsZXIp OworICAgICAgICBAcmVhZGFibGVTdHJlYW1EZWZhdWx0Q29udHJvbGxlckNhbGxQdWxsSWZOZWVk ZWQoY29udHJvbGxlcik7CiAgICAgfSwgKGVycm9yKSA9PiB7CiAgICAgICAgIGlmIChzdHJlYW0u QHN0YXRlID09PSBAc3RyZWFtUmVhZGFibGUpCiAgICAgICAgICAgICBAcmVhZGFibGVTdHJlYW1E ZWZhdWx0Q29udHJvbGxlckVycm9yKGNvbnRyb2xsZXIsIGVycm9yKTsKQEAgLTk2LDEwICs5Niwx MCBAQCBmdW5jdGlvbiByZWFkYWJsZVN0cmVhbURlZmF1bHRDb250cm9sbGVyRXJyb3IoY29udHJv bGxlciwgZXJyb3IpCiAgICAgY29uc3Qgc3RyZWFtID0gY29udHJvbGxlci5AY29udHJvbGxlZFJl YWRhYmxlU3RyZWFtOwogICAgIEBhc3NlcnQoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbVJlYWRh YmxlKTsKICAgICBjb250cm9sbGVyLkBxdWV1ZSA9IEBuZXdRdWV1ZSgpOwotICAgIEBlcnJvclJl YWRhYmxlU3RyZWFtKHN0cmVhbSwgZXJyb3IpOworICAgIEByZWFkYWJsZVN0cmVhbUVycm9yKHN0 cmVhbSwgZXJyb3IpOwogfQogCi1mdW5jdGlvbiB0ZWVSZWFkYWJsZVN0cmVhbShzdHJlYW0sIHNo b3VsZENsb25lKQorZnVuY3Rpb24gcmVhZGFibGVTdHJlYW1UZWUoc3RyZWFtLCBzaG91bGRDbG9u ZSkKIHsKICAgICAidXNlIHN0cmljdCI7CiAKQEAgLTExOCwxNSArMTE4LDE1IEBAIGZ1bmN0aW9u IHRlZVJlYWRhYmxlU3RyZWFtKHN0cmVhbSwgc2hvdWxkQ2xvbmUpCiAKICAgICB0ZWVTdGF0ZS5j YW5jZWxQcm9taXNlQ2FwYWJpbGl0eSA9IEBuZXdQcm9taXNlQ2FwYWJpbGl0eShASW50ZXJuYWxQ cm9taXNlKTsKIAotICAgIGNvbnN0IHB1bGxGdW5jdGlvbiA9IEB0ZWVSZWFkYWJsZVN0cmVhbVB1 bGxGdW5jdGlvbih0ZWVTdGF0ZSwgcmVhZGVyLCBzaG91bGRDbG9uZSk7CisgICAgY29uc3QgcHVs bEZ1bmN0aW9uID0gQHJlYWRhYmxlU3RyZWFtVGVlUHVsbEZ1bmN0aW9uKHRlZVN0YXRlLCByZWFk ZXIsIHNob3VsZENsb25lKTsKIAogICAgIGNvbnN0IGJyYW5jaDEgPSBuZXcgQFJlYWRhYmxlU3Ry ZWFtKHsKICAgICAgICAgInB1bGwiOiBwdWxsRnVuY3Rpb24sCi0gICAgICAgICJjYW5jZWwiOiBA dGVlUmVhZGFibGVTdHJlYW1CcmFuY2gxQ2FuY2VsRnVuY3Rpb24odGVlU3RhdGUsIHN0cmVhbSkK KyAgICAgICAgImNhbmNlbCI6IEByZWFkYWJsZVN0cmVhbVRlZUJyYW5jaDFDYW5jZWxGdW5jdGlv bih0ZWVTdGF0ZSwgc3RyZWFtKQogICAgIH0pOwogICAgIGNvbnN0IGJyYW5jaDIgPSBuZXcgQFJl YWRhYmxlU3RyZWFtKHsKICAgICAgICAgInB1bGwiOiBwdWxsRnVuY3Rpb24sCi0gICAgICAgICJj YW5jZWwiOiBAdGVlUmVhZGFibGVTdHJlYW1CcmFuY2gyQ2FuY2VsRnVuY3Rpb24odGVlU3RhdGUs IHN0cmVhbSkKKyAgICAgICAgImNhbmNlbCI6IEByZWFkYWJsZVN0cmVhbVRlZUJyYW5jaDJDYW5j ZWxGdW5jdGlvbih0ZWVTdGF0ZSwgc3RyZWFtKQogICAgIH0pOwogCiAgICAgcmVhZGVyLkBjbG9z ZWRQcm9taXNlQ2FwYWJpbGl0eS5AcHJvbWlzZS5AdGhlbihAdW5kZWZpbmVkLCBmdW5jdGlvbihl KSB7CkBAIC0xNjAsMTIgKzE2MCwxMiBAQCBmdW5jdGlvbiBkb1N0cnVjdHVyZWRDbG9uZShvYmpl Y3QpCiAgICAgdGhyb3cgbmV3IEBUeXBlRXJyb3IoInN0cnVjdHVyZWRDbG9uZSBub3QgaW1wbGVt ZW50ZWQgZm9yOiAiICsgb2JqZWN0KTsKIH0KIAotZnVuY3Rpb24gdGVlUmVhZGFibGVTdHJlYW1Q dWxsRnVuY3Rpb24odGVlU3RhdGUsIHJlYWRlciwgc2hvdWxkQ2xvbmUpCitmdW5jdGlvbiByZWFk YWJsZVN0cmVhbVRlZVB1bGxGdW5jdGlvbih0ZWVTdGF0ZSwgcmVhZGVyLCBzaG91bGRDbG9uZSkK IHsKICAgICAidXNlIHN0cmljdCI7CiAKICAgICByZXR1cm4gZnVuY3Rpb24oKSB7Ci0gICAgICAg IEBQcm9taXNlLnByb3RvdHlwZS5AdGhlbi5AY2FsbChAcmVhZEZyb21SZWFkYWJsZVN0cmVhbURl ZmF1bHRSZWFkZXIocmVhZGVyKSwgZnVuY3Rpb24ocmVzdWx0KSB7CisgICAgICAgIEBQcm9taXNl LnByb3RvdHlwZS5AdGhlbi5AY2FsbChAcmVhZGFibGVTdHJlYW1EZWZhdWx0UmVhZGVyUmVhZChy ZWFkZXIpLCBmdW5jdGlvbihyZXN1bHQpIHsKICAgICAgICAgICAgIEBhc3NlcnQoQGlzT2JqZWN0 KHJlc3VsdCkpOwogICAgICAgICAgICAgQGFzc2VydCh0eXBlb2YgcmVzdWx0LmRvbmUgPT09ICJi b29sZWFuIik7CiAgICAgICAgICAgICBpZiAocmVzdWx0LmRvbmUgJiYgIXRlZVN0YXRlLmNsb3Nl ZE9yRXJyb3JlZCkgewpAQCAtMTc4LDE0ICsxNzgsMTQgQEAgZnVuY3Rpb24gdGVlUmVhZGFibGVT dHJlYW1QdWxsRnVuY3Rpb24odGVlU3RhdGUsIHJlYWRlciwgc2hvdWxkQ2xvbmUpCiAgICAgICAg ICAgICBpZiAodGVlU3RhdGUuY2xvc2VkT3JFcnJvcmVkKQogICAgICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgICAgIGlmICghdGVlU3RhdGUuY2FuY2VsZWQxKQotICAgICAgICAgICAgICAg IEBlbnF1ZXVlSW5SZWFkYWJsZVN0cmVhbSh0ZWVTdGF0ZS5icmFuY2gxLkByZWFkYWJsZVN0cmVh bUNvbnRyb2xsZXIsIHNob3VsZENsb25lID8gQGRvU3RydWN0dXJlZENsb25lKHJlc3VsdC52YWx1 ZSkgOiByZXN1bHQudmFsdWUpOworICAgICAgICAgICAgICAgIEByZWFkYWJsZVN0cmVhbURlZmF1 bHRDb250cm9sbGVyRW5xdWV1ZSh0ZWVTdGF0ZS5icmFuY2gxLkByZWFkYWJsZVN0cmVhbUNvbnRy b2xsZXIsIHNob3VsZENsb25lID8gQGRvU3RydWN0dXJlZENsb25lKHJlc3VsdC52YWx1ZSkgOiBy ZXN1bHQudmFsdWUpOwogICAgICAgICAgICAgaWYgKCF0ZWVTdGF0ZS5jYW5jZWxlZDIpCi0gICAg ICAgICAgICAgICAgQGVucXVldWVJblJlYWRhYmxlU3RyZWFtKHRlZVN0YXRlLmJyYW5jaDIuQHJl YWRhYmxlU3RyZWFtQ29udHJvbGxlciwgc2hvdWxkQ2xvbmUgPyBAZG9TdHJ1Y3R1cmVkQ2xvbmUo cmVzdWx0LnZhbHVlKSA6IHJlc3VsdC52YWx1ZSk7CisgICAgICAgICAgICAgICAgQHJlYWRhYmxl U3RyZWFtRGVmYXVsdENvbnRyb2xsZXJFbnF1ZXVlKHRlZVN0YXRlLmJyYW5jaDIuQHJlYWRhYmxl U3RyZWFtQ29udHJvbGxlciwgc2hvdWxkQ2xvbmUgPyBAZG9TdHJ1Y3R1cmVkQ2xvbmUocmVzdWx0 LnZhbHVlKSA6IHJlc3VsdC52YWx1ZSk7CiAgICAgICAgIH0pOwogICAgIH0KIH0KIAotZnVuY3Rp b24gdGVlUmVhZGFibGVTdHJlYW1CcmFuY2gxQ2FuY2VsRnVuY3Rpb24odGVlU3RhdGUsIHN0cmVh bSkKK2Z1bmN0aW9uIHJlYWRhYmxlU3RyZWFtVGVlQnJhbmNoMUNhbmNlbEZ1bmN0aW9uKHRlZVN0 YXRlLCBzdHJlYW0pCiB7CiAgICAgInVzZSBzdHJpY3QiOwogCkBAIC0yMDEsNyArMjAxLDcgQEAg ZnVuY3Rpb24gdGVlUmVhZGFibGVTdHJlYW1CcmFuY2gxQ2FuY2VsRnVuY3Rpb24odGVlU3RhdGUs IHN0cmVhbSkKICAgICB9CiB9CiAKLWZ1bmN0aW9uIHRlZVJlYWRhYmxlU3RyZWFtQnJhbmNoMkNh bmNlbEZ1bmN0aW9uKHRlZVN0YXRlLCBzdHJlYW0pCitmdW5jdGlvbiByZWFkYWJsZVN0cmVhbVRl ZUJyYW5jaDJDYW5jZWxGdW5jdGlvbih0ZWVTdGF0ZSwgc3RyZWFtKQogewogICAgICJ1c2Ugc3Ry aWN0IjsKIApAQCAtMjQ4LDcgKzI0OCw3IEBAIGZ1bmN0aW9uIGlzUmVhZGFibGVTdHJlYW1EZWZh dWx0Q29udHJvbGxlcihjb250cm9sbGVyKQogICAgIHJldHVybiBAaXNPYmplY3QoY29udHJvbGxl cikgJiYgISFjb250cm9sbGVyLkB1bmRlcmx5aW5nU291cmNlOwogfQogCi1mdW5jdGlvbiBlcnJv clJlYWRhYmxlU3RyZWFtKHN0cmVhbSwgZXJyb3IpCitmdW5jdGlvbiByZWFkYWJsZVN0cmVhbUVy cm9yKHN0cmVhbSwgZXJyb3IpCiB7CiAgICAgInVzZSBzdHJpY3QiOwogCkBAIC0yNzQsNyArMjc0 LDcgQEAgZnVuY3Rpb24gZXJyb3JSZWFkYWJsZVN0cmVhbShzdHJlYW0sIGVycm9yKQogICAgIHJl YWRlci5AY2xvc2VkUHJvbWlzZUNhcGFiaWxpdHkuQHJlamVjdC5AY2FsbChAdW5kZWZpbmVkLCBl cnJvcik7CiB9CiAKLWZ1bmN0aW9uIHJlcXVlc3RSZWFkYWJsZVN0cmVhbVB1bGwoY29udHJvbGxl cikKK2Z1bmN0aW9uIHJlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXJDYWxsUHVsbElmTmVl ZGVkKGNvbnRyb2xsZXIpCiB7CiAgICAgInVzZSBzdHJpY3QiOwogCkBAIC0zMDAsNyArMzAwLDcg QEAgZnVuY3Rpb24gcmVxdWVzdFJlYWRhYmxlU3RyZWFtUHVsbChjb250cm9sbGVyKQogICAgICAg ICBjb250cm9sbGVyLkBwdWxsaW5nID0gZmFsc2U7CiAgICAgICAgIGlmIChjb250cm9sbGVyLkBw dWxsQWdhaW4pIHsKICAgICAgICAgICAgIGNvbnRyb2xsZXIuQHB1bGxBZ2FpbiA9IGZhbHNlOwot ICAgICAgICAgICAgQHJlcXVlc3RSZWFkYWJsZVN0cmVhbVB1bGwoY29udHJvbGxlcik7CisgICAg ICAgICAgICBAcmVhZGFibGVTdHJlYW1EZWZhdWx0Q29udHJvbGxlckNhbGxQdWxsSWZOZWVkZWQo Y29udHJvbGxlcik7CiAgICAgICAgIH0KICAgICB9LCBmdW5jdGlvbihlcnJvcikgewogICAgICAg ICBpZiAoc3RyZWFtLkBzdGF0ZSA9PT0gQHN0cmVhbVJlYWRhYmxlKQpAQCAtMzMyLDcgKzMzMiw3 IEBAIGZ1bmN0aW9uIHJlYWRhYmxlU3RyZWFtQ2FuY2VsKHN0cmVhbSwgcmVhc29uKQogICAgICAg ICByZXR1cm4gQFByb21pc2UuQHJlc29sdmUoKTsKICAgICBpZiAoc3RyZWFtLkBzdGF0ZSA9PT0g QHN0cmVhbUVycm9yZWQpCiAgICAgICAgIHJldHVybiBAUHJvbWlzZS5AcmVqZWN0KHN0cmVhbS5A c3RvcmVkRXJyb3IpOwotICAgIEBjbG9zZVJlYWRhYmxlU3RyZWFtKHN0cmVhbSk7CisgICAgQHJl YWRhYmxlU3RyZWFtQ2xvc2Uoc3RyZWFtKTsKICAgICByZXR1cm4gc3RyZWFtLkByZWFkYWJsZVN0 cmVhbUNvbnRyb2xsZXIuQGNhbmNlbChzdHJlYW0uQHJlYWRhYmxlU3RyZWFtQ29udHJvbGxlciwg cmVhc29uKS5AdGhlbihmdW5jdGlvbigpIHsgIH0pOwogfQogCkBAIC0zNTIsMTMgKzM1MiwxMyBA QCBmdW5jdGlvbiByZWFkYWJsZVN0cmVhbURlZmF1bHRDb250cm9sbGVyUHVsbChjb250cm9sbGVy KQogICAgIGlmIChjb250cm9sbGVyLkBxdWV1ZS5jb250ZW50Lmxlbmd0aCkgewogICAgICAgICBj b25zdCBjaHVuayA9IEBkZXF1ZXVlVmFsdWUoY29udHJvbGxlci5AcXVldWUpOwogICAgICAgICBp ZiAoY29udHJvbGxlci5AY2xvc2VSZXF1ZXN0ZWQgJiYgY29udHJvbGxlci5AcXVldWUuY29udGVu dC5sZW5ndGggPT09IDApCi0gICAgICAgICAgICBAY2xvc2VSZWFkYWJsZVN0cmVhbShzdHJlYW0p OworICAgICAgICAgICAgQHJlYWRhYmxlU3RyZWFtQ2xvc2Uoc3RyZWFtKTsKICAgICAgICAgZWxz ZQotICAgICAgICAgICAgQHJlcXVlc3RSZWFkYWJsZVN0cmVhbVB1bGwoY29udHJvbGxlcik7Cisg ICAgICAgICAgICBAcmVhZGFibGVTdHJlYW1EZWZhdWx0Q29udHJvbGxlckNhbGxQdWxsSWZOZWVk ZWQoY29udHJvbGxlcik7CiAgICAgICAgIHJldHVybiBAUHJvbWlzZS5AcmVzb2x2ZSh7dmFsdWU6 IGNodW5rLCBkb25lOiBmYWxzZX0pOwogICAgIH0KICAgICBjb25zdCBwZW5kaW5nUHJvbWlzZSA9 IEByZWFkYWJsZVN0cmVhbUFkZFJlYWRSZXF1ZXN0KHN0cmVhbSk7Ci0gICAgQHJlcXVlc3RSZWFk YWJsZVN0cmVhbVB1bGwoY29udHJvbGxlcik7CisgICAgQHJlYWRhYmxlU3RyZWFtRGVmYXVsdENv bnRyb2xsZXJDYWxsUHVsbElmTmVlZGVkKGNvbnRyb2xsZXIpOwogICAgIHJldHVybiBwZW5kaW5n UHJvbWlzZTsKIH0KIApAQCAtMzcxLDEwICszNzEsMTAgQEAgZnVuY3Rpb24gcmVhZGFibGVTdHJl YW1EZWZhdWx0Q29udHJvbGxlckNsb3NlKGNvbnRyb2xsZXIpCiAgICAgQGFzc2VydChzdHJlYW0u QHN0YXRlID09PSBAc3RyZWFtUmVhZGFibGUpOwogICAgIGNvbnRyb2xsZXIuQGNsb3NlUmVxdWVz dGVkID0gdHJ1ZTsKICAgICBpZiAoY29udHJvbGxlci5AcXVldWUuY29udGVudC5sZW5ndGggPT09 IDApCi0gICAgICAgIEBjbG9zZVJlYWRhYmxlU3RyZWFtKHN0cmVhbSk7CisgICAgICAgIEByZWFk YWJsZVN0cmVhbUNsb3NlKHN0cmVhbSk7CiB9CiAKLWZ1bmN0aW9uIGNsb3NlUmVhZGFibGVTdHJl YW0oc3RyZWFtKQorZnVuY3Rpb24gcmVhZGFibGVTdHJlYW1DbG9zZShzdHJlYW0pCiB7CiAgICAg InVzZSBzdHJpY3QiOwogCkBAIC0zOTUsNyArMzk1LDcgQEAgZnVuY3Rpb24gY2xvc2VSZWFkYWJs ZVN0cmVhbShzdHJlYW0pCiAgICAgcmVhZGVyLkBjbG9zZWRQcm9taXNlQ2FwYWJpbGl0eS5AcmVz b2x2ZS5AY2FsbCgpOwogfQogCi1mdW5jdGlvbiBlbnF1ZXVlSW5SZWFkYWJsZVN0cmVhbShjb250 cm9sbGVyLCBjaHVuaykKK2Z1bmN0aW9uIHJlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXJF bnF1ZXVlKGNvbnRyb2xsZXIsIGNodW5rKQogewogICAgICJ1c2Ugc3RyaWN0IjsKIApAQCAtNDA1 LDcgKzQwNSw3IEBAIGZ1bmN0aW9uIGVucXVldWVJblJlYWRhYmxlU3RyZWFtKGNvbnRyb2xsZXIs IGNodW5rKQogCiAgICAgaWYgKEBpc1JlYWRhYmxlU3RyZWFtTG9ja2VkKHN0cmVhbSkgJiYgc3Ry ZWFtLkByZWFkZXIuQHJlYWRSZXF1ZXN0cy5sZW5ndGgpIHsKICAgICAgICAgc3RyZWFtLkByZWFk ZXIuQHJlYWRSZXF1ZXN0cy5Ac2hpZnQoKS5AcmVzb2x2ZS5AY2FsbChAdW5kZWZpbmVkLCB7dmFs dWU6IGNodW5rLCBkb25lOiBmYWxzZX0pOwotICAgICAgICBAcmVxdWVzdFJlYWRhYmxlU3RyZWFt UHVsbChjb250cm9sbGVyKTsKKyAgICAgICAgQHJlYWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xs ZXJDYWxsUHVsbElmTmVlZGVkKGNvbnRyb2xsZXIpOwogICAgICAgICByZXR1cm47CiAgICAgfQog CkBAIC00MjAsMTAgKzQyMCwxMCBAQCBmdW5jdGlvbiBlbnF1ZXVlSW5SZWFkYWJsZVN0cmVhbShj b250cm9sbGVyLCBjaHVuaykKICAgICAgICAgICAgIEByZWFkYWJsZVN0cmVhbURlZmF1bHRDb250 cm9sbGVyRXJyb3IoY29udHJvbGxlciwgZXJyb3IpOwogICAgICAgICB0aHJvdyBlcnJvcjsKICAg ICB9Ci0gICAgQHJlcXVlc3RSZWFkYWJsZVN0cmVhbVB1bGwoY29udHJvbGxlcik7CisgICAgQHJl YWRhYmxlU3RyZWFtRGVmYXVsdENvbnRyb2xsZXJDYWxsUHVsbElmTmVlZGVkKGNvbnRyb2xsZXIp OwogfQogCi1mdW5jdGlvbiByZWFkRnJvbVJlYWRhYmxlU3RyZWFtRGVmYXVsdFJlYWRlcihyZWFk ZXIpCitmdW5jdGlvbiByZWFkYWJsZVN0cmVhbURlZmF1bHRSZWFkZXJSZWFkKHJlYWRlcikKIHsK ICAgICAidXNlIHN0cmljdCI7CiAK