149117 2015-09-14 10:13:50 -0700 Modern IDB Implementation 2017-10-04 05:04:45 -0700 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified ASSIGNED https://bugs.webkit.org/show_bug.cgi?id=154968 https://bugs.webkit.org/show_bug.cgi?id=165889 P2 Normal --- 139173 143193 149107 149118 149191 149205 149229 149234 149558 149603 149651 149678 149861 149928 149953 150033 150147 150148 150149 150150 150246 150402 150455 150468 150543 150607 150614 150617 150673 150695 150711 150718 150733 150735 150743 150784 150785 150804 150805 150815 150839 150854 150868 150882 150910 150911 150939 150985 151014 151196 151197 151219 151278 151341 151364 151389 151421 151448 151456 151481 151484 151522 151550 151557 151627 151630 151640 151645 151647 151648 151664 151665 151675 151683 151684 151693 151694 151704 151720 151725 151731 151732 151752 151753 151766 151772 151794 151807 151847 151850 151870 151879 151880 151895 151898 151912 151948 151961 151966 151968 151973 152007 152015 152023 152078 152092 152095 152096 152099 152101 152144 152167 152175 152177 152179 152187 152190 152192 152194 152201 152205 152217 152264 152344 152351 152355 152397 152405 152441 152481 152554 152577 152593 152600 152698 152717 152735 152763 152775 152795 152800 152822 152824 152827 152835 152849 152866 152875 152891 152892 152896 152921 152929 152936 152966 152976 152981 152990 152995 153021 153022 153038 153084 153178 153179 153181 153237 153251 153257 153272 153284 153318 153319 153323 153359 153375 153381 153396 153410 153415 153418 153425 153427 153438 153548 153558 153561 153569 153596 153604 153614 153616 153623 153625 153652 153661 153666 153688 153724 153783 153790 153791 153800 153808 153912 154032 154054 154061 154110 154153 154187 154296 154317 154351 154356 154363 154400 154411 154421 154429 154460 154686 154706 154735 154741 154747 154748 154756 154860 154922 155068 155951 156242 156248 156264 156321 156367 156416 156418 156472 156478 156511 156523 156640 156760 156782 156810 156826 156855 156868 156877 156883 156916 156925 156939 157072 157141 157289 157330 157448 157494 157498 157525 157600 157626 157757 157823 157843 157915 157917 157947 157980 158004 158038 158089 158093 158124 158160 158353 158391 158446 158894 158991 159094 159360 159371 159432 159471 160089 160463 177861 151925 152933 153343 153382 156344 156347 157958 158532 151296 151890 152643 154129 154457 156438 1 beidson beidson kyawtun oldest_to_newest 1125606 0 beidson 2015-09-14 10:13:50 -0700 Instead of continuing to try to shoehorn the legacy IDB implementation into the WK2 process model, moving it farther from being able to work in WK1 also, we should start "from scratch" Not really from scratch, because the bindings are in place, and the backing store is in place. But everything in-between has always needed modernization with an architecture overhaul. <rdar://problem/21911093> 1130730 1 262459 beidson 2015-10-05 14:18:19 -0700 Created attachment 262459 Patch v1 1130731 2 262459 beidson 2015-10-05 14:19:45 -0700 Comment on attachment 262459 Patch v1 Attached to wrong bug lol 1154712 3 beidson 2016-01-12 09:12:45 -0800 *** Bug 136937 has been marked as a duplicate of this bug. *** 262459 2015-10-05 14:18:19 -0700 2015-11-05 14:34:13 -0800 Patch v1 patch text/plain 12823 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlYjBhZGM5Li44NjFlYzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTUtMTAtMDUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIE1vZGVybml6ZSBJREJSZXF1ZXN0OjpSZWFkeVN0YXRlIGludG8gYW4gZW51bSBjbGFzcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTgxNwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyAoUmVmYWN0b3IsIG5vIGJlaGF2aW9yIGNoYW5nZSkuCisKKyAgICAgICAgKiBNb2R1bGVz L2luZGV4ZWRkYi9JREJSZXF1ZXN0Lmg6CisgICAgICAgIAorICAgICAgICAqIE1vZHVsZXMvaW5k ZXhlZGRiL2xlZ2FjeS9MZWdhY3lPcGVuREJSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxlZ2FjeU9wZW5EQlJlcXVlc3Q6OnNob3VsZEVucXVldWVFdmVudCk6CisgICAgICAgIAorICAg ICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL2xlZ2FjeS9MZWdhY3lSZXF1ZXN0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxlZ2FjeVJlcXVlc3Q6OkxlZ2FjeVJlcXVlc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGVnYWN5UmVxdWVzdDo6cmVzdWx0KToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVJl cXVlc3Q6OmVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVJlcXVlc3Q6OmVycm9yQ29k ZSk6CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lSZXF1ZXN0OjpyZWFkeVN0YXRlKToKKyAgICAg ICAgKFdlYkNvcmU6OkxlZ2FjeVJlcXVlc3Q6Om1hcmtFYXJseURlYXRoKToKKyAgICAgICAgKFdl YkNvcmU6OkxlZ2FjeVJlcXVlc3Q6OmFib3J0KToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVJl cXVlc3Q6OnNldEN1cnNvckRldGFpbHMpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5UmVxdWVz dDo6c2V0UGVuZGluZ0N1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lSZXF1ZXN0Ojpz ZXRSZXN1bHRDdXJzb3IpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5UmVxdWVzdDo6ZmluaXNo Q3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVJlcXVlc3Q6OnNob3VsZEVucXVldWVF dmVudCk6CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lSZXF1ZXN0OjpzdG9wKToKKyAgICAgICAg KFdlYkNvcmU6OkxlZ2FjeVJlcXVlc3Q6OmRpc3BhdGNoRXZlbnQpOgorICAgICAgICAoV2ViQ29y ZTo6TGVnYWN5UmVxdWVzdDo6dHJhbnNhY3Rpb25EaWRGaW5pc2hBbmREaXNwYXRjaCk6CisgICAg ICAgIChXZWJDb3JlOjpMZWdhY3lSZXF1ZXN0OjplbnF1ZXVlRXZlbnQpOgorICAgICAgICAqIE1v ZHVsZXMvaW5kZXhlZGRiL2xlZ2FjeS9MZWdhY3lSZXF1ZXN0Lmg6CisKIDIwMTUtMTAtMDUgIEFu ZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB1bnVzZWQg SGlzdG9yeUl0ZW06OnBhcmVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCUmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv SURCUmVxdWVzdC5oCmluZGV4IDhhNDQ1MDMuLmYzMTA5YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlJlcXVlc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJSZXF1ZXN0LmgKQEAgLTQ0LDYgKzQ0LDEzIEBAIGNsYXNz IElEQlRyYW5zYWN0aW9uOwogCiB0eXBlZGVmIGludCBFeGNlcHRpb25Db2RlOwogCisvLyBEZWZp bmVkIGluIHRoZSBJREwKK2VudW0gY2xhc3MgSURCUmVxdWVzdFJlYWR5U3RhdGUgeworICAgIFBl bmRpbmcgPSAxLAorICAgIERvbmUgPSAyLAorICAgIERlcHJlY2F0ZWRFYXJseURlYXRoID0gMywg Ly8gRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDkxMTcg LSBSZW1vdmUgdGhpcyB3aGVuIHJlbW92aW5nIExlZ2FjeUlEQgorfTsKKwogY2xhc3MgSURCUmVx dWVzdCA6IHB1YmxpYyBTY3JpcHRXcmFwcGFibGUsIHB1YmxpYyBFdmVudFRhcmdldFdpdGhJbmxp bmVEYXRhLCBwdWJsaWMgQWN0aXZlRE9NT2JqZWN0IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5J REJSZXF1ZXN0KCkgeyB9CkBAIC01NCwxMyArNjEsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBS ZWZQdHI8SURCQW55PiBzb3VyY2UoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBSZWZQdHI8SURC VHJhbnNhY3Rpb24+IHRyYW5zYWN0aW9uKCkgY29uc3QgPSAwOwogCi0gICAgLy8gRGVmaW5lZCBp biB0aGUgSURMCi0gICAgZW51bSBSZWFkeVN0YXRlIHsKLSAgICAgICAgUEVORElORyA9IDEsCi0g ICAgICAgIERPTkUgPSAyLAotICAgICAgICBFYXJseURlYXRoID0gMwotICAgIH07Ci0KICAgICB2 aXJ0dWFsIGNvbnN0IFN0cmluZyYgcmVhZHlTdGF0ZSgpIGNvbnN0ID0gMDsKIAogcHJvdGVjdGVk OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvbGVnYWN5L0xl Z2FjeU9wZW5EQlJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv bGVnYWN5L0xlZ2FjeU9wZW5EQlJlcXVlc3QuY3BwCmluZGV4IDU0NGI2MTUuLjMyOTBjNTBmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5 T3BlbkRCUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv bGVnYWN5L0xlZ2FjeU9wZW5EQlJlcXVlc3QuY3BwCkBAIC0xMzIsNyArMTMyLDcgQEAgYm9vbCBM ZWdhY3lPcGVuREJSZXF1ZXN0OjpzaG91bGRFbnF1ZXVlRXZlbnQoKSBjb25zdAogewogICAgIGlm IChtX2NvbnRleHRTdG9wcGVkIHx8ICFzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICBBU1NFUlQobV9yZWFkeVN0YXRlID09IFBFTkRJTkcgfHwgbV9y ZWFkeVN0YXRlID09IERPTkUpOworICAgIEFTU0VSVChtX3JlYWR5U3RhdGUgPT0gSURCUmVxdWVz dFJlYWR5U3RhdGU6OlBlbmRpbmcgfHwgbV9yZWFkeVN0YXRlID09IElEQlJlcXVlc3RSZWFkeVN0 YXRlOjpEb25lKTsKICAgICBpZiAobV9yZXF1ZXN0QWJvcnRlZCkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvbGVnYWN5L0xlZ2FjeVJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvbGVnYWN5L0xlZ2FjeVJlcXVlc3QuY3BwCmluZGV4IGM1MDBhNmMuLmQz NmJlMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2xlZ2Fj eS9MZWdhY3lSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9sZWdhY3kvTGVnYWN5UmVxdWVzdC5jcHAKQEAgLTc2LDcgKzc2LDcgQEAgTGVnYWN5UmVxdWVz dDo6TGVnYWN5UmVxdWVzdChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBQYXNzUmVm UHRyPExlZ2FjeUEKICAgICAsIG1fZXJyb3JDb2RlKDApCiAgICAgLCBtX2NvbnRleHRTdG9wcGVk KGZhbHNlKQogICAgICwgbV90cmFuc2FjdGlvbih0cmFuc2FjdGlvbikKLSAgICAsIG1fcmVhZHlT dGF0ZShQRU5ESU5HKQorICAgICwgbV9yZWFkeVN0YXRlKElEQlJlcXVlc3RSZWFkeVN0YXRlOjpQ ZW5kaW5nKQogICAgICwgbV9yZXF1ZXN0QWJvcnRlZChmYWxzZSkKICAgICAsIG1fc291cmNlKHNv dXJjZSkKICAgICAsIG1fdGFza1R5cGUodGFza1R5cGUpCkBAIC05Nyw3ICs5Nyw3IEBAIExlZ2Fj eVJlcXVlc3Q6On5MZWdhY3lSZXF1ZXN0KCkKIAogUmVmUHRyPElEQkFueT4gTGVnYWN5UmVxdWVz dDo6cmVzdWx0KEV4Y2VwdGlvbkNvZGUmIGVjKSBjb25zdAogewotICAgIGlmIChtX3JlYWR5U3Rh dGUgIT0gRE9ORSkgeworICAgIGlmIChtX3JlYWR5U3RhdGUgIT0gSURCUmVxdWVzdFJlYWR5U3Rh dGU6OkRvbmUpIHsKICAgICAgICAgZWMgPSBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6SW52YWxpZFN0 YXRlRXJyb3I7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KQEAgLTEwNiw3ICsxMDYsNyBAQCBS ZWZQdHI8SURCQW55PiBMZWdhY3lSZXF1ZXN0OjpyZXN1bHQoRXhjZXB0aW9uQ29kZSYgZWMpIGNv bnN0CiAKIFJlZlB0cjxET01FcnJvcj4gTGVnYWN5UmVxdWVzdDo6ZXJyb3IoRXhjZXB0aW9uQ29k ZSYgZWMpIGNvbnN0CiB7Ci0gICAgaWYgKG1fcmVhZHlTdGF0ZSAhPSBET05FKSB7CisgICAgaWYg KG1fcmVhZHlTdGF0ZSAhPSBJREJSZXF1ZXN0UmVhZHlTdGF0ZTo6RG9uZSkgewogICAgICAgICBl YyA9IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpJbnZhbGlkU3RhdGVFcnJvcjsKICAgICAgICAgcmV0 dXJuIDA7CiAgICAgfQpAQCAtMTE1LDcgKzExNSw3IEBAIFJlZlB0cjxET01FcnJvcj4gTGVnYWN5 UmVxdWVzdDo6ZXJyb3IoRXhjZXB0aW9uQ29kZSYgZWMpIGNvbnN0CiAKIHVuc2lnbmVkIHNob3J0 IExlZ2FjeVJlcXVlc3Q6OmVycm9yQ29kZShFeGNlcHRpb25Db2RlJiBlYykgY29uc3QKIHsKLSAg ICBpZiAobV9yZWFkeVN0YXRlICE9IERPTkUpIHsKKyAgICBpZiAobV9yZWFkeVN0YXRlICE9IElE QlJlcXVlc3RSZWFkeVN0YXRlOjpEb25lKSB7CiAgICAgICAgIGVjID0gSURCRGF0YWJhc2VFeGNl cHRpb246OkludmFsaWRTdGF0ZUVycm9yOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CkBAIC0x MzQsMTEgKzEzNCwxMSBAQCBSZWZQdHI8SURCVHJhbnNhY3Rpb24+IExlZ2FjeVJlcXVlc3Q6OnRy YW5zYWN0aW9uKCkgY29uc3QKIAogY29uc3QgU3RyaW5nJiBMZWdhY3lSZXF1ZXN0OjpyZWFkeVN0 YXRlKCkgY29uc3QKIHsKLSAgICBBU1NFUlQobV9yZWFkeVN0YXRlID09IFBFTkRJTkcgfHwgbV9y ZWFkeVN0YXRlID09IERPTkUpOworICAgIEFTU0VSVChtX3JlYWR5U3RhdGUgPT0gSURCUmVxdWVz dFJlYWR5U3RhdGU6OlBlbmRpbmcgfHwgbV9yZWFkeVN0YXRlID09IElEQlJlcXVlc3RSZWFkeVN0 YXRlOjpEb25lKTsKICAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3Ry aW5nLCBwZW5kaW5nLCAoInBlbmRpbmciLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRl cmFsKSk7CiAgICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywg ZG9uZSwgKCJkb25lIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwogCi0g ICAgaWYgKG1fcmVhZHlTdGF0ZSA9PSBQRU5ESU5HKQorICAgIGlmIChtX3JlYWR5U3RhdGUgPT0g SURCUmVxdWVzdFJlYWR5U3RhdGU6OlBlbmRpbmcpCiAgICAgICAgIHJldHVybiBwZW5kaW5nOwog CiAgICAgcmV0dXJuIGRvbmU7CkBAIC0xNDYsOCArMTQ2LDggQEAgY29uc3QgU3RyaW5nJiBMZWdh Y3lSZXF1ZXN0OjpyZWFkeVN0YXRlKCkgY29uc3QKIAogdm9pZCBMZWdhY3lSZXF1ZXN0OjptYXJr RWFybHlEZWF0aCgpCiB7Ci0gICAgQVNTRVJUKG1fcmVhZHlTdGF0ZSA9PSBQRU5ESU5HKTsKLSAg ICBtX3JlYWR5U3RhdGUgPSBFYXJseURlYXRoOworICAgIEFTU0VSVChtX3JlYWR5U3RhdGUgPT0g SURCUmVxdWVzdFJlYWR5U3RhdGU6OlBlbmRpbmcpOworICAgIG1fcmVhZHlTdGF0ZSA9IElEQlJl cXVlc3RSZWFkeVN0YXRlOjpEZXByZWNhdGVkRWFybHlEZWF0aDsKICAgICBpZiAobV90cmFuc2Fj dGlvbikKICAgICAgICAgbV90cmFuc2FjdGlvbi0+dW5yZWdpc3RlclJlcXVlc3QodGhpcyk7CiB9 CkBAIC0xNTcsOCArMTU3LDggQEAgdm9pZCBMZWdhY3lSZXF1ZXN0OjphYm9ydCgpCiAgICAgQVNT RVJUKCFtX3JlcXVlc3RBYm9ydGVkKTsKICAgICBpZiAobV9jb250ZXh0U3RvcHBlZCB8fCAhc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpKQogICAgICAgICByZXR1cm47Ci0gICAgQVNTRVJUKG1fcmVh ZHlTdGF0ZSA9PSBQRU5ESU5HIHx8IG1fcmVhZHlTdGF0ZSA9PSBET05FKTsKLSAgICBpZiAobV9y ZWFkeVN0YXRlID09IERPTkUpCisgICAgQVNTRVJUKG1fcmVhZHlTdGF0ZSA9PSBJREJSZXF1ZXN0 UmVhZHlTdGF0ZTo6UGVuZGluZyB8fCBtX3JlYWR5U3RhdGUgPT0gSURCUmVxdWVzdFJlYWR5U3Rh dGU6OkRvbmUpOworICAgIGlmIChtX3JlYWR5U3RhdGUgPT0gSURCUmVxdWVzdFJlYWR5U3RhdGU6 OkRvbmUpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIEVucXVldWVkIGV2ZW50cyBtYXkgYmUg dGhlIG9ubHkgcmVmZXJlbmNlIHRvIHRoaXMgb2JqZWN0LgpAQCAtMTgxLDcgKzE4MSw3IEBAIHZv aWQgTGVnYWN5UmVxdWVzdDo6YWJvcnQoKQogCiB2b2lkIExlZ2FjeVJlcXVlc3Q6OnNldEN1cnNv ckRldGFpbHMoSW5kZXhlZERCOjpDdXJzb3JUeXBlIGN1cnNvclR5cGUsIEluZGV4ZWREQjo6Q3Vy c29yRGlyZWN0aW9uIGRpcmVjdGlvbikKIHsKLSAgICBBU1NFUlQobV9yZWFkeVN0YXRlID09IFBF TkRJTkcpOworICAgIEFTU0VSVChtX3JlYWR5U3RhdGUgPT0gSURCUmVxdWVzdFJlYWR5U3RhdGU6 OlBlbmRpbmcpOwogICAgIEFTU0VSVCghbV9wZW5kaW5nQ3Vyc29yKTsKICAgICBtX2N1cnNvclR5 cGUgPSBjdXJzb3JUeXBlOwogICAgIG1fY3Vyc29yRGlyZWN0aW9uID0gZGlyZWN0aW9uOwpAQCAt MTg5LDcgKzE4OSw3IEBAIHZvaWQgTGVnYWN5UmVxdWVzdDo6c2V0Q3Vyc29yRGV0YWlscyhJbmRl eGVkREI6OkN1cnNvclR5cGUgY3Vyc29yVHlwZSwgSW5kZXhlZERCCiAKIHZvaWQgTGVnYWN5UmVx dWVzdDo6c2V0UGVuZGluZ0N1cnNvcihQYXNzUmVmUHRyPExlZ2FjeUN1cnNvcj4gY3Vyc29yKQog ewotICAgIEFTU0VSVChtX3JlYWR5U3RhdGUgPT0gRE9ORSk7CisgICAgQVNTRVJUKG1fcmVhZHlT dGF0ZSA9PSBJREJSZXF1ZXN0UmVhZHlTdGF0ZTo6RG9uZSk7CiAgICAgQVNTRVJUKHNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQoKSk7CiAgICAgQVNTRVJUKG1fdHJhbnNhY3Rpb24pOwogICAgIEFTU0VS VCghbV9wZW5kaW5nQ3Vyc29yKTsKQEAgLTE5Nyw3ICsxOTcsNyBAQCB2b2lkIExlZ2FjeVJlcXVl c3Q6OnNldFBlbmRpbmdDdXJzb3IoUGFzc1JlZlB0cjxMZWdhY3lDdXJzb3I+IGN1cnNvcikKIAog ICAgIG1fcGVuZGluZ0N1cnNvciA9IGN1cnNvcjsKICAgICBtX3Jlc3VsdCA9IG51bGxwdHI7Ci0g ICAgbV9yZWFkeVN0YXRlID0gUEVORElORzsKKyAgICBtX3JlYWR5U3RhdGUgPSBJREJSZXF1ZXN0 UmVhZHlTdGF0ZTo6UGVuZGluZzsKICAgICBtX2Vycm9yQ29kZSA9IDA7CiAgICAgbV9lcnJvciA9 IG51bGxwdHI7CiAgICAgbV9lcnJvck1lc3NhZ2UgPSBTdHJpbmcoKTsKQEAgLTIxNyw3ICsyMTcs NyBAQCBSZWZQdHI8TGVnYWN5Q3Vyc29yPiBMZWdhY3lSZXF1ZXN0OjpnZXRSZXN1bHRDdXJzb3Io KQogCiB2b2lkIExlZ2FjeVJlcXVlc3Q6OnNldFJlc3VsdEN1cnNvcihQYXNzUmVmUHRyPExlZ2Fj eUN1cnNvcj4gY3Vyc29yLCBQYXNzUmVmUHRyPElEQktleT4ga2V5LCBQYXNzUmVmUHRyPElEQktl eT4gcHJpbWFyeUtleSwgY29uc3QgRGVwcmVjYXRlZDo6U2NyaXB0VmFsdWUmIHZhbHVlKQogewot ICAgIEFTU0VSVChtX3JlYWR5U3RhdGUgPT0gUEVORElORyk7CisgICAgQVNTRVJUKG1fcmVhZHlT dGF0ZSA9PSBJREJSZXF1ZXN0UmVhZHlTdGF0ZTo6UGVuZGluZyk7CiAgICAgbV9jdXJzb3JLZXkg PSBrZXk7CiAgICAgbV9jdXJzb3JQcmltYXJ5S2V5ID0gcHJpbWFyeUtleTsKICAgICBtX2N1cnNv clZhbHVlID0gdmFsdWU7CkBAIC0yMzMsNyArMjMzLDcgQEAgdm9pZCBMZWdhY3lSZXF1ZXN0Ojpz ZXRSZXN1bHRDdXJzb3IoUGFzc1JlZlB0cjxMZWdhY3lDdXJzb3I+IGN1cnNvciwgUGFzc1JlZlB0 cjwKIHZvaWQgTGVnYWN5UmVxdWVzdDo6ZmluaXNoQ3Vyc29yKCkKIHsKICAgICBtX2N1cnNvckZp bmlzaGVkID0gdHJ1ZTsKLSAgICBpZiAobV9yZWFkeVN0YXRlICE9IFBFTkRJTkcpCisgICAgaWYg KG1fcmVhZHlTdGF0ZSAhPSBJREJSZXF1ZXN0UmVhZHlTdGF0ZTo6UGVuZGluZykKICAgICAgICAg bV9oYXNQZW5kaW5nQWN0aXZpdHkgPSBmYWxzZTsKIH0KIApAQCAtMjQxLDEwICsyNDEsMTAgQEAg Ym9vbCBMZWdhY3lSZXF1ZXN0OjpzaG91bGRFbnF1ZXVlRXZlbnQoKSBjb25zdAogewogICAgIGlm IChtX2NvbnRleHRTdG9wcGVkIHx8ICFzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICBBU1NFUlQobV9yZWFkeVN0YXRlID09IFBFTkRJTkcgfHwgbV9y ZWFkeVN0YXRlID09IERPTkUpOworICAgIEFTU0VSVChtX3JlYWR5U3RhdGUgPT0gSURCUmVxdWVz dFJlYWR5U3RhdGU6OlBlbmRpbmcgfHwgbV9yZWFkeVN0YXRlID09IElEQlJlcXVlc3RSZWFkeVN0 YXRlOjpEb25lKTsKICAgICBpZiAobV9yZXF1ZXN0QWJvcnRlZCkKICAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgIEFTU0VSVChtX3JlYWR5U3RhdGUgPT0gUEVORElORyk7CisgICAgQVNTRVJUKG1f cmVhZHlTdGF0ZSA9PSBJREJSZXF1ZXN0UmVhZHlTdGF0ZTo6UGVuZGluZyk7CiAgICAgQVNTRVJU KCFtX2Vycm9yQ29kZSAmJiBtX2Vycm9yTWVzc2FnZS5pc051bGwoKSAmJiAhbV9lcnJvciAmJiAh bV9yZXN1bHQpOwogICAgIHJldHVybiB0cnVlOwogfQpAQCAtNDQ3LDcgKzQ0Nyw3IEBAIHZvaWQg TGVnYWN5UmVxdWVzdDo6c3RvcCgpCiAKICAgICBtX2NvbnRleHRTdG9wcGVkID0gdHJ1ZTsKICAg ICBtX3JlcXVlc3RTdGF0ZS5jbGVhcigpOwotICAgIGlmIChtX3JlYWR5U3RhdGUgPT0gUEVORElO RykKKyAgICBpZiAobV9yZWFkeVN0YXRlID09IElEQlJlcXVlc3RSZWFkeVN0YXRlOjpQZW5kaW5n KQogICAgICAgICBtYXJrRWFybHlEZWF0aCgpOwogfQogCkBAIC00NjksMTggKzQ2OSwxOCBAQCBF dmVudFRhcmdldEludGVyZmFjZSBMZWdhY3lSZXF1ZXN0OjpldmVudFRhcmdldEludGVyZmFjZSgp IGNvbnN0CiBib29sIExlZ2FjeVJlcXVlc3Q6OmRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVu dD4gZXZlbnQpCiB7CiAgICAgTE9HKFN0b3JhZ2VBUEksICJMZWdhY3lSZXF1ZXN0OjpkaXNwYXRj aEV2ZW50Iik7Ci0gICAgQVNTRVJUKG1fcmVhZHlTdGF0ZSA9PSBQRU5ESU5HKTsKKyAgICBBU1NF UlQobV9yZWFkeVN0YXRlID09IElEQlJlcXVlc3RSZWFkeVN0YXRlOjpQZW5kaW5nKTsKICAgICBB U1NFUlQoIW1fY29udGV4dFN0b3BwZWQpOwogICAgIEFTU0VSVChtX2hhc1BlbmRpbmdBY3Rpdml0 eSk7CiAgICAgQVNTRVJUKG1fZW5xdWV1ZWRFdmVudHMuc2l6ZSgpKTsKICAgICBBU1NFUlQoc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpKTsKICAgICBBU1NFUlQoZXZlbnQtPnRhcmdldCgpID09IHRo aXMpOwotICAgIEFTU0VSVF9XSVRIX01FU1NBR0UobV9yZWFkeVN0YXRlIDwgRE9ORSwgIldoZW4g ZGlzcGF0Y2hpbmcgZXZlbnQgJXMsIG1fcmVhZHlTdGF0ZSA8IERPTkUoJWQpLCB3YXMgJWQiLCBl dmVudC0+dHlwZSgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIERPTkUsIG1fcmVhZHlTdGF0ZSk7 CisgICAgQVNTRVJUX1dJVEhfTUVTU0FHRShtX3JlYWR5U3RhdGUgPCBJREJSZXF1ZXN0UmVhZHlT dGF0ZTo6RG9uZSwgIldoZW4gZGlzcGF0Y2hpbmcgZXZlbnQgJXMsIG1fcmVhZHlTdGF0ZSA8IERP TkUoJWQpLCB3YXMgJWQiLCBldmVudC0+dHlwZSgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIElE QlJlcXVlc3RSZWFkeVN0YXRlOjpEb25lLCBtX3JlYWR5U3RhdGUpOwogCiAgICAgRE9NUmVxdWVz dFN0YXRlOjpTY29wZSBzY29wZShtX3JlcXVlc3RTdGF0ZSk7CiAKICAgICBpZiAoZXZlbnQtPnR5 cGUoKSAhPSBldmVudE5hbWVzKCkuYmxvY2tlZEV2ZW50KQotICAgICAgICBtX3JlYWR5U3RhdGUg PSBET05FOworICAgICAgICBtX3JlYWR5U3RhdGUgPSBJREJSZXF1ZXN0UmVhZHlTdGF0ZTo6RG9u ZTsKIAogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9lbnF1ZXVlZEV2ZW50cy5zaXplKCk7 ICsraSkgewogICAgICAgICBpZiAobV9lbnF1ZXVlZEV2ZW50c1tpXS5nZXQoKSA9PSBldmVudC5n ZXQoKSkKQEAgLTUyMyw3ICs1MjMsNyBAQCBib29sIExlZ2FjeVJlcXVlc3Q6OmRpc3BhdGNoRXZl bnQoUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQpCiAgICAgYm9vbCBkb250UHJldmVudERlZmF1bHQg PSBJREJFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoKGV2ZW50LmdldCgpLCB0YXJnZXRzKTsKIAog ICAgIGlmIChtX3RyYW5zYWN0aW9uKSB7Ci0gICAgICAgIGlmIChtX3JlYWR5U3RhdGUgPT0gRE9O RSkKKyAgICAgICAgaWYgKG1fcmVhZHlTdGF0ZSA9PSBJREJSZXF1ZXN0UmVhZHlTdGF0ZTo6RG9u ZSkKICAgICAgICAgICAgIG1fdHJhbnNhY3Rpb24tPnVucmVnaXN0ZXJSZXF1ZXN0KHRoaXMpOwog CiAgICAgICAgIC8vIFBvc3NpYmx5IGFib3J0IHRoZSB0cmFuc2FjdGlvbi4gVGhpcyBtdXN0IG9j Y3VyIGFmdGVyIHVucmVnaXN0ZXJpbmcgKHNvIHRoaXMgcmVxdWVzdApAQCAtNTQxLDcgKzU0MSw3 IEBAIGJvb2wgTGVnYWN5UmVxdWVzdDo6ZGlzcGF0Y2hFdmVudChQYXNzUmVmUHRyPEV2ZW50PiBl dmVudCkKICAgICBpZiAoY3Vyc29yVG9Ob3RpZnkpCiAgICAgICAgIGN1cnNvclRvTm90aWZ5LT5w b3N0U3VjY2Vzc0hhbmRsZXJDYWxsYmFjaygpOwogCi0gICAgaWYgKG1fcmVhZHlTdGF0ZSA9PSBE T05FICYmICghY3Vyc29yVG9Ob3RpZnkgfHwgbV9jdXJzb3JGaW5pc2hlZCkgJiYgZXZlbnQtPnR5 cGUoKSAhPSBldmVudE5hbWVzKCkudXBncmFkZW5lZWRlZEV2ZW50KQorICAgIGlmIChtX3JlYWR5 U3RhdGUgPT0gSURCUmVxdWVzdFJlYWR5U3RhdGU6OkRvbmUgJiYgKCFjdXJzb3JUb05vdGlmeSB8 fCBtX2N1cnNvckZpbmlzaGVkKSAmJiBldmVudC0+dHlwZSgpICE9IGV2ZW50TmFtZXMoKS51cGdy YWRlbmVlZGVkRXZlbnQpCiAgICAgICAgIG1faGFzUGVuZGluZ0FjdGl2aXR5ID0gZmFsc2U7CiAK ICAgICByZXR1cm4gZG9udFByZXZlbnREZWZhdWx0OwpAQCAtNTU5LDIwICs1NTksMjAgQEAgdm9p ZCBMZWdhY3lSZXF1ZXN0Ojp0cmFuc2FjdGlvbkRpZEZpbmlzaEFuZERpc3BhdGNoKCkKIHsKICAg ICBBU1NFUlQobV90cmFuc2FjdGlvbik7CiAgICAgQVNTRVJUKG1fdHJhbnNhY3Rpb24tPmlzVmVy c2lvbkNoYW5nZSgpKTsKLSAgICBBU1NFUlQobV9yZWFkeVN0YXRlID09IERPTkUpOworICAgIEFT U0VSVChtX3JlYWR5U3RhdGUgPT0gSURCUmVxdWVzdFJlYWR5U3RhdGU6OkRvbmUpOwogICAgIEFT U0VSVChzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOwogICAgIG1fdHJhbnNhY3Rpb24gPSBudWxs cHRyOwotICAgIG1fcmVhZHlTdGF0ZSA9IFBFTkRJTkc7CisgICAgbV9yZWFkeVN0YXRlID0gSURC UmVxdWVzdFJlYWR5U3RhdGU6OlBlbmRpbmc7CiB9CiAKIHZvaWQgTGVnYWN5UmVxdWVzdDo6ZW5x dWV1ZUV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50KQogewotICAgIEFTU0VSVChtX3JlYWR5 U3RhdGUgPT0gUEVORElORyB8fCBtX3JlYWR5U3RhdGUgPT0gRE9ORSk7CisgICAgQVNTRVJUKG1f cmVhZHlTdGF0ZSA9PSBJREJSZXF1ZXN0UmVhZHlTdGF0ZTo6UGVuZGluZyB8fCBtX3JlYWR5U3Rh dGUgPT0gSURCUmVxdWVzdFJlYWR5U3RhdGU6OkRvbmUpOwogCiAgICAgaWYgKG1fY29udGV4dFN0 b3BwZWQgfHwgIXNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgQVNTRVJUX1dJVEhfTUVTU0FHRShtX3JlYWR5U3RhdGUgPT0gUEVORElORyB8fCBtX2RpZEZp cmVVcGdyYWRlTmVlZGVkRXZlbnQsICJXaGVuIHF1ZXVlaW5nIGV2ZW50ICVzLCBtX3JlYWR5U3Rh dGUgd2FzICVkIiwgZXZlbnQtPnR5cGUoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBtX3JlYWR5 U3RhdGUpOworICAgIEFTU0VSVF9XSVRIX01FU1NBR0UobV9yZWFkeVN0YXRlID09IElEQlJlcXVl c3RSZWFkeVN0YXRlOjpQZW5kaW5nIHx8IG1fZGlkRmlyZVVwZ3JhZGVOZWVkZWRFdmVudCwgIldo ZW4gcXVldWVpbmcgZXZlbnQgJXMsIG1fcmVhZHlTdGF0ZSB3YXMgJWQiLCBldmVudC0+dHlwZSgp LnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIG1fcmVhZHlTdGF0ZSk7CiAKICAgICBldmVudC0+c2V0 VGFyZ2V0KHRoaXMpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9sZWdhY3kvTGVnYWN5UmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvbGVnYWN5L0xlZ2FjeVJlcXVlc3QuaAppbmRleCA0ODA3MTA5Li41YWVmYjExIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9sZWdhY3kvTGVnYWN5UmVx dWVzdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2xlZ2FjeS9MZWdh Y3lSZXF1ZXN0LmgKQEAgLTExOSw3ICsxMTksNyBAQCBwcm90ZWN0ZWQ6CiAgICAgUmVmUHRyPERP TUVycm9yPiBtX2Vycm9yOwogICAgIGJvb2wgbV9jb250ZXh0U3RvcHBlZDsKICAgICBSZWZQdHI8 TGVnYWN5VHJhbnNhY3Rpb24+IG1fdHJhbnNhY3Rpb247Ci0gICAgUmVhZHlTdGF0ZSBtX3JlYWR5 U3RhdGU7CisgICAgSURCUmVxdWVzdFJlYWR5U3RhdGUgbV9yZWFkeVN0YXRlOwogICAgIGJvb2wg bV9yZXF1ZXN0QWJvcnRlZDsgLy8gTWF5IGJlIGFib3J0ZWQgYnkgdHJhbnNhY3Rpb24gdGhlbiBy ZWNlaXZlIGFzeW5jIG9uc3VjY2VzczsgaWdub3JlIHZzLiBhc3NlcnQuCiAKIHByaXZhdGU6Cg==