101812 2012-11-09 16:26:17 -0800 Implement NetworkProcess willSendRequest 2012-11-13 20:36:57 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 98537 1 beidson beidson andersca ap levin+threading sam webkit.review.bot oldest_to_newest 763443 0 beidson 2012-11-09 16:26:17 -0800 Implement NetworkProcess willSendRequest Because we're getting network callbacks on a background thread this requires up to jump through a couple of hoops to get the message to the WebProcess synchronously. Fortunately those hoops follow an established pattern we've used in other places already. 763448 1 173396 beidson 2012-11-09 16:34:10 -0800 Created attachment 173396 Patch v1 763463 2 beidson 2012-11-09 16:54:06 -0800 http://trac.webkit.org/changeset/134137 173396 2012-11-09 16:34:10 -0800 2012-11-09 16:38:39 -0800 Patch v1 patch.txt text/plain 12837 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxOTk0MDIyLi5hYmQ2ZmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDEg QEAKIDIwMTItMTEtMDkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIEltcGxlbWVudCBOZXR3b3JrUHJvY2VzcyB3aWxsU2VuZFJlcXVlc3QKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTgxMgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lc3NhZ2UgdG8gdGhlIFdlYlBy b2Nlc3MgdG8gZ2V0IHRoZSBuZXcgcmVxdWVzdCwgaWYgYW55LgorCisgICAgICAgIEJlY2F1c2Ug bmV0d29yayBjYWxsYmFja3MgYXJlIGNvbWluZyBpbiBvbiBhIGJhY2tncm91bmQgdGhyZWFkIHdl IGhhdmUgdG8ganVtcCB0aHJvdWdoIGhvb3BzIHRvIHN5bmNocm9ub3VzbHkKKyAgICAgICAgYXNr IHRoZSBXZWJQcm9jZXNzLCBidXQgdGhlc2UgaG9vcHMgZm9sbG93IGFuIGVzdGFibGlzaGVkIHBh dHRlcm4gb2YgdXNpbmcgYXN5bmMgbWVzc2FnaW5nIHdpdGggQmxvY2tpbmdSZXNvdXJjZU1hcC4K KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6Ondp bGxTZW5kUmVxdWVzdEhhbmRsZWQpOiBQYXNzIHRoZSBuZXcgcmVxdWVzdCBiYWNrIHRvIE5ldHdv cmtSZXF1ZXN0IGZvciBoYW5kbGluZy4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluOgorCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvTmV0d29ya1JlcXVlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVx dWVzdDo6ZGlkRmFpbCk6CisgICAgICAgIChXZWJLaXQ6OnJlc3BvbnNlTWFwKToKKyAgICAgICAg KFdlYktpdDo6Z2VuZXJhdGVXaWxsU2VuZFJlcXVlc3RJRCk6CisgICAgICAgIChXZWJLaXQ6OmRp ZFJlY2VpdmVXaWxsU2VuZFJlcXVlc3RIYW5kbGVkKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a1JlcXVlc3Q6OndpbGxTZW5kUmVxdWVzdCk6IEFzeW5jaHJvbm91c2x5IG1lc3NhZ2UgdGhlIFdl YlByb2Nlc3MgYnV0IHN5bmNocm9ub3VzIHdhaXQgZm9yIGEgcmVwbHkgYmFjay4KKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVxdWVzdC5oOgorCisgICAgICAgICogV2ViUHJvY2Vz cy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6 Ok5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6d2lsbFNlbmRSZXF1ZXN0KTogQXNrIHRoZSBXZWJS ZXNvdXJjZUxvYWRTY2hlZHVsZXIgZm9yIHRoZSBuZXcgcmVxdWVzdCB0aGVuCisgICAgICAgICAg bWVzc2FnZSBiYWNrIHRvIHRoZSBOZXR3b3JrUHJvY2VzcyB3aXRoIHRoZSByZXBseS4KKyAgICAg ICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uLmg6CisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uLm1lc3Nh Z2VzLmluOgorCisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNj aGVkdWxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6 d2lsbFNlbmRSZXF1ZXN0KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3Vy Y2VMb2FkU2NoZWR1bGVyLmg6CisKKzIwMTItMTEtMDkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25A YXBwbGUuY29tPgorCiAgICAgICAgIEltcGxlbWVudCBXZWJSZXNvdXJjZUJ1ZmZlcjo6aXNFbXB0 eSgpCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE4 MDUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCmluZGV4IGY5YmQ1YWYuLmVkMGQ5MzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0 aW9uVG9XZWJQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2lu Y2x1ZGUgIkNvbm5lY3Rpb25TdGFjay5oIgogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzLmgiCisj aW5jbHVkZSAiTmV0d29ya1JlcXVlc3QuaCIKICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlUmVx dWVzdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUnVuTG9vcC5oPgogCkBAIC0xNDgsNiArMTQ5LDEx IEBAIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnNldFNlcmlhbExvYWRpbmdF bmFibGVkKGJvb2wgZW5hYmxlZCkKICAgICBtX3NlcmlhbExvYWRpbmdFbmFibGVkID0gZW5hYmxl ZDsKIH0KIAordm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6d2lsbFNlbmRSZXF1 ZXN0SGFuZGxlZCh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYgbmV3UmVxdWVzdCkKK3sKKyAgICBkaWRSZWNlaXZlV2lsbFNlbmRSZXF1ZXN0SGFuZGxl ZChyZXF1ZXN0SUQsIG5ld1JlcXVlc3QpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAog I2VuZGlmIC8vIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oIGIvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3Mu aAppbmRleCAyM2VlOTg0Li45MWYwMmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmgKQEAg LTgyLDYgKzgyLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHN1c3BlbmRQZW5kaW5nUmVxdWVzdHMo KTsKICAgICB2b2lkIHJlc3VtZVBlbmRpbmdSZXF1ZXN0cygpOwogICAgIHZvaWQgc2V0U2VyaWFs TG9hZGluZ0VuYWJsZWQoYm9vbCk7CisgICAgdm9pZCB3aWxsU2VuZFJlcXVlc3RIYW5kbGVkKHVp bnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Jik7CiAgICAg CiAgICAgUmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+IG1fY29ubmVjdGlvbjsKICAgICAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9u VG9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KaW5kZXggZGY3ODVhMS4u ZmFmNDRhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29y a0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MubWVzc2FnZXMuaW4K QEAgLTQyLDYgKzQyLDggQEAgbWVzc2FnZXMgLT4gTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3MgewogICAgIFJlc3VtZVBlbmRpbmdSZXF1ZXN0cygpIC0+ICgpCiAgICAgCiAgICAgU2V0U2Vy aWFsTG9hZGluZ0VuYWJsZWQoYm9vbCBlbmFibGVkKSAtPiAoKQorICAgIAorICAgIFdpbGxTZW5k UmVxdWVzdEhhbmRsZWQodWludDY0X3QgcmVxdWVzdElELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QgbmV3UmVxdWVzdCkKIH0KIAogI2VuZGlmIC8vIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVxdWVzdC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVxdWVzdC5jcHAKaW5k ZXggNmQ4MDlkOS4uMGQ2OTIyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvTmV0d29ya1JlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXF1ZXN0LmNwcApAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgRU5BQkxFKE5F VFdPUktfUFJPQ0VTUykKIAorI2luY2x1ZGUgIkJsb2NraW5nUmVzcG9uc2VNYXAuaCIKICNpbmNs dWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3Mu aCIKICNpbmNsdWRlICJOZXR3b3JrUHJvY2Vzcy5oIgpAQCAtMTc1LDcgKzE3Niw3IEBAIHZvaWQg TmV0d29ya1JlcXVlc3Q6OmRpZEZpbmlzaExvYWRpbmcoUmVzb3VyY2VIYW5kbGUqLCBkb3VibGUg ZmluaXNoVGltZSkKICAgICBzY2hlZHVsZVN0b3BPbk1haW5UaHJlYWQoKTsKIH0KIAotdm9pZCBO ZXR3b3JrUmVxdWVzdDo6ZGlkRmFpbChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yKQordm9pZCBOZXR3b3JrUmVxdWVzdDo6ZGlkRmFp bChSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogewogICAgIGNv bm5lY3Rpb25Ub1dlYlByb2Nlc3MoKS0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpOZXR3 b3JrUHJvY2Vzc0Nvbm5lY3Rpb246OkRpZEZhaWxSZXNvdXJjZUxvYWQobV9pZGVudGlmaWVyLCBl cnJvciksIDApOwogICAgIHNjaGVkdWxlU3RvcE9uTWFpblRocmVhZCgpOwpAQCAtMTg0LDkgKzE4 NSwzNSBAQCB2b2lkIE5ldHdvcmtSZXF1ZXN0OjpkaWRGYWlsKFdlYkNvcmU6OlJlc291cmNlSGFu ZGxlKiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcgogLy8gRklYTUUgKE5ldHdvcmtQcm9jZXNz KTogTWFueSBvZiB0aGUgZm9sbG93aW5nIFJlc291cmNlSGFuZGxlQ2xpZW50IG1ldGhvZHMgZGVm aW5pdGVseSBuZWVkIGltcGxlbWVudGF0aW9ucy4gQSBmZXcgd2lsbCBub3QuCiAvLyBPbmNlIHdl IGtub3cgd2hhdCB0aGV5IGFyZSB0aGV5IGNhbiBiZSByZW1vdmVkLgogCi12b2lkIE5ldHdvcmtS ZXF1ZXN0Ojp3aWxsU2VuZFJlcXVlc3QoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiAvKnJl ZGlyZWN0UmVzcG9uc2UqLykKKworc3RhdGljIEJsb2NraW5nUmVzcG9uc2VNYXA8UmVzb3VyY2VS ZXF1ZXN0Kj4mIHJlc3BvbnNlTWFwKCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIEF0 b21pY2FsbHlJbml0aWFsaXplZFN0YXRpYyhCbG9ja2luZ1Jlc3BvbnNlTWFwPFJlc291cmNlUmVx dWVzdCo+JiwgcmVzcG9uc2VNYXAgPSAqbmV3IEJsb2NraW5nUmVzcG9uc2VNYXA8UmVzb3VyY2VS ZXF1ZXN0Kj4pOworICAgIHJldHVybiByZXNwb25zZU1hcDsKK30KKworc3RhdGljIHVpbnQ2NF90 IGdlbmVyYXRlV2lsbFNlbmRSZXF1ZXN0SUQoKQoreworICAgIHN0YXRpYyBpbnQ2NF90IHVuaXF1 ZVdpbGxTZW5kUmVxdWVzdElEOworICAgIHJldHVybiBPU0F0b21pY0luY3JlbWVudDY0QmFycmll cigmdW5pcXVlV2lsbFNlbmRSZXF1ZXN0SUQpOworfQorCit2b2lkIGRpZFJlY2VpdmVXaWxsU2Vu ZFJlcXVlc3RIYW5kbGVkKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0KQoreworICAgIHJlc3BvbnNlTWFwKCkuZGlkUmVjZWl2ZVJlc3BvbnNlKHJlcXVl c3RJRCwgYWRvcHRQdHIobmV3IFJlc291cmNlUmVxdWVzdChyZXF1ZXN0KSkpOworfQorCit2b2lk IE5ldHdvcmtSZXF1ZXN0Ojp3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VIYW5kbGUqLCBSZXNvdXJj ZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9u c2UpCit7CisgICAgdWludDY0X3QgcmVxdWVzdElEID0gZ2VuZXJhdGVXaWxsU2VuZFJlcXVlc3RJ RCgpOworCisgICAgaWYgKCFjb25uZWN0aW9uVG9XZWJQcm9jZXNzKCktPmNvbm5lY3Rpb24oKS0+ c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOjpXaWxsU2VuZFJlcXVlc3Qo cmVxdWVzdElELCBtX2lkZW50aWZpZXIsIHJlcXVlc3QsIHJlZGlyZWN0UmVzcG9uc2UpLCAwKSkg eworICAgICAgICAvLyBGSVhNRSAoTmV0d29ya1Byb2Nlc3MpOiBXaGF0IHNob3VsZCB3ZSBkbyBp ZiB3ZSBjYW4ndCBzZW5kIHRoZSBtZXNzYWdlPworICAgICAgICByZXR1cm47CisgICAgfQorICAg IAorICAgIE93blB0cjxSZXNvdXJjZVJlcXVlc3Q+IG5ld1JlcXVlc3QgPSByZXNwb25zZU1hcCgp LndhaXRGb3JSZXNwb25zZShyZXF1ZXN0SUQpOworICAgIHJlcXVlc3QgPSAqbmV3UmVxdWVzdDsK IH0KIAogdm9pZCBOZXR3b3JrUmVxdWVzdDo6ZGlkU2VuZERhdGEoV2ViQ29yZTo6UmVzb3VyY2VI YW5kbGUqLCB1bnNpZ25lZCBsb25nIGxvbmcgLypieXRlc1NlbnQqLywgdW5zaWduZWQgbG9uZyBs b25nIC8qdG90YWxCeXRlc1RvQmVTZW50Ki8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVxdWVzdC5oIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvTmV0d29ya1JlcXVlc3QuaAppbmRleCBjYjAxOWE2Li4yNDQ3ODk4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVxdWVzdC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXF1ZXN0LmgKQEAgLTExNyw2ICsx MTcsOCBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxXZWJDb3JlOjpSZXNvdXJjZUJ1ZmZlcj4gbV9i dWZmZXI7CiB9OwogCit2b2lkIGRpZFJlY2VpdmVXaWxsU2VuZFJlcXVlc3RIYW5kbGVkKHVpbnQ2 NF90IHJlcXVlc3RJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Jik7CisKIH0gLy8g bmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vz c0Nvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL05ldHdv cmtQcm9jZXNzQ29ubmVjdGlvbi5jcHAKaW5kZXggNjllMzA0MS4uMTU3YTI4NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzQ29ubmVj dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQ cm9jZXNzQ29ubmVjdGlvbi5jcHAKQEAgLTI2LDYgKzI2LDggQEAKICNpbmNsdWRlICJjb25maWcu aCIKICNpbmNsdWRlICJOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24uaCIKIAorI2luY2x1ZGUgIk5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzTWVzc2FnZXMuaCIKKyNpbmNsdWRlICJXZWJDb3Jl QXJndW1lbnRDb2RlcnMuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSAiV2Vi UmVzb3VyY2VCdWZmZXIuaCIKICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlQnVmZmVyLmg+CkBA IC03MCw2ICs3MiwxNCBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6ZGlkUmVjZWl2 ZUludmFsaWRNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDbwogewogfQogCit2b2lkIE5l dHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6d2lsbFNlbmRSZXF1ZXN0KHVpbnQ2NF90IHJlcXVlc3RJ RCwgUmVzb3VyY2VMb2FkSWRlbnRpZmllciByZXNvdXJjZUxvYWRJZGVudGlmaWVyLCBjb25zdCBS ZXNvdXJjZVJlcXVlc3QmIHByb3Bvc2VkUmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYg cmVkaXJlY3RSZXNwb25zZSkKK3sKKyAgICBSZXNvdXJjZVJlcXVlc3QgbmV3UmVxdWVzdCA9IHBy b3Bvc2VkUmVxdWVzdDsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS53ZWJSZXNvdXJjZUxvYWRT Y2hlZHVsZXIoKS53aWxsU2VuZFJlcXVlc3QocmVzb3VyY2VMb2FkSWRlbnRpZmllciwgbmV3UmVx dWVzdCwgcmVkaXJlY3RSZXNwb25zZSk7CisKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5uZXR3 b3JrQ29ubmVjdGlvbigpLT5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtDb25u ZWN0aW9uVG9XZWJQcm9jZXNzOjpXaWxsU2VuZFJlcXVlc3RIYW5kbGVkKHJlcXVlc3RJRCwgbmV3 UmVxdWVzdCksIDApOworfQorCiB2b2lkIE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKFJlc291cmNlTG9hZElkZW50aWZpZXIgcmVzb3VyY2VMb2FkSWRlbnRpZmll ciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CiAgICAgV2ViUHJvY2Vzczo6 c2hhcmVkKCkud2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyKCkuZGlkUmVjZWl2ZVJlc3BvbnNlKHJl c291cmNlTG9hZElkZW50aWZpZXIsIHJlc3BvbnNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24uaCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24uaApp bmRleCBhZmE0MGQzLi4xMjU5N2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbi5oCkBAIC0zNSw2 ICszNSw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFJlc291cmNlRXJyb3I7Citj bGFzcyBSZXNvdXJjZVJlcXVlc3Q7CiBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwogfQogCkBAIC02 Myw2ICs2NCw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGRpZFJlY2VpdmVOZXR3b3JrUHJvY2Vz c0Nvbm5lY3Rpb25NZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdl SUQsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CiAKKyAgICB2b2lkIHdpbGxTZW5kUmVxdWVz dCh1aW50NjRfdCByZXF1ZXN0SUQsIFJlc291cmNlTG9hZElkZW50aWZpZXIsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmKTsK ICAgICB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUxvYWRJZGVudGlmaWVyLCBjb25z dCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJik7CiAgICAgdm9pZCBkaWRSZWNlaXZlUmVzb3Vy Y2UoUmVzb3VyY2VMb2FkSWRlbnRpZmllciwgY29uc3QgU2hhcmVhYmxlUmVzb3VyY2U6OkhhbmRs ZSYsIGRvdWJsZSBmaW5pc2hUaW1lKTsKICAgICB2b2lkIGRpZEZhaWxSZXNvdXJjZUxvYWQoUmVz b3VyY2VMb2FkSWRlbnRpZmllciwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNz Q29ubmVjdGlvbi5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29y ay9OZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24ubWVzc2FnZXMuaW4KaW5kZXggMGMxNjhmNi4uZWQy NWQyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL05ldHdv cmtQcm9jZXNzQ29ubmVjdGlvbi5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uLm1lc3NhZ2VzLmluCkBAIC0y NSw2ICsyNSw3IEBACiBtZXNzYWdlcyAtPiBOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24gewogCiAg ICAgLy8gRklYTUUgKE5ldHdvcmtQcm9jZXNzKTogV2UnbGwgbmVlZCBtdWNoIG1vcmUgZ3JhbnVs YXJpdHkgZm9yIHJlc3BvbnNlIG1lc3NhZ2VzLgorICAgIFdpbGxTZW5kUmVxdWVzdCh1aW50NjRf dCByZXF1ZXN0SUQsIHVpbnQ2NF90IHJlc291cmNlTG9hZElkZW50aWZpZXIsIFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCByZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlIHJlZGlyZWN0 UmVzcG9uc2UpCiAgICAgRGlkUmVjZWl2ZVJlc3BvbnNlKHVpbnQ2NF90IHJlc291cmNlTG9hZElk ZW50aWZpZXIsIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2UpCiAgICAgRGlkUmVj ZWl2ZVJlc291cmNlKHVpbnQ2NF90IHJlc291cmNlTG9hZElkZW50aWZpZXIsIFdlYktpdDo6U2hh cmVhYmxlUmVzb3VyY2U6OkhhbmRsZSByZXNvdXJjZSwgZG91YmxlIGZpbmlzaFRpbWUpCiAgICAg RGlkRmFpbFJlc291cmNlTG9hZCh1aW50NjRfdCByZXNvdXJjZUxvYWRJZGVudGlmaWVyLCBXZWJD b3JlOjpSZXNvdXJjZUVycm9yIGVycm9yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcAppbmRl eCBiZjE0ZjJlLi43YWZjY2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcApAQCAtMTky LDYgKzE5MiwxNSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2V0U2VyaWFsTG9h ZGluZ0VuYWJsZWQoYm9vbCBlbmFibGVkKQogICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLm5ldHdv cmtDb25uZWN0aW9uKCktPmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVzc2FnZXM6Ok5ldHdvcmtD b25uZWN0aW9uVG9XZWJQcm9jZXNzOjpTZXRTZXJpYWxMb2FkaW5nRW5hYmxlZChlbmFibGVkKSwg TWVzc2FnZXM6Ok5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpTZXRTZXJpYWxMb2FkaW5n RW5hYmxlZDo6UmVwbHkoKSwgMCk7CiB9CiAKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVy Ojp3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VMb2FkSWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpCit7CisgICAgUmVmUHRyPFJlc291cmNlTG9hZGVyPiBs b2FkZXIgPSBtX3BlbmRpbmdSZXNvdXJjZUxvYWRlcnMuZ2V0KGlkZW50aWZpZXIpOworICAgIEFT U0VSVChsb2FkZXIpOworCisgICAgTE9HKE5ldHdvcmssICIoV2ViUHJvY2VzcykgV2ViUmVzb3Vy Y2VMb2FkU2NoZWR1bGVyOjp3aWxsU2VuZFJlcXVlc3QgdG8gJyVzJyIsIHJlcXVlc3QudXJsKCku c3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisgICAgbG9hZGVyLT53aWxsU2VuZFJlcXVlc3QocmVx dWVzdCwgcmVkaXJlY3RSZXNwb25zZSk7Cit9CisKIHZvaWQgV2ViUmVzb3VyY2VMb2FkU2NoZWR1 bGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UoUmVzb3VyY2VMb2FkSWRlbnRpZmllciBpZGVudGlmaWVy LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKICAgICBSZWZQ dHI8UmVzb3VyY2VMb2FkZXI+IGxvYWRlciA9IG1fcGVuZGluZ1Jlc291cmNlTG9hZGVycy5nZXQo aWRlbnRpZmllcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdv cmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmgKaW5kZXggZmFhMmE0NS4uNjE3YjNl NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291 cmNlTG9hZFNjaGVkdWxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29y ay9XZWJSZXNvdXJjZUxvYWRTY2hlZHVsZXIuaApAQCAtNTcsNiArNTcsNyBAQCBwdWJsaWM6CiAK ICAgICB2aXJ0dWFsIHZvaWQgc2V0U2VyaWFsTG9hZGluZ0VuYWJsZWQoYm9vbCkgT1ZFUlJJREU7 CiAKKyAgICB2b2lkIHdpbGxTZW5kUmVxdWVzdChSZXNvdXJjZUxvYWRJZGVudGlmaWVyLCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiBy ZWRpcmVjdFJlc3BvbnNlKTsKICAgICB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUxv YWRJZGVudGlmaWVyLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJik7CiAgICAgdm9p ZCBkaWRSZWNlaXZlUmVzb3VyY2UoUmVzb3VyY2VMb2FkSWRlbnRpZmllciwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VCdWZmZXImLCBkb3VibGUgZmluaXNoVGltZSk7CiAgICAgdm9pZCBkaWRGYWls UmVzb3VyY2VMb2FkKFJlc291cmNlTG9hZElkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlRXJyb3ImKTsK