145913 2015-06-12 03:22:16 -0700 [EFL] Fix deprecated declarations warnings related to WK2 versioned structs 2015-06-12 03:34:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 145121 1 ossy ossy andersca commit-queue darin kling ossy sam oldest_to_newest 1101523 0 ossy 2015-06-12 03:22:16 -0700 for example: ------------- ../../Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp:120:40: warning: 'WKContextHistoryClient' is deprecated: Use an explicit versioned struct instead [-Wdeprecated-declarations] memset(&wkHistoryClient, 0, sizeof(WKContextHistoryClient)); ^ ../../Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h:64:3: note: 'WKContextHistoryClient' has been explicitly marked deprecated here } WKContextHistoryClient __attribute__((deprecated("Use an explicit versioned struct instead"))); ^ 1 warning generated. ../../Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp:62:42: warning: 'WKPageContextMenuClient' is deprecated: Use an explicit versioned struct instead [-Wdeprecated-declarations] memset(&contextMenuClient, 0, sizeof(WKPageContextMenuClient)); ^ ../../Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h:119:3: note: 'WKPageContextMenuClient' has been explicitly marked deprecated here } WKPageContextMenuClient __attribute__((deprecated("Use an explicit versioned struct instead"))); ^ 1 warning generated. ... 1101524 1 254786 ossy 2015-06-12 03:23:44 -0700 Created attachment 254786 Patch 1101529 2 254786 commit-queue 2015-06-12 03:34:49 -0700 Comment on attachment 254786 Patch Clearing flags on attachment: 254786 Committed r185496: <http://trac.webkit.org/changeset/185496> 1101530 3 commit-queue 2015-06-12 03:34:53 -0700 All reviewed patches have been landed. Closing bug. 254786 2015-06-12 03:23:44 -0700 2015-06-12 03:34:49 -0700 Patch bug-145913-20150612032313.patch text/plain 11648 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGRiYzFlMGRmODU0NGYx MjFiN2FkMTRkYmE5N2U1OTA5OTViYWNjOC4uN2I3YTdkMmU5YmRlMmUxMjkxNTljOGYwODFhMDVm YTcxODNmN2IzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA2LTEyICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0VGTF0gRml4IGRl cHJlY2F0ZWQgZGVjbGFyYXRpb25zIHdhcm5pbmdzIHJlbGF0ZWQgdG8gV0syIHZlcnNpb25lZCBz dHJ1Y3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDU5MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlLmNwcDoKKyAgICAgICAgKEV3 a0Zhdmljb25EYXRhYmFzZTo6RXdrRmF2aWNvbkRhdGFiYXNlKToKKyAgICAgICAgKiBVSVByb2Nl c3MvZWZsL0NvbnRleHRIaXN0b3J5Q2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29u dGV4dEhpc3RvcnlDbGllbnRFZmw6OkNvbnRleHRIaXN0b3J5Q2xpZW50RWZsKToKKyAgICAgICAg KiBVSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNwcDoKKyAgICAgICAgKENvbnRl eHRNZW51Q2xpZW50RWZsOjpDb250ZXh0TWVudUNsaWVudEVmbCk6CisgICAgICAgICogVUlQcm9j ZXNzL2VmbC9Eb3dubG9hZE1hbmFnZXJFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpEb3dubG9h ZE1hbmFnZXJFZmw6OkRvd25sb2FkTWFuYWdlckVmbCk6CisgICAgICAgICogVUlQcm9jZXNzL2Vm bC9GaW5kQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RmluZENsaWVudEVmbDo6Rmlu ZENsaWVudEVmbCk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9Gb3JtQ2xpZW50RWZsLmNwcDoK KyAgICAgICAgKFdlYktpdDo6Rm9ybUNsaWVudEVmbDo6Rm9ybUNsaWVudEVmbCk6CisgICAgICAg ICogVUlQcm9jZXNzL2VmbC9QYWdlVUlDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQ YWdlVUlDbGllbnRFZmw6OlBhZ2VVSUNsaWVudEVmbCk6CisKIDIwMTUtMDYtMTEgIE1hcmsgTGFt ICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYkNvcmU6OnJlcG9ydEV4Y2VwdGlv bigpIG5lZWRzIHRvIGJlIGFibGUgdG8gYWNjZXB0IGEgcmF3IHRocm93biB2YWx1ZSBpbiBhZGRp dGlvbiB0byBFeGNlcHRpb24gb2JqZWN0cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlLmNwcAppbmRleCA1MjgwYjYz MTU0NTYyYzM2N2M3MjA5YjBmNGNkMDEzNzM4MzEwYzUxLi4wNWU3NjZiNTllZTU2MTgxNGY4NWJk MDJiZjA4NThjMjhhNWI2MWI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2Zhdmljb25fZGF0YWJhc2UuY3BwCkBAIC00Myw4ICs0Myw4IEBA IEV3a0Zhdmljb25EYXRhYmFzZTo6RXdrRmF2aWNvbkRhdGFiYXNlKFdLSWNvbkRhdGFiYXNlUmVm IGljb25EYXRhYmFzZSkKICAgICA6IG1faWNvbkRhdGFiYXNlKGljb25EYXRhYmFzZSkKIHsKICAg ICBXS0ljb25EYXRhYmFzZUNsaWVudFYxIGljb25EYXRhYmFzZUNsaWVudDsKLSAgICBtZW1zZXQo Jmljb25EYXRhYmFzZUNsaWVudCwgMCwgc2l6ZW9mKFdLSWNvbkRhdGFiYXNlQ2xpZW50KSk7Ci0g ICAgaWNvbkRhdGFiYXNlQ2xpZW50LmJhc2UudmVyc2lvbiA9IGtXS0ljb25EYXRhYmFzZUNsaWVu dEN1cnJlbnRWZXJzaW9uOworICAgIG1lbXNldCgmaWNvbkRhdGFiYXNlQ2xpZW50LCAwLCBzaXpl b2YoV0tJY29uRGF0YWJhc2VDbGllbnRWMSkpOworICAgIGljb25EYXRhYmFzZUNsaWVudC5iYXNl LnZlcnNpb24gPSAxOwogICAgIGljb25EYXRhYmFzZUNsaWVudC5iYXNlLmNsaWVudEluZm8gPSB0 aGlzOwogICAgIGljb25EYXRhYmFzZUNsaWVudC5pY29uRGF0YVJlYWR5Rm9yUGFnZVVSTCA9IGlj b25EYXRhUmVhZHlGb3JQYWdlVVJMOwogICAgIFdLSWNvbkRhdGFiYXNlU2V0SWNvbkRhdGFiYXNl Q2xpZW50KG1faWNvbkRhdGFiYXNlLmdldCgpLCAmaWNvbkRhdGFiYXNlQ2xpZW50LmJhc2UpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Db250ZXh0SGlzdG9yeUNs aWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRIaXN0b3J5 Q2xpZW50RWZsLmNwcAppbmRleCAxN2Y5ODI1MGE4YmJjYTIzNTBiY2U4YzYzOTZiNjEwY2Y4MDQ5 NjBmLi44MDQ0MjQ5ZDA2Yzk0NWYwZjgzNThiMTU0N2IwYjUwN2Q1ZmU1NDI5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRIaXN0b3J5Q2xpZW50RWZsLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRIaXN0b3J5Q2xpZW50 RWZsLmNwcApAQCAtMTE3LDcgKzExNyw3IEBAIENvbnRleHRIaXN0b3J5Q2xpZW50RWZsOjpDb250 ZXh0SGlzdG9yeUNsaWVudEVmbChXS0NvbnRleHRSZWYgY29udGV4dCkKICAgICBBU1NFUlQobV9j b250ZXh0KTsKIAogICAgIFdLQ29udGV4dEhpc3RvcnlDbGllbnRWMCB3a0hpc3RvcnlDbGllbnQ7 Ci0gICAgbWVtc2V0KCZ3a0hpc3RvcnlDbGllbnQsIDAsIHNpemVvZihXS0NvbnRleHRIaXN0b3J5 Q2xpZW50KSk7CisgICAgbWVtc2V0KCZ3a0hpc3RvcnlDbGllbnQsIDAsIHNpemVvZihXS0NvbnRl eHRIaXN0b3J5Q2xpZW50VjApKTsKIAogICAgIHdrSGlzdG9yeUNsaWVudC5iYXNlLnZlcnNpb24g PSAwOwogICAgIHdrSGlzdG9yeUNsaWVudC5iYXNlLmNsaWVudEluZm8gPSB0aGlzOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNw cAppbmRleCAxYmFjMGRlZjMwMmQ4OWM1Yjc1ZjU3ODJhNGE1Zjc1ZGZkZDViMTk0Li4zMDg0MDFj NjFhYzdiNWJkYzlhMDEyZjVlYmMwZTkwMDdlMTRmNjRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNwcApAQCAtNTksNyAr NTksNyBAQCBDb250ZXh0TWVudUNsaWVudEVmbDo6Q29udGV4dE1lbnVDbGllbnRFZmwoRXdrVmll dyogdmlldykKICAgICBBU1NFUlQocGFnZVJlZik7CiAKICAgICBXS1BhZ2VDb250ZXh0TWVudUNs aWVudFYzIGNvbnRleHRNZW51Q2xpZW50OwotICAgIG1lbXNldCgmY29udGV4dE1lbnVDbGllbnQs IDAsIHNpemVvZihXS1BhZ2VDb250ZXh0TWVudUNsaWVudCkpOworICAgIG1lbXNldCgmY29udGV4 dE1lbnVDbGllbnQsIDAsIHNpemVvZihXS1BhZ2VDb250ZXh0TWVudUNsaWVudFYzKSk7CiAgICAg Y29udGV4dE1lbnVDbGllbnQuYmFzZS52ZXJzaW9uID0gMzsKICAgICBjb250ZXh0TWVudUNsaWVu dC5iYXNlLmNsaWVudEluZm8gPSB0aGlzOwogICAgIGNvbnRleHRNZW51Q2xpZW50LmdldENvbnRl eHRNZW51RnJvbVByb3Bvc2VkTWVudV9kZXByZWNhdGVkRm9yVXNlV2l0aFYwID0gMDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvRG93bmxvYWRNYW5hZ2VyRWZsLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvRG93bmxvYWRNYW5hZ2VyRWZsLmNwcApp bmRleCBmZjMyM2Q4YzM0NjlmZjhiZGNhYWJkODczMDdhZTU4NDc0OTViNTIyLi4yMzQyYWQ2MGZh OGM1OTAzODkwNmNkNmNjZDMyYzE4ZjY3OTY5NWY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvZWZsL0Rvd25sb2FkTWFuYWdlckVmbC5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2VmbC9Eb3dubG9hZE1hbmFnZXJFZmwuY3BwCkBAIC0xMzQsNyArMTM0LDcg QEAgRG93bmxvYWRNYW5hZ2VyRWZsOjpEb3dubG9hZE1hbmFnZXJFZmwoV0tDb250ZXh0UmVmIGNv bnRleHQpCiAgICAgbWVtc2V0KCZtX2NsaWVudENhbGxiYWNrcywgMCwgc2l6ZW9mKENsaWVudERv d25sb2FkQ2FsbGJhY2tzKSk7CiAKICAgICBXS0NvbnRleHREb3dubG9hZENsaWVudFYwIHdrRG93 bmxvYWRDbGllbnQ7Ci0gICAgbWVtc2V0KCZ3a0Rvd25sb2FkQ2xpZW50LCAwLCBzaXplb2YoV0tD b250ZXh0RG93bmxvYWRDbGllbnQpKTsKKyAgICBtZW1zZXQoJndrRG93bmxvYWRDbGllbnQsIDAs IHNpemVvZihXS0NvbnRleHREb3dubG9hZENsaWVudFYwKSk7CiAKICAgICB3a0Rvd25sb2FkQ2xp ZW50LmJhc2UudmVyc2lvbiA9IDA7CiAgICAgd2tEb3dubG9hZENsaWVudC5iYXNlLmNsaWVudElu Zm8gPSB0aGlzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9GaW5k Q2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvRmluZENsaWVudEVm bC5jcHAKaW5kZXggYjBjNTZhYTVjMDE0M2NkZmU1YjI3MmIzZDA0NTM4YmZhY2I4NGM4OS4uOWM1 MTQxMzMwNDQyMGVhZDJkOTMxYTIxMjg0YzY4YjU0NzYzN2M0ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2VmbC9GaW5kQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZWZsL0ZpbmRDbGllbnRFZmwuY3BwCkBAIC01OSw3ICs1OSw3IEBAIEZp bmRDbGllbnRFZmw6OkZpbmRDbGllbnRFZmwoRXdrVmlldyogdmlld0ltcGwpCiAgICAgQVNTRVJU KHBhZ2VSZWYpOwogCiAgICAgV0tQYWdlRmluZENsaWVudFYwIGZpbmRDbGllbnQ7Ci0gICAgbWVt c2V0KCZmaW5kQ2xpZW50LCAwLCBzaXplb2YoV0tQYWdlRmluZENsaWVudCkpOworICAgIG1lbXNl dCgmZmluZENsaWVudCwgMCwgc2l6ZW9mKFdLUGFnZUZpbmRDbGllbnRWMCkpOwogICAgIGZpbmRD bGllbnQuYmFzZS52ZXJzaW9uID0gMDsKICAgICBmaW5kQ2xpZW50LmJhc2UuY2xpZW50SW5mbyA9 IHRoaXM7CiAgICAgZmluZENsaWVudC5kaWRGaW5kU3RyaW5nID0gZGlkRmluZFN0cmluZzsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvRm9ybUNsaWVudEVmbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0Zvcm1DbGllbnRFZmwuY3BwCmluZGV4IDM0 YThkOTA1MWQyZjE4ODA1YjhlYzA4MmE3NTdkMGJkMjMwZTQ0OTEuLjM5NjJjYTlmZDI3MjJmYzA4 YTg5ZTI2MjhlZjA4OTEyYzNkZjEyYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvRm9ybUNsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2VmbC9Gb3JtQ2xpZW50RWZsLmNwcApAQCAtNTQsNyArNTQsNyBAQCBGb3JtQ2xpZW50RWZsOjpG b3JtQ2xpZW50RWZsKEV3a1ZpZXcqIHZpZXdJbXBsKQogICAgIEFTU0VSVChwYWdlUmVmKTsKIAog ICAgIFdLUGFnZUZvcm1DbGllbnRWMCBmb3JtQ2xpZW50OwotICAgIG1lbXNldCgmZm9ybUNsaWVu dCwgMCwgc2l6ZW9mKFdLUGFnZUZvcm1DbGllbnQpKTsKKyAgICBtZW1zZXQoJmZvcm1DbGllbnQs IDAsIHNpemVvZihXS1BhZ2VGb3JtQ2xpZW50VjApKTsKICAgICBmb3JtQ2xpZW50LmJhc2UudmVy c2lvbiA9IDA7CiAgICAgZm9ybUNsaWVudC5iYXNlLmNsaWVudEluZm8gPSB0aGlzOwogICAgIGZv cm1DbGllbnQud2lsbFN1Ym1pdEZvcm0gPSB3aWxsU3VibWl0Rm9ybTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcAppbmRleCAwMTEwYmFlNDJj MWU2NWEwNmViOGNkZTUyOTc5ZTk4OTQxYWE5NmJkLi5jOTE2YjJiNjVjNzNlMDdjZWQxZTIxOTE2 YWU2YWRiM2IzY2M4NDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZs L1BhZ2VVSUNsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Q YWdlVUlDbGllbnRFZmwuY3BwCkBAIC01Myw3ICs1Myw3IEBAIFBhZ2VVSUNsaWVudEVmbDo6UGFn ZVVJQ2xpZW50RWZsKEV3a1ZpZXcqIHZpZXcpCiAgICAgQVNTRVJUKHBhZ2VSZWYpOwogCiAgICAg V0tQYWdlVUlDbGllbnRWMiB1aUNsaWVudDsKLSAgICBtZW1zZXQoJnVpQ2xpZW50LCAwLCBzaXpl b2YoV0tQYWdlVUlDbGllbnQpKTsKKyAgICBtZW1zZXQoJnVpQ2xpZW50LCAwLCBzaXplb2YoV0tQ YWdlVUlDbGllbnRWMikpOwogICAgIHVpQ2xpZW50LmJhc2UudmVyc2lvbiA9IDI7CiAgICAgdWlD bGllbnQuYmFzZS5jbGllbnRJbmZvID0gdGhpczsKICAgICB1aUNsaWVudC5jbG9zZSA9IGNsb3Nl OwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDE4 ODIyNThiMTRjMThmZDM2NGZmYmZkMTczYTY0MjYwZmUzYjNiZDIuLjE5MThjYjEwYzYwYTNjMTcz MWJiZDE2NzU5ZjY3NTZlMjJmOTBmOGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMyBAQAogMjAxNS0wNi0xMiAgQ3NhYmEgT3N6 dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCisgICAgICAgIFtFRkxdIEZpeCBkZXByZWNh dGVkIGRlY2xhcmF0aW9ucyB3YXJuaW5ncyByZWxhdGVkIHRvIFdLMiB2ZXJzaW9uZWQgc3RydWN0 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1OTEz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvR2VvbG9jYXRpb24uY3BwOgorICAgICAgICAoVGVzdFdl YktpdEFQSTo6c2V0dXBHZW9sb2NhdGlvblByb3ZpZGVyKToKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDIvTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0RnJhbWVzLmNw cDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OnNldFBhZ2VMb2FkZXJDbGllbnQpOgorICAgICAg ICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9Vc2VyTWVzc2FnZS5jcHA6CisgICAgICAg IChUZXN0V2ViS2l0QVBJOjpXZWJLaXQyVXNlck1lc3NhZ2VSb3VuZFRyaXBUZXN0OjpzZXRQYWdl TG9hZGVyQ2xpZW50KToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0dlb2xvY2F0aW9uUHJv dmlkZXJNb2NrLmNwcDoKKyAgICAgICAgKFdUUjo6R2VvbG9jYXRpb25Qcm92aWRlck1vY2s6Okdl b2xvY2F0aW9uUHJvdmlkZXJNb2NrKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1dlYk5v dGlmaWNhdGlvblByb3ZpZGVyLmNwcDoKKyAgICAgICAgKFdUUjo6V2ViTm90aWZpY2F0aW9uUHJv dmlkZXI6OnByb3ZpZGVyKToKKworMjAxNS0wNi0xMiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3Nz eUB3ZWJraXQub3JnPgorCiAgICAgICAgIEZpeCB0aGUgbGlidXNyc2N0cCBidWlsZCB3aXRoIGNs YW5nCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDUx MjgKIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL0dlb2xv Y2F0aW9uLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9HZW9sb2NhdGlv bi5jcHAKaW5kZXggY2Y0NTkxMTRhYjhjMmI5OGU4MDdlNzY5NjA2Y2UyYzk2YzlhMjYzOC4uYjZk ODcyZjRjMzk1OGY5NTFlMDYzYmZmNmY0NjQ2NWI1NzdhZTc3ZCAxMDA2NDQKLS0tIGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL0dlb2xvY2F0aW9uLmNwcAorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvR2VvbG9jYXRpb24uY3BwCkBAIC0xMDYsNyArMTA2 LDcgQEAgdm9pZCBkZWNpZGVQb2xpY3lGb3JHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0Q2Fs bEJhY2soV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWUKIHZvaWQgc2V0dXBHZW9sb2NhdGlvblByb3Zp ZGVyKFdLQ29udGV4dFJlZiBjb250ZXh0LCB2b2lkICpjbGllbnRJbmZvKQogewogICAgIFdLR2Vv bG9jYXRpb25Qcm92aWRlclYxIHByb3ZpZGVyQ2FsbGJhY2s7Ci0gICAgbWVtc2V0KCZwcm92aWRl ckNhbGxiYWNrLCAwLCBzaXplb2YoV0tHZW9sb2NhdGlvblByb3ZpZGVyKSk7CisgICAgbWVtc2V0 KCZwcm92aWRlckNhbGxiYWNrLCAwLCBzaXplb2YoV0tHZW9sb2NhdGlvblByb3ZpZGVyVjEpKTsK IAogICAgIHByb3ZpZGVyQ2FsbGJhY2suYmFzZS52ZXJzaW9uID0gMTsKICAgICBwcm92aWRlckNh bGxiYWNrLmJhc2UuY2xpZW50SW5mbyA9IGNsaWVudEluZm87CmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvTmV3Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0 RnJhbWVzLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9OZXdGaXJzdFZp c3VhbGx5Tm9uRW1wdHlMYXlvdXRGcmFtZXMuY3BwCmluZGV4IDhhYzY0Y2MzM2NiZWUyMGIyN2Rm MTVjZjY2NDJlYTNlMjE1YjBlYmYuLmM3YjI0NjgwZWJiMDNkYzRkYWVlZTE2ZTBjMDcxMDhlYTVk OWVkOGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9OZXdG aXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGcmFtZXMuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Mi9OZXdGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRGcmFtZXMu Y3BwCkBAIC02Nyw3ICs2Nyw3IEBAIHN0YXRpYyB2b2lkIHNldFBhZ2VMb2FkZXJDbGllbnQoV0tQ YWdlUmVmIHBhZ2UpCiAgICAgV0tQYWdlTG9hZGVyQ2xpZW50VjMgbG9hZGVyQ2xpZW50OwogICAg IG1lbXNldCgmbG9hZGVyQ2xpZW50LCAwLCBzaXplb2YobG9hZGVyQ2xpZW50KSk7CiAKLSAgICBs b2FkZXJDbGllbnQuYmFzZS52ZXJzaW9uID0ga1dLUGFnZUxvYWRlckNsaWVudEN1cnJlbnRWZXJz aW9uOworICAgIGxvYWRlckNsaWVudC5iYXNlLnZlcnNpb24gPSAzOwogICAgIGxvYWRlckNsaWVu dC5kaWRGaW5pc2hMb2FkRm9yRnJhbWUgPSBkaWRGaW5pc2hMb2FkRm9yRnJhbWU7CiAgICAgbG9h ZGVyQ2xpZW50LmRpZExheW91dCA9IGRpZExheW91dDsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL1VzZXJNZXNzYWdlLmNwcCBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Mi9Vc2VyTWVzc2FnZS5jcHAKaW5kZXggMWU0NTI1MDQ5NWMzNWI0 OWQ2ZDg2ZjhjMDMxMDZhNTljMTg5ZjM1MS4uMDY0Y2JiODM4NWQ1MDk0MDA0ZmU0ZDMyMDVlMjRj NzE1MDNiNjJiYyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQy L1VzZXJNZXNzYWdlLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIv VXNlck1lc3NhZ2UuY3BwCkBAIC04MSw3ICs4MSw3IEBAIHB1YmxpYzoKICAgICAgICAgV0tQYWdl TG9hZGVyQ2xpZW50VjMgbG9hZGVyQ2xpZW50OwogICAgICAgICBtZW1zZXQoJmxvYWRlckNsaWVu dCwgMCwgc2l6ZW9mKGxvYWRlckNsaWVudCkpOwogCi0gICAgICAgIGxvYWRlckNsaWVudC5iYXNl LnZlcnNpb24gPSBrV0tQYWdlTG9hZGVyQ2xpZW50Q3VycmVudFZlcnNpb247CisgICAgICAgIGxv YWRlckNsaWVudC5iYXNlLnZlcnNpb24gPSAzOwogICAgICAgICBsb2FkZXJDbGllbnQuYmFzZS5j bGllbnRJbmZvID0gY2xpZW50SW5mbzsKICAgICAgICAgbG9hZGVyQ2xpZW50LmRpZEZpbmlzaExv YWRGb3JGcmFtZSA9IGRpZEZpbmlzaExvYWRGb3JGcmFtZTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9HZW9sb2NhdGlvblByb3ZpZGVyTW9jay5jcHAgYi9Ub29scy9XZWJL aXRUZXN0UnVubmVyL0dlb2xvY2F0aW9uUHJvdmlkZXJNb2NrLmNwcAppbmRleCA4N2I2ODNmMjUw ZWViMDJhZjBiOGE0ZmE1MzYwYWZiMWE5ZmRjNjllLi5hZDQxNjQ5NjZkMjA5MjhiMmNhNzNhNzFj ZWNmNzQxMjczNjhmMDkwIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0dlb2xv Y2F0aW9uUHJvdmlkZXJNb2NrLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0dlb2xv Y2F0aW9uUHJvdmlkZXJNb2NrLmNwcApAQCAtNTIsNyArNTIsNyBAQCBHZW9sb2NhdGlvblByb3Zp ZGVyTW9jazo6R2VvbG9jYXRpb25Qcm92aWRlck1vY2soV0tDb250ZXh0UmVmIGNvbnRleHQpCiAg ICAgbV9nZW9sb2NhdGlvbk1hbmFnZXIgPSBXS0NvbnRleHRHZXRHZW9sb2NhdGlvbk1hbmFnZXIo Y29udGV4dCk7CiAKICAgICBXS0dlb2xvY2F0aW9uUHJvdmlkZXJWMSBwcm92aWRlckNhbGxiYWNr OwotICAgIG1lbXNldCgmcHJvdmlkZXJDYWxsYmFjaywgMCwgc2l6ZW9mKFdLR2VvbG9jYXRpb25Q cm92aWRlcikpOworICAgIG1lbXNldCgmcHJvdmlkZXJDYWxsYmFjaywgMCwgc2l6ZW9mKFdLR2Vv bG9jYXRpb25Qcm92aWRlclYxKSk7CiAgICAgcHJvdmlkZXJDYWxsYmFjay5iYXNlLnZlcnNpb24g PSAxOwogICAgIHByb3ZpZGVyQ2FsbGJhY2suYmFzZS5jbGllbnRJbmZvID0gdGhpczsKICAgICBw cm92aWRlckNhbGxiYWNrLnN0YXJ0VXBkYXRpbmcgPSBzdGFydFVwZGF0aW5nQ2FsbGJhY2s7CmRp ZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1dlYk5vdGlmaWNhdGlvblByb3ZpZGVy LmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvV2ViTm90aWZpY2F0aW9uUHJvdmlkZXIuY3Bw CmluZGV4IDY5YzcxNzVkYzlmOGFlYWJjOGQwM2Y3NDJjZjRlODg3YWU1ZTM5MDguLjU2YzZlZjQ4 MGJmMGE0MzA0MmIzNWRmYzY5MmYwYWFhY2NhYjg2NzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvV2ViTm90aWZpY2F0aW9uUHJvdmlkZXIuY3BwCisrKyBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvV2ViTm90aWZpY2F0aW9uUHJvdmlkZXIuY3BwCkBAIC03Miw3ICs3Miw3IEBA IFdlYk5vdGlmaWNhdGlvblByb3ZpZGVyOjp+V2ViTm90aWZpY2F0aW9uUHJvdmlkZXIoKQogV0tO b3RpZmljYXRpb25Qcm92aWRlclYwIFdlYk5vdGlmaWNhdGlvblByb3ZpZGVyOjpwcm92aWRlcigp CiB7CiAgICAgV0tOb3RpZmljYXRpb25Qcm92aWRlclYwIG5vdGlmaWNhdGlvblByb3ZpZGVyID0g ewotICAgICAgICB7IGtXS05vdGlmaWNhdGlvblByb3ZpZGVyQ3VycmVudFZlcnNpb24sIHRoaXMg fSwKKyAgICAgICAgeyAwLCB0aGlzIH0sCiAgICAgICAgIFdUUjo6c2hvd1dlYk5vdGlmaWNhdGlv biwKICAgICAgICAgV1RSOjpjbG9zZVdlYk5vdGlmaWNhdGlvbiwKICAgICAgICAgMCwgLy8gZGlk RGVzdHJveU5vdGlmaWNhdGlvbgo=