43283 2010-07-30 16:16:16 -0700 Add APIObject template introspection support 2010-07-30 17:07:52 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned abarth eric webkit.review.bot oldest_to_newest 258453 0 sam 2010-07-30 16:16:16 -0700 Add APIObject template introspection support. 258454 1 63118 sam 2010-07-30 16:16:50 -0700 Created attachment 63118 Patch 258457 2 webkit.review.bot 2010-07-30 16:18:23 -0700 Attachment 63118 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/Shared/ImmutableArray.h:55: More than one command on the same line in if [whitespace/parens] [4] Total errors found: 1 in 31 files If any of these errors are false positives, please file a bug against check-webkit-style. 258467 3 sam 2010-07-30 16:38:38 -0700 Landed in 64386. 258488 4 webkit.review.bot 2010-07-30 17:07:52 -0700 http://trac.webkit.org/changeset/64386 might have broken Chromium Linux Release The following changes are on the blame list: http://trac.webkit.org/changeset/64385 http://trac.webkit.org/changeset/64386 http://trac.webkit.org/changeset/64387 http://trac.webkit.org/changeset/64388 63118 2010-07-30 16:16:50 -0700 2010-07-30 16:18:47 -0700 Patch patch.diff text/plain 22698 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDM4MykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNzUgQEAKKzIwMTAtMDctMzAgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXRjaCBm b3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzMjgzCisgICAgICAg IEFkZCBBUElPYmplY3QgdGVtcGxhdGUgaW50cm9zcGVjdGlvbiBzdXBwb3J0LgorCisgICAgICAg IEFkZCBhIHdheSB0byBnZXQgdGhlIHR5cGUgdGhlIEFQSU9iamVjdDo6VHlwZSBmcm9tIHRoZSBB UElPYmplY3Qgc3ViY2xhc3MgdHlwZW5hbWVzCisgICAgICAgIGZvciB0ZW1wbGF0ZSBmdW4uIFVz ZSB0aGlzIHRvIG1ha2UgYSB0eXBlIGNoZWNraW5nIHZlcnNpb24gb2YgSW1tdXRhYmxlQXJyYXk6 OmF0LgorCisgICAgICAgICogU2hhcmVkL0ltbXV0YWJsZUFycmF5Lmg6CisgICAgICAgIChXZWJL aXQ6OkltbXV0YWJsZUFycmF5OjphdCk6CisgICAgICAgIChXZWJLaXQ6OkltbXV0YWJsZUFycmF5 Ojp0eXBlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViU3RyaW5nLmg6CisgICAgICAgIChXZWJLaXQ6 OldlYlN0cmluZzo6dHlwZSk6CisgICAgICAgICogU2hhcmVkL1dlYlVSTC5oOgorICAgICAgICAo V2ViS2l0OjpXZWJVUkw6OnR5cGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0FycmF5 LmNwcDoKKyAgICAgICAgKFdLQXJyYXlHZXRUeXBlSUQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQy9XS0JhY2tGb3J3YXJkTGlzdC5jcHA6CisgICAgICAgIChXS0JhY2tGb3J3YXJkTGlzdEdl dFR5cGVJRCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQmFja0ZvcndhcmRMaXN0SXRl bS5jcHA6CisgICAgICAgIChXS0JhY2tGb3J3YXJkTGlzdEl0ZW1HZXRUeXBlSUQpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwOgorICAgICAgICAoV0tDb250ZXh0R2V0 VHlwZUlEKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5jcHA6CisgICAgICAg IChXS0ZyYW1lR2V0VHlwZUlEKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZVBv bGljeUxpc3RlbmVyLmNwcDoKKyAgICAgICAgKFdLRnJhbWVQb2xpY3lMaXN0ZW5lckdldFR5cGVJ RCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLTmF2aWdhdGlvbkRhdGEuY3BwOgorICAg ICAgICAoV0tOYXZpZ2F0aW9uRGF0YUdldFR5cGVJRCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9DL1dLUGFnZS5jcHA6CisgICAgICAgIChXS1BhZ2VHZXRUeXBlSUQpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2VOYW1lc3BhY2UuY3BwOgorICAgICAgICAoV0tQYWdlTmFtZXNw YWNlR2V0VHlwZUlEKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5j cHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0VHlwZUlEKToKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL0MvV0tTdHJpbmcuY3BwOgorICAgICAgICAoV0tTdHJpbmdHZXRUeXBlSUQpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1VSTC5jcHA6CisgICAgICAgIChXS1VSTEdldFR5cGVJ RCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdC5oOgorICAgICAgICAo V2ViS2l0OjpXZWJCYWNrRm9yd2FyZExpc3Q6OnR5cGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJCYWNrRm9yd2FyZExpc3RJdGVtLmg6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJk TGlzdEl0ZW06OnR5cGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0Lmg6CisgICAg ICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnR5cGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJG cmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVQb2xp Y3lMaXN0ZW5lclByb3h5Ojp0eXBlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94 eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVByb3h5Ojp0eXBlKToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViTmF2aWdhdGlvbkRhdGEuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViTmF2aWdh dGlvbkRhdGE6OnR5cGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlTmFtZXNwYWNlLmg6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VOYW1lc3BhY2U6OnR5cGUpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp0 eXBlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaDoKKyAgICAgICAgKFdl YktpdDo6V2ViUHJlZmVyZW5jZXM6OnR5cGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwOgorICAgICAgICAoV0tCdW5kbGVHZXRUeXBlSUQp OgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVGcmFt ZS5jcHA6CisgICAgICAgIChXS0J1bmRsZUZyYW1lR2V0VHlwZUlEKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHA6CisgICAgICAgIChX S0J1bmRsZVBhZ2VHZXRUeXBlSUQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvSW5qZWN0ZWRCdW5kbGUuaDoKKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGU6OnR5 cGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5oOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZTo6dHlwZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dHlwZSk6CisKIDIwMTAtMDctMzAg IFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRl cnMgQ2FybHNzb24uCkluZGV4OiBXZWJLaXQyL1NoYXJlZC9JbW11dGFibGVBcnJheS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL0ltbXV0YWJsZUFycmF5LmgJKHJldmlzaW9uIDY0Mzgw KQorKysgV2ViS2l0Mi9TaGFyZWQvSW1tdXRhYmxlQXJyYXkuaAkod29ya2luZyBjb3B5KQpAQCAt MzUsNiArMzUsOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgSW1tdXRhYmxlQXJyYXkg OiBwdWJsaWMgQVBJT2JqZWN0IHsKIHB1YmxpYzoKKyAgICBzdGF0aWMgY29uc3QgVHlwZSBBUElU eXBlID0gVHlwZUFycmF5OworCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SW1tdXRhYmxlQXJyYXk+ IGNyZWF0ZSgpCiAgICAgewogICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IEltbXV0YWJsZUFy cmF5KTsKQEAgLTQ5LDYgKzUxLDkgQEAgcHVibGljOgogICAgIH0KICAgICB+SW1tdXRhYmxlQXJy YXkoKTsKIAorICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CisgICAgVCogYXQoc2l6ZV90IGkpIHsg QVNTRVJUKGkgPCBtX3NpemUpOyBpZiAobV9lbnRyaWVzW2ldLT50eXBlKCkgIT0gVDo6QVBJVHlw ZSkgcmV0dXJuIDA7IHJldHVybiBtX2VudHJpZXNbaV07IH0KKwogICAgIEFQSU9iamVjdCogYXQo c2l6ZV90IGkpIHsgQVNTRVJUKGkgPCBtX3NpemUpOyByZXR1cm4gbV9lbnRyaWVzW2ldOyB9CiAg ICAgc2l6ZV90IHNpemUoKSB7IHJldHVybiBtX3NpemU7IH0KIApAQCAtNTgsNyArNjMsNyBAQCBw cml2YXRlOgogICAgIGVudW0gQWRvcHRUYWcgeyBBZG9wdCB9OwogICAgIEltbXV0YWJsZUFycmF5 KEFQSU9iamVjdCoqIGVudHJpZXMsIHNpemVfdCBzaXplLCBBZG9wdFRhZyk7CiAKLSAgICB2aXJ0 dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIFR5cGVBcnJheTsgfQorICAgIHZpcnR1YWwg VHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gQVBJVHlwZTsgfQogCiAgICAgQVBJT2JqZWN0Kiog bV9lbnRyaWVzOwogICAgIHNpemVfdCBtX3NpemU7CkluZGV4OiBXZWJLaXQyL1NoYXJlZC9XZWJT dHJpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9XZWJTdHJpbmcuaAkocmV2aXNp b24gNjQzNzkpCisrKyBXZWJLaXQyL1NoYXJlZC9XZWJTdHJpbmcuaAkod29ya2luZyBjb3B5KQpA QCAtMzYsNiArMzYsOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViU3RyaW5nIDog cHVibGljIEFQSU9iamVjdCB7CiBwdWJsaWM6CisgICAgc3RhdGljIGNvbnN0IFR5cGUgQVBJVHlw ZSA9IFR5cGVTdHJpbmc7CisKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJTdHJpbmc+IGNyZWF0 ZShjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHN0cmluZykKICAgICB7CiAgICAgICAgIHJldHVybiBh ZG9wdFJlZihuZXcgV2ViU3RyaW5nKHN0cmluZykpOwpAQCAtNTIsNyArNTQsNyBAQCBwcml2YXRl OgogICAgIHsKICAgICB9CiAKLSAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJu IFR5cGVTdHJpbmc7IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEFQ SVR5cGU7IH0KIAogICAgIFdlYkNvcmU6OlN0cmluZyBtX3N0cmluZzsKIH07CkluZGV4OiBXZWJL aXQyL1NoYXJlZC9XZWJVUkwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9XZWJVUkwu aAkocmV2aXNpb24gNjQzNzkpCisrKyBXZWJLaXQyL1NoYXJlZC9XZWJVUkwuaAkod29ya2luZyBj b3B5KQpAQCAtMzYsNiArMzYsOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViVVJM IDogcHVibGljIEFQSU9iamVjdCB7CiBwdWJsaWM6CisgICAgc3RhdGljIGNvbnN0IFR5cGUgQVBJ VHlwZSA9IFR5cGVVUkw7CisKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJVUkw+IGNyZWF0ZShj b25zdCBXZWJDb3JlOjpTdHJpbmcmIHN0cmluZykKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9w dFJlZihuZXcgV2ViVVJMKHN0cmluZykpOwpAQCAtNTIsNyArNTQsNyBAQCBwcml2YXRlOgogICAg IHsKICAgICB9CiAKLSAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIFR5cGVV Ukw7IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEFQSVR5cGU7IH0K IAogICAgIFdlYkNvcmU6OlN0cmluZyBtX3N0cmluZzsKIH07CkluZGV4OiBXZWJLaXQyL1VJUHJv Y2Vzcy9XZWJCYWNrRm9yd2FyZExpc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vz cy9XZWJCYWNrRm9yd2FyZExpc3QuaAkocmV2aXNpb24gNjQzNzkpCisrKyBXZWJLaXQyL1VJUHJv Y2Vzcy9XZWJCYWNrRm9yd2FyZExpc3QuaAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiArNDcsOCBA QCB0eXBlZGVmIFZlY3RvcjxSZWZQdHI8V2ViQmFja0ZvcndhcmRMaXN0CiAKIGNsYXNzIFdlYkJh Y2tGb3J3YXJkTGlzdCA6IHB1YmxpYyBBUElPYmplY3QgewogcHVibGljOgorICAgIHN0YXRpYyBj b25zdCBUeXBlIEFQSVR5cGUgPSBUeXBlQmFja0ZvcndhcmRMaXN0OworCiAgICAgc3RhdGljIFBh c3NSZWZQdHI8V2ViQmFja0ZvcndhcmRMaXN0PiBjcmVhdGUoV2ViUGFnZVByb3h5KiBwYWdlKQog ICAgIHsKICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJCYWNrRm9yd2FyZExpc3QocGFn ZSkpOwpAQCAtNzMsNyArNzUsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFdlYkJhY2tGb3J3 YXJkTGlzdChXZWJQYWdlUHJveHkqKTsKIAotICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3Qg eyByZXR1cm4gVHlwZUJhY2tGb3J3YXJkTGlzdDsgfQorICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkg Y29uc3QgeyByZXR1cm4gQVBJVHlwZTsgfQogCiAgICAgV2ViUGFnZVByb3h5KiBtX3BhZ2U7CiAg ICAgQmFja0ZvcndhcmRMaXN0SXRlbVZlY3RvciBtX2VudHJpZXM7CkluZGV4OiBXZWJLaXQyL1VJ UHJvY2Vzcy9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9V SVByb2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oCShyZXZpc2lvbiA2NDM3OSkKKysrIFdl YktpdDIvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaAkod29ya2luZyBjb3B5KQpA QCAtMzYsNiArMzYsOCBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIGNsYXNzIFdlYkJhY2tGb3J3 YXJkTGlzdEl0ZW0gOiBwdWJsaWMgQVBJT2JqZWN0IHsKIHB1YmxpYzoKKyAgICBzdGF0aWMgY29u c3QgVHlwZSBBUElUeXBlID0gVHlwZUJhY2tGb3J3YXJkTGlzdEl0ZW07CisKICAgICBzdGF0aWMg UGFzc1JlZlB0cjxXZWJCYWNrRm9yd2FyZExpc3RJdGVtPiBjcmVhdGUoY29uc3QgV2ViQ29yZTo6 U3RyaW5nJiBvcmlnaW5hbFVSTCwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiB1cmwsIGNvbnN0IFdl YkNvcmU6OlN0cmluZyYgdGl0bGUsIHVpbnQ2NF90IGl0ZW1JRCkKICAgICB7CiAgICAgICAgIHJl dHVybiBhZG9wdFJlZihuZXcgV2ViQmFja0ZvcndhcmRMaXN0SXRlbShvcmlnaW5hbFVSTCwgdXJs LCB0aXRsZSwgaXRlbUlEKSk7CkBAIC01Niw3ICs1OCw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAg ICAgV2ViQmFja0ZvcndhcmRMaXN0SXRlbShjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG9yaWdpbmFs VVJMLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHVybCwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiB0 aXRsZSwgdWludDY0X3QgaXRlbUlEKTsKIAotICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3Qg eyByZXR1cm4gVHlwZUJhY2tGb3J3YXJkTGlzdEl0ZW07IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlw ZSgpIGNvbnN0IHsgcmV0dXJuIEFQSVR5cGU7IH0KIAogICAgIFdlYkNvcmU6OlN0cmluZyBtX29y aWdpbmFsVVJMOwogICAgIFdlYkNvcmU6OlN0cmluZyBtX3VybDsKSW5kZXg6IFdlYktpdDIvVUlQ cm9jZXNzL1dlYkNvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJD b250ZXh0LmgJKHJldmlzaW9uIDY0MzgwKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4 dC5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw2ICs0OSw4IEBAIGNsYXNzIFdlYlByZWZlcmVuY2Vz OwogCiBjbGFzcyBXZWJDb250ZXh0IDogcHVibGljIEFQSU9iamVjdCB7CiBwdWJsaWM6CisgICAg c3RhdGljIGNvbnN0IFR5cGUgQVBJVHlwZSA9IFR5cGVDb250ZXh0OworCiAgICAgc3RhdGljIFdl YkNvbnRleHQqIHNoYXJlZFByb2Nlc3NDb250ZXh0KCk7CiAgICAgc3RhdGljIFdlYkNvbnRleHQq IHNoYXJlZFRocmVhZENvbnRleHQoKTsKIApAQCAtMTAxLDcgKzEwMyw3IEBAIHB1YmxpYzoKIHBy aXZhdGU6CiAgICAgV2ViQ29udGV4dChQcm9jZXNzTW9kZWwsIGNvbnN0IFdlYkNvcmU6OlN0cmlu ZyYgaW5qZWN0ZWRCdW5kbGVQYXRoKTsKIAotICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3Qg eyByZXR1cm4gVHlwZUNvbnRleHQ7IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsg cmV0dXJuIEFQSVR5cGU7IH0KIAogICAgIHZvaWQgZW5zdXJlV2ViUHJvY2VzcygpOwogICAgIGJv b2wgaGFzVmFsaWRQcm9jZXNzKCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzICYmIG1fcHJvY2Vz cy0+aXNWYWxpZCgpOyB9CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxp c3RlbmVyUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVBv bGljeUxpc3RlbmVyUHJveHkuaAkocmV2aXNpb24gNjQzNzkpCisrKyBXZWJLaXQyL1VJUHJvY2Vz cy9XZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMzcsNiAr MzcsOCBAQCBjbGFzcyBXZWJGcmFtZVByb3h5OwogCiBjbGFzcyBXZWJGcmFtZVBvbGljeUxpc3Rl bmVyUHJveHkgOiBwdWJsaWMgQVBJT2JqZWN0IHsKIHB1YmxpYzoKKyAgICBzdGF0aWMgY29uc3Qg VHlwZSBBUElUeXBlID0gVHlwZUZyYW1lUG9saWN5TGlzdGVuZXI7CisKICAgICBzdGF0aWMgUGFz c1JlZlB0cjxXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk+IGNyZWF0ZShXZWJGcmFtZVByb3h5 KiBmcmFtZSwgdWludDY0X3QgbGlzdGVuZXJJRCkKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9w dFJlZihuZXcgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KGZyYW1lLCBsaXN0ZW5lcklEKSk7 CkBAIC01NCw3ICs1Niw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgV2ViRnJhbWVQb2xpY3lM aXN0ZW5lclByb3h5KFdlYkZyYW1lUHJveHkqLCB1aW50NjRfdCBsaXN0ZW5lcklEKTsKIAotICAg IHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gVHlwZUZyYW1lUG9saWN5TGlzdGVu ZXI7IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEFQSVR5cGU7IH0K IAogICAgIHZvaWQgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJDb3JlOjpQb2xpY3lBY3Rpb24p OwogCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oCShyZXZpc2lvbiA2NDM3OSkKKysr IFdlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNDgs NiArNDgsOCBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIGNsYXNzIFdlYkZyYW1lUHJveHkgOiBw dWJsaWMgQVBJT2JqZWN0IHsKIHB1YmxpYzoKKyAgICBzdGF0aWMgY29uc3QgVHlwZSBBUElUeXBl ID0gVHlwZUZyYW1lOworCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViRnJhbWVQcm94eT4gY3Jl YXRlKFdlYlBhZ2VQcm94eSogcGFnZSwgdWludDY0X3QgZnJhbWVJRCkKICAgICB7CiAgICAgICAg IHJldHVybiBhZG9wdFJlZihuZXcgV2ViRnJhbWVQcm94eShwYWdlLCBmcmFtZUlEKSk7CkBAIC04 Miw3ICs4NCw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgV2ViRnJhbWVQcm94eShXZWJQYWdl UHJveHkqIHBhZ2UsIHVpbnQ2NF90IGZyYW1lSUQpOwogCi0gICAgdmlydHVhbCBUeXBlIHR5cGUo KSBjb25zdCB7IHJldHVybiBUeXBlRnJhbWU7IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNv bnN0IHsgcmV0dXJuIEFQSVR5cGU7IH0KIAogICAgIFdlYlBhZ2VQcm94eSogbV9wYWdlOwogICAg IExvYWRTdGF0ZSBtX2xvYWRTdGF0ZTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYk5hdmln YXRpb25EYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTmF2aWdhdGlv bkRhdGEuaAkocmV2aXNpb24gNjQzNzkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJOYXZpZ2F0 aW9uRGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCw4IEBAIG5hbWVzcGFjZSBXZWJL aXQgewogCiBjbGFzcyBXZWJOYXZpZ2F0aW9uRGF0YSA6IHB1YmxpYyBBUElPYmplY3QgewogcHVi bGljOgorICAgIHN0YXRpYyBjb25zdCBUeXBlIEFQSVR5cGUgPSBUeXBlTmF2aWdhdGlvbkRhdGE7 CisKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJOYXZpZ2F0aW9uRGF0YT4gY3JlYXRlKGNvbnN0 IFdlYk5hdmlnYXRpb25EYXRhU3RvcmUmIHN0b3JlKQogICAgIHsKICAgICAgICAgcmV0dXJuIGFk b3B0UmVmKG5ldyBXZWJOYXZpZ2F0aW9uRGF0YShzdG9yZSkpOwpAQCAtNDYsNyArNDgsNyBAQCBw dWJsaWM6CiBwcml2YXRlOgogICAgIFdlYk5hdmlnYXRpb25EYXRhKGNvbnN0IFdlYk5hdmlnYXRp b25EYXRhU3RvcmUmKTsKIAotICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4g VHlwZU5hdmlnYXRpb25EYXRhOyB9CisgICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJl dHVybiBBUElUeXBlOyB9CiAKICAgICBXZWJOYXZpZ2F0aW9uRGF0YVN0b3JlIG1fc3RvcmU7CiB9 OwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZU5hbWVzcGFjZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VOYW1lc3BhY2UuaAkocmV2aXNpb24gNjQzNzkp CisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlTmFtZXNwYWNlLmgJKHdvcmtpbmcgY29weSkK QEAgLTM5LDYgKzM5LDggQEAgY2xhc3MgV2ViQ29udGV4dDsKIAogY2xhc3MgV2ViUGFnZU5hbWVz cGFjZSA6IHB1YmxpYyBBUElPYmplY3QgewogcHVibGljOgorICAgIHN0YXRpYyBjb25zdCBUeXBl IEFQSVR5cGUgPSBUeXBlUGFnZU5hbWVzcGFjZTsKKwogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdl YlBhZ2VOYW1lc3BhY2U+IGNyZWF0ZShXZWJDb250ZXh0KiBjb250ZXh0KQogICAgIHsKICAgICAg ICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJQYWdlTmFtZXNwYWNlKGNvbnRleHQpKTsKQEAgLTU5 LDcgKzYxLDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBXZWJQYWdlTmFtZXNwYWNlKFdlYkNv bnRleHQqKTsKIAotICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gVHlwZVBh Z2VOYW1lc3BhY2U7IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEFQ SVR5cGU7IH0KIAogICAgIFJlZlB0cjxXZWJDb250ZXh0PiBtX2NvbnRleHQ7CiB9OwpJbmRleDog V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDY0Mzc5KQorKysgV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTc1LDYgKzc1LDggQEAgdHlw ZWRlZiBHZW5lcmljQ2FsbGJhY2s8V0tTdHJpbmdSZWYsIFdlYgogCiBjbGFzcyBXZWJQYWdlUHJv eHkgOiBwdWJsaWMgQVBJT2JqZWN0IHsKIHB1YmxpYzoKKyAgICBzdGF0aWMgY29uc3QgVHlwZSBB UElUeXBlID0gVHlwZVBhZ2U7CisKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJQYWdlUHJveHk+ IGNyZWF0ZShXZWJQYWdlTmFtZXNwYWNlKiwgdWludDY0X3QgcGFnZUlEKTsKICAgICB+V2ViUGFn ZVByb3h5KCk7CiAKQEAgLTE2Miw3ICsxNjQsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFdl YlBhZ2VQcm94eShXZWJQYWdlTmFtZXNwYWNlKiwgdWludDY0X3QgcGFnZUlEKTsKIAotICAgIHZp cnR1YWwgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gVHlwZVBhZ2U7IH0KKyAgICB2aXJ0dWFs IFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEFQSVR5cGU7IH0KIAogICAgIHZvaWQgZGlkQ3Jl YXRlTWFpbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQpOwogICAgIHZvaWQgZGlkQ3JlYXRlU3ViRnJh bWUodWludDY0X3QgZnJhbWVJRCk7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJl bmNlcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlByZWZlcmVuY2VzLmgJ KHJldmlzaW9uIDY0Mzc5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaAko d29ya2luZyBjb3B5KQpAQCAtMzgsNiArMzgsOCBAQCBjbGFzcyBXZWJDb250ZXh0OwogCiBjbGFz cyBXZWJQcmVmZXJlbmNlcyA6IHB1YmxpYyBBUElPYmplY3QgewogcHVibGljOgorICAgIHN0YXRp YyBjb25zdCBUeXBlIEFQSVR5cGUgPSBUeXBlUHJlZmVyZW5jZXM7CisKICAgICBzdGF0aWMgV2Vi UHJlZmVyZW5jZXMqIHNoYXJlZCgpOwogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViUHJlZmVy ZW5jZXM+IGNyZWF0ZSgpCkBAIC03MSw3ICs3Myw3IEBAIHByaXZhdGU6CiAgICAgV2ViUHJlZmVy ZW5jZXMoKTsKICAgICBXZWJQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyopOwogCi0gICAgdmly dHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBUeXBlUHJlZmVyZW5jZXM7IH0KKyAgICB2 aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEFQSVR5cGU7IH0KIAogICAgIHZvaWQg dXBkYXRlKCk7CiAKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQXJyYXkuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQXJyYXkuY3BwCShyZXZpc2lv biA2NDM4MikKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQXJyYXkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zMiw3ICszMiw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLVHlw ZUlEIFdLQXJyYXlHZXRUeXBlSUQoKQogewotICAgIHJldHVybiB0b1JlZihBUElPYmplY3Q6OlR5 cGVBcnJheSk7CisgICAgcmV0dXJuIHRvUmVmKEltbXV0YWJsZUFycmF5OjpBUElUeXBlKTsKIH0K IAogV0tBcnJheVJlZiBXS0FycmF5Q3JlYXRlKFdLVHlwZVJlZiogdmFsdWVzLCBzaXplX3QgbnVt YmVyT2ZWYWx1ZXMpCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0JhY2tGb3J3YXJk TGlzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tCYWNrRm9y d2FyZExpc3QuY3BwCShyZXZpc2lvbiA2NDM3OSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLQmFja0ZvcndhcmRMaXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNyBAQCB1 c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiBXS1R5cGVJRCBXS0JhY2tGb3J3YXJkTGlzdEdldFR5 cGVJRCgpCiB7Ci0gICAgcmV0dXJuIHRvUmVmKEFQSU9iamVjdDo6VHlwZUJhY2tGb3J3YXJkTGlz dCk7CisgICAgcmV0dXJuIHRvUmVmKFdlYkJhY2tGb3J3YXJkTGlzdDo6QVBJVHlwZSk7CiB9CiAK IFdLQmFja0ZvcndhcmRMaXN0SXRlbVJlZiBXS0JhY2tGb3J3YXJkTGlzdEdldEN1cnJlbnRJdGVt KFdLQmFja0ZvcndhcmRMaXN0UmVmIGxpc3RSZWYpCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS0JhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLQmFja0ZvcndhcmRMaXN0SXRlbS5jcHAJKHJldmlzaW9uIDY0Mzc5KQor KysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tCYWNrRm9yd2FyZExpc3RJdGVtLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiBX S1R5cGVJRCBXS0JhY2tGb3J3YXJkTGlzdEl0ZW1HZXRUeXBlSUQoKQogewotICAgIHJldHVybiB0 b1JlZihBUElPYmplY3Q6OlR5cGVCYWNrRm9yd2FyZExpc3RJdGVtKTsKKyAgICByZXR1cm4gdG9S ZWYoV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6QVBJVHlwZSk7CiB9CiAKIFdLVVJMUmVmIFdLQmFj a0ZvcndhcmRMaXN0SXRlbUNvcHlPcmlnaW5hbFVSTChXS0JhY2tGb3J3YXJkTGlzdEl0ZW1SZWYg aXRlbVJlZikKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcAkocmV2aXNp b24gNjQzODApCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNyw3ICszNyw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdL VHlwZUlEIFdLQ29udGV4dEdldFR5cGVJRCgpCiB7Ci0gICAgcmV0dXJuIHRvUmVmKEFQSU9iamVj dDo6VHlwZUNvbnRleHQpOworICAgIHJldHVybiB0b1JlZihXZWJDb250ZXh0OjpBUElUeXBlKTsK IH0KIAogV0tDb250ZXh0UmVmIFdLQ29udGV4dENyZWF0ZSgpCkluZGV4OiBXZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS0ZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS0ZyYW1lLmNwcAkocmV2aXNpb24gNjQzNzkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS0ZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNyBAQCB1c2luZyBu YW1lc3BhY2UgV2ViS2l0OwogCiBXS1R5cGVJRCBXS0ZyYW1lR2V0VHlwZUlEKCkKIHsKLSAgICBy ZXR1cm4gdG9SZWYoQVBJT2JqZWN0OjpUeXBlRnJhbWUpOworICAgIHJldHVybiB0b1JlZihXZWJG cmFtZVByb3h5OjpBUElUeXBlKTsKIH0KIAogYm9vbCBXS0ZyYW1lSXNNYWluRnJhbWUoV0tGcmFt ZVJlZiBmcmFtZVJlZikKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLRnJhbWVQb2xp Y3lMaXN0ZW5lci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tG cmFtZVBvbGljeUxpc3RlbmVyLmNwcAkocmV2aXNpb24gNjQzNzkpCisrKyBXZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS0ZyYW1lUG9saWN5TGlzdGVuZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z Myw3ICszMyw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLVHlwZUlEIFdLRnJhbWVQ b2xpY3lMaXN0ZW5lckdldFR5cGVJRCgpCiB7Ci0gICAgcmV0dXJuIHRvUmVmKEFQSU9iamVjdDo6 VHlwZUZyYW1lUG9saWN5TGlzdGVuZXIpOworICAgIHJldHVybiB0b1JlZihXZWJGcmFtZVBvbGlj eUxpc3RlbmVyUHJveHk6OkFQSVR5cGUpOwogfQogCiB2b2lkIFdLRnJhbWVQb2xpY3lMaXN0ZW5l clVzZShXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYgcG9saWN5TGlzdGVuZXJSZWYpCkluZGV4OiBX ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS05hdmlnYXRpb25EYXRhLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS05hdmlnYXRpb25EYXRhLmNwcAkocmV2aXNpb24g NjQzNzkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS05hdmlnYXRpb25EYXRhLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0Owog CiBXS1R5cGVJRCBXS05hdmlnYXRpb25EYXRhR2V0VHlwZUlEKCkKIHsKLSAgICByZXR1cm4gdG9S ZWYoQVBJT2JqZWN0OjpUeXBlTmF2aWdhdGlvbkRhdGEpOworICAgIHJldHVybiB0b1JlZihXZWJO YXZpZ2F0aW9uRGF0YTo6QVBJVHlwZSk7CiB9CiAKIFdLU3RyaW5nUmVmIFdLTmF2aWdhdGlvbkRh dGFDb3B5VGl0bGUoV0tOYXZpZ2F0aW9uRGF0YVJlZiBuYXZpZ2F0aW9uRGF0YVJlZikKSW5kZXg6 IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkocmV2aXNpb24gNjQzNzkpCisrKyBXZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw3ICszOCw3 IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLVHlwZUlEIFdLUGFnZUdldFR5cGVJRCgp CiB7Ci0gICAgcmV0dXJuIHRvUmVmKEFQSU9iamVjdDo6VHlwZVBhZ2UpOworICAgIHJldHVybiB0 b1JlZihXZWJQYWdlUHJveHk6OkFQSVR5cGUpOwogfQogCiBXS1BhZ2VOYW1lc3BhY2VSZWYgV0tQ YWdlR2V0UGFnZU5hbWVzcGFjZShXS1BhZ2VSZWYgcGFnZVJlZikKSW5kZXg6IFdlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLUGFnZU5hbWVzcGFjZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQYWdlTmFtZXNwYWNlLmNwcAkocmV2aXNpb24gNjQzNzkpCisrKyBX ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2VOYW1lc3BhY2UuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zNCw3ICszNCw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLVHlwZUlEIFdL UGFnZU5hbWVzcGFjZUdldFR5cGVJRCgpCiB7Ci0gICAgcmV0dXJuIHRvUmVmKEFQSU9iamVjdDo6 VHlwZVBhZ2VOYW1lc3BhY2UpOworICAgIHJldHVybiB0b1JlZihXZWJQYWdlTmFtZXNwYWNlOjpB UElUeXBlKTsKIH0KIAogV0tQYWdlTmFtZXNwYWNlUmVmIFdLUGFnZU5hbWVzcGFjZUNyZWF0ZShX S0NvbnRleHRSZWYgb3duZXJDb250ZXh0UmVmKQpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQcmVmZXJlbmNlcy5jcHAJKHJldmlzaW9uIDY0Mzc5KQorKysgV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDcgKzM0LDcg QEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogV0tUeXBlSUQgV0tQcmVmZXJlbmNlc0dldFR5 cGVJRCgpCiB7Ci0gICAgcmV0dXJuIHRvUmVmKEFQSU9iamVjdDo6VHlwZVByZWZlcmVuY2VzKTsK KyAgICByZXR1cm4gdG9SZWYoV2ViUHJlZmVyZW5jZXM6OkFQSVR5cGUpOwogfQogCiBXS1ByZWZl cmVuY2VzUmVmIFdLUHJlZmVyZW5jZXNDcmVhdGUoKQpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tTdHJpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLU3RyaW5nLmNwcAkocmV2aXNpb24gNjQzNzkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS1N0cmluZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDcgKzMxLDcgQEAgdXNpbmcgbmFt ZXNwYWNlIFdlYktpdDsKIAogV0tUeXBlSUQgV0tTdHJpbmdHZXRUeXBlSUQoKQogewotICAgIHJl dHVybiB0b1JlZihBUElPYmplY3Q6OlR5cGVTdHJpbmcpOworICAgIHJldHVybiB0b1JlZihXZWJT dHJpbmc6OkFQSVR5cGUpOwogfQogCiBXS1N0cmluZ1JlZiBXS1N0cmluZ1JldGFpbihXS1N0cmlu Z1JlZiBzdHJpbmdSZWYpCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1VSTC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tVUkwuY3BwCShyZXZpc2lv biA2NDM3OSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLVVJMLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzEsNyArMzEsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiBXS1R5cGVJ RCBXS1VSTEdldFR5cGVJRCgpCiB7Ci0gICAgcmV0dXJuIHRvUmVmKEFQSU9iamVjdDo6VHlwZVVS TCk7CisgICAgcmV0dXJuIHRvUmVmKFdlYlVSTDo6QVBJVHlwZSk7CiB9CiAKIFdLVVJMUmVmIFdL VVJMUmV0YWluKFdLVVJMUmVmIFVSTFJlZikKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oCShyZXZpc2lvbiA2NDM4MCkKKysr IFdlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01MSw2ICs1MSw4IEBAIGNsYXNzIFdlYlBhZ2U7CiAKIGNsYXNzIEluamVj dGVkQnVuZGxlIDogcHVibGljIEFQSU9iamVjdCB7CiBwdWJsaWM6CisgICAgc3RhdGljIGNvbnN0 IFR5cGUgQVBJVHlwZSA9IFR5cGVCdW5kbGU7CisKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbmpl Y3RlZEJ1bmRsZT4gY3JlYXRlKGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgcGF0aCkKICAgICB7CiAg ICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgSW5qZWN0ZWRCdW5kbGUocGF0aCkpOwpAQCAtNzks NyArODEsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIEluamVjdGVkQnVuZGxlKGNvbnN0IFdl YkNvcmU6OlN0cmluZyYpOwogCi0gICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVy biBUeXBlQnVuZGxlOyB9CisgICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBB UElUeXBlOyB9CiAKICAgICBXZWJDb3JlOjpTdHJpbmcgbV9wYXRoOwogICAgIFBsYXRmb3JtQnVu ZGxlIG1fcGxhdGZvcm1CdW5kbGU7IC8vIFRoaXMgaXMgbGVha2VkIHJpZ2h0IG5vdywgc2luY2Ug d2UgbmV2ZXIgdW5sb2FkIHRoZSBidW5kbGUvbW9kdWxlLgpJbmRleDogV2ViS2l0Mi9XZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwCShyZXZpc2lv biA2NDM3OSkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1 bmRsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDcgKzM0LDcgQEAgdXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKIAogV0tUeXBlSUQgV0tCdW5kbGVHZXRUeXBlSUQoKQogewotICAgIHJldHVybiB0 b1JlZihBUElPYmplY3Q6OlR5cGVCdW5kbGUpOworICAgIHJldHVybiB0b1JlZihJbmplY3RlZEJ1 bmRsZTo6QVBJVHlwZSk7CiB9CiAKIHZvaWQgV0tCdW5kbGVTZXRDbGllbnQoV0tCdW5kbGVSZWYg YnVuZGxlUmVmLCBXS0J1bmRsZUNsaWVudCAqIHdrQ2xpZW50KQpJbmRleDogV2ViS2l0Mi9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlRnJhbWUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZUZyYW1l LmNwcAkocmV2aXNpb24gNjQzNzkpCisrKyBXZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvQVBJL2MvV0tCdW5kbGVGcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDcgKzM2LDcg QEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogV0tUeXBlSUQgV0tCdW5kbGVGcmFtZUdldFR5 cGVJRCgpCiB7Ci0gICAgcmV0dXJuIHRvUmVmKEFQSU9iamVjdDo6VHlwZUJ1bmRsZUZyYW1lKTsK KyAgICByZXR1cm4gdG9SZWYoV2ViRnJhbWU6OkFQSVR5cGUpOwogfQogCiBib29sIFdLQnVuZGxl RnJhbWVJc01haW5GcmFtZShXS0J1bmRsZUZyYW1lUmVmIGZyYW1lUmVmKQpJbmRleDogV2ViS2l0 Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxl UGFnZS5jcHAJKHJldmlzaW9uIDY0Mzc5KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1 LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogV0tUeXBlSUQgV0tCdW5kbGVQYWdlR2V0 VHlwZUlEKCkKIHsKLSAgICByZXR1cm4gdG9SZWYoQVBJT2JqZWN0OjpUeXBlQnVuZGxlUGFnZSk7 CisgICAgcmV0dXJuIHRvUmVmKFdlYlBhZ2U6OkFQSVR5cGUpOwogfQogCiB2b2lkIFdLQnVuZGxl UGFnZVNldEVkaXRvckNsaWVudChXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgV0tCdW5kbGVQYWdl RWRpdG9yQ2xpZW50KiB3a0NsaWVudCkKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYkZyYW1lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi RnJhbWUuaAkocmV2aXNpb24gNjQzNzkpCisrKyBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJGcmFtZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCw4IEBAIGNsYXNzIFdlYlBhZ2U7 CiAKIGNsYXNzIFdlYkZyYW1lIDogcHVibGljIEFQSU9iamVjdCB7CiBwdWJsaWM6CisgICAgc3Rh dGljIGNvbnN0IFR5cGUgQVBJVHlwZSA9IFR5cGVCdW5kbGVGcmFtZTsKKwogICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFdlYkZyYW1lPiBjcmVhdGVNYWluRnJhbWUoV2ViUGFnZSopOwogICAgIHN0YXRp YyBQYXNzUmVmUHRyPFdlYkZyYW1lPiBjcmVhdGVTdWJmcmFtZShXZWJQYWdlKiwgY29uc3QgV2Vi Q29yZTo6U3RyaW5nJiBmcmFtZU5hbWUsIFdlYkNvcmU6OkhUTUxGcmFtZU93bmVyRWxlbWVudCop OwogICAgIH5XZWJGcmFtZSgpOwpAQCAtOTIsNyArOTQsNyBAQCBwcml2YXRlOgogICAgIHN0YXRp YyBQYXNzUmVmUHRyPFdlYkZyYW1lPiBjcmVhdGUoV2ViUGFnZSosIGNvbnN0IFdlYkNvcmU6OlN0 cmluZyYgZnJhbWVOYW1lLCBXZWJDb3JlOjpIVE1MRnJhbWVPd25lckVsZW1lbnQqKTsKICAgICBX ZWJGcmFtZShXZWJQYWdlKiwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBmcmFtZU5hbWUsIFdlYkNv cmU6OkhUTUxGcmFtZU93bmVyRWxlbWVudCopOwogCi0gICAgdmlydHVhbCBUeXBlIHR5cGUoKSBj b25zdCB7IHJldHVybiBUeXBlQnVuZGxlRnJhbWU7IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgp IGNvbnN0IHsgcmV0dXJuIEFQSVR5cGU7IH0KIAogICAgIFdlYlBhZ2UqIG1fcGFnZTsKICAgICBX ZWJDb3JlOjpGcmFtZSogbV9jb3JlRnJhbWU7CkluZGV4OiBXZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oCShyZXZpc2lvbiA2NDM3OSkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNjMsNiArNjMsOCBAQCBzdHJ1Y3QgV2ViUHJl ZmVyZW5jZXNTdG9yZTsKIAogY2xhc3MgV2ViUGFnZSA6IHB1YmxpYyBBUElPYmplY3QgewogcHVi bGljOgorICAgIHN0YXRpYyBjb25zdCBUeXBlIEFQSVR5cGUgPSBUeXBlQnVuZGxlUGFnZTsKKwog ICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlBhZ2U+IGNyZWF0ZSh1aW50NjRfdCBwYWdlSUQsIGNv bnN0IFdlYkNvcmU6OkludFNpemUmIHZpZXdTaXplLCBjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3Jl JiwgRHJhd2luZ0FyZWE6OlR5cGUpOwogICAgIH5XZWJQYWdlKCk7CiAKQEAgLTExOCw3ICsxMjAs NyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFdlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25z dCBXZWJDb3JlOjpJbnRTaXplJiB2aWV3U2l6ZSwgY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYs IERyYXdpbmdBcmVhOjpUeXBlKTsKIAotICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3QgeyBy ZXR1cm4gVHlwZUJ1bmRsZVBhZ2U7IH0KKyAgICB2aXJ0dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsg cmV0dXJuIEFQSVR5cGU7IH0KIAogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CiAgICAg c3RhdGljIGNvbnN0IGNoYXIqIGludGVycHJldEtleUV2ZW50KGNvbnN0IFdlYkNvcmU6OktleWJv YXJkRXZlbnQqKTsK