152405 2015-12-17 16:23:38 -0800 Modern IDB: Refactor when opening the backing store takes place 2015-12-18 10:32:06 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 152415 149117 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1150129 0 beidson 2015-12-17 16:23:38 -0800 Modern IDB: Refactor when opening the backing store takes place No change in behavior. 1150130 1 beidson 2015-12-17 16:24:59 -0800 (In reply to comment #0) > Modern IDB: Refactor when opening the backing store takes place > > No change in behavior. I lied - There was a subtle change in behavior, and it was caught by a test progression. 1150131 2 267596 beidson 2015-12-17 16:27:34 -0800 Created attachment 267596 Patch v1 1150153 3 267596 commit-queue 2015-12-17 17:30:38 -0800 Comment on attachment 267596 Patch v1 Clearing flags on attachment: 267596 Committed r194252: <http://trac.webkit.org/changeset/194252> 1150154 4 commit-queue 2015-12-17 17:30:41 -0800 All reviewed patches have been landed. Closing bug. 1150172 5 commit-queue 2015-12-17 18:59:39 -0800 Re-opened since this is blocked by bug 152415 1150174 6 ap 2015-12-17 19:05:30 -0800 Rolling this out together with <http://trac.webkit.org/changeset/194241>, because that one couldn't be unapplied cleanly alone. I am not aware of any problems with this patch. 1150289 7 267632 beidson 2015-12-18 09:01:18 -0800 Created attachment 267632 Patch for re-landing 1150324 8 267632 commit-queue 2015-12-18 10:32:01 -0800 Comment on attachment 267632 Patch for re-landing Clearing flags on attachment: 267632 Committed r194275: <http://trac.webkit.org/changeset/194275> 1150325 9 commit-queue 2015-12-18 10:32:06 -0800 All reviewed patches have been landed. Closing bug. 267596 2015-12-17 16:27:34 -0800 2015-12-17 17:30:38 -0800 Patch v1 patch text/plain 5213 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2NzIzZGZjLi5jODVhZTM4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTUtMTIt MTcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1vZGVybiBJ REI6IFJlZmFjdG9yIHdoZW4gb3BlbmluZyB0aGUgYmFja2luZyBzdG9yZSB0YWtlcyBwbGFjZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjQwNQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZv cm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDE1LTEyLTE3ICBSeWFuIEhhZGRhZCAg PHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIE1hcmtpbmcgZmFzdC9tZWRpYS9tcS0q IHRlc3RzIGFzIGZhaWxpbmcgb24gaW9zLXNpbXVsYXRvcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDYwNWIxM2YuLjk5Zjc4NDggMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucworKysg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTk5LDcg Kzk5LDYgQEAgc3RvcmFnZS9pbmRleGVkZGIvaW50dmVyc2lvbi1wZW5kaW5nLXZlcnNpb24tY2hh bmdlcy1zYW1lLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL2ludHZlcnNpb24t dHdvLW9wZW5zLW5vLXZlcnNpb25zLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRi L29kZC1zdHJpbmdzLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL29wZW4tZGIt cHJpdmF0ZS1icm93c2luZy5odG1sIFsgRmFpbHVyZSBdCi1zdG9yYWdlL2luZGV4ZWRkYi9vcGVu LW9yZGVyaW5nLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL3Byb3BlcnRpZXMt ZGlzYWJsZWQtYXQtcnVudGltZS5odG1sIFsgRmFpbHVyZSBdCiBzdG9yYWdlL2luZGV4ZWRkYi9z ZXR2ZXJzaW9uLWJsb2NrZWQtYnktdmVyc2lvbmNoYW5nZS1jbG9zZS5odG1sIFsgRmFpbHVyZSBd CiBzdG9yYWdlL2luZGV4ZWRkYi90cmFuc2FjdGlvbi1iYXNpY3MuaHRtbCBbIEZhaWx1cmUgXQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGI3NzdhNGMuLjc2NDZjMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMSBA QAogMjAxNS0xMi0xNyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAg ICAgTW9kZXJuIElEQjogUmVmYWN0b3Igd2hlbiBvcGVuaW5nIHRoZSBiYWNraW5nIHN0b3JlIHRh a2VzIHBsYWNlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUyNDA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIChBdCBsZWFzdCBvbmUgZmFpbGluZyB0ZXN0IG5vdyBwYXNzZXMpLgor CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6Om9wZW5E YXRhYmFzZUNvbm5lY3Rpb24pOiBNb3ZlIHRoZSAib3BlbiBiYWNraW5nIHN0b3JlIiBsb2dpYwor ICAgICAgICAgIGZyb20gaGVyZSB0byBwZXJmb3JtQ3VycmVudE9wZW5PcGVyYXRpb24uCisgICAg ICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpwZXJmb3JtQ3VycmVu dE9wZW5PcGVyYXRpb24pOiBJZiB0aGUgZGF0YWJhc2UgYmFja2luZyBzdG9yZSBpcworICAgICAg ICAgIG5vdCBvcGVuIHlldCwga2ljayBvZmYgb3BlbmluZyBpdCBoZXJlLgorICAgICAgICAoV2Vi Q29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6aGFuZGxlRGF0YWJhc2VPcGVyYXRp b25zKTogUmV3b3JrIHRoaXMgc3R1ZmYgdG8gYmUgYmV0dGVyLgorCisyMDE1LTEyLTE3ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBNb2Rlcm4gSURCOiBSZWZh Y3RvciBvcGVuL2RlbGV0ZSByZXF1ZXN0cyB0byBleGlzdCBpbiB0aGUgc2FtZSBxdWV1ZS4KICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjM5NwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVl SURCRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVy L1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAppbmRleCAwMjFhMDg0Li5mNjlkNzM4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJh c2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9Vbmlx dWVJREJEYXRhYmFzZS5jcHAKQEAgLTc1LDEzICs3NSw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJh c2U6Om9wZW5EYXRhYmFzZUNvbm5lY3Rpb24oSURCQ29ubmVjdGlvblRvQ2xpZW50JiBjb25uZWN0 aW9uCiAgICAgaWYgKG1faXNPcGVuaW5nQmFja2luZ1N0b3JlKQogICAgICAgICByZXR1cm47CiAK LSAgICBpZiAobV9kYXRhYmFzZUluZm8pIHsKLSAgICAgICAgaGFuZGxlRGF0YWJhc2VPcGVyYXRp b25zKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBtX2lzT3BlbmluZ0JhY2tpbmdT dG9yZSA9IHRydWU7Ci0gICAgbV9zZXJ2ZXIucG9zdERhdGFiYXNlVGFzayhjcmVhdGVDcm9zc1Ro cmVhZFRhc2soKnRoaXMsICZVbmlxdWVJREJEYXRhYmFzZTo6b3BlbkJhY2tpbmdTdG9yZSwgbV9p ZGVudGlmaWVyKSk7CisgICAgaGFuZGxlRGF0YWJhc2VPcGVyYXRpb25zKCk7CiB9CiAKIGJvb2wg VW5pcXVlSURCRGF0YWJhc2U6Omhhc0FueVBlbmRpbmdDYWxsYmFja3MoKSBjb25zdApAQCAtMTA5 LDYgKzEwMywxMiBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpwZXJmb3JtQ3VycmVudE9wZW5P cGVyYXRpb24oKQogICAgIEFTU0VSVChtX2N1cnJlbnRPcGVyYXRpb24pOwogICAgIEFTU0VSVCht X2N1cnJlbnRPcGVyYXRpb24tPmlzT3BlblJlcXVlc3QoKSk7CiAKKyAgICBpZiAoIW1fZGF0YWJh c2VJbmZvKSB7CisgICAgICAgIG1faXNPcGVuaW5nQmFja2luZ1N0b3JlID0gdHJ1ZTsKKyAgICAg ICAgbV9zZXJ2ZXIucG9zdERhdGFiYXNlVGFzayhjcmVhdGVDcm9zc1RocmVhZFRhc2soKnRoaXMs ICZVbmlxdWVJREJEYXRhYmFzZTo6b3BlbkJhY2tpbmdTdG9yZSwgbV9pZGVudGlmaWVyKSk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICAvLyBJZiB3ZSBwcmV2aW91c2x5IHN0YXJ0ZWQg YSB2ZXJzaW9uIGNoYW5nZSBvcGVyYXRpb24gYnV0IHdlcmUgYmxvY2tlZCBieSBoYXZpbmcgb3Bl biBjb25uZWN0aW9ucywKICAgICAvLyB3ZSBtaWdodCBub3cgYmUgdW5ibG9ja2VkLgogICAgIGlm IChtX3ZlcnNpb25DaGFuZ2VEYXRhYmFzZUNvbm5lY3Rpb24pIHsKQEAgLTIwNiwxOCArMjA2LDI0 IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmhhbmRsZURhdGFiYXNlT3BlcmF0aW9ucygpCiAg ICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBMT0coSW5kZXhlZERCLCAiKG1haW4pIFVu aXF1ZUlEQkRhdGFiYXNlOjpoYW5kbGVEYXRhYmFzZU9wZXJhdGlvbnMgLSBUaGVyZSBhcmUgJXp1 IHBlbmRpbmciLCBtX3BlbmRpbmdEYXRhYmFzZU9wZXJhdGlvbnMuc2l6ZSgpKTsKIAotICAgIGlm IChtX3BlbmRpbmdEYXRhYmFzZU9wZXJhdGlvbnMuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47 Ci0KICAgICBpZiAobV92ZXJzaW9uQ2hhbmdlRGF0YWJhc2VDb25uZWN0aW9uIHx8IG1fY3VycmVu dE9wZXJhdGlvbikgewogICAgICAgICAvLyBXZSBjYW4ndCBzdGFydCB0aGUgbmV4dCBkYXRhYmFz ZSBvcGVyYXRpb24gcXVpdGUgeWV0LCBidXQgd2UgbWlnaHQgbmVlZCB0byBub3RpZnkgYWxsIG9w ZW4gY29ubmVjdGlvbnMKICAgICAgICAgLy8gYWJvdXQgYSBwZW5kaW5nIGRlbGV0ZS4KLSAgICAg ICAgaWYgKG1fcGVuZGluZ0RhdGFiYXNlT3BlcmF0aW9ucy5maXJzdCgpLT5pc0RlbGV0ZVJlcXVl c3QoKSAmJiAhbV9oYXNOb3RpZmllZENvbm5lY3Rpb25zT2ZEZWxldGUpIHsKKyAgICAgICAgaWYg KCFtX3BlbmRpbmdEYXRhYmFzZU9wZXJhdGlvbnMuaXNFbXB0eSgpICYmIG1fcGVuZGluZ0RhdGFi YXNlT3BlcmF0aW9ucy5maXJzdCgpLT5pc0RlbGV0ZVJlcXVlc3QoKSAmJiAhbV9oYXNOb3RpZmll ZENvbm5lY3Rpb25zT2ZEZWxldGUpIHsKICAgICAgICAgICAgIG1faGFzTm90aWZpZWRDb25uZWN0 aW9uc09mRGVsZXRlID0gdHJ1ZTsKICAgICAgICAgICAgIG5vdGlmeUNvbm5lY3Rpb25zT2ZWZXJz aW9uQ2hhbmdlKDApOwogICAgICAgICB9CisKKyAgICAgICAgLy8gU29tZSBvcGVyYXRpb25zIChz dWNoIGFzIHRoZSBmaXJzdCBvcGVuIG9wZXJhdGlvbiBhZnRlciBhIGRlbGV0ZSkgcmVxdWlyZSBt dWx0aXBsZSBwYXNzZXMgdG8gY29tcGxldGVseSBoYW5kbGUKKyAgICAgICAgaWYgKG1fY3VycmVu dE9wZXJhdGlvbikKKyAgICAgICAgICAgIGhhbmRsZUN1cnJlbnRPcGVyYXRpb24oKTsKKworICAg ICAgICByZXR1cm47CiAgICAgfQogCisgICAgaWYgKG1fcGVuZGluZ0RhdGFiYXNlT3BlcmF0aW9u cy5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKwogICAgIG1fY3VycmVudE9wZXJhdGlvbiA9 IG1fcGVuZGluZ0RhdGFiYXNlT3BlcmF0aW9ucy50YWtlRmlyc3QoKTsKICAgICBMT0coSW5kZXhl ZERCLCAiVW5pcXVlSURCRGF0YWJhc2U6OmhhbmRsZURhdGFiYXNlT3BlcmF0aW9ucyAtIFBvcHBl ZCBhbiBvcGVyYXRpb24sIG5vdyB0aGVyZSBhcmUgJXp1IHBlbmRpbmciLCBtX3BlbmRpbmdEYXRh YmFzZU9wZXJhdGlvbnMuc2l6ZSgpKTsKIAo= 267632 2015-12-18 09:01:18 -0800 2015-12-18 10:32:01 -0800 Patch for re-landing patch text/plain 5193 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjYzBiNzNjLi5kMDgyZWNhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTUtMTIt MTcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1vZGVybiBJ REI6IFJlZmFjdG9yIHdoZW4gb3BlbmluZyB0aGUgYmFja2luZyBzdG9yZSB0YWtlcyBwbGFjZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjQwNQor CisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTUtMTItMTggIE1pY2hhZWwgQ2F0 YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFVucmV2aWV3 ZWQgZ2FyZGVuaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rl c3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3Rh dGlvbnMKaW5kZXggYTAyYjg5OS4uOTZlMGU5MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L21hYy13azEvVGVzdEV4cGVjdGF0aW9ucwpAQCAtOTksNyArOTksNiBAQCBzdG9yYWdlL2luZGV4 ZWRkYi9pbnR2ZXJzaW9uLXBlbmRpbmctdmVyc2lvbi1jaGFuZ2VzLXNhbWUuaHRtbCBbIEZhaWx1 cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvaW50dmVyc2lvbi10d28tb3BlbnMtbm8tdmVyc2lvbnMu aHRtbCBbIEZhaWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvb2RkLXN0cmluZ3MuaHRtbCBbIEZh aWx1cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvb3Blbi1kYi1wcml2YXRlLWJyb3dzaW5nLmh0bWwg WyBGYWlsdXJlIF0KLXN0b3JhZ2UvaW5kZXhlZGRiL29wZW4tb3JkZXJpbmcuaHRtbCBbIEZhaWx1 cmUgXQogc3RvcmFnZS9pbmRleGVkZGIvcHJvcGVydGllcy1kaXNhYmxlZC1hdC1ydW50aW1lLmh0 bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL3NldHZlcnNpb24tYmxvY2tlZC1ieS12 ZXJzaW9uY2hhbmdlLWNsb3NlLmh0bWwgWyBGYWlsdXJlIF0KIHN0b3JhZ2UvaW5kZXhlZGRiL3Ry YW5zYWN0aW9uLWJhc2ljcy5odG1sIFsgRmFpbHVyZSBdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc4ZjhhMS4u MGM1OTJmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE1LTEyLTE3ICBCcmFkeSBF aWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAorICAgICAgICBNb2Rlcm4gSURCOiBSZWZhY3Rv ciB3aGVuIG9wZW5pbmcgdGhlIGJhY2tpbmcgc3RvcmUgdGFrZXMgcGxhY2UuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI0MDUKKworICAgICAgICBS ZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoQXQg bGVhc3Qgb25lIGZhaWxpbmcgdGVzdCBub3cgcGFzc2VzKS4KKworICAgICAgICAqIE1vZHVsZXMv aW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpvcGVuRGF0YWJhc2VDb25uZWN0aW9uKTog TW92ZSB0aGUgIm9wZW4gYmFja2luZyBzdG9yZSIgbG9naWMKKyAgICAgICAgICBmcm9tIGhlcmUg dG8gcGVyZm9ybUN1cnJlbnRPcGVuT3BlcmF0aW9uLgorICAgICAgICAoV2ViQ29yZTo6SURCU2Vy dmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6cGVyZm9ybUN1cnJlbnRPcGVuT3BlcmF0aW9uKTogSWYg dGhlIGRhdGFiYXNlIGJhY2tpbmcgc3RvcmUgaXMKKyAgICAgICAgICBub3Qgb3BlbiB5ZXQsIGtp Y2sgb2ZmIG9wZW5pbmcgaXQgaGVyZS4KKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5p cXVlSURCRGF0YWJhc2U6OmhhbmRsZURhdGFiYXNlT3BlcmF0aW9ucyk6IFJld29yayB0aGlzIHN0 dWZmIHRvIGJlIGJldHRlci4KKworMjAxNS0xMi0xNyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBh cHBsZS5jb20+CisKICAgICAgICAgTW9kZXJuIElEQjogUmVmYWN0b3Igb3Blbi9kZWxldGUgcmVx dWVzdHMgdG8gZXhpc3QgaW4gdGhlIHNhbWUgcXVldWUuCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTIzOTcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5j cHAKaW5kZXggOTE0MDllYy4uNzFmNjVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCkBA IC03NSwxMyArNzUsNyBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpvcGVuRGF0YWJhc2VDb25u ZWN0aW9uKElEQkNvbm5lY3Rpb25Ub0NsaWVudCYgY29ubmVjdGlvbgogICAgIGlmIChtX2lzT3Bl bmluZ0JhY2tpbmdTdG9yZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fZGF0YWJhc2VJ bmZvKSB7Ci0gICAgICAgIGhhbmRsZURhdGFiYXNlT3BlcmF0aW9ucygpOwotICAgICAgICByZXR1 cm47Ci0gICAgfQotCi0gICAgbV9pc09wZW5pbmdCYWNraW5nU3RvcmUgPSB0cnVlOwotICAgIG1f c2VydmVyLnBvc3REYXRhYmFzZVRhc2soY3JlYXRlQ3Jvc3NUaHJlYWRUYXNrKCp0aGlzLCAmVW5p cXVlSURCRGF0YWJhc2U6Om9wZW5CYWNraW5nU3RvcmUsIG1faWRlbnRpZmllcikpOworICAgIGhh bmRsZURhdGFiYXNlT3BlcmF0aW9ucygpOwogfQogCiBib29sIFVuaXF1ZUlEQkRhdGFiYXNlOjpo YXNBbnlQZW5kaW5nQ2FsbGJhY2tzKCkgY29uc3QKQEAgLTEwOSw2ICsxMDMsMTIgQEAgdm9pZCBV bmlxdWVJREJEYXRhYmFzZTo6cGVyZm9ybUN1cnJlbnRPcGVuT3BlcmF0aW9uKCkKICAgICBBU1NF UlQobV9jdXJyZW50T3BlcmF0aW9uKTsKICAgICBBU1NFUlQobV9jdXJyZW50T3BlcmF0aW9uLT5p c09wZW5SZXF1ZXN0KCkpOwogCisgICAgaWYgKCFtX2RhdGFiYXNlSW5mbykgeworICAgICAgICBt X2lzT3BlbmluZ0JhY2tpbmdTdG9yZSA9IHRydWU7CisgICAgICAgIG1fc2VydmVyLnBvc3REYXRh YmFzZVRhc2soY3JlYXRlQ3Jvc3NUaHJlYWRUYXNrKCp0aGlzLCAmVW5pcXVlSURCRGF0YWJhc2U6 Om9wZW5CYWNraW5nU3RvcmUsIG1faWRlbnRpZmllcikpOworICAgICAgICByZXR1cm47CisgICAg fQorCiAgICAgLy8gSWYgd2UgcHJldmlvdXNseSBzdGFydGVkIGEgdmVyc2lvbiBjaGFuZ2Ugb3Bl cmF0aW9uIGJ1dCB3ZXJlIGJsb2NrZWQgYnkgaGF2aW5nIG9wZW4gY29ubmVjdGlvbnMsCiAgICAg Ly8gd2UgbWlnaHQgbm93IGJlIHVuYmxvY2tlZC4KICAgICBpZiAobV92ZXJzaW9uQ2hhbmdlRGF0 YWJhc2VDb25uZWN0aW9uKSB7CkBAIC0yMDYsMTggKzIwNiwyNCBAQCB2b2lkIFVuaXF1ZUlEQkRh dGFiYXNlOjpoYW5kbGVEYXRhYmFzZU9wZXJhdGlvbnMoKQogICAgIEFTU0VSVChpc01haW5UaHJl YWQoKSk7CiAgICAgTE9HKEluZGV4ZWREQiwgIihtYWluKSBVbmlxdWVJREJEYXRhYmFzZTo6aGFu ZGxlRGF0YWJhc2VPcGVyYXRpb25zIC0gVGhlcmUgYXJlICV6dSBwZW5kaW5nIiwgbV9wZW5kaW5n RGF0YWJhc2VPcGVyYXRpb25zLnNpemUoKSk7CiAKLSAgICBpZiAobV9wZW5kaW5nRGF0YWJhc2VP cGVyYXRpb25zLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgaWYgKG1fdmVyc2lv bkNoYW5nZURhdGFiYXNlQ29ubmVjdGlvbiB8fCBtX2N1cnJlbnRPcGVyYXRpb24pIHsKICAgICAg ICAgLy8gV2UgY2FuJ3Qgc3RhcnQgdGhlIG5leHQgZGF0YWJhc2Ugb3BlcmF0aW9uIHF1aXRlIHll dCwgYnV0IHdlIG1pZ2h0IG5lZWQgdG8gbm90aWZ5IGFsbCBvcGVuIGNvbm5lY3Rpb25zCiAgICAg ICAgIC8vIGFib3V0IGEgcGVuZGluZyBkZWxldGUuCi0gICAgICAgIGlmIChtX3BlbmRpbmdEYXRh YmFzZU9wZXJhdGlvbnMuZmlyc3QoKS0+aXNEZWxldGVSZXF1ZXN0KCkgJiYgIW1faGFzTm90aWZp ZWRDb25uZWN0aW9uc09mRGVsZXRlKSB7CisgICAgICAgIGlmICghbV9wZW5kaW5nRGF0YWJhc2VP cGVyYXRpb25zLmlzRW1wdHkoKSAmJiBtX3BlbmRpbmdEYXRhYmFzZU9wZXJhdGlvbnMuZmlyc3Qo KS0+aXNEZWxldGVSZXF1ZXN0KCkgJiYgIW1faGFzTm90aWZpZWRDb25uZWN0aW9uc09mRGVsZXRl KSB7CiAgICAgICAgICAgICBtX2hhc05vdGlmaWVkQ29ubmVjdGlvbnNPZkRlbGV0ZSA9IHRydWU7 CiAgICAgICAgICAgICBub3RpZnlDb25uZWN0aW9uc09mVmVyc2lvbkNoYW5nZSgwKTsKICAgICAg ICAgfQorCisgICAgICAgIC8vIFNvbWUgb3BlcmF0aW9ucyAoc3VjaCBhcyB0aGUgZmlyc3Qgb3Bl biBvcGVyYXRpb24gYWZ0ZXIgYSBkZWxldGUpIHJlcXVpcmUgbXVsdGlwbGUgcGFzc2VzIHRvIGNv bXBsZXRlbHkgaGFuZGxlCisgICAgICAgIGlmIChtX2N1cnJlbnRPcGVyYXRpb24pCisgICAgICAg ICAgICBoYW5kbGVDdXJyZW50T3BlcmF0aW9uKCk7CisKKyAgICAgICAgcmV0dXJuOwogICAgIH0K IAorICAgIGlmIChtX3BlbmRpbmdEYXRhYmFzZU9wZXJhdGlvbnMuaXNFbXB0eSgpKQorICAgICAg ICByZXR1cm47CisKICAgICBtX2N1cnJlbnRPcGVyYXRpb24gPSBtX3BlbmRpbmdEYXRhYmFzZU9w ZXJhdGlvbnMudGFrZUZpcnN0KCk7CiAgICAgTE9HKEluZGV4ZWREQiwgIlVuaXF1ZUlEQkRhdGFi YXNlOjpoYW5kbGVEYXRhYmFzZU9wZXJhdGlvbnMgLSBQb3BwZWQgYW4gb3BlcmF0aW9uLCBub3cg dGhlcmUgYXJlICV6dSBwZW5kaW5nIiwgbV9wZW5kaW5nRGF0YWJhc2VPcGVyYXRpb25zLnNpemUo KSk7CiAK