101493 2012-11-07 11:15:58 -0800 [V8] IntrusiveDOMWrapperMap is no longer needed and can be deleted 2012-11-07 12:49:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 101110 1 abarth abarth eric haraken japhet webkit.review.bot oldest_to_newest 760898 0 abarth 2012-11-07 11:15:58 -0800 [V8] IntrusiveDOMWrapperMap is no longer needed and can be deleted 760900 1 172843 abarth 2012-11-07 11:17:06 -0800 Created attachment 172843 Patch 760902 2 172843 abarth 2012-11-07 11:18:23 -0800 Comment on attachment 172843 Patch Please feel encouraged to review this patch, but I'd like to wait for http://build.chromium.org/f/chromium/perf/chromium-rel-win7-webkit/intl2/report.html?history=150&rev=-1&graph=ws_single_peak_r to cycle before landing it so I can separate out any regressions from http://trac.webkit.org/changeset/133783 760905 3 172843 haraken 2012-11-07 11:21:18 -0800 Comment on attachment 172843 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172843&action=review > Source/WebCore/bindings/v8/DOMDataStore.cpp:79 > + object->clearWrapper(); ASSERT(!object->wrapper().IsEmpty()) ? > Source/WebCore/bindings/v8/DOMDataStore.h:66 > + return object->wrapper(); ASSERT(!object->wrapper().IsEmpty()) ? > Source/WebCore/bindings/v8/DOMDataStore.h:84 > protected: private: 760908 4 abarth 2012-11-07 11:24:29 -0800 > > Source/WebCore/bindings/v8/DOMDataStore.h:84 > > protected: > > private: Thanks. You made this same comment the first time around. I just forgot to re-apply it. :) 760913 5 172843 abarth 2012-11-07 11:25:39 -0800 Comment on attachment 172843 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172843&action=review >> Source/WebCore/bindings/v8/DOMDataStore.cpp:79 >> + object->clearWrapper(); > > ASSERT(!object->wrapper().IsEmpty()) ? clearWrapper already has that ASSERT: http://trac.webkit.org/browser/trunk/Source/WebCore/bindings/v8/ScriptWrappable.h#L56 >> Source/WebCore/bindings/v8/DOMDataStore.h:66 >> + return object->wrapper(); > > ASSERT(!object->wrapper().IsEmpty()) ? It might be empty if the Node doesn't have a wrapper yet. 760983 6 abarth 2012-11-07 12:49:39 -0800 Committed r133794: <http://trac.webkit.org/changeset/133794> 172843 2012-11-07 11:17:06 -0800 2012-11-07 11:25:39 -0800 Patch bug-101493-20121107111517.patch text/plain 9548 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTY2ZGVkMzRmNDUyZmJk NGFiNTg2Mjc1YjkzYTBlZGJjZjBhNDUwZi4uYTM3MTU0YWI5Yjk5MTVkNGU1ZDE3ZDc5NGQzZDlk ODE1NDQwYWQ1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTExLTA3ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgW1Y4XSBJbnRydXNpdmVET01X cmFwcGVyTWFwIGlzIG5vIGxvbmdlciBuZWVkZWQgYW5kIGNhbiBiZSBkZWxldGVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE0OTMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIGFu b3RoZXIgaW5jcmVtZW50YWwgc3RlcCB0b3dhcmRzIGxhbmRpbmcgdGhlIHBhdGNoIGluIGJ1Zwor ICAgICAgICAxMDExMTAuIEluIHRoaXMgcGF0Y2gsIHdlIGRlbGV0ZSBJbnRydXNpdmVET01XcmFw cGVyTWFwLCB3aGljaCBpcyBubworICAgICAgICBsb25nZXIgbmVlZGVkLgorCisgICAgICAgICog V2ViQ29yZS5neXBpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpET01EYXRhU3RvcmU6OkRPTURhdGFTdG9yZSk6CisgICAgICAgIChX ZWJDb3JlOjpET01EYXRhU3RvcmU6On5ET01EYXRhU3RvcmUpOgorICAgICAgICAoV2ViQ29yZTo6 RE9NRGF0YVN0b3JlOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjpET01E YXRhU3RvcmU6OndlYWtDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBi aW5kaW5ncy92OC9ET01EYXRhU3RvcmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTURhdGFTdG9y ZTo6Z2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkRPTURhdGFTdG9yZTo6c2V0KToKKyAgICAgICAg KERPTURhdGFTdG9yZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvSW50cnVzaXZlRE9NV3JhcHBl ck1hcC5oOiBSZW1vdmVkLgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNw cDoKKworMjAxMi0xMS0wNyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCiAgICAg ICAgIFtWOF0gV2Ugc2hvdWxkIGhpZGUgdGhlIERPTVdyYXBwZXJNYXBzIGluc2lkZSBET01EYXRh U3RvcmUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw MTQzMAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkgYi9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggNTU0YzI3ZmIxZTkyYTY5Zjc3ZDAzNjA2Njg1MGI3 M2M5ZDEyZDhkNy4uY2I0MjQyNjE4MzA2M2U0Yzg5NTRiOGFmOGQ2YzY4YzEyOTY0ZWRlNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZ3lwaQpAQCAtMjIzMyw3ICsyMjMzLDYgQEAKICAgICAgICAgICAgICdiaW5kaW5n cy92OC9EYXRlRXh0ZW5zaW9uLmgnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L0lEQkJpbmRp bmdVdGlsaXRpZXMuY3BwJywKICAgICAgICAgICAgICdiaW5kaW5ncy92OC9JREJCaW5kaW5nVXRp bGl0aWVzLmgnLAotICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L0ludHJ1c2l2ZURPTVdyYXBwZXJN YXAuaCcsCiAgICAgICAgICAgICAnYmluZGluZ3MvdjgvSmF2YVNjcmlwdENhbGxGcmFtZS5jcHAn LAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L0phdmFTY3JpcHRDYWxsRnJhbWUuaCcsCiAgICAg ICAgICAgICAnYmluZGluZ3MvdjgvTlBPYmplY3RXcmFwcGVyLmNwcCcsCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhU3RvcmUuY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmNwcAppbmRleCAxZWI1NDhmYmUxNDc0YzYwMDM0 OWIwNTU2MWJjNmIxMjVkYzcxNWNlLi4xNTNmNWQ0Yjg5MjNlMmMwMjBhZjg3ZGQ2NGI3Zjg3ODUw ZjIzNDY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhU3Rv cmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5jcHAK QEAgLTMyLDcgKzMyLDYgQEAKICNpbmNsdWRlICJET01EYXRhU3RvcmUuaCIKIAogI2luY2x1ZGUg IkRPTVdyYXBwZXJNYXAuaCIKLSNpbmNsdWRlICJJbnRydXNpdmVET01XcmFwcGVyTWFwLmgiCiAj aW5jbHVkZSAiVjhCaW5kaW5nLmgiCiAjaW5jbHVkZSAiV2ViQ29yZU1lbW9yeUluc3RydW1lbnRh dGlvbi5oIgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CkBAIC00MiwyOCArNDEsMTQgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogRE9NRGF0YVN0b3JlOjpET01EYXRhU3RvcmUoVHlwZSB0eXBl KQogICAgIDogbV90eXBlKHR5cGUpCiB7Ci0gICAgaWYgKHR5cGUgPT0gTWFpbldvcmxkKQotICAg ICAgICBtX2RvbU5vZGVNYXAgPSBhZG9wdFB0cihuZXcgSW50cnVzaXZlRE9NV3JhcHBlck1hcDxO b2RlPik7Ci0gICAgZWxzZSB7Ci0gICAgICAgIEFTU0VSVCh0eXBlID09IElzb2xhdGVkV29ybGQg fHwgdHlwZSA9PSBXb3JrZXIpOwotICAgICAgICAvLyBGSVhNRTogSW4gcHJpbmNpcGxlLCB3ZSBz aG91bGRuJ3QgbmVlZCB0byBjcmVhdGUgdGhpcwotICAgICAgICAvLyB3cmFwcGVyIG1hcCBmb3Ig d29ya2VycyBiZWNhdXNlIHRoZXJlIGFyZSBubyBOb2RlcyBvbgotICAgICAgICAvLyB3b3JrZXIg dGhyZWFkcy4KLSAgICAgICAgbV9kb21Ob2RlTWFwID0gYWRvcHRQdHIobmV3IERPTVdyYXBwZXJI YXNoTWFwPE5vZGU+KTsKLSAgICB9CiAgICAgbV9kb21PYmplY3RNYXAgPSBhZG9wdFB0cihuZXcg RE9NV3JhcHBlckhhc2hNYXA8dm9pZD4pOwotCiAgICAgVjhQZXJJc29sYXRlRGF0YTo6Y3VycmVu dCgpLT5yZWdpc3RlckRPTURhdGFTdG9yZSh0aGlzKTsKIH0KIAogRE9NRGF0YVN0b3JlOjp+RE9N RGF0YVN0b3JlKCkKIHsKICAgICBBU1NFUlQobV90eXBlICE9IE1haW5Xb3JsZCk7IC8vIFdlIG5l dmVyIGFjdHVhbGx5IGRlc3RydWN0IHRoZSBtYWluIHdvcmxkJ3MgRE9NRGF0YVN0b3JlLgotCiAg ICAgVjhQZXJJc29sYXRlRGF0YTo6Y3VycmVudCgpLT51bnJlZ2lzdGVyRE9NRGF0YVN0b3JlKHRo aXMpOwotCi0gICAgaWYgKG1fdHlwZSA9PSBJc29sYXRlZFdvcmxkKQotICAgICAgICBtX2RvbU5v ZGVNYXAtPmNsZWFyKCk7CiAgICAgbV9kb21PYmplY3RNYXAtPmNsZWFyKCk7CiB9CiAKQEAgLTgy LDggKzY3LDE5IEBAIERPTURhdGFTdG9yZSogRE9NRGF0YVN0b3JlOjpjdXJyZW50KHY4OjpJc29s YXRlKiBpc29sYXRlKQogdm9pZCBET01EYXRhU3RvcmU6OnJlcG9ydE1lbW9yeVVzYWdlKE1lbW9y eU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0CiB7CiAgICAgTWVtb3J5Q2xhc3NJ bmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhpcywgV2ViQ29yZU1lbW9yeVR5cGVzOjpCaW5k aW5nKTsKLSAgICBpbmZvLmFkZE1lbWJlcihtX2RvbU5vZGVNYXApOwogICAgIGluZm8uYWRkTWVt YmVyKG1fZG9tT2JqZWN0TWFwKTsKIH0KIAordm9pZCBET01EYXRhU3RvcmU6OndlYWtDYWxsYmFj ayh2ODo6UGVyc2lzdGVudDx2ODo6VmFsdWU+IHZhbHVlLCB2b2lkKiBjb250ZXh0KQoreworICAg IE5vZGUqIG9iamVjdCA9IHN0YXRpY19jYXN0PE5vZGUqPihjb250ZXh0KTsKKyAgICBBU1NFUlQo dmFsdWUtPklzT2JqZWN0KCkpOworICAgIEFTU0VSVChvYmplY3QtPndyYXBwZXIoKSA9PSB2ODo6 UGVyc2lzdGVudDx2ODo6T2JqZWN0Pjo6Q2FzdCh2YWx1ZSkpOworCisgICAgb2JqZWN0LT5jbGVh cldyYXBwZXIoKTsKKyAgICB2YWx1ZS5EaXNwb3NlKCk7CisgICAgdmFsdWUuQ2xlYXIoKTsKKyAg ICBvYmplY3QtPmRlcmVmKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5oIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmgKaW5kZXggMTJiODljNjUzYzg1YTg5ZjM4 OGYxZmQ1MDg1NTNiMWM4YmRlNzRhYy4uOGI5YjMzMjkzYmJkOTU2MmFjMWI2YjdiYmM3ZjA2NWQ2 MmZmMDJkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0 b3JlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmgKQEAg LTYwLDE2ICs2MCwzMSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIERPTURhdGFTdG9yZSogY3VycmVu dCh2ODo6SXNvbGF0ZSopOwogCiAgICAgaW5saW5lIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2V0 KHZvaWQqIG9iamVjdCkgY29uc3QgeyByZXR1cm4gbV9kb21PYmplY3RNYXAtPmdldChvYmplY3Qp OyB9Ci0gICAgaW5saW5lIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2V0KE5vZGUqIG9iamVjdCkg Y29uc3QgeyByZXR1cm4gbV9kb21Ob2RlTWFwLT5nZXQob2JqZWN0KTsgfQorICAgIGlubGluZSB2 ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdldChOb2RlKiBvYmplY3QpIGNvbnN0CisgICAgeworICAg ICAgICBpZiAobV90eXBlID09IE1haW5Xb3JsZCkKKyAgICAgICAgICAgIHJldHVybiBvYmplY3Qt PndyYXBwZXIoKTsKKyAgICAgICAgcmV0dXJuIG1fZG9tT2JqZWN0TWFwLT5nZXQob2JqZWN0KTsK KyAgICB9CiAKLSAgICBpbmxpbmUgdm9pZCBzZXQodm9pZCogb2JqZWN0LCB2ODo6UGVyc2lzdGVu dDx2ODo6T2JqZWN0PiB3cmFwcGVyKSB7IHJldHVybiBtX2RvbU9iamVjdE1hcC0+c2V0KG9iamVj dCwgd3JhcHBlcik7IH0KLSAgICBpbmxpbmUgdm9pZCBzZXQoTm9kZSogb2JqZWN0LCB2ODo6UGVy c2lzdGVudDx2ODo6T2JqZWN0PiB3cmFwcGVyKSB7IHJldHVybiBtX2RvbU5vZGVNYXAtPnNldChv YmplY3QsIHdyYXBwZXIpOyB9CisgICAgaW5saW5lIHZvaWQgc2V0KHZvaWQqIG9iamVjdCwgdjg6 OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD4gd3JhcHBlcikgeyBtX2RvbU9iamVjdE1hcC0+c2V0KG9i amVjdCwgd3JhcHBlcik7IH0KKyAgICBpbmxpbmUgdm9pZCBzZXQoTm9kZSogb2JqZWN0LCB2ODo6 UGVyc2lzdGVudDx2ODo6T2JqZWN0PiB3cmFwcGVyKQorICAgIHsKKyAgICAgICAgaWYgKG1fdHlw ZSA9PSBNYWluV29ybGQpIHsKKyAgICAgICAgICAgIEFTU0VSVChvYmplY3QtPndyYXBwZXIoKS5J c0VtcHR5KCkpOworICAgICAgICAgICAgb2JqZWN0LT5zZXRXcmFwcGVyKHdyYXBwZXIpOworICAg ICAgICAgICAgd3JhcHBlci5NYWtlV2VhayhvYmplY3QsIHdlYWtDYWxsYmFjayk7CisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgbV9kb21PYmplY3RNYXAtPnNldChvYmpl Y3QsIHdyYXBwZXIpOworICAgIH0KIAogICAgIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5 T2JqZWN0SW5mbyopIGNvbnN0OwogCiBwcm90ZWN0ZWQ6CisgICAgc3RhdGljIHZvaWQgd2Vha0Nh bGxiYWNrKHY4OjpQZXJzaXN0ZW50PHY4OjpWYWx1ZT4sIHZvaWQqIGNvbnRleHQpOworCiAgICAg VHlwZSBtX3R5cGU7Ci0gICAgT3duUHRyPERPTVdyYXBwZXJNYXA8Tm9kZT4gPiBtX2RvbU5vZGVN YXA7CiAgICAgT3duUHRyPERPTVdyYXBwZXJNYXA8dm9pZD4gPiBtX2RvbU9iamVjdE1hcDsKIH07 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0ludHJ1c2l2ZURPTVdy YXBwZXJNYXAuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0ludHJ1c2l2ZURPTVdyYXBw ZXJNYXAuaApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMTIyNDZiNjc1MTY5YjFjM2Qw M2Q2YzY0MzNmZGJkMDU3YzZiYTJhOS4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9JbnRydXNpdmVET01XcmFw cGVyTWFwLmgKKysrIC9kZXYvbnVsbApAQCAtMSw4MCArMCwwIEBACi0vKgotICogQ29weXJpZ2h0 IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMgYXJlCi0gKiBtZXQ6Ci0gKgotICogICAgICogUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KLSAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUKLSAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKLSAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFu ZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKLSAqIGRpc3RyaWJ1dGlvbi4K LSAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBv ZiBpdHMKLSAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUg cHJvZHVjdHMgZGVyaXZlZCBmcm9tCi0gKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMg cHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKLSAqICJBUyBJUyIg QU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U Ci0gKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElU WSBBTkQgRklUTkVTUyBGT1IKLSAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVE LiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCi0gKiBPV05FUiBPUiBDT05UUklCVVRP UlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKLSAqIFNQ RUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QKLSAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLAotICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1Mg SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCi0gKiBUSEVPUlkgT0YgTElB QklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0g KiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotI2lmbmRlZiBJbnRydXNpdmVE T01XcmFwcGVyTWFwX2gKLSNkZWZpbmUgSW50cnVzaXZlRE9NV3JhcHBlck1hcF9oCi0KLSNpbmNs dWRlICJET01XcmFwcGVyTWFwLmgiCi0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotdGVtcGxhdGU8 Y2xhc3MgS2V5VHlwZT4KLWNsYXNzIEludHJ1c2l2ZURPTVdyYXBwZXJNYXAgOiBwdWJsaWMgRE9N V3JhcHBlck1hcDxLZXlUeXBlPiB7Ci1wdWJsaWM6Ci0gICAgdmlydHVhbCB2ODo6UGVyc2lzdGVu dDx2ODo6T2JqZWN0PiBnZXQoS2V5VHlwZSoga2V5KSBPVkVSUklERQotICAgIHsKLSAgICAgICAg cmV0dXJuIGtleS0+d3JhcHBlcigpOwotICAgIH0KLQotICAgIHZpcnR1YWwgdm9pZCBzZXQoS2V5 VHlwZSoga2V5LCB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0PiB3cmFwcGVyKSBPVkVSUklERQot ICAgIHsKLSAgICAgICAgQVNTRVJUKGtleSAmJiBrZXktPndyYXBwZXIoKS5Jc0VtcHR5KCkpOwot ICAgICAgICBrZXktPnNldFdyYXBwZXIod3JhcHBlcik7Ci0gICAgICAgIHdyYXBwZXIuTWFrZVdl YWsoa2V5LCB3ZWFrQ2FsbGJhY2spOwotICAgIH0KLQotICAgIHZpcnR1YWwgdm9pZCBjbGVhcigp IE9WRVJSSURFCi0gICAgewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICB9Ci0K LSAgICB2aXJ0dWFsIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVt b3J5T2JqZWN0SW5mbykgY29uc3QgT1ZFUlJJREUKLSAgICB7Ci0gICAgICAgIE1lbW9yeUNsYXNz SW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8sIHRoaXMsIFdlYkNvcmVNZW1vcnlUeXBlczo6Qmlu ZGluZyk7Ci0gICAgICAgIFVOVVNFRF9QQVJBTShpbmZvKTsKLSAgICB9Ci0KLXByaXZhdGU6Ci0g ICAgc3RhdGljIHZvaWQgd2Vha0NhbGxiYWNrKHY4OjpQZXJzaXN0ZW50PHY4OjpWYWx1ZT4gdmFs dWUsIHZvaWQqIGNvbnRleHQpCi0gICAgewotICAgICAgICBLZXlUeXBlKiBrZXkgPSBzdGF0aWNf Y2FzdDxLZXlUeXBlKj4oY29udGV4dCk7Ci0gICAgICAgIEFTU0VSVCh2YWx1ZS0+SXNPYmplY3Qo KSk7Ci0gICAgICAgIEFTU0VSVChrZXktPndyYXBwZXIoKSA9PSB2ODo6UGVyc2lzdGVudDx2ODo6 T2JqZWN0Pjo6Q2FzdCh2YWx1ZSkpOwotCi0gICAgICAgIGtleS0+Y2xlYXJXcmFwcGVyKCk7Ci0g ICAgICAgIHZhbHVlLkRpc3Bvc2UoKTsKLSAgICAgICAgdmFsdWUuQ2xlYXIoKTsKLSAgICAgICAg a2V5LT5kZXJlZigpOwotICAgIH0KLX07Ci0KLX0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKLQotI2Vu ZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEdDQ29udHJvbGxl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEdDQ29udHJvbGxlci5jcHAKaW5k ZXggMmY2YzRkYTc2NDE2MjMyNDgxMzBlNmU0MmYzMWRjYmIzYjcyYmNkZi4uM2Q0NDBlZWU3NjJk NWI3ZjdlYWJjNzMzYTRlYzE1ZDJhNWI2NjBhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvVjhHQ0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcApAQCAtMzcsNyArMzcsNiBAQAogI2luY2x1ZGUgIkRP TUltcGxlbWVudGF0aW9uLmgiCiAjaW5jbHVkZSAiSFRNTEltYWdlRWxlbWVudC5oIgogI2luY2x1 ZGUgIkhUTUxOYW1lcy5oIgotI2luY2x1ZGUgIkludHJ1c2l2ZURPTVdyYXBwZXJNYXAuaCIKICNp bmNsdWRlICJNZW1vcnlVc2FnZVN1cHBvcnQuaCIKICNpbmNsdWRlICJNZXNzYWdlUG9ydC5oIgog I2luY2x1ZGUgIlJldGFpbmVkRE9NSW5mby5oIgo=