160756 2016-08-10 15:23:02 -0700 Revert back to the old style member function state machine for callbacks 2016-08-10 15:39:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 1219163 0 andersca 2016-08-10 15:23:02 -0700 Revert back to the old style member function state machine for callbacks 1219166 1 285772 andersca 2016-08-10 15:27:43 -0700 Created attachment 285772 Patch 1219169 2 commit-queue 2016-08-10 15:30:44 -0700 Attachment 285772 did not pass style-queue: ERROR: Source/WebCore/Modules/webdatabase/SQLTransaction.cpp:122: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/Modules/webdatabase/SQLTransaction.cpp:123: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/Modules/webdatabase/SQLTransaction.cpp:124: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/Modules/webdatabase/SQLTransaction.cpp:125: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 4 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1219172 3 andersca 2016-08-10 15:39:16 -0700 Committed r204359: <http://trac.webkit.org/changeset/204359> 285772 2016-08-10 15:27:43 -0700 2016-08-10 15:30:29 -0700 Patch bug-160756-20160810152607.patch text/plain 9754 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjA0MzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI3NWM3MDY3NjY3MzJm OWZmMDgwY2QzZGVhYjg0MTliNWI1YzViZC4uMWUyNTUwN2I0ZTVjZjc2Y2ZkZDI0MDA1Y2YzNjc2 ZjRhZGI3MjY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE2LTA4LTEwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmV2ZXJ0IGJhY2sg dG8gdGhlIG9sZCBzdHlsZSBtZW1iZXIgZnVuY3Rpb24gc3RhdGUgbWFjaGluZSBmb3IgY2FsbGJh Y2tzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjA3 NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGlzIGFub3RoZXIgc3RlcCB0b3dhcmRzIG1lcmdpbmcgU1FMVHJhbnNhY3Rpb25CYWNrZW5kIGFu ZCBTUUxUcmFuc2FjdGlvbiwKKyAgICAgICAgYW5kIHVzaW5nIGEgc2luZ2xlIHN0YXRlIG1hY2hp bmUgZm9yIGJvdGggc2lkZXMuCisKKyAgICAgICAgKiBNb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRy YW5zYWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNRTFRyYW5zYWN0aW9uOjpTUUxUcmFu c2FjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlvbjo6cGVyZm9ybVBlbmRp bmdDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlvbjo6Y2hlY2tBbmRI YW5kbGVDbG9zZWREYXRhYmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlvbjo6 c2NoZWR1bGVDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlvbjo6b3Bl blRyYW5zYWN0aW9uQW5kUHJlZmxpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlNRTFRyYW5zYWN0 aW9uOjpydW5DdXJyZW50U3RhdGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlNRTFRyYW5zYWN0 aW9uOjpoYW5kbGVDdXJyZW50U3RhdGVtZW50RXJyb3IpOgorICAgICAgICAoV2ViQ29yZTo6U1FM VHJhbnNhY3Rpb246OmhhbmRsZVRyYW5zYWN0aW9uRXJyb3IpOgorICAgICAgICAoV2ViQ29yZTo6 U1FMVHJhbnNhY3Rpb246OnBvc3RmbGlnaHRBbmRDb21taXQpOgorICAgICAgICAoV2ViQ29yZTo6 U1FMVHJhbnNhY3Rpb246OmRlYnVnU3RlcE5hbWUpOgorICAgICAgICAqIE1vZHVsZXMvd2ViZGF0 YWJhc2UvU1FMVHJhbnNhY3Rpb24uaDoKKworMjAxNi0wOC0xMCAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIE1vdmUgbW9yZSBmdW5jdGlvbnMgdG8gZnJv bSBTUUxUcmFuc2FjdGlvbkJhY2tlbmQgdG8gU1FMVHJhbnNhY3Rpb24KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDc1MgogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5zYWN0aW9uLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24uY3BwCmluZGV4 IDFmZjJkZGE5Yzk2Y2VlMTBjMTU4NzI4YmM2ZDgxMzU0MjRkYjAxMWQuLmY2YTc4MjM1MTI2NGQw ZTNhNWUxMjgyNzEwOWE5YTNjYmU3YWYyNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24uY3BwCkBAIC0zMiw2ICszMiw3IEBA CiAjaW5jbHVkZSAiRGF0YWJhc2UuaCIKICNpbmNsdWRlICJEYXRhYmFzZUF1dGhvcml6ZXIuaCIK ICNpbmNsdWRlICJEYXRhYmFzZUNvbnRleHQuaCIKKyNpbmNsdWRlICJEYXRhYmFzZVRocmVhZC5o IgogI2luY2x1ZGUgIkRhdGFiYXNlVHJhY2tlci5oIgogI2luY2x1ZGUgIkV4Y2VwdGlvbkNvZGUu aCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCkBAIC02Myw2ICs2NCw3IEBAIFNRTFRyYW5zYWN0aW9u OjpTUUxUcmFuc2FjdGlvbihSZWY8RGF0YWJhc2U+JiYgZGF0YWJhc2UsIFJlZlB0cjxTUUxUcmFu c2FjdGlvbkNhCiAgICAgLCBtX3N1Y2Nlc3NDYWxsYmFja1dyYXBwZXIoV1RGTW92ZShzdWNjZXNz Q2FsbGJhY2spLCBtX2RhdGFiYXNlLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpCiAgICAgLCBt X2Vycm9yQ2FsbGJhY2tXcmFwcGVyKFdURk1vdmUoZXJyb3JDYWxsYmFjayksIG1fZGF0YWJhc2Ut PnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKICAgICAsIG1fd3JhcHBlcihXVEZNb3ZlKHdyYXBw ZXIpKQorICAgICwgbV9uZXh0U3RlcCgmU1FMVHJhbnNhY3Rpb246OmFjcXVpcmVMb2NrKQogICAg ICwgbV9leGVjdXRlU3FsQWxsb3dlZChmYWxzZSkKICAgICAsIG1fc2hvdWxkUmV0cnlDdXJyZW50 U3RhdGVtZW50KGZhbHNlKQogICAgICwgbV9tb2RpZmllZERhdGFiYXNlKGZhbHNlKQpAQCAtMTE0 LDggKzExNiwxOCBAQCB2b2lkIFNRTFRyYW5zYWN0aW9uOjpwZXJmb3JtTmV4dFN0ZXAoKQogCiB2 b2lkIFNRTFRyYW5zYWN0aW9uOjpwZXJmb3JtUGVuZGluZ0NhbGxiYWNrKCkKIHsKLSAgICBjb21w dXRlTmV4dFN0YXRlQW5kQ2xlYW51cElmTmVlZGVkKCk7Ci0gICAgcnVuU3RhdGVNYWNoaW5lKCk7 CisgICAgTE9HKFN0b3JhZ2VBUEksICJDYWxsYmFjayAlc1xuIiwgZGVidWdTdGVwTmFtZShtX25l eHRTdGVwKSk7CisKKyAgICBBU1NFUlQobV9uZXh0U3RlcCA9PSAmU1FMVHJhbnNhY3Rpb246OmRl bGl2ZXJUcmFuc2FjdGlvbkNhbGxiYWNrCisgICAgICAgICAgIHx8IG1fbmV4dFN0ZXAgPT0gJlNR TFRyYW5zYWN0aW9uOjpkZWxpdmVyVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrCisgICAgICAgICAg IHx8IG1fbmV4dFN0ZXAgPT0gJlNRTFRyYW5zYWN0aW9uOjpkZWxpdmVyU3RhdGVtZW50Q2FsbGJh Y2sKKyAgICAgICAgICAgfHwgbV9uZXh0U3RlcCA9PSAmU1FMVHJhbnNhY3Rpb246OmRlbGl2ZXJR dW90YUluY3JlYXNlQ2FsbGJhY2sKKyAgICAgICAgICAgfHwgbV9uZXh0U3RlcCA9PSAmU1FMVHJh bnNhY3Rpb246OmRlbGl2ZXJTdWNjZXNzQ2FsbGJhY2spOworCisgICAgY2hlY2tBbmRIYW5kbGVD bG9zZWREYXRhYmFzZSgpOworCisgICAgaWYgKG1fbmV4dFN0ZXApCisgICAgICAgICh0aGlzLT4q bV9uZXh0U3RlcCkoKTsKIH0KIAogdm9pZCBTUUxUcmFuc2FjdGlvbjo6bm90aWZ5RGF0YWJhc2VU aHJlYWRJc1NodXR0aW5nRG93bigpCkBAIC0xNjMsNiArMTc1LDQ1IEBAIHZvaWQgU1FMVHJhbnNh Y3Rpb246OnJlcXVlc3RUcmFuc2l0VG9TdGF0ZShTUUxUcmFuc2FjdGlvblN0YXRlIG5leHRTdGF0 ZSkKICAgICBtX2RhdGFiYXNlLT5zY2hlZHVsZVRyYW5zYWN0aW9uQ2FsbGJhY2sodGhpcyk7CiB9 CiAKK3ZvaWQgU1FMVHJhbnNhY3Rpb246OmNoZWNrQW5kSGFuZGxlQ2xvc2VkRGF0YWJhc2UoKQor eworICAgIGlmIChtX2RhdGFiYXNlLT5vcGVuZWQoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAg Ly8gSWYgdGhlIGRhdGFiYXNlIHdhcyBzdG9wcGVkLCBkb24ndCBkbyBhbnl0aGluZyBhbmQgY2Fu Y2VsIHF1ZXVlZCB3b3JrCisgICAgTE9HKFN0b3JhZ2VBUEksICJEYXRhYmFzZSB3YXMgc3RvcHBl ZCBvciBpbnRlcnJ1cHRlZCAtIGNhbmNlbGxpbmcgd29yayBmb3IgdGhpcyB0cmFuc2FjdGlvbiIp OworCisgICAgTG9ja0hvbGRlciBsb2NrZXIobV9zdGF0ZW1lbnRNdXRleCk7CisgICAgbV9zdGF0 ZW1lbnRRdWV1ZS5jbGVhcigpOworICAgIG1fbmV4dFN0ZXAgPSBudWxscHRyOworCisgICAgLy8g UmVsZWFzZSB0aGUgdW5uZWVkZWQgY2FsbGJhY2tzLCB0byBicmVhayByZWZlcmVuY2UgY3ljbGVz LgorICAgIG1fY2FsbGJhY2tXcmFwcGVyLmNsZWFyKCk7CisgICAgbV9zdWNjZXNzQ2FsbGJhY2tX cmFwcGVyLmNsZWFyKCk7CisgICAgbV9lcnJvckNhbGxiYWNrV3JhcHBlci5jbGVhcigpOworCisg ICAgLy8gVGhlIG5leHQgc3RlcHMgc2hvdWxkIGJlIGV4ZWN1dGVkIG9ubHkgaWYgd2UncmUgb24g dGhlIERCIHRocmVhZC4KKyAgICBpZiAoY3VycmVudFRocmVhZCgpICE9IG1fZGF0YWJhc2UtPmRh dGFiYXNlQ29udGV4dCgpLT5kYXRhYmFzZVRocmVhZCgpLT5nZXRUaHJlYWRJRCgpKQorICAgICAg ICByZXR1cm47CisKKyAgICAvLyBUaGUgY3VycmVudCBTUUxpdGUgdHJhbnNhY3Rpb24gc2hvdWxk IGJlIHN0b3BwZWQsIGFzIHdlbGwKKyAgICBpZiAobV9zcWxpdGVUcmFuc2FjdGlvbikgeworICAg ICAgICBtX3NxbGl0ZVRyYW5zYWN0aW9uLT5zdG9wKCk7CisgICAgICAgIG1fc3FsaXRlVHJhbnNh Y3Rpb24gPSBudWxscHRyOworICAgIH0KKworICAgIGlmIChtX2xvY2tBY3F1aXJlZCkKKyAgICAg ICAgbV9kYXRhYmFzZS0+dHJhbnNhY3Rpb25Db29yZGluYXRvcigpLT5yZWxlYXNlTG9jaygqdGhp cyk7Cit9CisKK3ZvaWQgU1FMVHJhbnNhY3Rpb246OnNjaGVkdWxlQ2FsbGJhY2sodm9pZCAoU1FM VHJhbnNhY3Rpb246OipzdGVwKSgpKQoreworICAgIG1fbmV4dFN0ZXAgPSBzdGVwOworCisgICAg TE9HKFN0b3JhZ2VBUEksICJTY2hlZHVsaW5nICVzIGZvciB0cmFuc2FjdGlvbiAlcFxuIiwgZGVi dWdTdGVwTmFtZShzdGVwKSwgdGhpcyk7CisgICAgbV9kYXRhYmFzZS0+c2NoZWR1bGVUcmFuc2Fj dGlvbkNhbGxiYWNrKHRoaXMpOworfQorCiB2b2lkIFNRTFRyYW5zYWN0aW9uOjphY3F1aXJlTG9j aygpCiB7CiAgICAgbV9kYXRhYmFzZS0+dHJhbnNhY3Rpb25Db29yZGluYXRvcigpLT5hY3F1aXJl TG9jaygqdGhpcyk7CkBAIC0yMzgsNyArMjg5LDcgQEAgdm9pZCBTUUxUcmFuc2FjdGlvbjo6b3Bl blRyYW5zYWN0aW9uQW5kUHJlZmxpZ2h0KCkKIAogICAgIC8vIFNwZWMgNC4zLjIuNDogSW52b2tl IHRoZSB0cmFuc2FjdGlvbiBjYWxsYmFjayB3aXRoIHRoZSBuZXcgU1FMVHJhbnNhY3Rpb24gb2Jq ZWN0CiAgICAgaWYgKG1fY2FsbGJhY2tXcmFwcGVyLmhhc0NhbGxiYWNrKCkpIHsKLSAgICAgICAg cmVxdWVzdFRyYW5zaXRUb1N0YXRlKFNRTFRyYW5zYWN0aW9uU3RhdGU6OkRlbGl2ZXJUcmFuc2Fj dGlvbkNhbGxiYWNrKTsKKyAgICAgICAgc2NoZWR1bGVDYWxsYmFjaygmU1FMVHJhbnNhY3Rpb246 OmRlbGl2ZXJUcmFuc2FjdGlvbkNhbGxiYWNrKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApA QCAtNDY5LDcgKzUyMCw3IEBAIGJvb2wgU1FMVHJhbnNhY3Rpb246OnJ1bkN1cnJlbnRTdGF0ZW1l bnQoKQogICAgICAgICB9CiAKICAgICAgICAgaWYgKG1fY3VycmVudFN0YXRlbWVudC0+aGFzU3Rh dGVtZW50Q2FsbGJhY2soKSkgewotICAgICAgICAgICAgcmVxdWVzdFRyYW5zaXRUb1N0YXRlKFNR TFRyYW5zYWN0aW9uU3RhdGU6OkRlbGl2ZXJTdGF0ZW1lbnRDYWxsYmFjayk7CisgICAgICAgICAg ICBzY2hlZHVsZUNhbGxiYWNrKCZTUUxUcmFuc2FjdGlvbjo6ZGVsaXZlclN0YXRlbWVudENhbGxi YWNrKTsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogCkBAIC00NzksNyAr NTMwLDcgQEAgYm9vbCBTUUxUcmFuc2FjdGlvbjo6cnVuQ3VycmVudFN0YXRlbWVudCgpCiAgICAg fQogCiAgICAgaWYgKG1fY3VycmVudFN0YXRlbWVudC0+bGFzdEV4ZWN1dGlvbkZhaWxlZER1ZVRv UXVvdGEoKSkgewotICAgICAgICByZXF1ZXN0VHJhbnNpdFRvU3RhdGUoU1FMVHJhbnNhY3Rpb25T dGF0ZTo6RGVsaXZlclF1b3RhSW5jcmVhc2VDYWxsYmFjayk7CisgICAgICAgIHNjaGVkdWxlQ2Fs bGJhY2soJlNRTFRyYW5zYWN0aW9uOjpkZWxpdmVyUXVvdGFJbmNyZWFzZUNhbGxiYWNrKTsKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIApAQCAtNDkyLDcgKzU0Myw3IEBAIHZvaWQgU1FM VHJhbnNhY3Rpb246OmhhbmRsZUN1cnJlbnRTdGF0ZW1lbnRFcnJvcigpCiAgICAgLy8gU3BlYyA0 LjMuMi42LjY6IGVycm9yIC0gQ2FsbCB0aGUgc3RhdGVtZW50J3MgZXJyb3IgY2FsbGJhY2ssIGJ1 dCBpZiB0aGVyZSB3YXMgbm8gZXJyb3IgY2FsbGJhY2ssCiAgICAgLy8gb3IgdGhlIHRyYW5zYWN0 aW9uIHdhcyByb2xsZWQgYmFjaywganVtcCB0byB0aGUgdHJhbnNhY3Rpb24gZXJyb3IgY2FsbGJh Y2sKICAgICBpZiAobV9jdXJyZW50U3RhdGVtZW50LT5oYXNTdGF0ZW1lbnRFcnJvckNhbGxiYWNr KCkgJiYgIW1fc3FsaXRlVHJhbnNhY3Rpb24tPndhc1JvbGxlZEJhY2tCeVNxbGl0ZSgpKSB7Ci0g ICAgICAgIHJlcXVlc3RUcmFuc2l0VG9TdGF0ZShTUUxUcmFuc2FjdGlvblN0YXRlOjpEZWxpdmVy U3RhdGVtZW50Q2FsbGJhY2spOworICAgICAgICBzY2hlZHVsZUNhbGxiYWNrKCZTUUxUcmFuc2Fj dGlvbjo6ZGVsaXZlclN0YXRlbWVudENhbGxiYWNrKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K IApAQCAtNTA3LDcgKzU1OCw3IEBAIHZvaWQgU1FMVHJhbnNhY3Rpb246OmhhbmRsZVRyYW5zYWN0 aW9uRXJyb3IoKQogewogICAgIEFTU0VSVChtX3RyYW5zYWN0aW9uRXJyb3IpOwogICAgIGlmICht X2Vycm9yQ2FsbGJhY2tXcmFwcGVyLmhhc0NhbGxiYWNrKCkpIHsKLSAgICAgICAgcmVxdWVzdFRy YW5zaXRUb1N0YXRlKFNRTFRyYW5zYWN0aW9uU3RhdGU6OkRlbGl2ZXJUcmFuc2FjdGlvbkVycm9y Q2FsbGJhY2spOworICAgICAgICBzY2hlZHVsZUNhbGxiYWNrKCZTUUxUcmFuc2FjdGlvbjo6ZGVs aXZlclRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjayk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK QEAgLTU1OCw3ICs2MDksNyBAQCB2b2lkIFNRTFRyYW5zYWN0aW9uOjpwb3N0ZmxpZ2h0QW5kQ29t bWl0KCkKICAgICAgICAgbV9kYXRhYmFzZS0+dHJhbnNhY3Rpb25DbGllbnQoKS0+ZGlkQ29tbWl0 V3JpdGVUcmFuc2FjdGlvbihtX2RhdGFiYXNlLnB0cigpKTsKIAogICAgIC8vIFNwZWMgNC4zLjIu ODogRGVsaXZlciBzdWNjZXNzIGNhbGxiYWNrLCBpZiB0aGVyZSBpcyBvbmUuCi0gICAgcmVxdWVz dFRyYW5zaXRUb1N0YXRlKFNRTFRyYW5zYWN0aW9uU3RhdGU6OkRlbGl2ZXJTdWNjZXNzQ2FsbGJh Y2spOworICAgIHNjaGVkdWxlQ2FsbGJhY2soJlNRTFRyYW5zYWN0aW9uOjpkZWxpdmVyU3VjY2Vz c0NhbGxiYWNrKTsKIH0KIAogdm9pZCBTUUxUcmFuc2FjdGlvbjo6YWNxdWlyZU9yaWdpbkxvY2so KQpAQCAtNTc2LDQgKzYyNywzMyBAQCB2b2lkIFNRTFRyYW5zYWN0aW9uOjpyZWxlYXNlT3JpZ2lu TG9ja0lmTmVlZGVkKCkKICAgICB9CiB9CiAKKyNpZiAhTE9HX0RJU0FCTEVECitjb25zdCBjaGFy KiBTUUxUcmFuc2FjdGlvbjo6ZGVidWdTdGVwTmFtZSh2b2lkIChTUUxUcmFuc2FjdGlvbjo6KnN0 ZXApKCkpCit7CisgICAgaWYgKHN0ZXAgPT0gJlNRTFRyYW5zYWN0aW9uOjphY3F1aXJlTG9jaykK KyAgICAgICAgcmV0dXJuICJhY3F1aXJlTG9jayI7CisgICAgaWYgKHN0ZXAgPT0gJlNRTFRyYW5z YWN0aW9uOjpvcGVuVHJhbnNhY3Rpb25BbmRQcmVmbGlnaHQpCisgICAgICAgIHJldHVybiAib3Bl blRyYW5zYWN0aW9uQW5kUHJlZmxpZ2h0IjsKKyAgICBpZiAoc3RlcCA9PSAmU1FMVHJhbnNhY3Rp b246OnJ1blN0YXRlbWVudHMpCisgICAgICAgIHJldHVybiAicnVuU3RhdGVtZW50cyI7CisgICAg aWYgKHN0ZXAgPT0gJlNRTFRyYW5zYWN0aW9uOjpwb3N0ZmxpZ2h0QW5kQ29tbWl0KQorICAgICAg ICByZXR1cm4gInBvc3RmbGlnaHRBbmRDb21taXQiOworICAgIGlmIChzdGVwID09ICZTUUxUcmFu c2FjdGlvbjo6Y2xlYW51cEFmdGVyVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrKQorICAgICAgICBy ZXR1cm4gImNsZWFudXBBZnRlclRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjayI7CisgICAgaWYgKHN0 ZXAgPT0gJlNRTFRyYW5zYWN0aW9uOjpkZWxpdmVyVHJhbnNhY3Rpb25DYWxsYmFjaykKKyAgICAg ICAgcmV0dXJuICJkZWxpdmVyVHJhbnNhY3Rpb25DYWxsYmFjayI7CisgICAgaWYgKHN0ZXAgPT0g JlNRTFRyYW5zYWN0aW9uOjpkZWxpdmVyVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrKQorICAgICAg ICByZXR1cm4gImRlbGl2ZXJUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2siOworICAgIGlmIChzdGVw ID09ICZTUUxUcmFuc2FjdGlvbjo6ZGVsaXZlclN0YXRlbWVudENhbGxiYWNrKQorICAgICAgICBy ZXR1cm4gImRlbGl2ZXJTdGF0ZW1lbnRDYWxsYmFjayI7CisgICAgaWYgKHN0ZXAgPT0gJlNRTFRy YW5zYWN0aW9uOjpkZWxpdmVyUXVvdGFJbmNyZWFzZUNhbGxiYWNrKQorICAgICAgICByZXR1cm4g ImRlbGl2ZXJRdW90YUluY3JlYXNlQ2FsbGJhY2siOworICAgIGlmIChzdGVwID09ICZTUUxUcmFu c2FjdGlvbjo6ZGVsaXZlclN1Y2Nlc3NDYWxsYmFjaykKKyAgICAgICAgcmV0dXJuICJkZWxpdmVy U3VjY2Vzc0NhbGxiYWNrIjsKKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVy biAiVU5LTk9XTiI7Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFuc2FjdGlvbi5o IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9TUUxUcmFuc2FjdGlvbi5oCmlu ZGV4IGYyMzc1MzgzYmVmYWY0MjkwYmU4OGQ4OTA3N2JmM2UzYzc4ZjNkMzAuLmVmM2JmY2ZiZDNm YWJmNjM1OWE3NzhkYzQ2YTMzOGY4ZDEyMzMwNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViZGF0YWJhc2UvU1FMVHJhbnNhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL1NRTFRyYW5zYWN0aW9uLmgKQEAgLTgyLDggKzgyLDEyIEBA IHByaXZhdGU6CiAKICAgICB2b2lkIGVucXVldWVTdGF0ZW1lbnQoc3RkOjp1bmlxdWVfcHRyPFNR TFN0YXRlbWVudD4pOwogCisgICAgdm9pZCBjaGVja0FuZEhhbmRsZUNsb3NlZERhdGFiYXNlKCk7 CisKICAgICB2b2lkIGNsZWFyQ2FsbGJhY2tXcmFwcGVycygpOwogCisgICAgdm9pZCBzY2hlZHVs ZUNhbGxiYWNrKHZvaWQgKFNRTFRyYW5zYWN0aW9uOjoqKSgpKTsKKwogICAgIC8vIFN0YXRlIE1h Y2hpbmUgZnVuY3Rpb25zOgogICAgIFN0YXRlRnVuY3Rpb24gc3RhdGVGdW5jdGlvbkZvcihTUUxU cmFuc2FjdGlvblN0YXRlKSBvdmVycmlkZTsKICAgICB2b2lkIGNvbXB1dGVOZXh0U3RhdGVBbmRD bGVhbnVwSWZOZWVkZWQoKTsKQEAgLTExMSw2ICsxMTUsMTAgQEAgcHJpdmF0ZToKICAgICB2b2lk IGFjcXVpcmVPcmlnaW5Mb2NrKCk7CiAgICAgdm9pZCByZWxlYXNlT3JpZ2luTG9ja0lmTmVlZGVk KCk7CiAKKyNpZiAhTE9HX0RJU0FCTEVECisgICAgc3RhdGljIGNvbnN0IGNoYXIqIGRlYnVnU3Rl cE5hbWUodm9pZCAoU1FMVHJhbnNhY3Rpb246OiopKCkpOworI2VuZGlmCisKICAgICBSZWY8RGF0 YWJhc2U+IG1fZGF0YWJhc2U7CiAgICAgU1FMQ2FsbGJhY2tXcmFwcGVyPFNRTFRyYW5zYWN0aW9u Q2FsbGJhY2s+IG1fY2FsbGJhY2tXcmFwcGVyOwogICAgIFNRTENhbGxiYWNrV3JhcHBlcjxWb2lk Q2FsbGJhY2s+IG1fc3VjY2Vzc0NhbGxiYWNrV3JhcHBlcjsKQEAgLTExOCw2ICsxMjYsOCBAQCBw cml2YXRlOgogCiAgICAgUmVmUHRyPFNRTFRyYW5zYWN0aW9uV3JhcHBlcj4gbV93cmFwcGVyOwog CisgICAgdm9pZCAoU1FMVHJhbnNhY3Rpb246OiptX25leHRTdGVwKSgpOworCiAgICAgYm9vbCBt X2V4ZWN1dGVTcWxBbGxvd2VkOwogICAgIFJlZlB0cjxTUUxFcnJvcj4gbV90cmFuc2FjdGlvbkVy cm9yOwogCg==