156416 2016-04-08 13:03:44 -0700 Modern IDB: Make IDBGetResult contain an IDBValue instead of a buffer, and remove unused methods 2016-04-08 14:11:39 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 1 beidson beidson alecflett commit-queue jsbell oldest_to_newest 1182271 0 beidson 2016-04-08 13:03:44 -0700 Modern IDB: Make IDBGetResult contain an IDBValue instead of a buffer 1182272 1 276030 beidson 2016-04-08 13:06:23 -0700 Created attachment 276030 Patch v1 1182309 2 276030 commit-queue 2016-04-08 14:11:36 -0700 Comment on attachment 276030 Patch v1 Clearing flags on attachment: 276030 Committed r199248: <http://trac.webkit.org/changeset/199248> 1182310 3 commit-queue 2016-04-08 14:11:39 -0700 All reviewed patches have been landed. Closing bug. 276030 2016-04-08 13:06:23 -0700 2016-04-08 14:11:36 -0700 Patch v1 patch text/plain 9628 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZjBmYmIxLi4xNTM1NjRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDEg QEAKIDIwMTYtMDQtMDggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIE1vZGVybiBJREI6IE1ha2UgSURCR2V0UmVzdWx0IGNvbnRhaW4gYW4gSURCVmFsdWUgaW5z dGVhZCBvZiBhIGJ1ZmZlciwgYW5kIHJlbW92ZSB1bnVzZWQgbWV0aG9kcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjQxNgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoUmVmYWN0 b3IsIG5vIGNoYW5nZSBpbiBiZWhhdmlvcikuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRk Yi9JREJDdXJzb3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCQ3Vyc29yOjpzZXRHZXRSZXN1 bHQpOgorICAgICAgICAKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJHZXRSZXN1bHQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCR2V0UmVzdWx0OjpkYXRhRnJvbUJ1ZmZlcik6Cisg ICAgICAgIChXZWJDb3JlOjpJREJHZXRSZXN1bHQ6Omlzb2xhdGVkQ29weSk6CisgICAgICAgICog TW9kdWxlcy9pbmRleGVkZGIvSURCR2V0UmVzdWx0Lmg6CisgICAgICAgIChXZWJDb3JlOjpJREJH ZXRSZXN1bHQ6OklEQkdldFJlc3VsdCk6CisgICAgICAgIChXZWJDb3JlOjpJREJHZXRSZXN1bHQ6 OnZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OklEQkdldFJlc3VsdDo6ZW5jb2RlKToKKyAgICAg ICAgKFdlYkNvcmU6OklEQkdldFJlc3VsdDo6ZGVjb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OklE QkdldFJlc3VsdDo6dmFsdWVCdWZmZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SURC R2V0UmVzdWx0OjpzZXRWYWx1ZUJ1ZmZlcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJ REJHZXRSZXN1bHQ6OnNldEtleURhdGEpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SURC R2V0UmVzdWx0OjpzZXRQcmltYXJ5S2V5RGF0YSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpJREJHZXRSZXN1bHQ6OnNldEtleVBhdGgpOiBEZWxldGVkLgorICAgICAgICAKKyAgICAgICAg KiBNb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJREJUcmFuc2FjdGlvbjo6ZGlkR2V0UmVjb3JkT25TZXJ2ZXIpOgorICAgICAgICAKKyAgICAg ICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9JREJWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ REJWYWx1ZTo6SURCVmFsdWUpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVl Lmg6CisgICAgICAgIAorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJ REJCYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJ REJCYWNraW5nU3RvcmU6OmdldEluZGV4UmVjb3JkKToKKworMjAxNi0wNC0wOCAgQnJhZHkgRWlk c29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgQnVpbGQgZml4IGZvbGxvd3VwIHRv IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE5OTIzMAogCiAgICAgICAgIFVucmV2 aWV3ZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJD dXJzb3IuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCQ3Vyc29yLmNw cAppbmRleCBjN2IzYjNjLi45OTgwODI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9JREJDdXJzb3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL0lEQkN1cnNvci5jcHAKQEAgLTQxOCw3ICs0MTgsNyBAQCB2b2lkIElEQkN1cnNv cjo6c2V0R2V0UmVzdWx0KElEQlJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IElEQkdldFJlc3VsdCYg Z2V0UmVzdWx0KQogICAgIGlmIChpc0tleUN1cnNvcigpKQogICAgICAgICBtX2RlcHJlY2F0ZWRD dXJyZW50VmFsdWUgPSB7IH07CiAgICAgZWxzZQotICAgICAgICBtX2RlcHJlY2F0ZWRDdXJyZW50 VmFsdWUgPSBkZXNlcmlhbGl6ZUlEQlZhbHVlRGF0YSgqY29udGV4dCwgZ2V0UmVzdWx0LnZhbHVl QnVmZmVyKCkpOworICAgICAgICBtX2RlcHJlY2F0ZWRDdXJyZW50VmFsdWUgPSBkZXNlcmlhbGl6 ZUlEQlZhbHVlRGF0YSgqY29udGV4dCwgZ2V0UmVzdWx0LnZhbHVlKCkuZGF0YSgpKTsKIAogICAg IG1fZ290VmFsdWUgPSB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvSURCR2V0UmVzdWx0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQkdldFJlc3VsdC5jcHAKaW5kZXggNDJhYzI2OC4uOTk4ZGQzMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCR2V0UmVzdWx0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJHZXRSZXN1bHQuY3BwCkBAIC0z NSwxMyArMzUsMTMgQEAgdm9pZCBJREJHZXRSZXN1bHQ6OmRhdGFGcm9tQnVmZmVyKFNoYXJlZEJ1 ZmZlciYgYnVmZmVyKQogICAgIFZlY3Rvcjx1aW50OF90PiBkYXRhKGJ1ZmZlci5zaXplKCkpOwog ICAgIG1lbWNweShkYXRhLmRhdGEoKSwgYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSk7CiAK LSAgICBtX3ZhbHVlQnVmZmVyID0gVGhyZWFkU2FmZURhdGFCdWZmZXI6OmFkb3B0VmVjdG9yKGRh dGEpOworICAgIG1fdmFsdWUgPSBUaHJlYWRTYWZlRGF0YUJ1ZmZlcjo6YWRvcHRWZWN0b3IoZGF0 YSk7CiB9CiAKIElEQkdldFJlc3VsdCBJREJHZXRSZXN1bHQ6Omlzb2xhdGVkQ29weSgpIGNvbnN0 CiB7CiAgICAgSURCR2V0UmVzdWx0IHJlc3VsdDsKLSAgICByZXN1bHQubV92YWx1ZUJ1ZmZlciA9 IG1fdmFsdWVCdWZmZXI7CisgICAgcmVzdWx0Lm1fdmFsdWUgPSBtX3ZhbHVlLmlzb2xhdGVkQ29w eSgpOwogICAgIHJlc3VsdC5tX2tleURhdGEgPSBtX2tleURhdGEuaXNvbGF0ZWRDb3B5KCk7CiAg ICAgcmVzdWx0Lm1fcHJpbWFyeUtleURhdGEgPSBtX3ByaW1hcnlLZXlEYXRhLmlzb2xhdGVkQ29w eSgpOwogICAgIHJlc3VsdC5tX2tleVBhdGggPSBtX2tleVBhdGguaXNvbGF0ZWRDb3B5KCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJHZXRSZXN1bHQu aCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkdldFJlc3VsdC5oCmluZGV4 IDNkY2Q3YTcuLmQ1Yjg2ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL0lEQkdldFJlc3VsdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkdldFJlc3VsdC5oCkBAIC0zMSw4ICszMSw4IEBACiAjaW5jbHVkZSAiSURCS2V5Lmgi CiAjaW5jbHVkZSAiSURCS2V5RGF0YS5oIgogI2luY2x1ZGUgIklEQktleVBhdGguaCIKKyNpbmNs dWRlICJJREJWYWx1ZS5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgotI2luY2x1ZGUgIlRo cmVhZFNhZmVEYXRhQnVmZmVyLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNDMsMTQg KzQzLDE0IEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQogCi0gICAgSURCR2V0UmVzdWx0KFNoYXJl ZEJ1ZmZlciogYnVmZmVyKQorICAgIElEQkdldFJlc3VsdChSZWY8U2hhcmVkQnVmZmVyPiYmIGJ1 ZmZlciwgY29uc3QgSURCS2V5RGF0YSYgY3VycmVudFByaW1hcnlLZXkpCisgICAgICAgIDogbV9w cmltYXJ5S2V5RGF0YShjdXJyZW50UHJpbWFyeUtleSkKICAgICB7Ci0gICAgICAgIGlmIChidWZm ZXIpCi0gICAgICAgICAgICBkYXRhRnJvbUJ1ZmZlcigqYnVmZmVyKTsKKyAgICAgICAgZGF0YUZy b21CdWZmZXIoYnVmZmVyLmdldCgpKTsKICAgICB9CiAKICAgICBJREJHZXRSZXN1bHQoY29uc3Qg VGhyZWFkU2FmZURhdGFCdWZmZXImIGJ1ZmZlcikKLSAgICAgICAgOiBtX3ZhbHVlQnVmZmVyKGJ1 ZmZlcikKKyAgICAgICAgOiBtX3ZhbHVlKGJ1ZmZlcikKICAgICB7CiAgICAgfQogCkBAIC03OSw3 ICs3OSw3IEBAIHB1YmxpYzoKICAgICB9CiAKICAgICBJREJHZXRSZXN1bHQoY29uc3QgSURCS2V5 RGF0YSYga2V5RGF0YSwgY29uc3QgSURCS2V5RGF0YSYgcHJpbWFyeUtleURhdGEsIGNvbnN0IFRo cmVhZFNhZmVEYXRhQnVmZmVyJiB2YWx1ZUJ1ZmZlcikKLSAgICAgICAgOiBtX3ZhbHVlQnVmZmVy KHZhbHVlQnVmZmVyKQorICAgICAgICA6IG1fdmFsdWUodmFsdWVCdWZmZXIpCiAgICAgICAgICwg bV9rZXlEYXRhKGtleURhdGEpCiAgICAgICAgICwgbV9wcmltYXJ5S2V5RGF0YShwcmltYXJ5S2V5 RGF0YSkKICAgICB7CkBAIC04Nyw3ICs4Nyw3IEBAIHB1YmxpYzoKIAogICAgIElEQkdldFJlc3Vs dCBpc29sYXRlZENvcHkoKSBjb25zdDsKIAotICAgIGNvbnN0IFRocmVhZFNhZmVEYXRhQnVmZmVy JiB2YWx1ZUJ1ZmZlcigpIGNvbnN0IHsgcmV0dXJuIG1fdmFsdWVCdWZmZXI7IH0KKyAgICBjb25z dCBJREJWYWx1ZSYgdmFsdWUoKSBjb25zdCB7IHJldHVybiBtX3ZhbHVlOyB9CiAgICAgY29uc3Qg SURCS2V5RGF0YSYga2V5RGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fa2V5RGF0YTsgfQogICAgIGNv bnN0IElEQktleURhdGEmIHByaW1hcnlLZXlEYXRhKCkgY29uc3QgeyByZXR1cm4gbV9wcmltYXJ5 S2V5RGF0YTsgfQogICAgIGNvbnN0IElEQktleVBhdGgmIGtleVBhdGgoKSBjb25zdCB7IHJldHVy biBtX2tleVBhdGg7IH0KQEAgLTk2LDE4ICs5NiwxMCBAQCBwdWJsaWM6CiAgICAgdGVtcGxhdGU8 Y2xhc3MgRW5jb2Rlcj4gdm9pZCBlbmNvZGUoRW5jb2RlciYpIGNvbnN0OwogICAgIHRlbXBsYXRl PGNsYXNzIERlY29kZXI+IHN0YXRpYyBib29sIGRlY29kZShEZWNvZGVyJiwgSURCR2V0UmVzdWx0 Jik7CiAKLSAgICAvLyBGSVhNRTogV2hlbiByZW1vdmluZyBMZWdhY3lJREIsIHJlbW92ZSB0aGVz ZSBzZXR0ZXJzLgotICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNTA4NTQKLQotICAgIHZvaWQgc2V0VmFsdWVCdWZmZXIoY29uc3QgVGhyZWFkU2FmZURhdGFC dWZmZXImIHZhbHVlQnVmZmVyKSB7IG1fdmFsdWVCdWZmZXIgPSB2YWx1ZUJ1ZmZlcjsgfQotICAg IHZvaWQgc2V0S2V5RGF0YShjb25zdCBJREJLZXlEYXRhJiBrZXlEYXRhKSB7IG1fa2V5RGF0YSA9 IGtleURhdGE7IH0KLSAgICB2b2lkIHNldFByaW1hcnlLZXlEYXRhKGNvbnN0IElEQktleURhdGEm IGtleURhdGEpIHsgbV9wcmltYXJ5S2V5RGF0YSA9IGtleURhdGE7IH0KLSAgICB2b2lkIHNldEtl eVBhdGgoY29uc3QgSURCS2V5UGF0aCYga2V5UGF0aCkgeyBtX2tleVBhdGggPSBrZXlQYXRoOyB9 Ci0KIHByaXZhdGU6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBkYXRhRnJvbUJ1ZmZlcihTaGFy ZWRCdWZmZXImKTsKIAotICAgIFRocmVhZFNhZmVEYXRhQnVmZmVyIG1fdmFsdWVCdWZmZXI7Cisg ICAgSURCVmFsdWUgbV92YWx1ZTsKICAgICBJREJLZXlEYXRhIG1fa2V5RGF0YTsKICAgICBJREJL ZXlEYXRhIG1fcHJpbWFyeUtleURhdGE7CiAgICAgSURCS2V5UGF0aCBtX2tleVBhdGg7CkBAIC0x MTcsMTEgKzEwOSw3IEBAIHByaXZhdGU6CiB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPgogdm9pZCBJ REJHZXRSZXN1bHQ6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewotICAgIGVuY29k ZXIgPDwgbV9rZXlEYXRhIDw8IG1fcHJpbWFyeUtleURhdGEgPDwgbV9rZXlQYXRoIDw8IG1faXNE ZWZpbmVkOwotCi0gICAgZW5jb2RlciA8PCAhIW1fdmFsdWVCdWZmZXIuZGF0YSgpOwotICAgIGlm IChtX3ZhbHVlQnVmZmVyLmRhdGEoKSkKLSAgICAgICAgZW5jb2RlciA8PCAqbV92YWx1ZUJ1ZmZl ci5kYXRhKCk7CisgICAgZW5jb2RlciA8PCBtX2tleURhdGEgPDwgbV9wcmltYXJ5S2V5RGF0YSA8 PCBtX2tleVBhdGggPDwgbV9pc0RlZmluZWQgPDwgbV92YWx1ZTsKIH0KIAogdGVtcGxhdGU8Y2xh c3MgRGVjb2Rlcj4KQEAgLTEzOSwxNyArMTI3LDkgQEAgYm9vbCBJREJHZXRSZXN1bHQ6OmRlY29k ZShEZWNvZGVyJiBkZWNvZGVyLCBJREJHZXRSZXN1bHQmIHJlc3VsdCkKICAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHJlc3VsdC5tX2lzRGVmaW5lZCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAot ICAgIGJvb2wgaGFzT2JqZWN0OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaGFzT2JqZWN0KSkK KyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3ZhbHVlKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgaWYgKGhhc09iamVjdCkgewotICAgICAgICBWZWN0b3I8dWludDhfdD4g dmFsdWU7Ci0gICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUodmFsdWUpKQotICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgICAgICByZXN1bHQubV92YWx1ZUJ1ZmZlciA9IFRocmVhZFNhZmVE YXRhQnVmZmVyOjphZG9wdFZlY3Rvcih2YWx1ZSk7Ci0gICAgfQotCiAgICAgcmV0dXJuIHRydWU7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRy YW5zYWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5z YWN0aW9uLmNwcAppbmRleCBjN2UxMGRlLi41NjE1NjNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5zYWN0aW9uLmNwcApAQCAtNzM3LDggKzcz Nyw4IEBAIHZvaWQgSURCVHJhbnNhY3Rpb246OmRpZEdldFJlY29yZE9uU2VydmVyKElEQlJlcXVl c3QmIHJlcXVlc3QsIGNvbnN0IElEQlJlc3VsdERhCiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IHJlcXVlc3Quc2V0UmVzdWx0VG9VbmRlZmluZWQoKTsKICAgICB9IGVsc2UgewotICAgICAgICBp ZiAocmVzdWx0RGF0YS5nZXRSZXN1bHQoKS52YWx1ZUJ1ZmZlcigpLmRhdGEoKSkKLSAgICAgICAg ICAgIHJlcXVlc3Quc2V0UmVzdWx0VG9TdHJ1Y3R1cmVkQ2xvbmUocmVzdWx0RGF0YS5nZXRSZXN1 bHQoKS52YWx1ZUJ1ZmZlcigpKTsKKyAgICAgICAgaWYgKHJlc3VsdERhdGEuZ2V0UmVzdWx0KCku dmFsdWUoKS5kYXRhKCkuZGF0YSgpKQorICAgICAgICAgICAgcmVxdWVzdC5zZXRSZXN1bHRUb1N0 cnVjdHVyZWRDbG9uZShyZXN1bHREYXRhLmdldFJlc3VsdCgpLnZhbHVlKCkuZGF0YSgpKTsKICAg ICAgICAgZWxzZQogICAgICAgICAgICAgcmVxdWVzdC5zZXRSZXN1bHRUb1VuZGVmaW5lZCgpOwog ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZh bHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmNwcApp bmRleCA5MjFlYzMzLi4xZDc3N2Y5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L2luZGV4ZWRkYi9JREJWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvSURCVmFsdWUuY3BwCkBAIC00Miw2ICs0MiwxMSBAQCBJREJWYWx1ZTo6SURCVmFsdWUo Y29uc3QgU2VyaWFsaXplZFNjcmlwdFZhbHVlJiBzY3JpcHRWYWx1ZSkKIHsKIH0KIAorSURCVmFs dWU6OklEQlZhbHVlKGNvbnN0IFRocmVhZFNhZmVEYXRhQnVmZmVyJiB2YWx1ZSkKKyAgICA6IG1f ZGF0YSh2YWx1ZSkKK3sKK30KKwogSURCVmFsdWU6OklEQlZhbHVlKGNvbnN0IFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZSYgc2NyaXB0VmFsdWUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBibG9iVVJMcywg Y29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JGaWxlUGF0aHMpCiAgICAgOiBtX2RhdGEoVGhyZWFk U2FmZURhdGFCdWZmZXI6OmNvcHlWZWN0b3Ioc2NyaXB0VmFsdWUuZGF0YSgpKSkKICAgICAsIG1f YmxvYlVSTHMoYmxvYlVSTHMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9JREJWYWx1ZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURC VmFsdWUuaAppbmRleCBmNDQ3MzhkLi43ZTc4MTNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJWYWx1ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL0lEQlZhbHVlLmgKQEAgLTM3LDYgKzM3LDcgQEAgY2xhc3MgSURCVmFsdWUg ewogcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIElEQlZhbHVlKCk7CiAgICAgSURCVmFsdWUo Y29uc3QgU2VyaWFsaXplZFNjcmlwdFZhbHVlJik7CisgICAgSURCVmFsdWUoY29uc3QgVGhyZWFk U2FmZURhdGFCdWZmZXImKTsKICAgICBJREJWYWx1ZShjb25zdCBTZXJpYWxpemVkU2NyaXB0VmFs dWUmLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxvYlVSTHMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBibG9iRmlsZVBhdGhzKTsKIAogICAgIElEQlZhbHVlIGlzb2xhdGVkQ29weSgpIGNvbnN0Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0 ZUlEQkJhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9z ZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcAppbmRleCA4ZGJhNTRjLi42MmVkMjlhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRl SURCQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRk Yi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcApAQCAtMTYzMCwxMCArMTYzMCw4IEBA IElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0SW5kZXhSZWNvcmQoY29uc3QgSURC UmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuCiAgICAgZWxzZSB7CiAgICAgICAgIGlmICh0eXBlID09 IEluZGV4ZWREQjo6SW5kZXhSZWNvcmRUeXBlOjpLZXkpCiAgICAgICAgICAgICBnZXRSZXN1bHQg PSB7IGN1cnNvci0+Y3VycmVudFByaW1hcnlLZXkoKSB9OwotICAgICAgICBlbHNlIHsKLSAgICAg ICAgICAgIGdldFJlc3VsdCA9IHsgU2hhcmVkQnVmZmVyOjpjcmVhdGUoY3Vyc29yLT5jdXJyZW50 VmFsdWVCdWZmZXIoKS5kYXRhKCksIGN1cnNvci0+Y3VycmVudFZhbHVlQnVmZmVyKCkuc2l6ZSgp KS5wdHIoKSB9OwotICAgICAgICAgICAgZ2V0UmVzdWx0LnNldEtleURhdGEoY3Vyc29yLT5jdXJy ZW50UHJpbWFyeUtleSgpKTsKLSAgICAgICAgfQorICAgICAgICBlbHNlCisgICAgICAgICAgICBn ZXRSZXN1bHQgPSB7IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKGN1cnNvci0+Y3VycmVudFZhbHVlQnVm ZmVyKCkuZGF0YSgpLCBjdXJzb3ItPmN1cnJlbnRWYWx1ZUJ1ZmZlcigpLnNpemUoKSksIGN1cnNv ci0+Y3VycmVudFByaW1hcnlLZXkoKSB9OwogICAgIH0KIAogICAgIHJldHVybiB7IH07Cg==