184946 2018-04-24 17:40:03 -0700 Move all calls to ResourceLoader::start to WebKitLegacy 2018-08-01 20:22:34 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen aestes cdumez dbates ews-watchlist japhet webkit-bug-importer oldest_to_newest 1417359 0 achristensen 2018-04-24 17:40:03 -0700 Move all calls to ResourceLoader::start to WebKitLegacy 1417365 1 338691 achristensen 2018-04-24 17:52:10 -0700 Created attachment 338691 Patch 1446991 2 338691 aestes 2018-08-01 14:29:22 -0700 Comment on attachment 338691 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338691&action=review > Source/WebCore/loader/ResourceLoader.h:155 > + ResourceRequest takeDeferredRequest() { return std::exchange(m_deferredRequest, ResourceRequest()); } Can ResourceRequest() be replaced with { }? 1447020 3 achristensen 2018-08-01 15:09:23 -0700 Yes! http://trac.webkit.org/r234483 1447122 4 webkit-bug-importer 2018-08-01 20:22:34 -0700 <rdar://problem/42840212> 338691 2018-04-24 17:52:10 -0700 2018-08-01 14:29:22 -0700 Patch bug-184946-20180424175210.patch text/plain 9225 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDk3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA0LTI0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBhbGwg Y2FsbHMgdG8gUmVzb3VyY2VMb2FkZXI6OnN0YXJ0IHRvIFdlYktpdExlZ2FjeQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0OTQ2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJh dGlvbiBmb3IgbW92aW5nIFJlc291cmNlTG9hZGVyOjpzdGFydCB0byBXZWJLaXRMZWdhY3kgYWxv bmcgd2l0aCBhbGwgUmVzb3VyY2VIYW5kbGUgY29kZS4KKyAgICAgICAgSSBtb3ZlIHRoZSBjb2Rl IHRoYXQgbW92ZXMgbV9kZWZlcnJlZFJlcXVlc3QgaW50byBtX3JlcXVlc3QgaW50byBXZWJLaXRM ZWdhY3ksIHdoaWNoIHdvbid0IGNoYW5nZSBiZWhhdmlvciBmb3IKKyAgICAgICAgbW9kZXJuIFdl YktpdCBiZWNhdXNlIG1vZGVybiBXZWJLaXQgbmV2ZXIgY2FsbHMgUmVzb3VyY2VMb2FkZXI6OnN0 YXJ0LCB0aGUgb25seSBwbGFjZSB3aGVyZSBtX2RlZmVycmVkUmVxdWVzdAorICAgICAgICBpcyBl dmVyIHNldC4gIFRoaXMgd29uJ3QgY2hhbmdlIGJlaGF2aW9yIGZvciBXZWJLaXRMZWdhY3kgYmVj YXVzZSB0aGUgc2FtZSBvcGVyYXRpb25zIGhhcHBlbiBpbiB0aGUgc2FtZSBvcmRlci4KKworICAg ICAgICAqIGxvYWRlci9Mb2FkZXJTdHJhdGVneS5oOgorICAgICAgICAqIGxvYWRlci9SZXNvdXJj ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6c2V0RGVmZXJz TG9hZGluZyk6CisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVyLmg6CisgICAgICAgIChX ZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6c2V0UmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZUxvYWRlcjo6ZGVmZXJyZWRSZXF1ZXN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlTG9hZGVyOjp0YWtlRGVmZXJyZWRSZXF1ZXN0KToKKwogMjAxOC0wNC0yNCAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBzaGFwZS1vdXRz aWRlIGFuZCBmaWx0ZXIgc3R5bGVzIG9jY3VyIHR3aWNlIGluIHRoZSByZXN1bHQgb2YgZ2V0Q29t cHV0ZWRTdHlsZQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0xvYWRlclN0cmF0ZWd5LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0xvYWRlclN0cmF0ZWd5LmgJKHJl dmlzaW9uIDIzMDk3NikKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Mb2FkZXJTdHJhdGVneS5o CSh3b3JraW5nIGNvcHkpCkBAIC02MCw3ICs2MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgbG9hZFJlc291cmNlU3luY2hyb25vdXNseShGcmFtZUxvYWRlciYsIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgQ2xpZW50Q3JlZGVudGlhbFBvbGlj eSwgY29uc3QgRmV0Y2hPcHRpb25zJiwgY29uc3QgSFRUUEhlYWRlck1hcCYsIFJlc291cmNlRXJy b3ImLCBSZXNvdXJjZVJlc3BvbnNlJiwgVmVjdG9yPGNoYXI+JiBkYXRhKSA9IDA7CiAKICAgICB2 aXJ0dWFsIHZvaWQgcmVtb3ZlKFJlc291cmNlTG9hZGVyKikgPSAwOwotICAgIHZpcnR1YWwgdm9p ZCBzZXREZWZlcnNMb2FkaW5nKFJlc291cmNlTG9hZGVyKiwgYm9vbCkgPSAwOworICAgIHZpcnR1 YWwgdm9pZCBzZXREZWZlcnNMb2FkaW5nKFJlc291cmNlTG9hZGVyJiwgYm9vbCkgPSAwOwogICAg IHZpcnR1YWwgdm9pZCBjcm9zc09yaWdpblJlZGlyZWN0UmVjZWl2ZWQoUmVzb3VyY2VMb2FkZXIq LCBjb25zdCBVUkwmIHJlZGlyZWN0VVJMKSA9IDA7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2VydmVQ ZW5kaW5nUmVxdWVzdHMoUmVzb3VyY2VMb2FkUHJpb3JpdHkgbWluaW11bVByaW9yaXR5ID0gUmVz b3VyY2VMb2FkUHJpb3JpdHk6OlZlcnlMb3cpID0gMDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9h ZGVyL1Jlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24gMjMwOTc2KQorKysgU291cmNlL1dlYkNv cmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjMxLDEzICsy MzEsOCBAQCB2b2lkIFJlc291cmNlTG9hZGVyOjpzZXREZWZlcnNMb2FkaW5nKGJvCiAgICAgbV9k ZWZlcnNMb2FkaW5nID0gZGVmZXJzOwogICAgIGlmIChtX2hhbmRsZSkKICAgICAgICAgbV9oYW5k bGUtPnNldERlZmVyc0xvYWRpbmcoZGVmZXJzKTsKLSAgICBpZiAoIWRlZmVycyAmJiAhbV9kZWZl cnJlZFJlcXVlc3QuaXNOdWxsKCkpIHsKLSAgICAgICAgbV9yZXF1ZXN0ID0gbV9kZWZlcnJlZFJl cXVlc3Q7Ci0gICAgICAgIG1fZGVmZXJyZWRSZXF1ZXN0ID0gUmVzb3VyY2VSZXF1ZXN0KCk7Ci0g ICAgICAgIHN0YXJ0KCk7Ci0gICAgfQogCi0gICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPmxvYWRl clN0cmF0ZWd5KCktPnNldERlZmVyc0xvYWRpbmcodGhpcywgZGVmZXJzKTsKKyAgICBwbGF0Zm9y bVN0cmF0ZWdpZXMoKS0+bG9hZGVyU3RyYXRlZ3koKS0+c2V0RGVmZXJzTG9hZGluZygqdGhpcywg ZGVmZXJzKTsKIH0KIAogRnJhbWVMb2FkZXIqIFJlc291cmNlTG9hZGVyOjpmcmFtZUxvYWRlcigp IGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuaAkocmV2aXNp b24gMjMwOTc2KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmgJKHdv cmtpbmcgY29weSkKQEAgLTEzMyw2ICsxMzMsNyBAQCBwdWJsaWM6CiAKIAogICAgIGNvbnN0IFJl c291cmNlUmVxdWVzdCYgcmVxdWVzdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVxdWVzdDsgfQorICAg IHZvaWQgc2V0UmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0KSB7IG1fcmVxdWVzdCA9 IFdURk1vdmUocmVxdWVzdCk7IH0KIAogICAgIHZvaWQgc2V0RGF0YUJ1ZmZlcmluZ1BvbGljeShE YXRhQnVmZmVyaW5nUG9saWN5KTsKIApAQCAtMTUwLDYgKzE1MSw5IEBAIHB1YmxpYzoKIAogICAg IGNvbnN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucygpIGNvbnN0IHsgcmV0dXJuIG1f b3B0aW9uczsgfQogCisgICAgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBkZWZlcnJlZFJlcXVlc3Qo KSBjb25zdCB7IHJldHVybiBtX2RlZmVycmVkUmVxdWVzdDsgfQorICAgIFJlc291cmNlUmVxdWVz dCB0YWtlRGVmZXJyZWRSZXF1ZXN0KCkgeyByZXR1cm4gc3RkOjpleGNoYW5nZShtX2RlZmVycmVk UmVxdWVzdCwgUmVzb3VyY2VSZXF1ZXN0KCkpOyB9CisKIHByb3RlY3RlZDoKICAgICBSZXNvdXJj ZUxvYWRlcihGcmFtZSYsIFJlc291cmNlTG9hZGVyT3B0aW9ucyk7CiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShy ZXZpc2lvbiAyMzA5NzcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE0IEBACisyMDE4LTA0LTI0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBhbGwgY2FsbHMgdG8gUmVzb3VyY2VM b2FkZXI6OnN0YXJ0IHRvIFdlYktpdExlZ2FjeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0OTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRl Z3kuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6c2V0RGVmZXJzTG9h ZGluZyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5Lmg6 CisKIDIwMTgtMDQtMjQgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgS2VlcCBhcm91bmQgYSBwcmUtd2FybWVkIHByb2Nlc3Mgd2hlbiBkb2luZyBwcm9jZXNzIHN3 YXAgb24gbmF2aWdhdGlvbgpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsv V2ViTG9hZGVyU3RyYXRlZ3kuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAkocmV2aXNpb24gMjMwOTc2KQorKysg U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00MjEsOSArNDIxLDkgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6 cmVtb3ZlKFJlc291cmNlTAogICAgIGxvYWRlci0+ZGV0YWNoRnJvbUNvcmVMb2FkZXIoKTsKIH0K IAotdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c2V0RGVmZXJzTG9hZGluZyhSZXNvdXJjZUxvYWRl ciogcmVzb3VyY2VMb2FkZXIsIGJvb2wgZGVmZXJzKQordm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6 c2V0RGVmZXJzTG9hZGluZyhSZXNvdXJjZUxvYWRlciYgcmVzb3VyY2VMb2FkZXIsIGJvb2wgZGVm ZXJzKQogewotICAgIFJlc291cmNlTG9hZElkZW50aWZpZXIgaWRlbnRpZmllciA9IHJlc291cmNl TG9hZGVyLT5pZGVudGlmaWVyKCk7CisgICAgUmVzb3VyY2VMb2FkSWRlbnRpZmllciBpZGVudGlm aWVyID0gcmVzb3VyY2VMb2FkZXIuaWRlbnRpZmllcigpOwogICAgIFdlYlByb2Nlc3M6OnNpbmds ZXRvbigpLmVuc3VyZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rpb24oKS5zZW5k KE1lc3NhZ2VzOjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6U2V0RGVmZXJzTG9hZGlu ZyhpZGVudGlmaWVyLCBkZWZlcnMpLCAwKTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5oCShyZXZpc2lvbiAy MzA5NzYpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJh dGVneS5oCSh3b3JraW5nIGNvcHkpCkBAIC01MSw3ICs1MSw3IEBAIHB1YmxpYzoKICAgICB2b2lk IGxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoV2ViQ29yZTo6RnJhbWVMb2FkZXImLCB1bnNpZ25l ZCBsb25nIHJlc291cmNlTG9hZElkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYsIFdlYkNvcmU6OkNsaWVudENyZWRlbnRpYWxQb2xpY3ksIGNvbnN0IFdlYkNvcmU6OkZl dGNoT3B0aW9ucyYsIGNvbnN0IFdlYkNvcmU6OkhUVFBIZWFkZXJNYXAmLCBXZWJDb3JlOjpSZXNv dXJjZUVycm9yJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYsIFZlY3RvcjxjaGFyPiYgZGF0 YSkgZmluYWw7CiAKICAgICB2b2lkIHJlbW92ZShXZWJDb3JlOjpSZXNvdXJjZUxvYWRlciopIGZp bmFsOwotICAgIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcios IGJvb2wpIGZpbmFsOworICAgIHZvaWQgc2V0RGVmZXJzTG9hZGluZyhXZWJDb3JlOjpSZXNvdXJj ZUxvYWRlciYsIGJvb2wpIGZpbmFsOwogICAgIHZvaWQgY3Jvc3NPcmlnaW5SZWRpcmVjdFJlY2Vp dmVkKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyKiwgY29uc3QgV2ViQ29yZTo6VVJMJiByZWRpcmVj dFVSTCkgZmluYWw7CiAgICAgCiAgICAgdm9pZCBzZXJ2ZVBlbmRpbmdSZXF1ZXN0cyhXZWJDb3Jl OjpSZXNvdXJjZUxvYWRQcmlvcml0eSBtaW5pbXVtUHJpb3JpdHkpIGZpbmFsOwpJbmRleDogU291 cmNlL1dlYktpdExlZ2FjeS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExl Z2FjeS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDk3NikKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTgtMDQtMjQgIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBNb3Zl IGFsbCBjYWxscyB0byBSZXNvdXJjZUxvYWRlcjo6c3RhcnQgdG8gV2ViS2l0TGVnYWN5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ5NDYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBw b3J0L1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHA6CisgICAgICAgIChXZWJSZXNvdXJjZUxv YWRTY2hlZHVsZXI6OnNldERlZmVyc0xvYWRpbmcpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5oOgorCiAyMDE4LTA0LTE2ICBZb3Vlbm4gRmFibGV0 ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgTmV0d29ya0xvYWRDaGVja2VyIHRv IGhhbmRsZSBzeW5jaHJvbm91cyBIVFRQIGxvYWRzCkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5 L1dlYkNvcmVTdXBwb3J0L1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdExlZ2FjeS9XZWJDb3JlU3VwcG9ydC9XZWJSZXNvdXJjZUxvYWRTY2hl ZHVsZXIuY3BwCShyZXZpc2lvbiAyMzA5NzYpCisrKyBTb3VyY2UvV2ViS2l0TGVnYWN5L1dlYkNv cmVTdXBwb3J0L1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE5NSw4ICsxOTUsMTIgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OnJlbW92ZShS ZQogICAgIHNjaGVkdWxlU2VydmVQZW5kaW5nUmVxdWVzdHMoKTsKIH0KIAotdm9pZCBXZWJSZXNv dXJjZUxvYWRTY2hlZHVsZXI6OnNldERlZmVyc0xvYWRpbmcoUmVzb3VyY2VMb2FkZXIqLCBib29s KQordm9pZCBXZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXI6OnNldERlZmVyc0xvYWRpbmcoUmVzb3Vy Y2VMb2FkZXImIGxvYWRlciwgYm9vbCBkZWZlcnMpCiB7CisgICAgaWYgKCFkZWZlcnMgJiYgIWxv YWRlci5kZWZlcnJlZFJlcXVlc3QoKS5pc051bGwoKSkgeworICAgICAgICBsb2FkZXIuc2V0UmVx dWVzdChsb2FkZXIudGFrZURlZmVycmVkUmVxdWVzdCgpKTsKKyAgICAgICAgbG9hZGVyLnN0YXJ0 KCk7CisgICAgfQogfQogCiB2b2lkIFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6Y3Jvc3NPcmln aW5SZWRpcmVjdFJlY2VpdmVkKFJlc291cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlciwgY29uc3Qg VVJMJiByZWRpcmVjdFVSTCkKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvV2ViQ29yZVN1cHBv cnQvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dExlZ2FjeS9XZWJDb3JlU3VwcG9ydC9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuaAkocmV2aXNp b24gMjMwOTc2KQorKysgU291cmNlL1dlYktpdExlZ2FjeS9XZWJDb3JlU3VwcG9ydC9XZWJSZXNv dXJjZUxvYWRTY2hlZHVsZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNTIsNyArNTIsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBsb2FkUmVzb3VyY2UoV2ViQ29yZTo6RnJhbWUmLCBXZWJDb3JlOjpDYWNo ZWRSZXNvdXJjZSYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZUxvYWRlck9wdGlvbnMmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFJlZlB0cjxXZWJD b3JlOjpTdWJyZXNvdXJjZUxvYWRlcj4mJik+JiYpIGZpbmFsOwogICAgIHZvaWQgbG9hZFJlc291 cmNlU3luY2hyb25vdXNseShXZWJDb3JlOjpGcmFtZUxvYWRlciYsIHVuc2lnbmVkIGxvbmcsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFdlYkNvcmU6OkNsaWVudENyZWRlbnRpYWxQ b2xpY3ksIGNvbnN0IFdlYkNvcmU6OkZldGNoT3B0aW9ucyYsIGNvbnN0IFdlYkNvcmU6OkhUVFBI ZWFkZXJNYXAmLCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiwgV2ViQ29yZTo6UmVzb3VyY2VSZXNw b25zZSYsIFZlY3RvcjxjaGFyPiYpIGZpbmFsOwogICAgIHZvaWQgcmVtb3ZlKFdlYkNvcmU6OlJl c291cmNlTG9hZGVyKikgZmluYWw7Ci0gICAgdm9pZCBzZXREZWZlcnNMb2FkaW5nKFdlYkNvcmU6 OlJlc291cmNlTG9hZGVyKiwgYm9vbCkgZmluYWw7CisgICAgdm9pZCBzZXREZWZlcnNMb2FkaW5n KFdlYkNvcmU6OlJlc291cmNlTG9hZGVyJiwgYm9vbCkgZmluYWw7CiAgICAgdm9pZCBjcm9zc09y aWdpblJlZGlyZWN0UmVjZWl2ZWQoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXIqLCBjb25zdCBXZWJD b3JlOjpVUkwmIHJlZGlyZWN0VVJMKSBmaW5hbDsKICAgICAKICAgICB2b2lkIHNlcnZlUGVuZGlu Z1JlcXVlc3RzKFdlYkNvcmU6OlJlc291cmNlTG9hZFByaW9yaXR5IG1pbmltdW1Qcmlvcml0eSA9 IFdlYkNvcmU6OlJlc291cmNlTG9hZFByaW9yaXR5OjpWZXJ5TG93KSBmaW5hbDsK