177795 2017-10-02 17:09:29 -0700 Move more code into PasteboardCustomData 2017-10-02 17:22:50 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa darin sam webkit-bug-importer wenson_hsieh oldest_to_newest 1355626 0 rniwa 2017-10-02 17:09:29 -0700 There are two global functions: sharedBufferFromCustomData and customDataFromSharedBuffer as well as a const global variable: customWebKitPasteboardDataType We should move them all into PasteboardCustomData. 1355628 1 322476 rniwa 2017-10-02 17:13:54 -0700 Created attachment 322476 Cleanup 1355632 2 rniwa 2017-10-02 17:22:19 -0700 Committed r222761: <http://trac.webkit.org/changeset/222761> 1355633 3 webkit-bug-importer 2017-10-02 17:22:50 -0700 <rdar://problem/34781267> 322476 2017-10-02 17:13:54 -0700 2017-10-02 17:17:18 -0700 Cleanup bug-177795-20171002171353.patch text/plain 14755 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMjc1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE3LTEwLTAyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1vdmUgbW9yZSBjb2RlIGludG8g UGFzdGVib2FyZEN1c3RvbURhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3Nzc5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1vdmVkIHNoYXJlZEJ1ZmZlckZyb21DdXN0b21EYXRhLCBjdXN0b21EYXRh RnJvbVNoYXJlZEJ1ZmZlciwgYW5kIGN1c3RvbVdlYktpdFBhc3RlYm9hcmREYXRhVHlwZSBpbnRv CisgICAgICAgIFBhc3RlYm9hcmRDdXN0b21EYXRhIGFzIGNyZWF0ZVNoYXJlZEJ1ZmZlciwgZnJv bVNoYXJlZEJ1ZmZlciwgYW5kIGNvY29hVHlwZSByZXNwZWN0aXZlbHkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9QYXN0ZWJvYXJkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmRDdXN0 b21EYXRhOjpjcmVhdGVTaGFyZWRCdWZmZXIgY29uc3QpOiBSZW5hbWVkIGZyb20gc2hhcmVkQnVm ZmVyRnJvbUN1c3RvbURhdGEuCisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkQ3VzdG9tRGF0 YTo6ZnJvbVNoYXJlZEJ1ZmZlcik6IFJlbmFtZWQgZnJvbSBjdXN0b21EYXRhRnJvbVNoYXJlZEJ1 ZmZlci4KKyAgICAgICAgKiBwbGF0Zm9ybS9QYXN0ZWJvYXJkLmg6CisgICAgICAgICogcGxhdGZv cm0vU3RhdGljUGFzdGVib2FyZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdGF0aWNQYXN0ZWJv YXJkOjpjb21taXRUb1Bhc3RlYm9hcmQpOiBOb3cgaW5pdGlhbGl6ZXMgd2l0aCBhbiBlbXB0eSBv cmlnaW4gc3RyaW5nLgorICAgICAgICAqIHBsYXRmb3JtL2NvY29hL1Bhc3RlYm9hcmRDb2NvYS5t bToKKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmRDdXN0b21EYXRhOjpjb2NvYVR5cGUpOiBN b3ZlZCBoZXJlIGZyb20gUGFzdGVib2FyZC5oCisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJk OjpyZWFkU3RyaW5nSW5DdXN0b21EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvUGxhdGZv cm1QYXN0ZWJvYXJkSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1QYXN0ZWJvYXJk Ojp0eXBlc1NhZmVGb3JET01Ub1JlYWRBbmRXcml0ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpQbGF0Zm9ybVBhc3RlYm9hcmQ6OndyaXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvV2Vi SXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbToKKyAgICAgICAgKC1bV2ViSXRlbVByb3ZpZGVyUGFz dGVib2FyZCB0eXBlSWRlbnRpZmllcnNUb0xvYWRGb3JSZWdpc3RlcmVkVHlwZUlkZW50ZmllcnM6 XSk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1BsYXRmb3JtUGFzdGVib2FyZE1hYy5tbToKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtUGFzdGVib2FyZDo6dHlwZXNTYWZlRm9yRE9NVG9SZWFk QW5kV3JpdGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1QYXN0ZWJvYXJkOjp3 cml0ZSk6CisKIDIwMTctMTAtMDIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUGFzdGVJbWFnZSB0ZXN0cyBhcmUgZmFpbGluZyBvbiBkZWJ1ZyBidWlsZHMKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQuY3BwCShyZXZpc2lvbiAyMjI3NTQp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNDQsMjAgKzQ0LDE5IEBAIGJvb2wgUGFzdGVib2FyZDo6aXNTYWZlVHlwZUZvckRPTVRv UmVhZEEKICAgICByZXR1cm4gdHlwZSA9PSAidGV4dC9wbGFpbiIgfHwgdHlwZSA9PSAidGV4dC9o dG1sIiB8fCB0eXBlID09ICJ0ZXh0L3VyaS1saXN0IjsKIH0KIAotUmVmPFNoYXJlZEJ1ZmZlcj4g c2hhcmVkQnVmZmVyRnJvbUN1c3RvbURhdGEoY29uc3QgUGFzdGVib2FyZEN1c3RvbURhdGEmIGRh dGEpCitSZWY8U2hhcmVkQnVmZmVyPiBQYXN0ZWJvYXJkQ3VzdG9tRGF0YTo6Y3JlYXRlU2hhcmVk QnVmZmVyKCkgY29uc3QKIHsKICAgICBjb25zdCBzdGF0aWMgdW5zaWduZWQgY3VycmVudEN1c3Rv bURhdGFTZXJpYWxpemF0aW9uVmVyc2lvbiA9IDE7CiAKICAgICBXVEY6OlBlcnNpc3RlbmNlOjpF bmNvZGVyIGVuY29kZXI7CiAgICAgZW5jb2RlciA8PCBjdXJyZW50Q3VzdG9tRGF0YVNlcmlhbGl6 YXRpb25WZXJzaW9uOwotICAgIC8vIEZJWE1FOiBSZXBsYWNlIHdpdGggb3JpZ2luIGluZm9ybWF0 aW9uIGZyb20gUGFzdGVib2FyZEN1c3RvbURhdGEgb25jZSBzYW1lIG9yaWdpbiByZXN0cmljdGlv bnMgYXJlIGltcGxlbWVudGVkLgotICAgIGVuY29kZXIgPDwgZW1wdHlTdHJpbmcoKTsKLSAgICBl bmNvZGVyIDw8IGRhdGEuc2FtZU9yaWdpbkN1c3RvbURhdGE7Ci0gICAgZW5jb2RlciA8PCBkYXRh Lm9yZGVyZWRUeXBlczsKKyAgICBlbmNvZGVyIDw8IG9yaWdpbjsKKyAgICBlbmNvZGVyIDw8IHNh bWVPcmlnaW5DdXN0b21EYXRhOworICAgIGVuY29kZXIgPDwgb3JkZXJlZFR5cGVzOwogICAgIHJl dHVybiBTaGFyZWRCdWZmZXI6OmNyZWF0ZShlbmNvZGVyLmJ1ZmZlcigpLCBlbmNvZGVyLmJ1ZmZl clNpemUoKSk7CiB9CiAKLVBhc3RlYm9hcmRDdXN0b21EYXRhIGN1c3RvbURhdGFGcm9tU2hhcmVk QnVmZmVyKGNvbnN0IFNoYXJlZEJ1ZmZlciYgYnVmZmVyKQorUGFzdGVib2FyZEN1c3RvbURhdGEg UGFzdGVib2FyZEN1c3RvbURhdGE6OmZyb21TaGFyZWRCdWZmZXIoY29uc3QgU2hhcmVkQnVmZmVy JiBidWZmZXIpCiB7CiAgICAgY29uc3Qgc3RhdGljIHVuc2lnbmVkIG1heFN1cHBvcnRlZERhdGFT ZXJpYWxpemF0aW9uVmVyc2lvbk51bWJlciA9IDE7CiAKQEAgLTY3LDggKzY2LDcgQEAgUGFzdGVi b2FyZEN1c3RvbURhdGEgY3VzdG9tRGF0YUZyb21TaGFyZQogICAgIGlmICghZGVjb2Rlci5kZWNv ZGUodmVyc2lvbikgfHwgdmVyc2lvbiA+IG1heFN1cHBvcnRlZERhdGFTZXJpYWxpemF0aW9uVmVy c2lvbk51bWJlcikKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIFN0cmluZyBvcmlnaW47Ci0g ICAgaWYgKCFkZWNvZGVyLmRlY29kZShvcmlnaW4pKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUo cmVzdWx0Lm9yaWdpbikpCiAgICAgICAgIHJldHVybiB7IH07CiAKICAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKHJlc3VsdC5zYW1lT3JpZ2luQ3VzdG9tRGF0YSkpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vUGFzdGVib2FyZC5oCShyZXZpc2lvbiAyMjI3NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9QYXN0ZWJvYXJkLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1NiwxNyArMTU2LDE4IEBA IHN0cnVjdCBQYXN0ZWJvYXJkRmlsZVJlYWRlciB7CiAKIC8vIEZJWE1FOiBXZSBuZWVkIHRvIGVu c3VyZSB0aGF0IHRoZSBjb250ZW50cyBvZiBzYW1lT3JpZ2luQ3VzdG9tRGF0YSBhcmUgbm90IGFj Y2Vzc2libGUgYWNyb3NzIGRpZmZlcmVudCBvcmlnaW5zLgogc3RydWN0IFBhc3RlYm9hcmRDdXN0 b21EYXRhIHsKKyAgICBTdHJpbmcgb3JpZ2luOwogICAgIFZlY3RvcjxTdHJpbmc+IG9yZGVyZWRU eXBlczsKICAgICBIYXNoTWFwPFN0cmluZywgU3RyaW5nPiBwbGF0Zm9ybURhdGE7CiAgICAgSGFz aE1hcDxTdHJpbmcsIFN0cmluZz4gc2FtZU9yaWdpbkN1c3RvbURhdGE7Ci19OwogCi1XRUJDT1JF X0VYUE9SVCBSZWY8U2hhcmVkQnVmZmVyPiBzaGFyZWRCdWZmZXJGcm9tQ3VzdG9tRGF0YShjb25z dCBQYXN0ZWJvYXJkQ3VzdG9tRGF0YSYpOwotV0VCQ09SRV9FWFBPUlQgUGFzdGVib2FyZEN1c3Rv bURhdGEgY3VzdG9tRGF0YUZyb21TaGFyZWRCdWZmZXIoY29uc3QgU2hhcmVkQnVmZmVyJik7Cisg ICAgV0VCQ09SRV9FWFBPUlQgUmVmPFNoYXJlZEJ1ZmZlcj4gY3JlYXRlU2hhcmVkQnVmZmVyKCkg Y29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFBhc3RlYm9hcmRDdXN0b21EYXRhIGZy b21TaGFyZWRCdWZmZXIoY29uc3QgU2hhcmVkQnVmZmVyJik7CiAKICNpZiBQTEFURk9STShDT0NP QSkKLWNvbnN0IGNoYXIgY3VzdG9tV2ViS2l0UGFzdGVib2FyZERhdGFUeXBlW10gPSAiY29tLmFw cGxlLldlYktpdC5jdXN0b20tcGFzdGVib2FyZC1kYXRhIjsKKyAgICBzdGF0aWMgY29uc3QgY2hh ciogY29jb2FUeXBlKCk7CiAjZW5kaWYKK307CiAKIGNsYXNzIFBhc3RlYm9hcmQgewogICAgIFdU Rl9NQUtFX05PTkNPUFlBQkxFKFBhc3RlYm9hcmQpOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1N0YXRpY1Bhc3RlYm9hcmQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1N0YXRpY1Bhc3RlYm9hcmQuY3BwCShy ZXZpc2lvbiAyMjI3NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TdGF0aWNQYXN0ZWJv YXJkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODMsNyArODMsNyBAQCB2b2lkIFN0YXRpY1Bhc3Rl Ym9hcmQ6OmNvbW1pdFRvUGFzdGVib2FyCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChTZXR0 aW5nczo6Y3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkpIHsKLSAgICAgICAgcGFzdGVib2Fy ZC53cml0ZUN1c3RvbURhdGEoeyBXVEZNb3ZlKG1fdHlwZXMpLCBXVEZNb3ZlKG1fcGxhdGZvcm1E YXRhKSwgV1RGTW92ZShtX2N1c3RvbURhdGEpIH0pOworICAgICAgICBwYXN0ZWJvYXJkLndyaXRl Q3VzdG9tRGF0YSh7IHsgfSwgV1RGTW92ZShtX3R5cGVzKSwgV1RGTW92ZShtX3BsYXRmb3JtRGF0 YSksIFdURk1vdmUobV9jdXN0b21EYXRhKSB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvUGFzdGVib2FyZENvY29hLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1Bhc3RlYm9hcmRDb2Nv YS5tbQkocmV2aXNpb24gMjIyNzU0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2Ev UGFzdGVib2FyZENvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0MywxMSBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiBQYXN0ZWJvYXJkV2ViQ29udGVudDo6UGFzdGVib2FyZFdlYkNvbnRl bnQoKSA9IGRlZmF1bHQ7CiBQYXN0ZWJvYXJkV2ViQ29udGVudDo6flBhc3RlYm9hcmRXZWJDb250 ZW50KCkgPSBkZWZhdWx0OwogCitjb25zdCBjaGFyKiBQYXN0ZWJvYXJkQ3VzdG9tRGF0YTo6Y29j b2FUeXBlKCkKK3sKKyAgICByZXR1cm4gImNvbS5hcHBsZS5XZWJLaXQuY3VzdG9tLXBhc3RlYm9h cmQtZGF0YSI7Cit9CisKIGVudW0gY2xhc3MgSW1hZ2VUeXBlIHsKICAgICBJbnZhbGlkID0gMCwK ICAgICBUSUZGLApAQCAtMjEwLDcgKzIxNSw3IEBAIFN0cmluZyBQYXN0ZWJvYXJkOjpyZWFkU3Ry aW5nKGNvbnN0IFN0cmkKIAogU3RyaW5nIFBhc3RlYm9hcmQ6OnJlYWRTdHJpbmdJbkN1c3RvbURh dGEoY29uc3QgU3RyaW5nJiB0eXBlKQogewotICAgIGF1dG8gYnVmZmVyID0gcmVhZEJ1ZmZlckZv clR5cGVXaXRoU2VjdXJpdHlDaGVjayhjdXN0b21XZWJLaXRQYXN0ZWJvYXJkRGF0YVR5cGUpOwor ICAgIGF1dG8gYnVmZmVyID0gcmVhZEJ1ZmZlckZvclR5cGVXaXRoU2VjdXJpdHlDaGVjayhQYXN0 ZWJvYXJkQ3VzdG9tRGF0YTo6Y29jb2FUeXBlKCkpOwogICAgIGlmICghYnVmZmVyKQogICAgICAg ICByZXR1cm4geyB9OwogCkBAIC0yMTksNyArMjI0LDcgQEAgU3RyaW5nIFBhc3RlYm9hcmQ6OnJl YWRTdHJpbmdJbkN1c3RvbURhdAogICAgIGlmIChtX2NoYW5nZUNvdW50ICE9IHBsYXRmb3JtU3Ry YXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+Y2hhbmdlQ291bnQobV9wYXN0ZWJvYXJk TmFtZSkpCiAgICAgICAgIHJldHVybiB7IH07CiAKLSAgICByZXR1cm4gY3VzdG9tRGF0YUZyb21T aGFyZWRCdWZmZXIoKmJ1ZmZlcikuc2FtZU9yaWdpbkN1c3RvbURhdGEuZ2V0KHR5cGUpOworICAg IHJldHVybiBQYXN0ZWJvYXJkQ3VzdG9tRGF0YTo6ZnJvbVNoYXJlZEJ1ZmZlcigqYnVmZmVyKS5z YW1lT3JpZ2luQ3VzdG9tRGF0YS5nZXQodHlwZSk7CiB9CiAKIHZvaWQgUGFzdGVib2FyZDo6d3Jp dGVDdXN0b21EYXRhKGNvbnN0IFBhc3RlYm9hcmRDdXN0b21EYXRhJiBkYXRhKQpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1QYXN0ZWJvYXJkSU9T Lm1tCShyZXZpc2lvbiAyMjI3NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxh dGZvcm1QYXN0ZWJvYXJkSU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNTQsNyArMzU0LDcgQEAg VmVjdG9yPFN0cmluZz4gUGxhdGZvcm1QYXN0ZWJvYXJkOjp0eXBlcwogICAgICAgICBpZiAoIXRl YW1EYXRhT2JqZWN0IHx8ICFbdGVhbURhdGFPYmplY3QgaXNLaW5kT2ZDbGFzczpbTlNEaWN0aW9u YXJ5IGNsYXNzXV0pCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBpZCBjdXN0b21U eXBlcyA9IFsoTlNEaWN0aW9uYXJ5ICopdGVhbURhdGFPYmplY3Qgb2JqZWN0Rm9yS2V5OkAoY3Vz dG9tV2ViS2l0UGFzdGVib2FyZERhdGFUeXBlKV07CisgICAgICAgIGlkIGN1c3RvbVR5cGVzID0g WyhOU0RpY3Rpb25hcnkgKil0ZWFtRGF0YU9iamVjdCBvYmplY3RGb3JLZXk6QChQYXN0ZWJvYXJk Q3VzdG9tRGF0YTo6Y29jb2FUeXBlKCkpXTsKICAgICAgICAgaWYgKCFbY3VzdG9tVHlwZXMgaXNL aW5kT2ZDbGFzczpbTlNBcnJheSBjbGFzc11dKQogICAgICAgICAgICAgY29udGludWU7CiAKQEAg LTM2MiwxNCArMzYyLDE0IEBAIFZlY3RvcjxTdHJpbmc+IFBsYXRmb3JtUGFzdGVib2FyZDo6dHlw ZXMKICAgICAgICAgICAgIGRvbVBhc3RlYm9hcmRUeXBlcy5hZGQodHlwZSk7CiAgICAgfQogCi0g ICAgaWYgKE5TRGF0YSAqc2VyaWFsaXplZEN1c3RvbURhdGEgPSBbbV9wYXN0ZWJvYXJkIGRhdGFG b3JQYXN0ZWJvYXJkVHlwZTpAKGN1c3RvbVdlYktpdFBhc3RlYm9hcmREYXRhVHlwZSldKSB7Cisg ICAgaWYgKE5TRGF0YSAqc2VyaWFsaXplZEN1c3RvbURhdGEgPSBbbV9wYXN0ZWJvYXJkIGRhdGFG b3JQYXN0ZWJvYXJkVHlwZTpAKFBhc3RlYm9hcmRDdXN0b21EYXRhOjpjb2NvYVR5cGUoKSldKSB7 CiAgICAgICAgIGF1dG8gYnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUoc2VyaWFsaXplZEN1 c3RvbURhdGEpOwotICAgICAgICBmb3IgKGF1dG8mIHR5cGUgOiBjdXN0b21EYXRhRnJvbVNoYXJl ZEJ1ZmZlcihidWZmZXIuZ2V0KCkpLm9yZGVyZWRUeXBlcykKKyAgICAgICAgZm9yIChhdXRvJiB0 eXBlIDogUGFzdGVib2FyZEN1c3RvbURhdGE6OmZyb21TaGFyZWRCdWZmZXIoYnVmZmVyLmdldCgp KS5vcmRlcmVkVHlwZXMpCiAgICAgICAgICAgICBkb21QYXN0ZWJvYXJkVHlwZXMuYWRkKHR5cGUp OwogICAgIH0KIAogICAgIGZvciAoTlNTdHJpbmcgKnR5cGUgaW4gW21fcGFzdGVib2FyZCBwYXN0 ZWJvYXJkVHlwZXNdKSB7Ci0gICAgICAgIGlmIChbdHlwZSBpc0VxdWFsVG9TdHJpbmc6QChjdXN0 b21XZWJLaXRQYXN0ZWJvYXJkRGF0YVR5cGUpXSkKKyAgICAgICAgaWYgKFt0eXBlIGlzRXF1YWxU b1N0cmluZzpAKFBhc3RlYm9hcmRDdXN0b21EYXRhOjpjb2NvYVR5cGUoKSldKQogICAgICAgICAg ICAgY29udGludWU7CiAKICAgICAgICAgaWYgKFBhc3RlYm9hcmQ6OmlzU2FmZVR5cGVGb3JET01U b1JlYWRBbmRXcml0ZSh0eXBlKSkgewpAQCAtMzkyLDcgKzM5Miw3IEBAIGxvbmcgUGxhdGZvcm1Q YXN0ZWJvYXJkOjp3cml0ZShjb25zdCBQYXMKICAgICBbcmVwcmVzZW50YXRpb25zVG9SZWdpc3Rl ciBzZXRQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZTpXZWJQcmVmZXJyZWRQcmVzZW50YXRpb25T dHlsZUlubGluZV07CiAKICAgICBpZiAoZGF0YS5zYW1lT3JpZ2luQ3VzdG9tRGF0YS5zaXplKCkp IHsKLSAgICAgICAgaWYgKGF1dG8gc2VyaWFsaXplZFNoYXJlZEJ1ZmZlciA9IHNoYXJlZEJ1ZmZl ckZyb21DdXN0b21EYXRhKGRhdGEpLT5jcmVhdGVOU0RhdGEoKSkgeworICAgICAgICBpZiAoYXV0 byBzZXJpYWxpemVkU2hhcmVkQnVmZmVyID0gZGF0YS5jcmVhdGVTaGFyZWRCdWZmZXIoKS0+Y3Jl YXRlTlNEYXRhKCkpIHsKICAgICAgICAgICAgIC8vIFdlIHN0YXNoIHRoZSBsaXN0IG9mIHN1cHBs aWVkIHBhc3RlYm9hcmQgdHlwZXMgaW4gdGVhbURhdGEgaGVyZSBmb3IgY29tcGF0aWJpbGl0eSB3 aXRoIGRyYWcgYW5kIGRyb3AuCiAgICAgICAgICAgICAvLyBTaW5jZSB0aGUgY29udGVudHMgb2Yg aXRlbSBwcm92aWRlcnMgY2Fubm90IGJlIGxvYWRlZCBwcmlvciB0byBkcm9wLCBidXQgdGhlIHBh c3RlYm9hcmQgdHlwZXMgYXJlCiAgICAgICAgICAgICAvLyBjb250YWluZWQgd2l0aGluIHRoZSBj dXN0b20gZGF0YSBibG9iIGFuZCB3ZSBuZWVkIHRvIHZlbmQgdGhlbSB0byB0aGUgcGFnZSB3aGVu IGZpcmluZyBgZHJhZ292ZXJgCkBAIC00MDIsOCArNDAyLDggQEAgbG9uZyBQbGF0Zm9ybVBhc3Rl Ym9hcmQ6OndyaXRlKGNvbnN0IFBhcwogICAgICAgICAgICAgTlNNdXRhYmxlQXJyYXk8TlNTdHJp bmcgKj4gKnR5cGVzQXNOU0FycmF5ID0gW05TTXV0YWJsZUFycmF5IGFycmF5XTsKICAgICAgICAg ICAgIGZvciAoYXV0byYgdHlwZSA6IGRhdGEub3JkZXJlZFR5cGVzKQogICAgICAgICAgICAgICAg IFt0eXBlc0FzTlNBcnJheSBhZGRPYmplY3Q6dHlwZV07Ci0gICAgICAgICAgICBbcmVwcmVzZW50 YXRpb25zVG9SZWdpc3RlciBzZXRUZWFtRGF0YTpbTlNLZXllZEFyY2hpdmVyIGFyY2hpdmVkRGF0 YVdpdGhSb290T2JqZWN0OkB7IEAoY3VzdG9tV2ViS2l0UGFzdGVib2FyZERhdGFUeXBlKSA6IHR5 cGVzQXNOU0FycmF5IH1dXTsKLSAgICAgICAgICAgIFtyZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVy IGFkZERhdGE6c2VyaWFsaXplZFNoYXJlZEJ1ZmZlci5nZXQoKSBmb3JUeXBlOkAoY3VzdG9tV2Vi S2l0UGFzdGVib2FyZERhdGFUeXBlKV07CisgICAgICAgICAgICBbcmVwcmVzZW50YXRpb25zVG9S ZWdpc3RlciBzZXRUZWFtRGF0YTpbTlNLZXllZEFyY2hpdmVyIGFyY2hpdmVkRGF0YVdpdGhSb290 T2JqZWN0OkB7IEAoUGFzdGVib2FyZEN1c3RvbURhdGE6OmNvY29hVHlwZSgpKSA6IHR5cGVzQXNO U0FycmF5IH1dXTsKKyAgICAgICAgICAgIFtyZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVyIGFkZERh dGE6c2VyaWFsaXplZFNoYXJlZEJ1ZmZlci5nZXQoKSBmb3JUeXBlOkAoUGFzdGVib2FyZEN1c3Rv bURhdGE6OmNvY29hVHlwZSgpKV07CiAgICAgICAgIH0KICAgICB9CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJv YXJkLm1tCShyZXZpc2lvbiAyMjI3NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbQkod29ya2luZyBjb3B5KQpAQCAtNTU0LDcgKzU1 NCw3IEBAIC0gKE5TQXJyYXk8TlNTdHJpbmcgKj4gKil0eXBlSWRlbnRpZmllcnMKIAogICAgIC8v IEZvciBjb21wYXRpYmlsaXR5IHdpdGggRGF0YVRyYW5zZmVyIEFQSXMsIGFkZGl0aW9uYWxseSBs b2FkIHdlYi1leHBvc2VkIHR5cGVzLiBTaW5jZSB0aGlzIGlzIHRoZSBvbmx5IGNoYW5jZSB0bwog ICAgIC8vIGZhdWx0IGluIGFueSBkYXRhIGF0IGFsbCwgd2UgbmVlZCB0byBsb2FkIHVwIGZyb250 IGFueSBpbmZvcm1hdGlvbiB0aGF0IHRoZSBwYWdlIG1heSBhc2sgZm9yIGxhdGVyIGRvd24gdGhl IGxpbmUuCi0gICAgTlNTdHJpbmcgKmN1c3RvbVBhc3RlYm9hcmREYXRhVVRJID0gQChjdXN0b21X ZWJLaXRQYXN0ZWJvYXJkRGF0YVR5cGUpOworICAgIE5TU3RyaW5nICpjdXN0b21QYXN0ZWJvYXJk RGF0YVVUSSA9IEAoUGFzdGVib2FyZEN1c3RvbURhdGE6OmNvY29hVHlwZSgpKTsKICAgICBmb3Ig KE5TU3RyaW5nICpyZWdpc3RlcmVkVHlwZUlkZW50aWZpZXIgaW4gcmVnaXN0ZXJlZFR5cGVJZGVu dGlmaWVycykgewogICAgICAgICBpZiAoW3R5cGVzVG9Mb2FkIGNvbnRhaW5zT2JqZWN0OnJlZ2lz dGVyZWRUeXBlSWRlbnRpZmllcl0pCiAgICAgICAgICAgICBjb250aW51ZTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVBhc3RlYm9hcmRNYWMubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1BsYXRmb3JtUGFzdGVib2FyZE1hYy5t bQkocmV2aXNpb24gMjIyNzU0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1BsYXRm b3JtUGFzdGVib2FyZE1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTEwLDE1ICsxMTAsMTUgQEAg c3RhdGljIGNvbnN0IGNoYXIqIHNhZmVUeXBlRm9yRE9NVG9SZWFkQQogVmVjdG9yPFN0cmluZz4g UGxhdGZvcm1QYXN0ZWJvYXJkOjp0eXBlc1NhZmVGb3JET01Ub1JlYWRBbmRXcml0ZSgpIGNvbnN0 CiB7CiAgICAgTGlzdEhhc2hTZXQ8U3RyaW5nPiBkb21QYXN0ZWJvYXJkVHlwZXM7Ci0gICAgaWYg KE5TRGF0YSAqc2VyaWFsaXplZEN1c3RvbURhdGEgPSBbbV9wYXN0ZWJvYXJkIGRhdGFGb3JUeXBl OkAoY3VzdG9tV2ViS2l0UGFzdGVib2FyZERhdGFUeXBlKV0pIHsKKyAgICBpZiAoTlNEYXRhICpz ZXJpYWxpemVkQ3VzdG9tRGF0YSA9IFttX3Bhc3RlYm9hcmQgZGF0YUZvclR5cGU6QChQYXN0ZWJv YXJkQ3VzdG9tRGF0YTo6Y29jb2FUeXBlKCkpXSkgewogICAgICAgICBhdXRvIGJ1ZmZlciA9IFNo YXJlZEJ1ZmZlcjo6Y3JlYXRlKHNlcmlhbGl6ZWRDdXN0b21EYXRhKTsKLSAgICAgICAgZm9yIChh dXRvJiB0eXBlIDogY3VzdG9tRGF0YUZyb21TaGFyZWRCdWZmZXIoYnVmZmVyLmdldCgpKS5vcmRl cmVkVHlwZXMpCisgICAgICAgIGZvciAoYXV0byYgdHlwZSA6IFBhc3RlYm9hcmRDdXN0b21EYXRh Ojpmcm9tU2hhcmVkQnVmZmVyKGJ1ZmZlci5nZXQoKSkub3JkZXJlZFR5cGVzKQogICAgICAgICAg ICAgZG9tUGFzdGVib2FyZFR5cGVzLmFkZCh0eXBlKTsKICAgICB9CiAKICAgICBOU0FycmF5PE5T U3RyaW5nICo+ICphbGxUeXBlcyA9IFttX3Bhc3RlYm9hcmQgdHlwZXNdOwogICAgIGZvciAoTlNT dHJpbmcgKnR5cGUgaW4gYWxsVHlwZXMpIHsKLSAgICAgICAgaWYgKFt0eXBlIGlzRXF1YWxUb1N0 cmluZzpAKGN1c3RvbVdlYktpdFBhc3RlYm9hcmREYXRhVHlwZSldKQorICAgICAgICBpZiAoW3R5 cGUgaXNFcXVhbFRvU3RyaW5nOkAoUGFzdGVib2FyZEN1c3RvbURhdGE6OmNvY29hVHlwZSgpKV0p CiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBpZiAoUGFzdGVib2FyZDo6aXNTYWZl VHlwZUZvckRPTVRvUmVhZEFuZFdyaXRlKHR5cGUpKQpAQCAtMTM4LDcgKzEzOCw3IEBAIGxvbmcg UGxhdGZvcm1QYXN0ZWJvYXJkOjp3cml0ZShjb25zdCBQYXMKICAgICBmb3IgKGF1dG8mIGVudHJ5 IDogZGF0YS5wbGF0Zm9ybURhdGEpCiAgICAgICAgIFt0eXBlcyBhZGRPYmplY3Q6cGxhdGZvcm1Q YXN0ZWJvYXJkVHlwZUZvclNhZmVUeXBlRm9yRE9NVG9SZWFkQW5kV3JpdGUoZW50cnkua2V5KV07 CiAgICAgaWYgKGRhdGEuc2FtZU9yaWdpbkN1c3RvbURhdGEuc2l6ZSgpKQotICAgICAgICBbdHlw ZXMgYWRkT2JqZWN0OkAoY3VzdG9tV2ViS2l0UGFzdGVib2FyZERhdGFUeXBlKV07CisgICAgICAg IFt0eXBlcyBhZGRPYmplY3Q6QChQYXN0ZWJvYXJkQ3VzdG9tRGF0YTo6Y29jb2FUeXBlKCkpXTsK IAogICAgIFttX3Bhc3RlYm9hcmQgZGVjbGFyZVR5cGVzOnR5cGVzIG93bmVyOm5pbF07CiAKQEAg LTE1MCw4ICsxNTAsOCBAQCBsb25nIFBsYXRmb3JtUGFzdGVib2FyZDo6d3JpdGUoY29uc3QgUGFz CiAgICAgfQogCiAgICAgaWYgKGRhdGEuc2FtZU9yaWdpbkN1c3RvbURhdGEuc2l6ZSgpKSB7Ci0g ICAgICAgIGlmIChhdXRvIHNlcmlhbGl6ZWRDdXN0b21EYXRhID0gc2hhcmVkQnVmZmVyRnJvbUN1 c3RvbURhdGEoZGF0YSktPmNyZWF0ZU5TRGF0YSgpKQotICAgICAgICAgICAgW21fcGFzdGVib2Fy ZCBzZXREYXRhOnNlcmlhbGl6ZWRDdXN0b21EYXRhLmdldCgpIGZvclR5cGU6QChjdXN0b21XZWJL aXRQYXN0ZWJvYXJkRGF0YVR5cGUpXTsKKyAgICAgICAgaWYgKGF1dG8gc2VyaWFsaXplZEN1c3Rv bURhdGEgPSBkYXRhLmNyZWF0ZVNoYXJlZEJ1ZmZlcigpLT5jcmVhdGVOU0RhdGEoKSkKKyAgICAg ICAgICAgIFttX3Bhc3RlYm9hcmQgc2V0RGF0YTpzZXJpYWxpemVkQ3VzdG9tRGF0YS5nZXQoKSBm b3JUeXBlOkAoUGFzdGVib2FyZEN1c3RvbURhdGE6OmNvY29hVHlwZSgpKV07CiAgICAgfQogCiAg ICAgcmV0dXJuIGNoYW5nZUNvdW50KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjIyNzU5KQor KysgU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBA QAorMjAxNy0xMC0wMiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAg ICBNb3ZlIG1vcmUgY29kZSBpbnRvIFBhc3RlYm9hcmRDdXN0b21EYXRhCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc3OTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCB0aGUgc3VwcG9ydCBmb3Ig ZW5jb2RpbmcgYW5kIGRlY29kaW5nIHRoZSBvcmlnaW4gc3RyaW5nIGluIFBhc3RlYm9hcmRDdXN0 b21EYXRhLgorCisgICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHA6Cisg ICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UGFzdGVib2FyZEN1c3RvbURhdGE+OjplbmNvZGUp OgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFBhc3RlYm9hcmRDdXN0b21EYXRhPjo6ZGVj b2RlKToKKwogMjAxNy0xMC0wMiAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtHVEtdIERvIG5vdCBoYXJkY29kZSBmb250IGZhbWlseSBpbiBz ZXJ2ZWQgcmVtb3RlIGluc3BlY3RvciBIVE1MIHNuaXBwZXRzCkluZGV4OiBTb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAJKHJldmlzaW9uIDIyMjc1NCkK KysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTE1ODAsNiArMTU4MCw3IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxEYXRhYmFz ZURldGFpbHM+OjpkZWMKIAogdm9pZCBBcmd1bWVudENvZGVyPFBhc3RlYm9hcmRDdXN0b21EYXRh Pjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IFBhc3RlYm9hcmRDdXN0b21EYXRhJiBk YXRhKQogeworICAgIGVuY29kZXIgPDwgZGF0YS5vcmlnaW47CiAgICAgZW5jb2RlciA8PCBkYXRh Lm9yZGVyZWRUeXBlczsKICAgICBlbmNvZGVyIDw8IGRhdGEucGxhdGZvcm1EYXRhOwogICAgIGVu Y29kZXIgPDwgZGF0YS5zYW1lT3JpZ2luQ3VzdG9tRGF0YTsKQEAgLTE1ODcsNiArMTU4OCw5IEBA IHZvaWQgQXJndW1lbnRDb2RlcjxQYXN0ZWJvYXJkQ3VzdG9tRGF0YT4KIAogYm9vbCBBcmd1bWVu dENvZGVyPFBhc3RlYm9hcmRDdXN0b21EYXRhPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIFBh c3RlYm9hcmRDdXN0b21EYXRhJiBkYXRhKQogeworICAgIGlmICghZGVjb2Rlci5kZWNvZGUoZGF0 YS5vcmlnaW4pKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoIWRlY29kZXIuZGVj b2RlKGRhdGEub3JkZXJlZFR5cGVzKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCg==