163004 2016-10-06 03:12:38 -0700 CachedResourceRequest should not need to store defer and preload options 2016-10-06 23:02:45 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf cdumez commit-queue dbates japhet oldest_to_newest 1236984 0 youennf 2016-10-06 03:12:38 -0700 This should be handled by CachedResourceLoader internally. 1236986 1 290806 youennf 2016-10-06 03:16:58 -0700 Created attachment 290806 Patch 1237076 2 290806 achristensen 2016-10-06 08:59:26 -0700 Comment on attachment 290806 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=290806&action=review > Source/WebCore/loader/cache/CachedResourceLoader.cpp:192 > + auto defer = clientDefersImage(request.resourceRequest().url()) ? DeferOption::DeferredByClient : DeferOption::NoDefer; I think this auto should be bool. 1237480 3 youennf 2016-10-06 22:39:59 -0700 Thanks for the review. > > Source/WebCore/loader/cache/CachedResourceLoader.cpp:192 > > + auto defer = clientDefersImage(request.resourceRequest().url()) ? DeferOption::DeferredByClient : DeferOption::NoDefer; > > I think this auto should be bool. defer is of type enum class DeferOption. 1237489 4 290806 commit-queue 2016-10-06 23:02:41 -0700 Comment on attachment 290806 Patch Clearing flags on attachment: 290806 Committed r206900: <http://trac.webkit.org/changeset/206900> 1237490 5 commit-queue 2016-10-06 23:02:45 -0700 All reviewed patches have been landed. Closing bug. 290806 2016-10-06 03:16:58 -0700 2016-10-06 23:02:41 -0700 Patch bug-163004-20161006121343.patch text/plain 17461 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2ODQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDJlZGUxYzljOWRkMmRi M2RlMDZjY2VhNzhkNDJmY2E5ZjUxNjAzNC4uZjY1YmE3ZjUyOWY5MGExYjY4YjYzYTYxN2I0OGZm NTMzMjdmOTYxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQxIEBACiAyMDE2LTEwLTA2ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBDYWNoZWRSZXNvdXJjZVJl cXVlc3Qgc2hvdWxkIG5vdCBuZWVkIHRvIHN0b3JlIGRlZmVyIGFuZCBwcmVsb2FkIG9wdGlvbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MzAwNAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5n ZSBvZiBiZWhhdmlvci4KKworICAgICAgICBSZW1vdmluZyBDYWNoZWRSZXNvdXJjZVJlcXVlc3Qg ZGVmZXIgYW5kIHByZWxvYWQgZmllbGRzLgorICAgICAgICBUaGVzZSBmaWVsZHMgYXJlIGNvbXB1 dGVkIGluc2lkZSBDYWNoZWRSZXNvdXJjZUxvYWRlciBpbnN0ZWFkLgorCisgICAgICAgIFVwZGF0 ZWQgc2V0dGluZyBvZiBwcmlvcml0eSBmcm9tIENhY2hlZFJlc291cmNlUmVxdWVzdCB0byBDYWNo ZWRSZXNvdXJjZS4KKyAgICAgICAgUHJpb3JpdHkgaXMgc2V0IGZvciBhbnkgbmV3IHJlc291cmNl ICh0aGlzIGNvdmVycyBhbGwgY2FzZXMgd2hlcmUgbm8gY2FjaGVkIHJlc291cmNlIGNhbiBiZSBy ZXVzZWQgZnJvbSB0aGUgbWVtb3J5IGNhY2hlKS4KKyAgICAgICAgUHJpb3JpdHkgaXMgc2V0IGZv ciBhIGNhY2hlZCByZXNvdXJjZSBpZiB0aGUgcmVxdWVzdCBpcyBub3QgYSBwcmVsb2FkIHJlcXVl c3QuCisKKyAgICAgICAgKiBsb2FkZXIvTGlua0xvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMaW5rTG9hZGVyOjpwcmVsb2FkSWZOZWVkZWQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZTo6Q2Fj aGVkUmVzb3VyY2UpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdElt YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpjYW5SZXF1ZXN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0UmVzb3Vy Y2UpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmRldGVybWluZVJl dmFsaWRhdGlvblBvbGljeSk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRl cjo6cmVxdWVzdFByZWxvYWQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0OjpDYWNoZWRSZXNv dXJjZVJlcXVlc3QpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVl c3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlUmVxdWVzdDo6cHJpb3JpdHkp OgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0Ojpmb3JQcmVsb2FkKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlUmVxdWVzdDo6c2V0Rm9y UHJlbG9hZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZVJlcXVl c3Q6OmRlZmVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlUmVx dWVzdDo6c2V0RGVmZXIpOiBEZWxldGVkLgorCisyMDE2LTEwLTA2ICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KKwogICAgICAgICBbRmV0Y2ggQVBJXSBGb3JiaWQgcmVkaXJlY3Rp b24gdG8gbm9uLUhUVFAocykgVVJMIGluIG5vbi1uYXZpZ2F0aW9uIG1vZGUuCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjI3ODUKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0xpbmtMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0xpbmtMb2FkZXIuY3BwCmluZGV4IDYzZTk5YzU1NGI0MjhhYjc4NDUzZjBhMDM0N2Nl N2E5MDhiYWNkMDQuLmNkY2ZhZmYwZGMyZDI5NWJjNzliZmJkNDdlMzYyNmI5NDgzODdjNmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rTG9hZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvTGlua0xvYWRlci5jcHAKQEAgLTE2Miw3ICsxNjIsNiBAQCB2b2lk IExpbmtMb2FkZXI6OnByZWxvYWRJZk5lZWRlZChjb25zdCBMaW5rUmVsQXR0cmlidXRlJiByZWxB dHRyaWJ1dGUsIGNvbnN0IFVSTAogICAgIGxpbmtSZXF1ZXN0LnNldEluaXRpYXRvcigibGluayIp OwogCiAgICAgbGlua1JlcXVlc3Quc2V0QXNQb3RlbnRpYWxseUNyb3NzT3JpZ2luKGNyb3NzT3Jp Z2luTW9kZSwgZG9jdW1lbnQpOwotICAgIGxpbmtSZXF1ZXN0LnNldEZvclByZWxvYWQodHJ1ZSk7 CiAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IGNhY2hlZExpbmtSZXNv dXJjZSA9IGRvY3VtZW50LmNhY2hlZFJlc291cmNlTG9hZGVyKCkucHJlbG9hZCh0eXBlLnZhbHVl KCksIFdURk1vdmUobGlua1JlcXVlc3QpLCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6RXhwbGljaXRQ cmVsb2FkKTsKIAogICAgIGlmIChjYWNoZWRMaW5rUmVzb3VyY2UpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcAppbmRleCAzYmFjOTE2YjE5ZGYyMThh YTI4N2I0MzIyZGZjODNjNmEwZGRiODU5Li41ZGYyYzc1MTM2NjMzYjRjNWQ3YWY2ZjkwYjc0OGYy YmZlY2M5MjYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk UmVzb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNv dXJjZS5jcHAKQEAgLTEyNSw2ICsxMjUsOCBAQCBDYWNoZWRSZXNvdXJjZTo6Q2FjaGVkUmVzb3Vy Y2UoQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgVHlwZSB0eXBlLCBTZXNzaQogICAg ICwgbV90eXBlKHR5cGUpCiB7CiAgICAgQVNTRVJUKHNlc3Npb25JRC5pc1ZhbGlkKCkpOworCisg ICAgc2V0TG9hZFByaW9yaXR5KHJlcXVlc3QucHJpb3JpdHkoKSk7CiAgICAgZmluaXNoUmVxdWVz dEluaXRpYWxpemF0aW9uKCk7CiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGhhdmUgYSBiZXR0 ZXIgd2F5IG9mIGNoZWNraW5nIGZvciBOYXZpZ2F0aW9uIGxvYWRzLCBtYXliZSBGZXRjaE1vZGU6 Ok9wdGlvbnM6Ok5hdmlnYXRlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggODYwZTViM2E1MDQ5ZDVjYTFlMjU2Y2Ni MDcwMmY4ODcyZmIwZGNjMC4uMzY0ZDQ0MDgzZDEwMzg2NzE5YjJiYWY5NTA2NjZiMjU2ZmNjNmNk NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VMb2FkZXIuY3BwCkBAIC0xODMsMTQgKzE4MywxNCBAQCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxD YWNoZWRJbWFnZT4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RJbWFnZShDYWNoZWRSZXNv dQogICAgICAgICAgICAgaWYgKERvY3VtZW50KiBkb2N1bWVudCA9IGZyYW1lLT5kb2N1bWVudCgp KQogICAgICAgICAgICAgICAgIGRvY3VtZW50LT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+dXBn cmFkZUluc2VjdXJlUmVxdWVzdElmTmVlZGVkKHJlcXVlc3QubXV0YWJsZVJlc291cmNlUmVxdWVz dCgpLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6Okluc2VjdXJlUmVxdWVzdFR5cGU6OkxvYWQpOwog ICAgICAgICAgICAgVVJMIHJlcXVlc3RVUkwgPSByZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLnVy bCgpOwotICAgICAgICAgICAgaWYgKHJlcXVlc3RVUkwuaXNWYWxpZCgpICYmIGNhblJlcXVlc3Qo Q2FjaGVkUmVzb3VyY2U6OkltYWdlUmVzb3VyY2UsIHJlcXVlc3RVUkwsIHJlcXVlc3QpKQorICAg ICAgICAgICAgaWYgKHJlcXVlc3RVUkwuaXNWYWxpZCgpICYmIGNhblJlcXVlc3QoQ2FjaGVkUmVz b3VyY2U6OkltYWdlUmVzb3VyY2UsIHJlcXVlc3RVUkwsIHJlcXVlc3QsIEZvclByZWxvYWQ6Ok5v KSkKICAgICAgICAgICAgICAgICBQaW5nTG9hZGVyOjpsb2FkSW1hZ2UoKmZyYW1lLCByZXF1ZXN0 VVJMKTsKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICB9CiAgICAgfQogCi0g ICAgcmVxdWVzdC5zZXREZWZlcihjbGllbnREZWZlcnNJbWFnZShyZXF1ZXN0LnJlc291cmNlUmVx dWVzdCgpLnVybCgpKSA/IENhY2hlZFJlc291cmNlUmVxdWVzdDo6RGVmZXJyZWRCeUNsaWVudCA6 IENhY2hlZFJlc291cmNlUmVxdWVzdDo6Tm9EZWZlcik7Ci0gICAgcmV0dXJuIGRvd25jYXN0PENh Y2hlZEltYWdlPihyZXF1ZXN0UmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2U6OkltYWdlUmVzb3VyY2Us IFdURk1vdmUocmVxdWVzdCkpLmdldCgpKTsKKyAgICBhdXRvIGRlZmVyID0gY2xpZW50RGVmZXJz SW1hZ2UocmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS51cmwoKSkgPyBEZWZlck9wdGlvbjo6RGVm ZXJyZWRCeUNsaWVudCA6IERlZmVyT3B0aW9uOjpOb0RlZmVyOworICAgIHJldHVybiBkb3duY2Fz dDxDYWNoZWRJbWFnZT4ocmVxdWVzdFJlc291cmNlKENhY2hlZFJlc291cmNlOjpJbWFnZVJlc291 cmNlLCBXVEZNb3ZlKHJlcXVlc3QpLCBGb3JQcmVsb2FkOjpObywgZGVmZXIpLmdldCgpKTsKIH0K IAogQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkRm9udD4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6 OnJlcXVlc3RGb250KENhY2hlZFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIGJvb2wgaXNTVkcp CkBAIC00MzcsMTIgKzQzNywxMiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNTYW1lT3JpZ2luRGF0 YVVSTChjb25zdCBVUkwmIHVybCwgY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRpbwogICAgIHJldHVy biB1cmwucHJvdG9jb2xJc0RhdGEoKSAmJiBvcHRpb25zLnNhbWVPcmlnaW5EYXRhVVJMRmxhZyA9 PSBTYW1lT3JpZ2luRGF0YVVSTEZsYWc6OlNldDsKIH0KIAotYm9vbCBDYWNoZWRSZXNvdXJjZUxv YWRlcjo6Y2FuUmVxdWVzdChDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBjb25zdCBVUkwmIHVy bCwgY29uc3QgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQorYm9vbCBDYWNoZWRSZXNv dXJjZUxvYWRlcjo6Y2FuUmVxdWVzdChDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBjb25zdCBV UkwmIHVybCwgY29uc3QgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBGb3JQcmVsb2Fk IGZvclByZWxvYWQpCiB7CiAgICAgYXV0byYgb3B0aW9ucyA9IHJlcXVlc3Qub3B0aW9ucygpOwog CiAgICAgaWYgKGRvY3VtZW50KCkgJiYgIWRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPmNh bkRpc3BsYXkodXJsKSkgewotICAgICAgICBpZiAoIXJlcXVlc3QuZm9yUHJlbG9hZCgpKQorICAg ICAgICBpZiAoZm9yUHJlbG9hZCA9PSBGb3JQcmVsb2FkOjpObykKICAgICAgICAgICAgIEZyYW1l TG9hZGVyOjpyZXBvcnRMb2NhbExvYWRGYWlsZWQoZnJhbWUoKSwgdXJsLnN0cmluZ0NlbnRlckVs bGlwc2l6ZWRUb0xlbmd0aCgpKTsKICAgICAgICAgTE9HKFJlc291cmNlTG9hZGluZywgIkNhY2hl ZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0UmVzb3VyY2UgVVJMIHdhcyBub3QgYWxsb3dlZCBieSBT ZWN1cml0eU9yaWdpbjo6Y2FuRGlzcGxheSIpOwogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC02 MzQsMTQgKzYzNCwxNCBAQCB2b2lkIENhY2hlZFJlc291cmNlTG9hZGVyOjpwcmVwYXJlRmV0Y2go Q2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwgQ2FjaGVkUmVzb3VyYwogICAgIC8vIEZJWE1FOiBE ZWNpZGUgd2hldGhlciB0byBzdXBwb3J0IGNsaWVudCBoaW50cwogfQogCi1DYWNoZWRSZXNvdXJj ZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNv dXJjZShDYWNoZWRSZXNvdXJjZTo6VHlwZSB0eXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmJiBy ZXF1ZXN0KQorQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhY2hlZFJlc291 cmNlTG9hZGVyOjpyZXF1ZXN0UmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwgQ2Fj aGVkUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgRm9yUHJlbG9hZCBmb3JQcmVsb2FkLCBEZWZl ck9wdGlvbiBkZWZlcikKIHsKICAgICBpZiAoRG9jdW1lbnQqIGRvY3VtZW50ID0gdGhpcy0+ZG9j dW1lbnQoKSkKICAgICAgICAgZG9jdW1lbnQtPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT51cGdy YWRlSW5zZWN1cmVSZXF1ZXN0SWZOZWVkZWQocmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1ZXN0 KCksIENvbnRlbnRTZWN1cml0eVBvbGljeTo6SW5zZWN1cmVSZXF1ZXN0VHlwZTo6TG9hZCk7CiAK ICAgICBVUkwgdXJsID0gcmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS51cmwoKTsKIAotICAgIExP RyhSZXNvdXJjZUxvYWRpbmcsICJDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNl ICclcycsIGNoYXJzZXQgJyVzJywgcHJpb3JpdHk9JWQsIGZvclByZWxvYWQ9JXUiLCB1cmwuc3Ry aW5nQ2VudGVyRWxsaXBzaXplZFRvTGVuZ3RoKCkubGF0aW4xKCkuZGF0YSgpLCByZXF1ZXN0LmNo YXJzZXQoKS5sYXRpbjEoKS5kYXRhKCksIHJlcXVlc3QucHJpb3JpdHkoKSA/IHN0YXRpY19jYXN0 PGludD4ocmVxdWVzdC5wcmlvcml0eSgpLnZhbHVlKCkpIDogLTEsIHJlcXVlc3QuZm9yUHJlbG9h ZCgpKTsKKyAgICBMT0coUmVzb3VyY2VMb2FkaW5nLCAiQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJl cXVlc3RSZXNvdXJjZSAnJXMnLCBjaGFyc2V0ICclcycsIHByaW9yaXR5PSVkLCBmb3JQcmVsb2Fk PSV1IiwgdXJsLnN0cmluZ0NlbnRlckVsbGlwc2l6ZWRUb0xlbmd0aCgpLmxhdGluMSgpLmRhdGEo KSwgcmVxdWVzdC5jaGFyc2V0KCkubGF0aW4xKCkuZGF0YSgpLCByZXF1ZXN0LnByaW9yaXR5KCkg PyBzdGF0aWNfY2FzdDxpbnQ+KHJlcXVlc3QucHJpb3JpdHkoKS52YWx1ZSgpKSA6IC0xLCBmb3JQ cmVsb2FkID09IEZvclByZWxvYWQ6Olllcyk7CiAKICAgICAvLyBJZiBvbmx5IHRoZSBmcmFnbWVu dCBpZGVudGlmaWVycyBkaWZmZXIsIGl0IGlzIHRoZSBzYW1lIHJlc291cmNlLgogICAgIHVybCA9 IE1lbW9yeUNhY2hlOjpyZW1vdmVGcmFnbWVudElkZW50aWZpZXJJZk5lZWRlZCh1cmwpOwpAQCAt NjU0LDcgKzY1NCw3IEBAIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiBDYWNo ZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKENhY2hlCiAgICAgcHJlcGFyZUZldGNo KHR5cGUsIHJlcXVlc3QpOwogCiAgICAgLy8gV2UgYXJlIHBhc3NpbmcgdXJsIGFzIHdlbGwgYXMg cmVxdWVzdCwgYXMgcmVxdWVzdCB1cmwgbWF5IGNvbnRhaW4gYSBmcmFnbWVudCBpZGVudGlmaWVy LgotICAgIGlmICghY2FuUmVxdWVzdCh0eXBlLCB1cmwsIHJlcXVlc3QpKSB7CisgICAgaWYgKCFj YW5SZXF1ZXN0KHR5cGUsIHVybCwgcmVxdWVzdCwgZm9yUHJlbG9hZCkpIHsKICAgICAgICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRCgicmVxdWVzdFJlc291cmNlOiBOb3QgYWxsb3dlZCB0byByZXF1 ZXN0IHJlc291cmNlIChmcmFtZSA9ICVwKSIsIGZyYW1lKCkpOwogICAgICAgICByZXR1cm4gbnVs bHB0cjsKICAgICB9CkBAIC03MTIsMTMgKzcxMiw3IEBAIENhY2hlZFJlc291cmNlSGFuZGxlPENh Y2hlZFJlc291cmNlPiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKENhY2hl CiAKICAgICBsb2dNZW1vcnlDYWNoZVJlc291cmNlUmVxdWVzdChmcmFtZSgpLCByZXNvdXJjZSA/ IERpYWdub3N0aWNMb2dnaW5nS2V5czo6aW5NZW1vcnlDYWNoZUtleSgpIDogRGlhZ25vc3RpY0xv Z2dpbmdLZXlzOjpub3RJbk1lbW9yeUNhY2hlS2V5KCkpOwogCi0gICAgLy8gVGhlc2UgMyBmaWVs ZHMgd2lsbCBiZSB1c2VkIGJlbG93IGFmdGVyIHJlcXVlc3QgaXMgbW92ZWQuCi0gICAgLy8gRklY TUU6IFdlIGNhbiByZWFycmFuZ2UgdGhlIGNvZGUgdG8gbm90IHJlcXVpcmUgc3RvcmluZyBhbGwg MyBmaWVsZHMuCi0gICAgYXV0byBmb3JQcmVsb2FkID0gcmVxdWVzdC5mb3JQcmVsb2FkKCk7Ci0g ICAgYXV0byBkZWZlciA9IHJlcXVlc3QuZGVmZXIoKTsKLSAgICBhdXRvIHByaW9yaXR5ID0gcmVx dWVzdC5wcmlvcml0eSgpOwotCi0gICAgUmV2YWxpZGF0aW9uUG9saWN5IHBvbGljeSA9IGRldGVy bWluZVJldmFsaWRhdGlvblBvbGljeSh0eXBlLCByZXF1ZXN0LCByZXNvdXJjZS5nZXQoKSk7Cisg ICAgUmV2YWxpZGF0aW9uUG9saWN5IHBvbGljeSA9IGRldGVybWluZVJldmFsaWRhdGlvblBvbGlj eSh0eXBlLCByZXF1ZXN0LCByZXNvdXJjZS5nZXQoKSwgZm9yUHJlbG9hZCwgZGVmZXIpOwogICAg IHN3aXRjaCAocG9saWN5KSB7CiAgICAgY2FzZSBSZWxvYWQ6CiAgICAgICAgIG1lbW9yeUNhY2hl LnJlbW92ZSgqcmVzb3VyY2UpOwpAQCAtNzUzLDYgKzc0Nyw4IEBAIENhY2hlZFJlc291cmNlSGFu ZGxlPENhY2hlZFJlc291cmNlPiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNl KENhY2hlCiAgICAgICAgICAgICAgICAgbV9yZXNvdXJjZVRpbWluZ0luZm8uYWRkUmVzb3VyY2VU aW1pbmcocmVzb3VyY2UuZ2V0KCksICpkb2N1bWVudCgpLCBsb2FkVGltaW5nKTsKICAgICAgICAg ICAgIH0KICNlbmRpZgorICAgICAgICAgICAgaWYgKGZvclByZWxvYWQgPT0gRm9yUHJlbG9hZDo6 Tm8pCisgICAgICAgICAgICAgICAgcmVzb3VyY2UtPnNldExvYWRQcmlvcml0eShyZXF1ZXN0LnBy aW9yaXR5KCkpOwogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTc2MCwxNSAr NzU2LDEyIEBAIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiBDYWNoZWRSZXNv dXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKENhY2hlCiAgICAgaWYgKCFyZXNvdXJjZSkKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBpZiAoIWZvclByZWxvYWQgfHwgcG9saWN5ICE9 IFVzZSkKLSAgICAgICAgcmVzb3VyY2UtPnNldExvYWRQcmlvcml0eShwcmlvcml0eSk7Ci0KLSAg ICBpZiAoIWZvclByZWxvYWQgJiYgcmVzb3VyY2UtPmxvYWRlcigpICYmIHJlc291cmNlLT5yZXNv dXJjZVJlcXVlc3QoKS5pZ25vcmVGb3JSZXF1ZXN0Q291bnQoKSkgeworICAgIGlmIChmb3JQcmVs b2FkID09IEZvclByZWxvYWQ6Ok5vICYmIHJlc291cmNlLT5sb2FkZXIoKSAmJiByZXNvdXJjZS0+ cmVzb3VyY2VSZXF1ZXN0KCkuaWdub3JlRm9yUmVxdWVzdENvdW50KCkpIHsKICAgICAgICAgcmVz b3VyY2UtPnJlc291cmNlUmVxdWVzdCgpLnNldElnbm9yZUZvclJlcXVlc3RDb3VudChmYWxzZSk7 CiAgICAgICAgIGluY3JlbWVudFJlcXVlc3RDb3VudCgqcmVzb3VyY2UpOwogICAgIH0KIAotICAg IGlmICgocG9saWN5ICE9IFVzZSB8fCByZXNvdXJjZS0+c3RpbGxOZWVkc0xvYWQoKSkgJiYgQ2Fj aGVkUmVzb3VyY2VSZXF1ZXN0OjpOb0RlZmVyID09IGRlZmVyKSB7CisgICAgaWYgKChwb2xpY3kg IT0gVXNlIHx8IHJlc291cmNlLT5zdGlsbE5lZWRzTG9hZCgpKSAmJiBkZWZlciA9PSBEZWZlck9w dGlvbjo6Tm9EZWZlcikgewogICAgICAgICByZXNvdXJjZS0+bG9hZCgqdGhpcyk7CiAKICAgICAg ICAgLy8gV2UgZG9uJ3Qgc3VwcG9ydCBpbW1lZGlhdGUgbG9hZHMsIGJ1dCB3ZSBkbyBzdXBwb3J0 IGltbWVkaWF0ZSBmYWlsdXJlLgpAQCAtODY4LDcgKzg2MSw3IEBAIHN0YXRpYyB2b2lkIGxvZ1Jl c291cmNlUmV2YWxpZGF0aW9uRGVjaXNpb24oQ2FjaGVkUmVzb3VyY2U6OlJldmFsaWRhdGlvbkRl Y2lzaW9uCiAgICAgfQogfQogCi1DYWNoZWRSZXNvdXJjZUxvYWRlcjo6UmV2YWxpZGF0aW9uUG9s aWN5IENhY2hlZFJlc291cmNlTG9hZGVyOjpkZXRlcm1pbmVSZXZhbGlkYXRpb25Qb2xpY3koQ2Fj aGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiBjYWNoZWRSZXNv dXJjZVJlcXVlc3QsIENhY2hlZFJlc291cmNlKiBleGlzdGluZ1Jlc291cmNlKSBjb25zdAorQ2Fj aGVkUmVzb3VyY2VMb2FkZXI6OlJldmFsaWRhdGlvblBvbGljeSBDYWNoZWRSZXNvdXJjZUxvYWRl cjo6ZGV0ZXJtaW5lUmV2YWxpZGF0aW9uUG9saWN5KENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUs IENhY2hlZFJlc291cmNlUmVxdWVzdCYgY2FjaGVkUmVzb3VyY2VSZXF1ZXN0LCBDYWNoZWRSZXNv dXJjZSogZXhpc3RpbmdSZXNvdXJjZSwgRm9yUHJlbG9hZCBmb3JQcmVsb2FkLCBEZWZlck9wdGlv biBkZWZlcikgY29uc3QKIHsKICAgICBhdXRvJiByZXF1ZXN0ID0gY2FjaGVkUmVzb3VyY2VSZXF1 ZXN0LnJlc291cmNlUmVxdWVzdCgpOwogCkBAIC04NzYsNyArODY5LDcgQEAgQ2FjaGVkUmVzb3Vy Y2VMb2FkZXI6OlJldmFsaWRhdGlvblBvbGljeSBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6ZGV0ZXJt aW5lUmV2YWxpZGEKICAgICAgICAgcmV0dXJuIExvYWQ7CiAKICAgICAvLyBXZSBhbHJlYWR5IGhh dmUgYSBwcmVsb2FkIGdvaW5nIGZvciB0aGlzIFVSTC4KLSAgICBpZiAoY2FjaGVkUmVzb3VyY2VS ZXF1ZXN0LmZvclByZWxvYWQoKSAmJiBleGlzdGluZ1Jlc291cmNlLT5pc1ByZWxvYWRlZCgpKQor ICAgIGlmIChmb3JQcmVsb2FkID09IEZvclByZWxvYWQ6OlllcyAmJiBleGlzdGluZ1Jlc291cmNl LT5pc1ByZWxvYWRlZCgpKQogICAgICAgICByZXR1cm4gVXNlOwogCiAgICAgLy8gSWYgdGhlIHNh bWUgVVJMIGhhcyBiZWVuIGxvYWRlZCBhcyBhIGRpZmZlcmVudCB0eXBlLCB3ZSBuZWVkIHRvIHJl bG9hZC4KQEAgLTkwNSw5ICs4OTgsOCBAQCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6UmV2YWxpZGF0 aW9uUG9saWN5IENhY2hlZFJlc291cmNlTG9hZGVyOjpkZXRlcm1pbmVSZXZhbGlkYQogICAgIC8v IENvbmRpdGlvbmFsIHJlcXVlc3RzIHNob3VsZCBoYXZlIGZhaWxlZCBjYW5SZXVzZSBjaGVjay4K ICAgICBBU1NFUlQoIXJlcXVlc3QuaXNDb25kaXRpb25hbCgpKTsKIAotICAgIC8vIERvIG5vdCBs b2FkIGZyb20gY2FjaGUgaWYgaW1hZ2VzIGFyZSBub3QgZW5hYmxlZC4gVGhlIGxvYWQgZm9yIHRo aXMgaW1hZ2Ugd2lsbCBiZSBibG9ja2VkCi0gICAgLy8gaW4gQ2FjaGVkSW1hZ2U6OmxvYWQuCi0g ICAgaWYgKGNhY2hlZFJlc291cmNlUmVxdWVzdC5kZWZlcigpID09IENhY2hlZFJlc291cmNlUmVx dWVzdDo6RGVmZXJyZWRCeUNsaWVudCkKKyAgICAvLyBEbyBub3QgbG9hZCBmcm9tIGNhY2hlIGlm IGltYWdlcyBhcmUgbm90IGVuYWJsZWQuIFRoZSBsb2FkIGZvciB0aGlzIGltYWdlIHdpbGwgYmUg YmxvY2tlZCBpbiBDYWNoZWRJbWFnZTo6bG9hZC4KKyAgICBpZiAoZGVmZXIgPT0gRGVmZXJPcHRp b246OkRlZmVycmVkQnlDbGllbnQpCiAgICAgICAgIHJldHVybiBSZWxvYWQ7CiAKICAgICAvLyBE b24ndCByZWxvYWQgcmVzb3VyY2VzIHdoaWxlIHBhc3RpbmcuCkBAIC0xMjI0LDkgKzEyMTYsOCBA QCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2Fk ZXI6OnJlcXVlc3RQcmVsb2FkKENhY2hlZAogewogICAgIGlmIChyZXF1ZXN0LmNoYXJzZXQoKS5p c0VtcHR5KCkgJiYgKHR5cGUgPT0gQ2FjaGVkUmVzb3VyY2U6OlNjcmlwdCB8fCB0eXBlID09IENh Y2hlZFJlc291cmNlOjpDU1NTdHlsZVNoZWV0KSkKICAgICAgICAgcmVxdWVzdC5zZXRDaGFyc2V0 KG1fZG9jdW1lbnQtPmNoYXJzZXQoKSk7Ci0gICAgcmVxdWVzdC5zZXRGb3JQcmVsb2FkKHRydWUp OwogCi0gICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IHJlc291cmNlID0g cmVxdWVzdFJlc291cmNlKHR5cGUsIFdURk1vdmUocmVxdWVzdCkpOworICAgIENhY2hlZFJlc291 cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiByZXNvdXJjZSA9IHJlcXVlc3RSZXNvdXJjZSh0eXBl LCBXVEZNb3ZlKHJlcXVlc3QpLCBGb3JQcmVsb2FkOjpZZXMpOwogICAgIGlmICghcmVzb3VyY2Ug fHwgKG1fcHJlbG9hZHMgJiYgbV9wcmVsb2Fkcy0+Y29udGFpbnMocmVzb3VyY2UuZ2V0KCkpKSkK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgLy8gRm9udHMgbmVlZCBzcGVjaWFsIHRyZWF0 bWVudCBzaW5jZSBqdXN0IGNyZWF0aW5nIHRoZSByZXNvdXJjZSBkb2Vzbid0IHRyaWdnZXIgYSBs b2FkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291 cmNlTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VM b2FkZXIuaAppbmRleCBkMzgzNjI1YjhlZjkyZmU0MTA5ZDRlMWUwOGVjMjk4N2JmZDVkNWUwLi5m OGYxNTIyZDIwOWYyOTUzYjc2YmRkZWUwN2UwOWVjN2I4YjhjM2NhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaApAQCAtMTM2LDcg KzEzNiw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGNoZWNrRm9yUGVuZGluZ1ByZWxvYWRzKCk7CiAg ICAgdm9pZCBwcmludFByZWxvYWRTdGF0cygpOwogCi0gICAgYm9vbCBjYW5SZXF1ZXN0KENhY2hl ZFJlc291cmNlOjpUeXBlLCBjb25zdCBVUkwmLCBjb25zdCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Qm KTsKICAgICBib29sIGNhblJlcXVlc3RBZnRlclJlZGlyZWN0aW9uKENhY2hlZFJlc291cmNlOjpU eXBlLCBjb25zdCBVUkwmLCBjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmKTsKIAogICAgIHN0 YXRpYyBjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmIGRlZmF1bHRDYWNoZWRSZXNvdXJjZU9w dGlvbnMoKTsKQEAgLTE1MiwxNCArMTUxLDE5IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZXhw bGljaXQgQ2FjaGVkUmVzb3VyY2VMb2FkZXIoRG9jdW1lbnRMb2FkZXIqKTsKIAotICAgIENhY2hl ZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiByZXF1ZXN0UmVzb3VyY2UoQ2FjaGVkUmVz b3VyY2U6OlR5cGUsIENhY2hlZFJlc291cmNlUmVxdWVzdCYmKTsKKyAgICBlbnVtIGNsYXNzIEZv clByZWxvYWQgeyBZZXMsIE5vIH07CisgICAgZW51bSBjbGFzcyBEZWZlck9wdGlvbiB7IE5vRGVm ZXIsIERlZmVycmVkQnlDbGllbnQgfTsKKworICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hl ZFJlc291cmNlPiByZXF1ZXN0UmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2U6OlR5cGUsIENhY2hlZFJl c291cmNlUmVxdWVzdCYmLCBGb3JQcmVsb2FkID0gRm9yUHJlbG9hZDo6Tm8sIERlZmVyT3B0aW9u ID0gRGVmZXJPcHRpb246Ok5vRGVmZXIpOwogICAgIHZvaWQgcHJlcGFyZUZldGNoKENhY2hlZFJl c291cmNlOjpUeXBlLCBDYWNoZWRSZXNvdXJjZVJlcXVlc3QmKTsKICAgICBDYWNoZWRSZXNvdXJj ZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gcmV2YWxpZGF0ZVJlc291cmNlKENhY2hlZFJlc291cmNl UmVxdWVzdCYmLCBDYWNoZWRSZXNvdXJjZSYpOwogICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENh Y2hlZFJlc291cmNlPiBsb2FkUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2U6OlR5cGUsIENhY2hlZFJl c291cmNlUmVxdWVzdCYmKTsKICAgICBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJj ZT4gcmVxdWVzdFByZWxvYWQoQ2FjaGVkUmVzb3VyY2U6OlR5cGUsIENhY2hlZFJlc291cmNlUmVx dWVzdCYmKTsKIAorICAgIGJvb2wgY2FuUmVxdWVzdChDYWNoZWRSZXNvdXJjZTo6VHlwZSwgY29u c3QgVVJMJiwgY29uc3QgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiwgRm9yUHJlbG9hZCk7CisKICAg ICBlbnVtIFJldmFsaWRhdGlvblBvbGljeSB7IFVzZSwgUmV2YWxpZGF0ZSwgUmVsb2FkLCBMb2Fk IH07Ci0gICAgUmV2YWxpZGF0aW9uUG9saWN5IGRldGVybWluZVJldmFsaWRhdGlvblBvbGljeShD YWNoZWRSZXNvdXJjZTo6VHlwZSwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiwgQ2FjaGVkUmVzb3Vy Y2UqIGV4aXN0aW5nUmVzb3VyY2UpIGNvbnN0OworICAgIFJldmFsaWRhdGlvblBvbGljeSBkZXRl cm1pbmVSZXZhbGlkYXRpb25Qb2xpY3koQ2FjaGVkUmVzb3VyY2U6OlR5cGUsIENhY2hlZFJlc291 cmNlUmVxdWVzdCYsIENhY2hlZFJlc291cmNlKiBleGlzdGluZ1Jlc291cmNlLCBGb3JQcmVsb2Fk LCBEZWZlck9wdGlvbikgY29uc3Q7CiAKICAgICBib29sIHNob3VsZFVwZGF0ZUNhY2hlZFJlc291 cmNlV2l0aEN1cnJlbnRSZXF1ZXN0KGNvbnN0IENhY2hlZFJlc291cmNlJiwgY29uc3QgQ2FjaGVk UmVzb3VyY2VSZXF1ZXN0Jik7CiAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3Vy Y2U+IHVwZGF0ZUNhY2hlZFJlc291cmNlV2l0aEN1cnJlbnRSZXF1ZXN0KGNvbnN0IENhY2hlZFJl c291cmNlJiwgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcAppbmRleCAxYzNlZTZm MjdiNTk5YzlmOGMzYzA4YjdkZWUwMGNiNDc0M2RkMWYxLi45MTY0MTJjODJiODhkY2UyYjhhODZl MmY2OGQ4MDE2MjJmZmQ5MDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcApAQCAtMzksOCArMzksNiBAQCBDYWNoZWRS ZXNvdXJjZVJlcXVlc3Q6OkNhY2hlZFJlc291cmNlUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlc291cmNlUmVxdQogICAgICwgbV9jaGFyc2V0KGNoYXJzZXQpCiAgICAgLCBtX29wdGlv bnMoQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OmRlZmF1bHRDYWNoZWRSZXNvdXJjZU9wdGlvbnMoKSkK ICAgICAsIG1fcHJpb3JpdHkocHJpb3JpdHkpCi0gICAgLCBtX2ZvclByZWxvYWQoZmFsc2UpCi0g ICAgLCBtX2RlZmVyKE5vRGVmZXIpCiB7CiB9CiAKQEAgLTQ4LDggKzQ2LDYgQEAgQ2FjaGVkUmVz b3VyY2VSZXF1ZXN0OjpDYWNoZWRSZXNvdXJjZVJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYgcmVz b3VyY2VSZXF1ZXN0LAogICAgIDogbV9yZXNvdXJjZVJlcXVlc3QoV1RGTW92ZShyZXNvdXJjZVJl cXVlc3QpKQogICAgICwgbV9vcHRpb25zKG9wdGlvbnMpCiAgICAgLCBtX3ByaW9yaXR5KHByaW9y aXR5KQotICAgICwgbV9mb3JQcmVsb2FkKGZhbHNlKQotICAgICwgbV9kZWZlcihOb0RlZmVyKQog ewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVz b3VyY2VSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0LmgKaW5kZXggZDI3YjVlMzkxNWQ5NjI4M2JhNTg1YWVhNTdmN2U3MDMxMjgzYTVj My4uYjQ1NzQ3NjQ3YTM5ODBmNGEzMDI2ZjE4OTA1NzA3OGMyOWMzYWM5OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuaApAQCAt NDAsOCArNDAsNiBAQCBjbGFzcyBEb2N1bWVudDsKIAogY2xhc3MgQ2FjaGVkUmVzb3VyY2VSZXF1 ZXN0IHsKIHB1YmxpYzoKLSAgICBlbnVtIERlZmVyT3B0aW9uIHsgTm9EZWZlciwgRGVmZXJyZWRC eUNsaWVudCB9OwotCiAgICAgZXhwbGljaXQgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0KGNvbnN0IFJl c291cmNlUmVxdWVzdCYsIGNvbnN0IFN0cmluZyYgY2hhcnNldCA9IFN0cmluZygpLCBPcHRpb25h bDxSZXNvdXJjZUxvYWRQcmlvcml0eT4gPSBOdWxsb3B0KTsKICAgICBDYWNoZWRSZXNvdXJjZVJl cXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYsIGNvbnN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyYsIE9w dGlvbmFsPFJlc291cmNlTG9hZFByaW9yaXR5PiA9IE51bGxvcHQpOwogCkBAIC01MiwxMCArNTAs NiBAQCBwdWJsaWM6CiAgICAgY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zJiBvcHRpb25zKCkg Y29uc3QgeyByZXR1cm4gbV9vcHRpb25zOyB9CiAgICAgdm9pZCBzZXRPcHRpb25zKGNvbnN0IFJl c291cmNlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucykgeyBtX29wdGlvbnMgPSBvcHRpb25zOyB9CiAg ICAgY29uc3QgT3B0aW9uYWw8UmVzb3VyY2VMb2FkUHJpb3JpdHk+JiBwcmlvcml0eSgpIGNvbnN0 IHsgcmV0dXJuIG1fcHJpb3JpdHk7IH0KLSAgICBib29sIGZvclByZWxvYWQoKSBjb25zdCB7IHJl dHVybiBtX2ZvclByZWxvYWQ7IH0KLSAgICB2b2lkIHNldEZvclByZWxvYWQoYm9vbCBmb3JQcmVs b2FkKSB7IG1fZm9yUHJlbG9hZCA9IGZvclByZWxvYWQ7IH0KLSAgICBEZWZlck9wdGlvbiBkZWZl cigpIGNvbnN0IHsgcmV0dXJuIG1fZGVmZXI7IH0KLSAgICB2b2lkIHNldERlZmVyKERlZmVyT3B0 aW9uIGRlZmVyKSB7IG1fZGVmZXIgPSBkZWZlcjsgfQogICAgIHZvaWQgc2V0SW5pdGlhdG9yKFBh c3NSZWZQdHI8RWxlbWVudD4pOwogICAgIHZvaWQgc2V0SW5pdGlhdG9yKGNvbnN0IEF0b21pY1N0 cmluZyYgbmFtZSk7CiAgICAgY29uc3QgQXRvbWljU3RyaW5nJiBpbml0aWF0b3JOYW1lKCkgY29u c3Q7CkBAIC03Miw4ICs2Niw2IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIG1fY2hhcnNldDsKICAg ICBSZXNvdXJjZUxvYWRlck9wdGlvbnMgbV9vcHRpb25zOwogICAgIE9wdGlvbmFsPFJlc291cmNl TG9hZFByaW9yaXR5PiBtX3ByaW9yaXR5OwotICAgIGJvb2wgbV9mb3JQcmVsb2FkOwotICAgIERl ZmVyT3B0aW9uIG1fZGVmZXI7CiAgICAgUmVmUHRyPEVsZW1lbnQ+IG1faW5pdGlhdG9yRWxlbWVu dDsKICAgICBBdG9taWNTdHJpbmcgbV9pbml0aWF0b3JOYW1lOwogICAgIFJlZlB0cjxTZWN1cml0 eU9yaWdpbj4gbV9vcmlnaW47Cg==