144270 2015-04-27 11:16:55 -0700 Make `enum NavigationType` be an enum class 2015-04-27 11:47:46 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 144269 1 beidson beidson berto cgarcia commit-queue gustavo japhet mcatanzaro mrobinson oldest_to_newest 1089091 0 beidson 2015-04-27 11:16:55 -0700 Make `enum NavigationType` be an enum class 1089098 1 251762 beidson 2015-04-27 11:31:17 -0700 Created attachment 251762 Patch v1 1089099 2 commit-queue 2015-04-27 11:32:28 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1089107 3 251762 achristensen 2015-04-27 11:40:17 -0700 Comment on attachment 251762 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=251762&action=review r=me > Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm:1569 > + [NSNumber numberWithInt:static_cast<int>(action.type())], WebActionNavigationTypeKey, Why is this necessary? I would omit this from this change. 1089108 4 beidson 2015-04-27 11:42:55 -0700 (In reply to comment #3) > Comment on attachment 251762 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=251762&action=review > > r=me > > > Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm:1569 > > + [NSNumber numberWithInt:static_cast<int>(action.type())], WebActionNavigationTypeKey, > > Why is this necessary? I would omit this from this change. Because it is illegal to implicitly cast an `enum class` to an integer - One of the stronger protections enum class provides. Without this change, this patch rightfully fails to build! 1089112 5 beidson 2015-04-27 11:47:46 -0700 http://trac.webkit.org/changeset/183405 251762 2015-04-27 11:31:17 -0700 2015-04-27 11:40:17 -0700 Patch v1 patch text/plain 16463 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZTg4ZjY3Li5jN2JjYmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTUtMDQtMjcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIE1ha2UgJ2VudW0gTmF2aWdhdGlvblR5cGUnIGJlIGFuIGVudW0gY2xhc3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDI3MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoTm8g Y2hhbmdlIGluIGJlaGF2aW9yKS4KKworICAgICAgICBJ4oCZbGwgYmUgYWRkaW5nIGEgbmV3IE5h dmlnYXRpb25UeXBlIGZvciBidWcgMTQ0MjY5IHNvIGl0IG1ha2VzIHNlbnNlIHRvIG1ha2UgdGhp cworICAgICAgICBhbiBlbnVtIGNsYXNzIGZpcnN0LgorCisgICAgICAgICogbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkKToKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpyZWxvYWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVMb2FkZXI6OmxvYWREaWZmZXJlbnREb2N1bWVudEl0ZW0pOgorICAgICAgICAqIGxvYWRlci9G cmFtZUxvYWRlclR5cGVzLmg6CisKKyAgICAgICAgKiBsb2FkZXIvTmF2aWdhdGlvbkFjdGlvbi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpuYXZpZ2F0aW9uVHlwZSk6CisgICAgICAgIChXZWJDb3Jl OjpOYXZpZ2F0aW9uQWN0aW9uOjpOYXZpZ2F0aW9uQWN0aW9uKToKKworICAgICAgICAqIGxvYWRl ci9Qb2xpY3lDaGVja2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvbGljeUNoZWNrZXI6OmNo ZWNrTmF2aWdhdGlvblBvbGljeSk6CisKKyAgICAgICAgKiBwYWdlL1BlcmZvcm1hbmNlTmF2aWdh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQZXJmb3JtYW5jZU5hdmlnYXRpb246OnR5cGUp OgorCiAyMDE1LTA0LTI3ICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxp YS5jb20+IGFuZCBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAK ICAgICAgICAgW1N0cmVhbXMgQVBJXSBSZWFkYWJsZVN0cmVhbSBjb25zdHJ1Y3RvciBzdGFydCBm dW5jdGlvbiBzaG91bGQgYmUgYWJsZSB0byBjbG9zZSB0aGUgc3RyZWFtCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBiNmM5ODk4Li45NTA5MTU2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTEzMDAsNyArMTMwMCw3IEBAIHZvaWQgRnJhbWVM b2FkZXI6OmxvYWQoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYgcGFzc2VkUmVxdWVzdCkKICAgICB9 CiAKICAgICBpZiAocmVxdWVzdC5zaG91bGRDaGVja05ld1dpbmRvd1BvbGljeSgpKSB7Ci0gICAg ICAgIHBvbGljeUNoZWNrZXIoKS5jaGVja05ld1dpbmRvd1BvbGljeShOYXZpZ2F0aW9uQWN0aW9u KHJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCksIE5hdmlnYXRpb25UeXBlT3RoZXIpLCByZXF1ZXN0 LnJlc291cmNlUmVxdWVzdCgpLCBudWxscHRyLCByZXF1ZXN0LmZyYW1lTmFtZSgpLCBbdGhpc10o Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBQYXNzUmVmUHRyPEZvcm1TdGF0ZT4gZm9y bVN0YXRlLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYg YWN0aW9uLCBib29sIHNob3VsZENvbnRpbnVlKSB7CisgICAgICAgIHBvbGljeUNoZWNrZXIoKS5j aGVja05ld1dpbmRvd1BvbGljeShOYXZpZ2F0aW9uQWN0aW9uKHJlcXVlc3QucmVzb3VyY2VSZXF1 ZXN0KCksIE5hdmlnYXRpb25UeXBlOjpPdGhlciksIHJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCks IG51bGxwdHIsIHJlcXVlc3QuZnJhbWVOYW1lKCksIFt0aGlzXShjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QsIFBhc3NSZWZQdHI8Rm9ybVN0YXRlPiBmb3JtU3RhdGUsIGNvbnN0IFN0cmlu ZyYgZnJhbWVOYW1lLCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rpb24sIGJvb2wgc2hvdWxk Q29udGludWUpIHsKICAgICAgICAgICAgIGNvbnRpbnVlTG9hZEFmdGVyTmV3V2luZG93UG9saWN5 KHJlcXVlc3QsIGZvcm1TdGF0ZSwgZnJhbWVOYW1lLCBhY3Rpb24sIHNob3VsZENvbnRpbnVlLCBB bGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OlN1 cHByZXNzKTsKICAgICAgICAgfSk7CiAKQEAgLTE1NzMsNyArMTU3Myw3IEBAIHZvaWQgRnJhbWVM b2FkZXI6OnJlbG9hZChib29sIGVuZFRvRW5kUmVsb2FkKQogCiAgICAgLy8gSWYgd2UncmUgYWJv dXQgdG8gcmUtcG9zdCwgc2V0IHVwIGFjdGlvbiBzbyB0aGUgYXBwbGljYXRpb24gY2FuIHdhcm4g dGhlIHVzZXIuCiAgICAgaWYgKHJlcXVlc3QuaHR0cE1ldGhvZCgpID09ICJQT1NUIikKLSAgICAg ICAgbG9hZGVyLT5zZXRUcmlnZ2VyaW5nQWN0aW9uKE5hdmlnYXRpb25BY3Rpb24ocmVxdWVzdCwg TmF2aWdhdGlvblR5cGVGb3JtUmVzdWJtaXR0ZWQpKTsKKyAgICAgICAgbG9hZGVyLT5zZXRUcmln Z2VyaW5nQWN0aW9uKE5hdmlnYXRpb25BY3Rpb24ocmVxdWVzdCwgTmF2aWdhdGlvblR5cGU6OkZv cm1SZXN1Ym1pdHRlZCkpOwogCiAgICAgbG9hZGVyLT5zZXRPdmVycmlkZUVuY29kaW5nKG1fZG9j dW1lbnRMb2FkZXItPm92ZXJyaWRlRW5jb2RpbmcoKSk7CiAgICAgCkBAIC0zMjA5LDcgKzMyMDks NyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkRGlmZmVyZW50RG9jdW1lbnRJdGVtKEhpc3RvcnlJ dGVtJiBpdGVtLCBGcmFtZUxvYWRUeXBlIGxvYQogICAgICAgICAgICAgYWN0aW9uID0gTmF2aWdh dGlvbkFjdGlvbihyZXF1ZXN0LCBsb2FkVHlwZSwgZmFsc2UpOwogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgcmVxdWVzdC5zZXRDYWNoZVBvbGljeShSZXR1cm5DYWNoZURhdGFFbHNlTG9h ZCk7Ci0gICAgICAgICAgICBhY3Rpb24gPSBOYXZpZ2F0aW9uQWN0aW9uKHJlcXVlc3QsIE5hdmln YXRpb25UeXBlRm9ybVJlc3VibWl0dGVkKTsKKyAgICAgICAgICAgIGFjdGlvbiA9IE5hdmlnYXRp b25BY3Rpb24ocmVxdWVzdCwgTmF2aWdhdGlvblR5cGU6OkZvcm1SZXN1Ym1pdHRlZCk7CiAgICAg ICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBzd2l0Y2ggKGxvYWRUeXBlKSB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJUeXBlcy5oIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyVHlwZXMuaAppbmRleCBlMDIwYzkzLi40ZWY4YWI2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJUeXBlcy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlclR5cGVzLmgKQEAgLTYyLDE0ICs2Miwx NCBAQCBlbnVtIGNsYXNzIE5ld0ZyYW1lT3BlbmVyUG9saWN5IHsKICAgICBBbGxvdwogfTsKIAot ICAgIGVudW0gTmF2aWdhdGlvblR5cGUgewotICAgICAgICBOYXZpZ2F0aW9uVHlwZUxpbmtDbGlj a2VkLAotICAgICAgICBOYXZpZ2F0aW9uVHlwZUZvcm1TdWJtaXR0ZWQsCi0gICAgICAgIE5hdmln YXRpb25UeXBlQmFja0ZvcndhcmQsCi0gICAgICAgIE5hdmlnYXRpb25UeXBlUmVsb2FkLAotICAg ICAgICBOYXZpZ2F0aW9uVHlwZUZvcm1SZXN1Ym1pdHRlZCwKLSAgICAgICAgTmF2aWdhdGlvblR5 cGVPdGhlcgotICAgIH07CitlbnVtIGNsYXNzIE5hdmlnYXRpb25UeXBlIHsKKyAgICBMaW5rQ2xp Y2tlZCwKKyAgICBGb3JtU3VibWl0dGVkLAorICAgIEJhY2tGb3J3YXJkLAorICAgIFJlbG9hZCwK KyAgICBGb3JtUmVzdWJtaXR0ZWQsCisgICAgT3RoZXIKK307CiAKICAgICBlbnVtIENsZWFyUHJv dmlzaW9uYWxJdGVtUG9saWN5IHsKICAgICAgICAgU2hvdWxkQ2xlYXJQcm92aXNpb25hbEl0ZW0s CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvbkFjdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvbkFjdGlvbi5jcHAKaW5kZXggOTBmZTRi OS4uODM3ZWJkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25B Y3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uQWN0aW9uLmNw cApAQCAtMzgsMjUgKzM4LDI1IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHN0YXRpYyBOYXZpZ2F0 aW9uVHlwZSBuYXZpZ2F0aW9uVHlwZShGcmFtZUxvYWRUeXBlIGZyYW1lTG9hZFR5cGUsIGJvb2wg aXNGb3JtU3VibWlzc2lvbiwgYm9vbCBoYXZlRXZlbnQpCiB7CiAgICAgaWYgKGlzRm9ybVN1Ym1p c3Npb24pCi0gICAgICAgIHJldHVybiBOYXZpZ2F0aW9uVHlwZUZvcm1TdWJtaXR0ZWQ7CisgICAg ICAgIHJldHVybiBOYXZpZ2F0aW9uVHlwZTo6Rm9ybVN1Ym1pdHRlZDsKICAgICBpZiAoaGF2ZUV2 ZW50KQotICAgICAgICByZXR1cm4gTmF2aWdhdGlvblR5cGVMaW5rQ2xpY2tlZDsKKyAgICAgICAg cmV0dXJuIE5hdmlnYXRpb25UeXBlOjpMaW5rQ2xpY2tlZDsKICAgICBpZiAoZnJhbWVMb2FkVHlw ZSA9PSBGcmFtZUxvYWRUeXBlOjpSZWxvYWQgfHwgZnJhbWVMb2FkVHlwZSA9PSBGcmFtZUxvYWRU eXBlOjpSZWxvYWRGcm9tT3JpZ2luKQotICAgICAgICByZXR1cm4gTmF2aWdhdGlvblR5cGVSZWxv YWQ7CisgICAgICAgIHJldHVybiBOYXZpZ2F0aW9uVHlwZTo6UmVsb2FkOwogICAgIGlmIChpc0Jh Y2tGb3J3YXJkTG9hZFR5cGUoZnJhbWVMb2FkVHlwZSkpCi0gICAgICAgIHJldHVybiBOYXZpZ2F0 aW9uVHlwZUJhY2tGb3J3YXJkOwotICAgIHJldHVybiBOYXZpZ2F0aW9uVHlwZU90aGVyOworICAg ICAgICByZXR1cm4gTmF2aWdhdGlvblR5cGU6OkJhY2tGb3J3YXJkOworICAgIHJldHVybiBOYXZp Z2F0aW9uVHlwZTo6T3RoZXI7CiB9CiAKIE5hdmlnYXRpb25BY3Rpb246Ok5hdmlnYXRpb25BY3Rp b24oKQotICAgIDogbV90eXBlKE5hdmlnYXRpb25UeXBlT3RoZXIpCisgICAgOiBtX3R5cGUoTmF2 aWdhdGlvblR5cGU6Ok90aGVyKQogICAgICwgbV9wcm9jZXNzaW5nVXNlckdlc3R1cmUoU2NyaXB0 Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkpCiB7CiB9CiAKIE5hdmlnYXRpb25B Y3Rpb246Ok5hdmlnYXRpb25BY3Rpb24oY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJl cXVlc3QpCiAgICAgOiBtX3Jlc291cmNlUmVxdWVzdChyZXNvdXJjZVJlcXVlc3QpCi0gICAgLCBt X3R5cGUoTmF2aWdhdGlvblR5cGVPdGhlcikKKyAgICAsIG1fdHlwZShOYXZpZ2F0aW9uVHlwZTo6 T3RoZXIpCiAgICAgLCBtX3Byb2Nlc3NpbmdVc2VyR2VzdHVyZShTY3JpcHRDb250cm9sbGVyOjpw cm9jZXNzaW5nVXNlckdlc3R1cmUoKSkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9Qb2xpY3lDaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qb2xpY3lD aGVja2VyLmNwcAppbmRleCBhM2M5NmFmLi45MTc4YjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUG9saWN5Q2hlY2tlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L1BvbGljeUNoZWNrZXIuY3BwCkBAIC02NSw3ICs2NSw3IEBAIHZvaWQgUG9saWN5Q2hlY2tlcjo6 Y2hlY2tOYXZpZ2F0aW9uUG9saWN5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgRG9j dW1lCiB7CiAgICAgTmF2aWdhdGlvbkFjdGlvbiBhY3Rpb24gPSBsb2FkZXItPnRyaWdnZXJpbmdB Y3Rpb24oKTsKICAgICBpZiAoYWN0aW9uLmlzRW1wdHkoKSkgewotICAgICAgICBhY3Rpb24gPSBO YXZpZ2F0aW9uQWN0aW9uKHJlcXVlc3QsIE5hdmlnYXRpb25UeXBlT3RoZXIpOworICAgICAgICBh Y3Rpb24gPSBOYXZpZ2F0aW9uQWN0aW9uKHJlcXVlc3QsIE5hdmlnYXRpb25UeXBlOjpPdGhlcik7 CiAgICAgICAgIGxvYWRlci0+c2V0VHJpZ2dlcmluZ0FjdGlvbihhY3Rpb24pOwogICAgIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZU5hdmlnYXRpb24uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZU5hdmlnYXRpb24uY3BwCmluZGV4IDk1 ZDRjMDUuLmJlNDcyYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFu Y2VOYXZpZ2F0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZvcm1hbmNlTmF2 aWdhdGlvbi5jcHAKQEAgLTU1LDkgKzU1LDkgQEAgdW5zaWduZWQgc2hvcnQgUGVyZm9ybWFuY2VO YXZpZ2F0aW9uOjp0eXBlKCkgY29uc3QKIAogICAgIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlIG5h dmlnYXRpb25UeXBlID0gZG9jdW1lbnRMb2FkZXItPnRyaWdnZXJpbmdBY3Rpb24oKS50eXBlKCk7 CiAgICAgc3dpdGNoIChuYXZpZ2F0aW9uVHlwZSkgewotICAgIGNhc2UgTmF2aWdhdGlvblR5cGVS ZWxvYWQ6CisgICAgY2FzZSBOYXZpZ2F0aW9uVHlwZTo6UmVsb2FkOgogICAgICAgICByZXR1cm4g VFlQRV9SRUxPQUQ7Ci0gICAgY2FzZSBOYXZpZ2F0aW9uVHlwZUJhY2tGb3J3YXJkOgorICAgIGNh c2UgTmF2aWdhdGlvblR5cGU6OkJhY2tGb3J3YXJkOgogICAgICAgICByZXR1cm4gVFlQRV9CQUNL X0ZPUldBUkQ7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIFRZUEVfTkFWSUdBVEU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKaW5kZXggMDZmZjdmZi4uMzEyZTQ4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDE1LTA0LTI3ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNv bT4KKworICAgICAgICBNYWtlICdlbnVtIE5hdmlnYXRpb25UeXBlJyBiZSBhbiBlbnVtIGNsYXNz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQyNzAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tOgorICAgICAgICAoV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmFjdGlvbkRpY3Rpb25hcnkpOgorCiAyMDE1LTA0LTI2ICBZdXN1a2UgU3V6dWtp ICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIFtFUzZdIEltcGxlbWVudCBFUzYg dGVtcGxhdGUgbGl0ZXJhbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVT dXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KaW5kZXggMDQ5MTdmYy4uODNiMzJmYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVMb2FkZXJDbGllbnQubW0KQEAgLTE1NjYsNyArMTU2Niw3IEBAIE5TRGljdGlvbmFyeSAqV2Vi RnJhbWVMb2FkZXJDbGllbnQ6OmFjdGlvbkRpY3Rpb25hcnkoY29uc3QgTmF2aWdhdGlvbkFjdGlv biYgYWN0CiAgICAgTlNVUkwgKm9yaWdpbmFsVVJMID0gYWN0aW9uLnVybCgpOwogCiAgICAgTlNN dXRhYmxlRGljdGlvbmFyeSAqcmVzdWx0ID0gW05TTXV0YWJsZURpY3Rpb25hcnkgZGljdGlvbmFy eVdpdGhPYmplY3RzQW5kS2V5czoKLSAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhJbnQ6YWN0 aW9uLnR5cGUoKV0sIFdlYkFjdGlvbk5hdmlnYXRpb25UeXBlS2V5LAorICAgICAgICBbTlNOdW1i ZXIgbnVtYmVyV2l0aEludDpzdGF0aWNfY2FzdDxpbnQ+KGFjdGlvbi50eXBlKCkpXSwgV2ViQWN0 aW9uTmF2aWdhdGlvblR5cGVLZXksCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoSW50Om1v ZGlmaWVyRmxhZ3NdLCBXZWJBY3Rpb25Nb2RpZmllckZsYWdzS2V5LAogICAgICAgICBvcmlnaW5h bFVSTCwgV2ViQWN0aW9uT3JpZ2luYWxVUkxLZXksCiAgICAgICAgIG5pbF07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5k ZXggZTI5MTJiMC4uNzI5ZjI0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTA0 LTI3ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlICdl bnVtIE5hdmlnYXRpb25UeXBlJyBiZSBhbiBlbnVtIGNsYXNzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQyNzAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS1NoYXJlZEFQSUNh c3QuaDoKKyAgICAgICAgKFdlYktpdDo6dG9BUEkpOgorICAgICAgICAKKyAgICAgICAgKiBTaGFy ZWQvTmF2aWdhdGlvbkFjdGlvbkRhdGEuY3BwOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9u QWN0aW9uRGF0YTo6TmF2aWdhdGlvbkFjdGlvbkRhdGEpOgorICAgICAgICAKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbToKKyAgICAgICAgKHRvV0tO YXZpZ2F0aW9uVHlwZSk6CisgICAgICAgIAorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFByaXZhdGUuY3BwOgorICAgICAgICAodG9XZWJLaXROYXZpZ2F0aW9uVHlwZSk6CisgICAg ICAgIAorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0 Y2hEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKToKKyAgICAgICAgCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rvci5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl Ykluc3BlY3Rvcjo6b3BlbkluTmV3VGFiKToKKwogMjAxNS0wNC0yNyAgQ3NhYmEgT3N6dHJvZ29u w6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtFRkxdIFRlc3RXZWJLaXRBUEkncyBm b3J3YXJkaW5nIGhlYWRlciBnZW5lcmF0b3Igc2hvdWxkIGRlcGVuZCBvbiBXZWJLaXQyJ3MgZ2Vu ZXJhdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tTaGFyZWRB UElDYXN0LmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0LmgK aW5kZXggNjE1N2NkZC4uNjA2MzYzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVk L0FQSS9jL1dLU2hhcmVkQVBJQ2FzdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkv Yy9XS1NoYXJlZEFQSUNhc3QuaApAQCAtNzUyLDIyICs3NTIsMjIgQEAgaW5saW5lIFdLRnJhbWVO YXZpZ2F0aW9uVHlwZSB0b0FQSShXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZSB0eXBlKQogICAgIFdL RnJhbWVOYXZpZ2F0aW9uVHlwZSB3a1R5cGUgPSBrV0tGcmFtZU5hdmlnYXRpb25UeXBlT3RoZXI7 CiAKICAgICBzd2l0Y2ggKHR5cGUpIHsKLSAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBl TGlua0NsaWNrZWQ6CisgICAgY2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZTo6TGlua0NsaWNr ZWQ6CiAgICAgICAgIHdrVHlwZSA9IGtXS0ZyYW1lTmF2aWdhdGlvblR5cGVMaW5rQ2xpY2tlZDsK ICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZUZvcm1TdWJt aXR0ZWQ6CisgICAgY2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZTo6Rm9ybVN1Ym1pdHRlZDoK ICAgICAgICAgd2tUeXBlID0ga1dLRnJhbWVOYXZpZ2F0aW9uVHlwZUZvcm1TdWJtaXR0ZWQ7CiAg ICAgICAgIGJyZWFrOwotICAgIGNhc2UgV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVCYWNrRm9yd2Fy ZDoKKyAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlOjpCYWNrRm9yd2FyZDoKICAgICAg ICAgd2tUeXBlID0ga1dLRnJhbWVOYXZpZ2F0aW9uVHlwZUJhY2tGb3J3YXJkOwogICAgICAgICBi cmVhazsKLSAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlUmVsb2FkOgorICAgIGNhc2Ug V2ViQ29yZTo6TmF2aWdhdGlvblR5cGU6OlJlbG9hZDoKICAgICAgICAgd2tUeXBlID0ga1dLRnJh bWVOYXZpZ2F0aW9uVHlwZVJlbG9hZDsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBXZWJDb3Jl OjpOYXZpZ2F0aW9uVHlwZUZvcm1SZXN1Ym1pdHRlZDoKKyAgICBjYXNlIFdlYkNvcmU6Ok5hdmln YXRpb25UeXBlOjpGb3JtUmVzdWJtaXR0ZWQ6CiAgICAgICAgIHdrVHlwZSA9IGtXS0ZyYW1lTmF2 aWdhdGlvblR5cGVGb3JtUmVzdWJtaXR0ZWQ7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgV2Vi Q29yZTo6TmF2aWdhdGlvblR5cGVPdGhlcjoKKyAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25U eXBlOjpPdGhlcjoKICAgICAgICAgd2tUeXBlID0ga1dLRnJhbWVOYXZpZ2F0aW9uVHlwZU90aGVy OwogICAgICAgICBicmVhazsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvTmF2aWdhdGlvbkFjdGlvbkRhdGEuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05hdmln YXRpb25BY3Rpb25EYXRhLmNwcAppbmRleCAzZGMzMjE2Li43MzI3YTRlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmF2aWdhdGlvbkFjdGlvbkRhdGEuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9OYXZpZ2F0aW9uQWN0aW9uRGF0YS5jcHAKQEAgLTM0LDcgKzM0LDcg QEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogTmF2aWdh dGlvbkFjdGlvbkRhdGE6Ok5hdmlnYXRpb25BY3Rpb25EYXRhKCkKLSAgICA6IG5hdmlnYXRpb25U eXBlKE5hdmlnYXRpb25UeXBlT3RoZXIpCisgICAgOiBuYXZpZ2F0aW9uVHlwZShOYXZpZ2F0aW9u VHlwZTo6T3RoZXIpCiAgICAgLCBtb2RpZmllcnMoKQogICAgICwgbW91c2VCdXR0b24oV2ViTW91 c2VFdmVudDo6Tm9CdXR0b24pCiAgICAgLCBpc1Byb2Nlc3NpbmdVc2VyR2VzdHVyZShmYWxzZSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0 aW9uQWN0aW9uLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmln YXRpb25BY3Rpb24ubW0KaW5kZXggOWI5OTQ0Mi4uOWY2MWZiNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0KKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0K QEAgLTM3LDE3ICszNywxNyBAQAogc3RhdGljIFdLTmF2aWdhdGlvblR5cGUgdG9XS05hdmlnYXRp b25UeXBlKFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlIG5hdmlnYXRpb25UeXBlKQogewogICAgIHN3 aXRjaCAobmF2aWdhdGlvblR5cGUpIHsKLSAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBl TGlua0NsaWNrZWQ6CisgICAgY2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZTo6TGlua0NsaWNr ZWQ6CiAgICAgICAgIHJldHVybiBXS05hdmlnYXRpb25UeXBlTGlua0FjdGl2YXRlZDsKLSAgICBj YXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlRm9ybVN1Ym1pdHRlZDoKKyAgICBjYXNlIFdlYkNv cmU6Ok5hdmlnYXRpb25UeXBlOjpGb3JtU3VibWl0dGVkOgogICAgICAgICByZXR1cm4gV0tOYXZp Z2F0aW9uVHlwZUZvcm1TdWJtaXR0ZWQ7Ci0gICAgY2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlw ZUJhY2tGb3J3YXJkOgorICAgIGNhc2UgV2ViQ29yZTo6TmF2aWdhdGlvblR5cGU6OkJhY2tGb3J3 YXJkOgogICAgICAgICByZXR1cm4gV0tOYXZpZ2F0aW9uVHlwZUJhY2tGb3J3YXJkOwotICAgIGNh c2UgV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVSZWxvYWQ6CisgICAgY2FzZSBXZWJDb3JlOjpOYXZp Z2F0aW9uVHlwZTo6UmVsb2FkOgogICAgICAgICByZXR1cm4gV0tOYXZpZ2F0aW9uVHlwZVJlbG9h ZDsKLSAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlRm9ybVJlc3VibWl0dGVkOgorICAg IGNhc2UgV2ViQ29yZTo6TmF2aWdhdGlvblR5cGU6OkZvcm1SZXN1Ym1pdHRlZDoKICAgICAgICAg cmV0dXJuIFdLTmF2aWdhdGlvblR5cGVGb3JtUmVzdWJtaXR0ZWQ7Ci0gICAgY2FzZSBXZWJDb3Jl OjpOYXZpZ2F0aW9uVHlwZU90aGVyOgorICAgIGNhc2UgV2ViQ29yZTo6TmF2aWdhdGlvblR5cGU6 Ok90aGVyOgogICAgICAgICByZXR1cm4gV0tOYXZpZ2F0aW9uVHlwZU90aGVyOwogICAgIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UHJpdmF0 ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQcml2YXRlLmNw cAppbmRleCAyMDZjYmNjLi4yYjFlMTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRQcml2YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRQcml2YXRlLmNwcApAQCAtNTYsMTcgKzU2LDE3IEBAIHVuc2ln bmVkIHRvR2RrTW9kaWZpZXJzKFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVycyB3a01vZGlmaWVy cykKIFdlYktpdE5hdmlnYXRpb25UeXBlIHRvV2ViS2l0TmF2aWdhdGlvblR5cGUoV2ViQ29yZTo6 TmF2aWdhdGlvblR5cGUgdHlwZSkKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKLSAgICBjYXNlIFdl YkNvcmU6Ok5hdmlnYXRpb25UeXBlOjpOYXZpZ2F0aW9uVHlwZUxpbmtDbGlja2VkOgorICAgIGNh c2UgV2ViQ29yZTo6TmF2aWdhdGlvblR5cGU6OkxpbmtDbGlja2VkOgogICAgICAgICByZXR1cm4g V0VCS0lUX05BVklHQVRJT05fVFlQRV9MSU5LX0NMSUNLRUQ7Ci0gICAgY2FzZSBXZWJDb3JlOjpO YXZpZ2F0aW9uVHlwZTo6TmF2aWdhdGlvblR5cGVGb3JtU3VibWl0dGVkOgorICAgIGNhc2UgV2Vi Q29yZTo6TmF2aWdhdGlvblR5cGU6OkZvcm1TdWJtaXR0ZWQ6CiAgICAgICAgIHJldHVybiBXRUJL SVRfTkFWSUdBVElPTl9UWVBFX0ZPUk1fU1VCTUlUVEVEOwotICAgIGNhc2UgV2ViQ29yZTo6TmF2 aWdhdGlvblR5cGU6Ok5hdmlnYXRpb25UeXBlQmFja0ZvcndhcmQ6CisgICAgY2FzZSBXZWJDb3Jl OjpOYXZpZ2F0aW9uVHlwZTo6QmFja0ZvcndhcmQ6CiAgICAgICAgIHJldHVybiBXRUJLSVRfTkFW SUdBVElPTl9UWVBFX0JBQ0tfRk9SV0FSRDsKLSAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25U eXBlOjpOYXZpZ2F0aW9uVHlwZVJlbG9hZDoKKyAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25U eXBlOjpSZWxvYWQ6CiAgICAgICAgIHJldHVybiBXRUJLSVRfTkFWSUdBVElPTl9UWVBFX1JFTE9B RDsKLSAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlOjpOYXZpZ2F0aW9uVHlwZUZvcm1S ZXN1Ym1pdHRlZDoKKyAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlOjpGb3JtUmVzdWJt aXR0ZWQ6CiAgICAgICAgIHJldHVybiBXRUJLSVRfTkFWSUdBVElPTl9UWVBFX0ZPUk1fUkVTVUJN SVRURUQ7Ci0gICAgY2FzZSBXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZTo6TmF2aWdhdGlvblR5cGVP dGhlcjoKKyAgICBjYXNlIFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlOjpPdGhlcjoKICAgICAgICAg cmV0dXJuIFdFQktJVF9OQVZJR0FUSU9OX1RZUEVfT1RIRVI7CiAgICAgZGVmYXVsdDoKICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3Bw CmluZGV4IDk1NTc3ZWMuLjQyZDExMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu Y3BwCkBAIC03NjQsNyArNzY0LDcgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0 Y2hEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IE5hdmlnYXQKIAogICAgIFJl ZlB0cjxXZWJGcmFtZT4gb3JpZ2luYXRpbmdGcmFtZTsKICAgICBzd2l0Y2ggKGFjdGlvbi0+bmF2 aWdhdGlvblR5cGUoKSkgewotICAgIGNhc2UgTmF2aWdhdGlvblR5cGVMaW5rQ2xpY2tlZDoKKyAg ICBjYXNlIE5hdmlnYXRpb25UeXBlOjpMaW5rQ2xpY2tlZDoKICAgICAgICAgaWYgKEV2ZW50VGFy Z2V0KiB0YXJnZXQgPSBuYXZpZ2F0aW9uQWN0aW9uLmV2ZW50KCktPnRhcmdldCgpKSB7CiAgICAg ICAgICAgICBpZiAoTm9kZSogbm9kZSA9IHRhcmdldC0+dG9Ob2RlKCkpIHsKICAgICAgICAgICAg ICAgICBpZiAoRnJhbWUqIGZyYW1lID0gbm9kZS0+ZG9jdW1lbnQoKS5mcmFtZSgpKQpAQCAtNzcy LDE0ICs3NzIsMTQgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IE5hdmlnYXQKICAgICAgICAgICAgIH0KICAg ICAgICAgfQogICAgICAgICBicmVhazsKLSAgICBjYXNlIE5hdmlnYXRpb25UeXBlRm9ybVN1Ym1p dHRlZDoKLSAgICBjYXNlIE5hdmlnYXRpb25UeXBlRm9ybVJlc3VibWl0dGVkOgorICAgIGNhc2Ug TmF2aWdhdGlvblR5cGU6OkZvcm1TdWJtaXR0ZWQ6CisgICAgY2FzZSBOYXZpZ2F0aW9uVHlwZTo6 Rm9ybVJlc3VibWl0dGVkOgogICAgICAgICBpZiAoZm9ybVN0YXRlKQogICAgICAgICAgICAgb3Jp Z2luYXRpbmdGcmFtZSA9IFdlYkZyYW1lOjpmcm9tQ29yZUZyYW1lKCpmb3JtU3RhdGUtPnNvdXJj ZURvY3VtZW50KCktPmZyYW1lKCkpOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIE5hdmlnYXRp b25UeXBlQmFja0ZvcndhcmQ6Ci0gICAgY2FzZSBOYXZpZ2F0aW9uVHlwZVJlbG9hZDoKLSAgICBj YXNlIE5hdmlnYXRpb25UeXBlT3RoZXI6CisgICAgY2FzZSBOYXZpZ2F0aW9uVHlwZTo6QmFja0Zv cndhcmQ6CisgICAgY2FzZSBOYXZpZ2F0aW9uVHlwZTo6UmVsb2FkOgorICAgIGNhc2UgTmF2aWdh dGlvblR5cGU6Ok90aGVyOgogICAgICAgICBicmVhazsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3IuY3BwIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rvci5jcHAKaW5kZXggYmYwNDc2 MC4uZmQ5OWE4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYkluc3BlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYkluc3BlY3Rvci5jcHAKQEAgLTEzNyw3ICsxMzcsNyBAQCB2b2lkIFdlYkluc3BlY3Rvcjo6 b3BlbkluTmV3VGFiKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKQogICAgIEZyYW1lJiBpbnNwZWN0 ZWRNYWluRnJhbWUgPSBpbnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKTsKICAgICBGcmFtZUxvYWRS ZXF1ZXN0IHJlcXVlc3QoaW5zcGVjdGVkTWFpbkZyYW1lLmRvY3VtZW50KCktPnNlY3VyaXR5T3Jp Z2luKCksIFJlc291cmNlUmVxdWVzdCh1cmxTdHJpbmcpLCAiX2JsYW5rIik7CiAKLSAgICBQYWdl KiBuZXdQYWdlID0gaW5zcGVjdGVkUGFnZS0+Y2hyb21lKCkuY3JlYXRlV2luZG93KCZpbnNwZWN0 ZWRNYWluRnJhbWUsIHJlcXVlc3QsIFdpbmRvd0ZlYXR1cmVzKCksIE5hdmlnYXRpb25BY3Rpb24o cmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKSwgTmF2aWdhdGlvblR5cGVMaW5rQ2xpY2tlZCkpOwor ICAgIFBhZ2UqIG5ld1BhZ2UgPSBpbnNwZWN0ZWRQYWdlLT5jaHJvbWUoKS5jcmVhdGVXaW5kb3co Jmluc3BlY3RlZE1haW5GcmFtZSwgcmVxdWVzdCwgV2luZG93RmVhdHVyZXMoKSwgTmF2aWdhdGlv bkFjdGlvbihyZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLCBOYXZpZ2F0aW9uVHlwZTo6TGlua0Ns aWNrZWQpKTsKICAgICBpZiAoIW5ld1BhZ2UpCiAgICAgICAgIHJldHVybjsKIAo=