91096 2012-07-12 08:19:04 -0700 Web Inspector: fix instrumentation code for the bindings instrumentation 2012-07-13 02:02:39 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 loislo loislo abarth alph apavlov bweinstein haraken japhet jochen joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 667788 0 loislo 2012-07-12 08:19:04 -0700 EOM 667808 1 151964 loislo 2012-07-12 08:31:23 -0700 Created attachment 151964 Patch 667838 2 loislo 2012-07-12 09:00:06 -0700 Committed r122466: <http://trac.webkit.org/changeset/122466> 668576 3 151964 yurys 2012-07-12 20:58:10 -0700 Comment on attachment 151964 Patch Could you explain which what kind of problem this patch addresses? 668747 4 loislo 2012-07-13 02:02:39 -0700 (In reply to comment #3) > (From update of attachment 151964 [details]) > Could you explain which what kind of problem this patch addresses? bindings related classes were instrumented a little bit different way than other WebCore code. I just made the instrumentation a bit more consistent. In next patches I'd like to slightly adjust the instrumentation API. It'd be simpler to do that if the instrumentation code uses a single pattern. 151964 2012-07-12 08:31:23 -0700 2012-07-12 20:58:10 -0700 Patch bug-91096-20120712193121.patch text/plain 12236 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzE3ZDQ2MjJiNTczZmJk ZmYxMjhhMTMwODA1MzI1Njk0OWNlOTYxNy4uNDg3YjE5YThiNDQ2ZmY0YjQxNzYwYzUyOTZiOGRi ZmM4M2UyNzM0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDEyLTA3LTEyICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBmaXggbmF0aXZlIG1lbW9yeSBpbnN0cnVtZW50YXRpb24gY29kZSBmb3IgdGhlIGJpbmRp bmdzIGluc3RydW1lbnRhdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTkxMDk2CisKKyAgICAgICAgVGhlIGluc3RydW1lbnRlZCBjbGFzcyBoYXMg dG8gaGF2ZSBpbnN0cnVtZW50YXRpb24gbWV0aG9kIHdoaWNoIHJlcG9ydHMgY2xhc3Mgc2l6ZSBh bmQgdHlwZSBhbmQKKyAgICAgICAgdGhlIG1lbWJlciBvYmplY3RzIGFuZCBwb2ludGVycy4KKwor ICAgICAgICBTYW1wbGU6CisgICAgICAgIHZvaWQgTm9kZTo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVt b3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykgY29uc3QKKyAgICAgICAgeworICAgICAg ICAgICAgbWVtb3J5T2JqZWN0SW5mby0+cmVwb3J0T2JqZWN0SW5mbyh0aGlzLCBNZW1vcnlJbnN0 cnVtZW50YXRpb246OkRPTSk7IC8vIHJlcG9ydCBvYmplY3Qgc2l6ZSBhbmQgdHlwZS4KKyAgICAg ICAgICAgIFRyZWVTaGFyZWQ8Tm9kZSwgQ29udGFpbmVyTm9kZT46OnJlcG9ydE1lbW9yeVVzYWdl KG1lbW9yeU9iamVjdEluZm8pOyAvLyBjYWxsIGJhc2UgY2xhc3MgaW5zdHJ1bWVudGF0aW9uLgor ICAgICAgICAgICAgU2NyaXB0V3JhcHBhYmxlOjpyZXBvcnRNZW1vcnlVc2FnZShtZW1vcnlPYmpl Y3RJbmZvKTsgLy8gY2FsbCBiYXNlIGNsYXNzIGluc3RydW1lbnRhdGlvbi4KKyAgICAgICAgICAg IG1lbW9yeU9iamVjdEluZm8tPnJlcG9ydFBvaW50ZXIobV9kb2N1bWVudCwgTWVtb3J5SW5zdHJ1 bWVudGF0aW9uOjpET00pOyAvLyByZXBvcnQgdW5pbnN0cnVtZW50ZWQgcG9pbnRlci4KKyAgICAg ICAgICAgIG1lbW9yeU9iamVjdEluZm8tPnJlcG9ydEluc3RydW1lbnRlZFBvaW50ZXIobV9uZXh0 KTsgLy8gcmVwb3J0IGluc3RydW1lbnRlZCBwb2ludGVyLgorICAgICAgICAgICAgbWVtb3J5T2Jq ZWN0SW5mby0+cmVwb3J0SW5zdHJ1bWVudGVkT2JqZWN0KG1fYW5PYmplY3QpOyAvLyByZXBvcnQg aW5zdHJ1bWVudGVkIG9iamVjdC4KKyAgICAgICAgfQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGl0aW9uYWwgaW5mb3JtYXRpb24gb2YgdGhlIGNo YW5nZSBzdWNoIGFzIGFwcHJvYWNoLCByYXRpb25hbGUuIFBsZWFzZSBhZGQgcGVyLWZ1bmN0aW9u IGRlc2NyaXB0aW9ucyBiZWxvdyAoT09QUyEpLgorCisgICAgICAgIEV4aXN0aW5nIHRlc3RzIGZv ciBuYXRpdmUgbWVtb3J5IGluc3RydW1lbnRhdGlvbi4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4 L0RPTURhdGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01EYXRhU3RvcmU6OnJlcG9y dE1lbW9yeVVzYWdlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9ET01EYXRhU3RvcmUuaDoKKyAg ICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoRE9NRGF0YVN0b3JlKToKKyAgICAgICAgKiBiaW5k aW5ncy92OC9JbnRydXNpdmVET01XcmFwcGVyTWFwLmg6CisgICAgICAgIChXZWJDb3JlOjpDaHVu a2VkVGFibGU6OnJlcG9ydE1lbW9yeVVzYWdlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3Jp cHRQcm9maWxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRQcm9maWxlcjo6Y29sbGVj dEJpbmRpbmdNZW1vcnlJbmZvKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOEJpbmRpbmcuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VjhCaW5kaW5nUGVySXNvbGF0ZURhdGE6OnJlcG9ydE1lbW9y eVVzYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0cmluZ0NhY2hlOjpyZXBvcnRNZW1vcnlVc2Fn ZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhCaW5kaW5nLmg6CisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKFN0cmluZ0NhY2hlKToKKyAgICAgICAgKFY4QmluZGluZ1Blcklzb2xhdGVE YXRhKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTU1hcC5oOgorICAgICAgICAoV2ViQ29y ZSk6CisgICAgICAgIChBYnN0cmFjdFdlYWtSZWZlcmVuY2VNYXApOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKwogMjAx Mi0wNy0xMiAgRG9uZ3dvbyBJbSAgPGR3LmltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIEluc3Bl Y3RvckZpbGVTeXN0ZW1BZ2VudC5jcHAgaGF2ZSB0byBpbmNsdWRlIEZpbGUuaCBleHBsaWNpdGx5 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9ET01EYXRhU3RvcmUuY3Bw IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmNwcAppbmRleCBkYmNh Mzk1NDA5NWFmMzY5MTAzNzFjOWUwOTdlOTY5ZWQ5OWE2NmVkLi45NWVmZDUwNTk3ZTA4YjhjMWEz YTA1NjQxNTYwZjE3MWEyNTIwY2YwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9ET01EYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RP TURhdGFTdG9yZS5jcHAKQEAgLTExOSwxMyArMTE5LDEzIEBAIHZvaWQqIERPTURhdGFTdG9yZTo6 Z2V0RE9NV3JhcHBlck1hcChET01XcmFwcGVyTWFwVHlwZSB0eXBlKQogICAgIHJldHVybiAwOwog fQogCi12b2lkIERPTURhdGFTdG9yZTo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5SW5zdHJ1bWVu dGF0aW9uKiBpbnN0cnVtZW50YXRpb24pCit2b2lkIERPTURhdGFTdG9yZTo6cmVwb3J0TWVtb3J5 VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykgY29uc3QKIHsKLSAgICBp bnN0cnVtZW50YXRpb24tPnJlcG9ydFBvaW50ZXIodGhpcywgTWVtb3J5SW5zdHJ1bWVudGF0aW9u OjpCaW5kaW5nKTsKLSAgICBkb21Ob2RlTWFwKCkucmVwb3J0TWVtb3J5VXNhZ2UoaW5zdHJ1bWVu dGF0aW9uKTsKLSAgICBhY3RpdmVEb21Ob2RlTWFwKCkucmVwb3J0TWVtb3J5VXNhZ2UoaW5zdHJ1 bWVudGF0aW9uKTsKLSAgICBkb21PYmplY3RNYXAoKS5yZXBvcnRNZW1vcnlVc2FnZShpbnN0cnVt ZW50YXRpb24pOwotICAgIGFjdGl2ZURvbU9iamVjdE1hcCgpLnJlcG9ydE1lbW9yeVVzYWdlKGlu c3RydW1lbnRhdGlvbik7CisgICAgbWVtb3J5T2JqZWN0SW5mby0+cmVwb3J0T2JqZWN0SW5mbyh0 aGlzLCBNZW1vcnlJbnN0cnVtZW50YXRpb246OkJpbmRpbmcpOworICAgIG1lbW9yeU9iamVjdElu Zm8tPnJlcG9ydEluc3RydW1lbnRlZFBvaW50ZXIobV9kb21Ob2RlTWFwKTsKKyAgICBtZW1vcnlP YmplY3RJbmZvLT5yZXBvcnRJbnN0cnVtZW50ZWRQb2ludGVyKG1fYWN0aXZlRG9tTm9kZU1hcCk7 CisgICAgbWVtb3J5T2JqZWN0SW5mby0+cmVwb3J0SW5zdHJ1bWVudGVkUG9pbnRlcihtX2RvbU9i amVjdE1hcCk7CisgICAgbWVtb3J5T2JqZWN0SW5mby0+cmVwb3J0SW5zdHJ1bWVudGVkUG9pbnRl cihtX2FjdGl2ZURvbU9iamVjdE1hcCk7CiB9CiAKIC8vIENhbGxlZCB3aGVuIHRoZSBvYmplY3Qg aXMgbmVhciBkZWF0aCAobm90IHJlYWNoYWJsZSBmcm9tIEpTIHJvb3RzKS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGFTdG9yZS5oIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmgKaW5kZXggYjViZGZjMzkyNWQzMTFhNDliNGYw ZWRiZGQxMDMxY2Y5MzA0YmJlMy4uM2U2ZDQzZDcyZWFmMWQ0MWY4ZmUxOTRlZDBlOTE2NDgwMTYx NzFkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3Jl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmgKQEAgLTQ3 LDcgKzQ3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgY2xhc3MgRE9NRGF0YTsKICAg ICBjbGFzcyBET01EYXRhU3RvcmU7Ci0gICAgY2xhc3MgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOwor ICAgIGNsYXNzIE1lbW9yeU9iamVjdEluZm87CiAKICAgICB0eXBlZGVmIFdURjo6VmVjdG9yPERP TURhdGFTdG9yZSo+IERPTURhdGFMaXN0OwogCkBAIC04Nyw3ICs4Nyw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgc3RhdGljIHZvaWQgd2Vha0FjdGl2ZURPTU9iamVjdENhbGxiYWNr KHY4OjpQZXJzaXN0ZW50PHY4OjpWYWx1ZT4gdjhPYmplY3QsIHZvaWQqIGRvbU9iamVjdCk7CiAg ICAgICAgIHN0YXRpYyB2b2lkIHdlYWtOb2RlQ2FsbGJhY2sodjg6OlBlcnNpc3RlbnQ8djg6OlZh bHVlPiB2OE9iamVjdCwgdm9pZCogZG9tT2JqZWN0KTsKIAotICAgICAgICB2b2lkIHJlcG9ydE1l bW9yeVVzYWdlKE1lbW9yeUluc3RydW1lbnRhdGlvbiopOworICAgICAgICB2b2lkIHJlcG9ydE1l bW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdDsKIAogICAgIHByb3RlY3RlZDoKICAg ICAgICAgc3RhdGljIHZvaWQgd2Vha0RPTU9iamVjdENhbGxiYWNrKHY4OjpQZXJzaXN0ZW50PHY4 OjpWYWx1ZT4gdjhPYmplY3QsIHZvaWQqIGRvbU9iamVjdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9JbnRydXNpdmVET01XcmFwcGVyTWFwLmggYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9JbnRydXNpdmVET01XcmFwcGVyTWFwLmgKaW5kZXggNWQ2MTY2OGMx OTA5MDI3NWZkYTUxMmJlZmYzMWMyMTRiMzk4OTAxOC4uNTIzMDhiZGM0M2RlNTY5MDhiMDA4Yjg0 MDI5ZDhiMzM3NzIwMmNkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv SW50cnVzaXZlRE9NV3JhcHBlck1hcC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L0ludHJ1c2l2ZURPTVdyYXBwZXJNYXAuaApAQCAtMTAyLDEwICsxMDIsMTEgQEAgY2xhc3MgQ2h1 bmtlZFRhYmxlIHsKICAgICAgICAgICAgIHZpc2l0RW50cmllcyhzdG9yZSwgY2h1bmstPm1fZW50 cmllcywgY2h1bmstPm1fZW50cmllcyArIENIVU5LX1NJWkUsIHZpc2l0b3IpOwogICAgIH0KIAot ICAgIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5SW5zdHJ1bWVudGF0aW9uKiBpbnN0cnVt ZW50YXRpb24pCisgICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBt ZW1vcnlPYmplY3RJbmZvKSBjb25zdAogICAgIHsKKyAgICAgICAgbWVtb3J5T2JqZWN0SW5mby0+ cmVwb3J0T2JqZWN0SW5mbyh0aGlzLCBNZW1vcnlJbnN0cnVtZW50YXRpb246OkJpbmRpbmcpOwog ICAgICAgICBmb3IgKENodW5rKiBjaHVuayA9IG1fY2h1bmtzOyBjaHVuazsgY2h1bmsgPSBjaHVu ay0+bV9wcmV2aW91cykKLSAgICAgICAgICAgIGluc3RydW1lbnRhdGlvbi0+cmVwb3J0UG9pbnRl cihjaHVuaywgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpCaW5kaW5nKTsKKyAgICAgICAgICAgIG1l bW9yeU9iamVjdEluZm8tPnJlcG9ydFBvaW50ZXIoY2h1bmssIE1lbW9yeUluc3RydW1lbnRhdGlv bjo6QmluZGluZyk7CiAgICAgfQogCiAgIHByaXZhdGU6CkBAIC0xODMsMTAgKzE4NCwxMCBAQCBw dWJsaWM6CiAgICAgICAgIG1fdGFibGUuY2xlYXIoKTsKICAgICB9CiAKLSAgICB2aXJ0dWFsIHZv aWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5SW5zdHJ1bWVudGF0aW9uKiBpbnN0cnVtZW50YXRp b24pIE9WRVJSSURFCisgICAgdmlydHVhbCB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9i amVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0IE9WRVJSSURFCiAgICAgewotICAgICAg ICBpbnN0cnVtZW50YXRpb24tPnJlcG9ydFBvaW50ZXIodGhpcywgTWVtb3J5SW5zdHJ1bWVudGF0 aW9uOjpCaW5kaW5nKTsKLSAgICAgICAgbV90YWJsZS5yZXBvcnRNZW1vcnlVc2FnZShpbnN0cnVt ZW50YXRpb24pOworICAgICAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRPYmplY3RJbmZvKHRo aXMsIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6QmluZGluZyk7CisgICAgICAgIG1lbW9yeU9iamVj dEluZm8tPnJlcG9ydEluc3RydW1lbnRlZE9iamVjdChtX3RhYmxlKTsKICAgICB9CiAKIHByaXZh dGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRQcm9maWxl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRQcm9maWxlci5jcHAKaW5k ZXggOGQ2YzUwMjllOWVlNTcwYTRjNzdiODcyODNlNWM1ZjQwYzk2ODc2Yi4uMDdmMDM5ZTdjNWU3 ZGIzZjdjZDhjY2E3MDM2YTU5NmJkMWM1NjUxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvU2NyaXB0UHJvZmlsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdFByb2ZpbGVyLmNwcApAQCAtMjIzLDkgKzIyMyw3IEBAIHZvaWQgU2NyaXB0 UHJvZmlsZXI6OnZpc2l0RXh0ZXJuYWxBcnJheXMoRXh0ZXJuYWxBcnJheVZpc2l0b3IqIHZpc2l0 b3IpCiB2b2lkIFNjcmlwdFByb2ZpbGVyOjpjb2xsZWN0QmluZGluZ01lbW9yeUluZm8oTWVtb3J5 SW5zdHJ1bWVudGF0aW9uKiBpbnN0cnVtZW50YXRpb24pCiB7CiAgICAgVjhCaW5kaW5nUGVySXNv bGF0ZURhdGEqIGRhdGEgPSBWOEJpbmRpbmdQZXJJc29sYXRlRGF0YTo6Y3VycmVudCgpOwotICAg IGlmICghZGF0YSkKLSAgICAgICAgcmV0dXJuOwotICAgIGRhdGEtPnJlcG9ydE1lbW9yeVVzYWdl KGluc3RydW1lbnRhdGlvbik7CisgICAgaW5zdHJ1bWVudGF0aW9uLT5yZXBvcnRJbnN0cnVtZW50 ZWRQb2ludGVyKGRhdGEpOwogfQogCiBzaXplX3QgU2NyaXB0UHJvZmlsZXI6OnByb2ZpbGVyU25h cHNob3RzU2l6ZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJp bmRpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmNwcAppbmRl eCBjMjliY2Y4MzM1ZGVmM2VjYWJhNDg5NTk2ZDM1MmFkNmQ4NDMwMDcxLi44MTk4YWQwZDZhYzFl OTk1NDliMGFjMWUxMzk4ZmYyMWYwNGQ5MjE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9WOEJpbmRpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4QmluZGluZy5jcHAKQEAgLTkwLDE1ICs5MCwxNiBAQCB2b2lkIFY4QmluZGluZ1Blcklzb2xh dGVEYXRhOjpkaXNwb3NlKHY4OjpJc29sYXRlKiBpc29sYXRlKQogICAgIGlzb2xhdGUtPlNldERh dGEoMCk7CiB9CiAKLXZvaWQgVjhCaW5kaW5nUGVySXNvbGF0ZURhdGE6OnJlcG9ydE1lbW9yeVVz YWdlKE1lbW9yeUluc3RydW1lbnRhdGlvbiogaW5zdHJ1bWVudGF0aW9uKQordm9pZCBWOEJpbmRp bmdQZXJJc29sYXRlRGF0YTo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVt b3J5T2JqZWN0SW5mbykgY29uc3QKIHsKLSAgICBpbnN0cnVtZW50YXRpb24tPnJlcG9ydFBvaW50 ZXIodGhpcywgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpCaW5kaW5nKTsKLSAgICBpbnN0cnVtZW50 YXRpb24tPnJlcG9ydEhhc2hNYXAobV9yYXdUZW1wbGF0ZXMsIE1lbW9yeUluc3RydW1lbnRhdGlv bjo6QmluZGluZyk7Ci0gICAgaW5zdHJ1bWVudGF0aW9uLT5yZXBvcnRIYXNoTWFwKG1fdGVtcGxh dGVzLCBNZW1vcnlJbnN0cnVtZW50YXRpb246OkJpbmRpbmcpOwotICAgIG1fc3RyaW5nQ2FjaGUu cmVwb3J0TWVtb3J5VXNhZ2UoaW5zdHJ1bWVudGF0aW9uKTsKKyAgICBtZW1vcnlPYmplY3RJbmZv LT5yZXBvcnRPYmplY3RJbmZvKHRoaXMsIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6QmluZGluZyk7 CisgICAgbWVtb3J5T2JqZWN0SW5mby0+cmVwb3J0SGFzaE1hcChtX3Jhd1RlbXBsYXRlcyk7Cisg ICAgbWVtb3J5T2JqZWN0SW5mby0+cmVwb3J0SGFzaE1hcChtX3RlbXBsYXRlcyk7CisgICAgbWVt b3J5T2JqZWN0SW5mby0+cmVwb3J0SW5zdHJ1bWVudGVkT2JqZWN0KG1fc3RyaW5nQ2FjaGUpOwor ICAgIG1lbW9yeU9iamVjdEluZm8tPnJlcG9ydFZlY3RvcihtX2RvbURhdGFMaXN0KTsKIAogICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9kb21EYXRhTGlzdC5zaXplKCk7IGkrKykKLSAgICAg ICAgbV9kb21EYXRhTGlzdFtpXS0+cmVwb3J0TWVtb3J5VXNhZ2UoaW5zdHJ1bWVudGF0aW9uKTsK KyAgICAgICAgbWVtb3J5T2JqZWN0SW5mby0+cmVwb3J0SW5zdHJ1bWVudGVkUG9pbnRlcihtX2Rv bURhdGFMaXN0W2ldKTsKIH0KIAogLy8gV2ViQ29yZVN0cmluZ1Jlc291cmNlIGlzIGEgaGVscGVy IGNsYXNzIGZvciB2OEV4dGVybmFsU3RyaW5nLiBJdCBpcyB1c2VkCkBAIC01ODcsOSArNTg4LDEw IEBAIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBnZXRUb1N0cmluZ1RlbXBs YXRlKCkKICAgICByZXR1cm4gdG9TdHJpbmdUZW1wbGF0ZTsKIH0KIAotdm9pZCBTdHJpbmdDYWNo ZTo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5SW5zdHJ1bWVudGF0aW9uKiBpbnN0cnVtZW50YXRp b24pCit2b2lkIFN0cmluZ0NhY2hlOjpyZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZv KiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAogewotICAgIGluc3RydW1lbnRhdGlvbi0+cmVwb3J0 SGFzaE1hcChtX3N0cmluZ0NhY2hlLCBNZW1vcnlJbnN0cnVtZW50YXRpb246OkJpbmRpbmcpOwor ICAgIG1lbW9yeU9iamVjdEluZm8tPnJlcG9ydE9iamVjdEluZm8odGhpcywgTWVtb3J5SW5zdHJ1 bWVudGF0aW9uOjpCaW5kaW5nKTsKKyAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRIYXNoTWFw KG1fc3RyaW5nQ2FjaGUpOwogfQogICAgIAogUGFzc1JlZlB0cjxET01TdHJpbmdMaXN0PiB2OFZh bHVlVG9XZWJDb3JlRE9NU3RyaW5nTGlzdCh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJpbmRpbmcuaCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5oCmluZGV4IGNiNDIwMDAyZjIwMWM0ZDM3 ZmRjM2RjOGNjYTcwMGQzZmVjMjQwZGYuLjg2MmVmNzE1YmIxZjc5N2I3NDk3ZTk5ZGY2NWMwZDVm NDliOWM3ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGlu Zy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5oCkBAIC00OSw3 ICs0OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBFdmVudExpc3RlbmVyOwog ICAgIGNsYXNzIEV2ZW50VGFyZ2V0OwogICAgIGNsYXNzIEV4dGVybmFsU3RyaW5nVmlzaXRvcjsK LSAgICBjbGFzcyBNZW1vcnlJbnN0cnVtZW50YXRpb247CisgICAgY2xhc3MgTWVtb3J5T2JqZWN0 SW5mbzsKIAogICAgIC8vIEZJWE1FOiBSZW1vdmUgVjhCaW5kaW5nLgogICAgIGNsYXNzIFY4Qmlu ZGluZyB7CkBAIC03OSw3ICs3OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2 b2lkIHJlbW92ZShTdHJpbmdJbXBsKik7CiAKLSAgICAgICAgdm9pZCByZXBvcnRNZW1vcnlVc2Fn ZShNZW1vcnlJbnN0cnVtZW50YXRpb24qKTsKKyAgICAgICAgdm9pZCByZXBvcnRNZW1vcnlVc2Fn ZShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7CiAKICAgICBwcml2YXRlOgogICAgICAgICB2ODo6 TG9jYWw8djg6OlN0cmluZz4gdjhFeHRlcm5hbFN0cmluZ1Nsb3coU3RyaW5nSW1wbCosIHY4OjpJ c29sYXRlKik7CkBAIC0yMTcsNyArMjE3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAg ICAgIEdDRXZlbnREYXRhJiBnY0V2ZW50RGF0YSgpIHsgcmV0dXJuIG1fZ2NFdmVudERhdGE7IH0K IAotICAgICAgICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeUluc3RydW1lbnRhdGlvbiop OworICAgICAgICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qKSBjb25z dDsKIAogICAgIHByaXZhdGU6CiAgICAgICAgIGV4cGxpY2l0IFY4QmluZGluZ1Blcklzb2xhdGVE YXRhKHY4OjpJc29sYXRlKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9WOERPTU1hcC5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuaAppbmRl eCA0ZWU2YzMxOGQxYjI3NWQzYTUwOWNkYmZlMDkwYzQxYTA4MGY0YTE3Li4yYjcwYzU4MmI2ZTVj NzlmZWI5YzU5NDZlYjZlMzM2ZWFlOGNkN2QxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9WOERPTU1hcC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 RE9NTWFwLmgKQEAgLTM5LDcgKzM5LDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFz cyBET01EYXRhU3RvcmU7CiAgICAgY2xhc3MgTm9kZTsKLSAgICBjbGFzcyBNZW1vcnlJbnN0cnVt ZW50YXRpb247CisgICAgY2xhc3MgTWVtb3J5T2JqZWN0SW5mbzsKIAogICAgIHRlbXBsYXRlIDxj bGFzcyBLZXlUeXBlLCBjbGFzcyBWYWx1ZVR5cGU+IGNsYXNzIEFic3RyYWN0V2Vha1JlZmVyZW5j ZU1hcCB7CiAgICAgcHVibGljOgpAQCAtNjQsNyArNjQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICAgICAgICAgdjg6OldlYWtSZWZlcmVuY2VDYWxsYmFjayB3ZWFrUmVmZXJlbmNlQ2FsbGJh Y2soKSB7IHJldHVybiBtX3dlYWtSZWZlcmVuY2VDYWxsYmFjazsgfQogCi0gICAgICAgIHZpcnR1 YWwgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlJbnN0cnVtZW50YXRpb24qKSA9IDA7Cisg ICAgICAgIHZpcnR1YWwgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKikg Y29uc3QgPSAwOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgdjg6OldlYWtSZWZlcmVuY2VDYWxs YmFjayBtX3dlYWtSZWZlcmVuY2VDYWxsYmFjazsKQEAgLTEzNCw5ICsxMzQsMTAgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICAgICAgdmlzaXRvci0+ZW5kTWFwKCk7CiAgICAgICAgIH0K IAotICAgICAgICB2aXJ0dWFsIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5SW5zdHJ1bWVu dGF0aW9uKiBpbnN0cnVtZW50YXRpb24pIE9WRVJSSURFCisgICAgICAgIHZpcnR1YWwgdm9pZCBy ZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25z dCBPVkVSUklERQogICAgICAgICB7Ci0gICAgICAgICAgICBpbnN0cnVtZW50YXRpb24tPnJlcG9y dEhhc2hNYXAobV9tYXAsIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6QmluZGluZyk7CisgICAgICAg ICAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRPYmplY3RJbmZvKHRoaXMsIE1lbW9yeUluc3Ry dW1lbnRhdGlvbjo6QmluZGluZyk7CisgICAgICAgICAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBv cnRIYXNoTWFwKG1fbWFwKTsKICAgICAgICAgfQogCiAgICAgcHJvdGVjdGVkOgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKaW5kZXggZmYw MWZmYmY5MzcwMzk1NjEzYjcxZDY4ZGRhMTljYjRhMjdkMjNkZi4uNWIzZTM2NjJkNWE1MWVkYTYy MGYzODdlNjVhOTljYzMwOTAwZjc0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwCkBAIC01NDgsNiArNTQ4LDcgQEAgcHVibGljOgog ICAgIHZvaWQgdmlzaXRCaW5kaW5ncygpCiAgICAgewogICAgICAgICBTY3JpcHRQcm9maWxlcjo6 Y29sbGVjdEJpbmRpbmdNZW1vcnlJbmZvKCZtX2RvbU1lbW9yeVVzYWdlKTsKKyAgICAgICAgbV9k b21NZW1vcnlVc2FnZS5wcm9jZXNzRGVmZXJyZWRJbnN0cnVtZW50ZWRQb2ludGVycygpOwogICAg IH0KIAogICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yTWVtb3J5QmxvY2s+IGR1bXBTdGF0aXN0aWNz KEluc3BlY3RvckRhdGFDb3VudGVyKiBpbnNwZWN0b3JEYXRhKQo=