35879 2010-03-08 14:25:35 -0800 Eliminate m_mightDownloadFromHandle 2010-03-08 15:52:34 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Mac All RESOLVED FIXED P2 Trivial --- 1 ap ap darin ddkilzer oldest_to_newest 197314 0 ap 2010-03-08 14:25:35 -0800 It's only used on Mac, and doesn't seem to be really needed. The performance effect of not wrapping a connection delegate seems minimal, but the effect on code complexity is significant. Besides, we weren't setting it correctly anyway - XMLHttpRequest was hitting the complex code path here. 197332 1 50250 ap 2010-03-08 15:00:35 -0800 Created attachment 50250 proposed patch 197333 2 50250 darin 2010-03-08 15:02:49 -0800 Comment on attachment 50250 proposed patch r=me assuming there is no measurable performance penalty to the extra level of indirection of every delegate call 197334 3 50250 darin 2010-03-08 15:03:24 -0800 Comment on attachment 50250 proposed patch > + d->m_proxy = wkCreateNSURLConnectionDelegateProxy(); Is ownership correct here? The function has create in its name, but I don't see an adopt. 197335 4 ap 2010-03-08 15:11:28 -0800 > Is ownership correct here? I think so - there is an explicit release call below. But I'll change to adopt, to avoid current and future confusion. d->m_proxy = wkCreateNSURLConnectionDelegateProxy(); [d->m_proxy.get() setDelegate:ResourceHandle::delegate()]; [d->m_proxy.get() release]; 197376 5 ap 2010-03-08 15:52:34 -0800 Committed <http://trac.webkit.org/changeset/55688>. 50250 2010-03-08 15:00:35 -0800 2010-03-08 15:03:24 -0800 proposed patch EliminateMightDownload.txt text/plain 9584 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTY4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMTAtMDMtMDggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1ODc5CisgICAgICAgIEVs aW1pbmF0ZSBtX21pZ2h0RG93bmxvYWRGcm9tSGFuZGxlCisKKyAgICAgICAgSXQgd2FzIG9ubHkg dXNlZCBvbiBNYWMsIGFuZCB1bm5lY2Vzc2FyaWx5IGNvbXBsaWNhdGVkIHRoZSBjb2RlLgorCisg ICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvciwgdGh1cyBubyB0ZXN0LgorCisgICAgICAgICog bG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNYWluUmVz b3VyY2VMb2FkZXI6OmxvYWROb3cpOgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6bG9hZCk6CisgICAgICAgICog bG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OmNyZWF0ZVJlc291cmNlSGFuZGxlKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlSGFuZGxlOjpSZXNvdXJjZUhhbmRsZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZUhhbmRsZTo6Y3JlYXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291 cmNlSGFuZGxlLmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUlu dGVybmFsLmg6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZUludGVybmFsOjpSZXNv dXJjZUhhbmRsZUludGVybmFsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNv dXJjZUhhbmRsZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpzdGFy dCk6CisKIDIwMTAtMDMtMDggIEpvYW5tYXJpZSBEaWdncyAgPGpvYW5tYXJpZS5kaWdnc0BnbWFp bC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6LgpJbmRleDogV2ViQ29yZS9s b2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRl ci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwCShyZXZpc2lvbiA1NTY3MykKKysrIFdlYkNvcmUvbG9h ZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxNyw3ICs1MTcs NyBAQCBib29sIE1haW5SZXNvdXJjZUxvYWRlcjo6bG9hZE5vdyhSZXNvdXJjCiAgICAgZWxzZSBp ZiAoc2hvdWxkTG9hZEVtcHR5IHx8IGZyYW1lTG9hZGVyKCktPnJlcHJlc2VudGF0aW9uRXhpc3Rz Rm9yVVJMU2NoZW1lKHVybC5wcm90b2NvbCgpKSkKICAgICAgICAgaGFuZGxlRW1wdHlMb2FkKHVy bCwgIXNob3VsZExvYWRFbXB0eSk7CiAgICAgZWxzZQotICAgICAgICBtX2hhbmRsZSA9IFJlc291 cmNlSGFuZGxlOjpjcmVhdGUociwgdGhpcywgbV9mcmFtZS5nZXQoKSwgZmFsc2UsIHRydWUsIHRy dWUpOworICAgICAgICBtX2hhbmRsZSA9IFJlc291cmNlSGFuZGxlOjpjcmVhdGUociwgdGhpcywg bV9mcmFtZS5nZXQoKSwgZmFsc2UsIHRydWUpOwogCiAgICAgcmV0dXJuIGZhbHNlOwogfQpJbmRl eDogV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAkocmV2aXNpb24gNTU2NzMpCisrKyBXZWJDb3Jl L2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMCw3ICsxMzAs NyBAQCBib29sIFJlc291cmNlTG9hZGVyOjpsb2FkKGNvbnN0IFJlc291cmNlCiAgICAgICAgIHJl dHVybiB0cnVlOwogICAgIH0KICAgICAKLSAgICBtX2hhbmRsZSA9IFJlc291cmNlSGFuZGxlOjpj cmVhdGUoY2xpZW50UmVxdWVzdCwgdGhpcywgbV9mcmFtZS5nZXQoKSwgbV9kZWZlcnNMb2FkaW5n LCBtX3Nob3VsZENvbnRlbnRTbmlmZiwgdHJ1ZSk7CisgICAgbV9oYW5kbGUgPSBSZXNvdXJjZUhh bmRsZTo6Y3JlYXRlKGNsaWVudFJlcXVlc3QsIHRoaXMsIG1fZnJhbWUuZ2V0KCksIG1fZGVmZXJz TG9hZGluZywgbV9zaG91bGRDb250ZW50U25pZmYpOwogCiAgICAgcmV0dXJuIHRydWU7CiB9Cklu ZGV4OiBXZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91 cC5jcHAJKHJldmlzaW9uIDU1NjczKQorKysgV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGlj YXRpb25DYWNoZUdyb3VwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQzLDcgKzQ0Myw3IEBAIFBh c3NSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IEFwcGxpY2F0aW9uQ2EKICAgICAgICAgfQogICAgIH0K ICAgICAKLSAgICByZXR1cm4gUmVzb3VyY2VIYW5kbGU6OmNyZWF0ZShyZXF1ZXN0LCB0aGlzLCBt X2ZyYW1lLCBmYWxzZSwgdHJ1ZSwgZmFsc2UpOworICAgIHJldHVybiBSZXNvdXJjZUhhbmRsZTo6 Y3JlYXRlKHJlcXVlc3QsIHRoaXMsIG1fZnJhbWUsIGZhbHNlLCB0cnVlKTsKIH0KIAogdm9pZCBB cHBsaWNhdGlvbkNhY2hlR3JvdXA6OmRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUhhbmRsZSog aGFuZGxlLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmNwcAkocmV2aXNpb24gNTU2NzMpCisr KyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGUuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNywxOCArMzcsMTggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3RhdGljIGJvb2wg c2hvdWxkRm9yY2VDb250ZW50U25pZmZpbmc7CiAKIFJlc291cmNlSGFuZGxlOjpSZXNvdXJjZUhh bmRsZShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlSGFuZGxlQ2xpZW50 KiBjbGllbnQsIGJvb2wgZGVmZXJzTG9hZGluZywKLSAgICAgICAgIGJvb2wgc2hvdWxkQ29udGVu dFNuaWZmLCBib29sIG1pZ2h0RG93bmxvYWRGcm9tSGFuZGxlKQotICAgIDogZChuZXcgUmVzb3Vy Y2VIYW5kbGVJbnRlcm5hbCh0aGlzLCByZXF1ZXN0LCBjbGllbnQsIGRlZmVyc0xvYWRpbmcsIHNo b3VsZENvbnRlbnRTbmlmZiwgbWlnaHREb3dubG9hZEZyb21IYW5kbGUpKQorICAgICAgICAgYm9v bCBzaG91bGRDb250ZW50U25pZmYpCisgICAgOiBkKG5ldyBSZXNvdXJjZUhhbmRsZUludGVybmFs KHRoaXMsIHJlcXVlc3QsIGNsaWVudCwgZGVmZXJzTG9hZGluZywgc2hvdWxkQ29udGVudFNuaWZm KSkKIHsKIH0KIAogUGFzc1JlZlB0cjxSZXNvdXJjZUhhbmRsZT4gUmVzb3VyY2VIYW5kbGU6OmNy ZWF0ZShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlSGFuZGxlQ2xpZW50 KiBjbGllbnQsCi0gICAgRnJhbWUqIGZyYW1lLCBib29sIGRlZmVyc0xvYWRpbmcsIGJvb2wgc2hv dWxkQ29udGVudFNuaWZmLCBib29sIG1pZ2h0RG93bmxvYWRGcm9tSGFuZGxlKQorICAgIEZyYW1l KiBmcmFtZSwgYm9vbCBkZWZlcnNMb2FkaW5nLCBib29sIHNob3VsZENvbnRlbnRTbmlmZikKIHsK ICAgICBpZiAoc2hvdWxkQ29udGVudFNuaWZmKQogICAgICAgICBzaG91bGRDb250ZW50U25pZmYg PSBzaG91bGRDb250ZW50U25pZmZVUkwocmVxdWVzdC51cmwoKSk7CiAKLSAgICBSZWZQdHI8UmVz b3VyY2VIYW5kbGU+IG5ld0hhbmRsZShhZG9wdFJlZihuZXcgUmVzb3VyY2VIYW5kbGUocmVxdWVz dCwgY2xpZW50LCBkZWZlcnNMb2FkaW5nLCBzaG91bGRDb250ZW50U25pZmYsIG1pZ2h0RG93bmxv YWRGcm9tSGFuZGxlKSkpOworICAgIFJlZlB0cjxSZXNvdXJjZUhhbmRsZT4gbmV3SGFuZGxlKGFk b3B0UmVmKG5ldyBSZXNvdXJjZUhhbmRsZShyZXF1ZXN0LCBjbGllbnQsIGRlZmVyc0xvYWRpbmcs IHNob3VsZENvbnRlbnRTbmlmZikpKTsKIAogICAgIGlmICghcmVxdWVzdC51cmwoKS5pc1ZhbGlk KCkpIHsKICAgICAgICAgbmV3SGFuZGxlLT5zY2hlZHVsZUZhaWx1cmUoSW52YWxpZFVSTEZhaWx1 cmUpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlLmgJKHJl dmlzaW9uIDU1NjczKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxl LmgJKHdvcmtpbmcgY29weSkKQEAgLTk4LDcgKzk4LDcgQEAgY2xhc3MgUmVzb3VyY2VIYW5kbGUg OiBwdWJsaWMgUmVmQ291bnRlZAogI2VuZGlmCiAgICAgewogcHJpdmF0ZToKLSAgICBSZXNvdXJj ZUhhbmRsZShjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBSZXNvdXJjZUhhbmRsZUNsaWVudCosIGJv b2wgZGVmZXJzTG9hZGluZywgYm9vbCBzaG91bGRDb250ZW50U25pZmYsIGJvb2wgbWlnaHREb3du bG9hZEZyb21IYW5kbGUpOworICAgIFJlc291cmNlSGFuZGxlKGNvbnN0IFJlc291cmNlUmVxdWVz dCYsIFJlc291cmNlSGFuZGxlQ2xpZW50KiwgYm9vbCBkZWZlcnNMb2FkaW5nLCBib29sIHNob3Vs ZENvbnRlbnRTbmlmZik7CiAKICAgICBlbnVtIEZhaWx1cmVUeXBlIHsKICAgICAgICAgQmxvY2tl ZEZhaWx1cmUsCkBAIC0xMDcsNyArMTA3LDcgQEAgcHJpdmF0ZToKIAogcHVibGljOgogICAgIC8v IEZJWE1FOiBzaG91bGQgbm90IG5lZWQgdGhlIEZyYW1lCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8 UmVzb3VyY2VIYW5kbGU+IGNyZWF0ZShjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBSZXNvdXJjZUhh bmRsZUNsaWVudCosIEZyYW1lKiwgYm9vbCBkZWZlcnNMb2FkaW5nLCBib29sIHNob3VsZENvbnRl bnRTbmlmZiwgYm9vbCBtaWdodERvd25sb2FkRnJvbUhhbmRsZSA9IGZhbHNlKTsKKyAgICBzdGF0 aWMgUGFzc1JlZlB0cjxSZXNvdXJjZUhhbmRsZT4gY3JlYXRlKGNvbnN0IFJlc291cmNlUmVxdWVz dCYsIFJlc291cmNlSGFuZGxlQ2xpZW50KiwgRnJhbWUqLCBib29sIGRlZmVyc0xvYWRpbmcsIGJv b2wgc2hvdWxkQ29udGVudFNuaWZmKTsKIAogICAgIHN0YXRpYyB2b2lkIGxvYWRSZXNvdXJjZVN5 bmNocm9ub3VzbHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgU3RvcmVkQ3JlZGVudGlhbHMsIFJl c291cmNlRXJyb3ImLCBSZXNvdXJjZVJlc3BvbnNlJiwgVmVjdG9yPGNoYXI+JiBkYXRhLCBGcmFt ZSogZnJhbWUpOwogICAgIHN0YXRpYyBib29sIHdpbGxMb2FkRnJvbUNhY2hlKFJlc291cmNlUmVx dWVzdCYsIEZyYW1lKik7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VI YW5kbGVJbnRlcm5hbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9S ZXNvdXJjZUhhbmRsZUludGVybmFsLmgJKHJldmlzaW9uIDU1NjczKQorKysgV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaAkod29ya2luZyBjb3B5KQpAQCAt ODEsMTQgKzgxLDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNsYXNzIFJlc291cmNl SGFuZGxlSW50ZXJuYWwgOiBwdWJsaWMgTm9uY29weWFibGUgewogICAgIHB1YmxpYzoKLSAgICAg ICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbChSZXNvdXJjZUhhbmRsZSogbG9hZGVyLCBjb25zdCBS ZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFJlc291cmNlSGFuZGxlQ2xpZW50KiBjLCBib29sIGRl ZmVyc0xvYWRpbmcsIGJvb2wgc2hvdWxkQ29udGVudFNuaWZmLCBib29sIG1pZ2h0RG93bmxvYWRG cm9tSGFuZGxlKQorICAgICAgICBSZXNvdXJjZUhhbmRsZUludGVybmFsKFJlc291cmNlSGFuZGxl KiBsb2FkZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgUmVzb3VyY2VIYW5kbGVD bGllbnQqIGMsIGJvb2wgZGVmZXJzTG9hZGluZywgYm9vbCBzaG91bGRDb250ZW50U25pZmYpCiAg ICAgICAgICAgICA6IG1fY2xpZW50KGMpCiAgICAgICAgICAgICAsIG1fcmVxdWVzdChyZXF1ZXN0 KQogICAgICAgICAgICAgLCBtX2xhc3RIVFRQTWV0aG9kKHJlcXVlc3QuaHR0cE1ldGhvZCgpKQog ICAgICAgICAgICAgLCBzdGF0dXMoMCkKICAgICAgICAgICAgICwgbV9kZWZlcnNMb2FkaW5nKGRl ZmVyc0xvYWRpbmcpCiAgICAgICAgICAgICAsIG1fc2hvdWxkQ29udGVudFNuaWZmKHNob3VsZENv bnRlbnRTbmlmZikKLSAgICAgICAgICAgICwgbV9taWdodERvd25sb2FkRnJvbUhhbmRsZShtaWdo dERvd25sb2FkRnJvbUhhbmRsZSkKICNpZiBVU0UoQ0ZORVRXT1JLKQogICAgICAgICAgICAgLCBt X2Nvbm5lY3Rpb24oMCkKICNlbmRpZgpAQCAtMTYwLDcgKzE1OSw2IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogICAgICAgICBib29sIG1fZGVmZXJzTG9hZGluZzsKICAgICAgICAgYm9vbCBtX3No b3VsZENvbnRlbnRTbmlmZjsKLSAgICAgICAgYm9vbCBtX21pZ2h0RG93bmxvYWRGcm9tSGFuZGxl OwogI2lmIFVTRShDRk5FVFdPUkspCiAgICAgICAgIFJldGFpblB0cjxDRlVSTENvbm5lY3Rpb25S ZWY+IG1fY29ubmVjdGlvbjsKICNlbGlmIFBMQVRGT1JNKE1BQykKSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9SZXNvdXJjZUhhbmRsZU1hYy5tbQkocmV2aXNpb24g NTU2NzMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291cmNlSGFuZGxlTWFj Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjYsMTcgKzE2NiwxMCBAQCBib29sIFJlc291cmNlSGFu ZGxlOjpzdGFydChGcmFtZSogZnJhbWUpCiAgICAgaXNJbml0aWFsaXppbmdDb25uZWN0aW9uID0g WUVTOwogI2VuZGlmCiAKLSAgICBpZCBkZWxlZ2F0ZTsKLSAgICAKLSAgICBpZiAoZC0+bV9taWdo dERvd25sb2FkRnJvbUhhbmRsZSkgewotICAgICAgICBBU1NFUlQoIWQtPm1fcHJveHkpOwotICAg ICAgICBkLT5tX3Byb3h5ID0gd2tDcmVhdGVOU1VSTENvbm5lY3Rpb25EZWxlZ2F0ZVByb3h5KCk7 Ci0gICAgICAgIFtkLT5tX3Byb3h5LmdldCgpIHNldERlbGVnYXRlOlJlc291cmNlSGFuZGxlOjpk ZWxlZ2F0ZSgpXTsKLSAgICAgICAgW2QtPm1fcHJveHkuZ2V0KCkgcmVsZWFzZV07Ci0gICAgICAg IAotICAgICAgICBkZWxlZ2F0ZSA9IGQtPm1fcHJveHkuZ2V0KCk7Ci0gICAgfSBlbHNlIAotICAg ICAgICBkZWxlZ2F0ZSA9IFJlc291cmNlSGFuZGxlOjpkZWxlZ2F0ZSgpOworICAgIEFTU0VSVCgh ZC0+bV9wcm94eSk7CisgICAgZC0+bV9wcm94eSA9IHdrQ3JlYXRlTlNVUkxDb25uZWN0aW9uRGVs ZWdhdGVQcm94eSgpOworICAgIFtkLT5tX3Byb3h5LmdldCgpIHNldERlbGVnYXRlOlJlc291cmNl SGFuZGxlOjpkZWxlZ2F0ZSgpXTsKKyAgICBbZC0+bV9wcm94eS5nZXQoKSByZWxlYXNlXTsKIAog ICAgIGlmICgoIWQtPm1fdXNlci5pc0VtcHR5KCkgfHwgIWQtPm1fcGFzcy5pc0VtcHR5KCkpCiAj aWZuZGVmIEJVSUxESU5HX09OX1RJR0VSCkBAIC0yMzMsMTcgKzIyNiwxNyBAQCBib29sIFJlc291 cmNlSGFuZGxlOjpzdGFydChGcmFtZSogZnJhbWUpCiAgICAgCiAgICAgaWYgKGQtPm1fc2hvdWxk Q29udGVudFNuaWZmIHx8IGZyYW1lLT5zZXR0aW5ncygpLT5sb2NhbEZpbGVDb250ZW50U25pZmZp bmdFbmFibGVkKCkpIAogI2lmZGVmIEJVSUxESU5HX09OX1RJR0VSCi0gICAgICAgIGNvbm5lY3Rp b24gPSBbW05TVVJMQ29ubmVjdGlvbiBhbGxvY10gaW5pdFdpdGhSZXF1ZXN0OmQtPm1fcmVxdWVz dC5uc1VSTFJlcXVlc3QoKSBkZWxlZ2F0ZTpkZWxlZ2F0ZV07CisgICAgICAgIGNvbm5lY3Rpb24g PSBbW05TVVJMQ29ubmVjdGlvbiBhbGxvY10gaW5pdFdpdGhSZXF1ZXN0OmQtPm1fcmVxdWVzdC5u c1VSTFJlcXVlc3QoKSBkZWxlZ2F0ZTpkLT5tX3Byb3h5LmdldCgpXTsKICNlbHNlCi0gICAgICAg IGNvbm5lY3Rpb24gPSBbW05TVVJMQ29ubmVjdGlvbiBhbGxvY10gaW5pdFdpdGhSZXF1ZXN0OmQt Pm1fcmVxdWVzdC5uc1VSTFJlcXVlc3QoKSBkZWxlZ2F0ZTpkZWxlZ2F0ZSBzdGFydEltbWVkaWF0 ZWx5Ok5PXTsKKyAgICAgICAgY29ubmVjdGlvbiA9IFtbTlNVUkxDb25uZWN0aW9uIGFsbG9jXSBp bml0V2l0aFJlcXVlc3Q6ZC0+bV9yZXF1ZXN0Lm5zVVJMUmVxdWVzdCgpIGRlbGVnYXRlOmQtPm1f cHJveHkuZ2V0KCkgc3RhcnRJbW1lZGlhdGVseTpOT107CiAjZW5kaWYKICAgICBlbHNlIHsKICAg ICAgICAgTlNNdXRhYmxlVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtkLT5tX3JlcXVlc3QubnNVUkxS ZXF1ZXN0KCkgbXV0YWJsZUNvcHldOwogICAgICAgICB3a1NldE5TVVJMUmVxdWVzdFNob3VsZENv bnRlbnRTbmlmZihyZXF1ZXN0LCBOTyk7CiAjaWZkZWYgQlVJTERJTkdfT05fVElHRVIKLSAgICAg ICAgY29ubmVjdGlvbiA9IFtbTlNVUkxDb25uZWN0aW9uIGFsbG9jXSBpbml0V2l0aFJlcXVlc3Q6 cmVxdWVzdCBkZWxlZ2F0ZTpkZWxlZ2F0ZV07CisgICAgICAgIGNvbm5lY3Rpb24gPSBbW05TVVJM Q29ubmVjdGlvbiBhbGxvY10gaW5pdFdpdGhSZXF1ZXN0OnJlcXVlc3QgZGVsZWdhdGU6ZC0+bV9w cm94eS5nZXQoKV07CiAjZWxzZQotICAgICAgICBjb25uZWN0aW9uID0gW1tOU1VSTENvbm5lY3Rp b24gYWxsb2NdIGluaXRXaXRoUmVxdWVzdDpyZXF1ZXN0IGRlbGVnYXRlOmRlbGVnYXRlIHN0YXJ0 SW1tZWRpYXRlbHk6Tk9dOworICAgICAgICBjb25uZWN0aW9uID0gW1tOU1VSTENvbm5lY3Rpb24g YWxsb2NdIGluaXRXaXRoUmVxdWVzdDpyZXF1ZXN0IGRlbGVnYXRlOmQtPm1fcHJveHkuZ2V0KCkg c3RhcnRJbW1lZGlhdGVseTpOT107CiAjZW5kaWYKICAgICAgICAgW3JlcXVlc3QgcmVsZWFzZV07 CiAgICAgfQo=