93001 2012-08-02 09:25:06 -0700 Web Inspector: simple replace objectType with ownerObjectType in NMI code 2012-08-03 00:42:00 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 92994 87262 0 loislo loislo alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 685480 0 loislo 2012-08-02 09:25:06 -0700 In all the cases when we are visiting members, objectType field is actually the objectType of the member's owner object. 685482 1 156106 loislo 2012-08-02 09:27:58 -0700 Created attachment 156106 Patch 686314 2 loislo 2012-08-03 00:42:00 -0700 Committed r124572: <http://trac.webkit.org/changeset/124572> 156106 2012-08-02 09:27:58 -0700 2012-08-02 22:57:08 -0700 Patch bug-93001-20120802202738.patch text/plain 15233 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ0MTIwYTc4NTcwZGE5 ZGM4YzA3OTlhODc2NjdhN2M5MDRkNTNjMS4uN2IyMmZiYjQyMWNhZGY2MmRhMWJlNTg5ZDc3OTRj M2RkMGJiODQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDEyLTA4LTAyICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVj dG9yOiBzaW1wbGUgcmVwbGFjZSBvYmplY3RUeXBlIHdpdGggb3duZXJPYmplY3RUeXBlIGluIE5N SSBjb2RlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTMwMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ biBhbGwgdGhlIGNhc2VzIHdoZW4gd2UgYXJlIHZpc2l0aW5nIG1lbWJlcnMsIG9iamVjdFR5cGUg ZmllbGQgaXMgYWN0dWFsbHkgdGhlIG9iamVjdCB0eXBlIG9mIHRoZSBtZW1iZXIncyBvd25lciBv YmplY3QuCisKKyAgICAgICAgKiBkb20vTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAg IChXZWJDb3JlOjpNZW1vcnlJbnN0cnVtZW50YXRpb246Okluc3RydW1lbnRlZFBvaW50ZXI6Oklu c3RydW1lbnRlZFBvaW50ZXIpOgorICAgICAgICAoSW5zdHJ1bWVudGVkUG9pbnRlcik6CisgICAg ICAgIChXZWJDb3JlOjpNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZE9iamVjdCk6CisgICAgICAg IChXZWJDb3JlOjpNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZEluc3RydW1lbnRlZE9iamVjdCk6 CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZFJhd0J1ZmZlcik6 CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlJbnN0cnVtZW50YXRpb246Ok93bmluZ1RyYWl0czo6 YWRkSW5zdHJ1bWVudGVkT2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUluc3RydW1l bnRhdGlvbjo6T3duaW5nVHJhaXRzOjphZGRPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVt b3J5T2JqZWN0SW5mbzo6TWVtb3J5T2JqZWN0SW5mbyk6CisgICAgICAgIChXZWJDb3JlOjpNZW1v cnlJbnN0cnVtZW50YXRpb246OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwpOgorICAgICAgICAo V2ViQ29yZTo6TWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRPYmplY3RJbXBsKToKKyAgICAgICAg KFdlYkNvcmU6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRkSGFzaE1hcCk6CisgICAgICAgIChX ZWJDb3JlOjpNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZEhhc2hTZXQpOgorICAgICAgICAoV2Vi Q29yZTo6TWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRJbnN0cnVtZW50ZWRDb2xsZWN0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRkTGlzdEhhc2hTZXQp OgorICAgICAgICAoV2ViQ29yZTo6TWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRWZWN0b3IpOgor ICAgICAgICAoV2ViQ29yZTo6Ojpwcm9jZXNzKToKKworMjAxMi0wOC0wMiAgSWx5YSBUaWtob25v dnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogZXh0 ZW5kIHRlc3QgY292ZXJhZ2UgZm9yIG5taSBjb2RlLgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI5OTQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZG9tL01lbW9yeUluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvZG9tL01lbW9y eUluc3RydW1lbnRhdGlvbi5oCmluZGV4IDNiMzQyZmQwNjA2MWVhZDQyMWNiZjhjMDk3M2NkY2Q1 ZDFmZTQ1ZjYuLmQ0NmU1ZTEwNDc2NTc5M2E1M2QyNzM5NTI1Y2FhYTE1MjIyMjM3N2IgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9NZW1vcnlJbnN0cnVtZW50YXRpb24uaAorKysgYi9T b3VyY2UvV2ViQ29yZS9kb20vTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKQEAgLTc5LDMxICs3OSwz MSBAQCBwcml2YXRlOgogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBmcmllbmQgY2xhc3MgTWVt b3J5Q2xhc3NJbmZvOwogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBjbGFzcyBJbnN0cnVtZW50 ZWRQb2ludGVyIDogcHVibGljIEluc3RydW1lbnRlZFBvaW50ZXJCYXNlIHsKICAgICBwdWJsaWM6 Ci0gICAgICAgIGV4cGxpY2l0IEluc3RydW1lbnRlZFBvaW50ZXIoY29uc3QgVCogcG9pbnRlciwg T2JqZWN0VHlwZSBvYmplY3RUeXBlKSA6IG1fcG9pbnRlcihwb2ludGVyKSwgbV9vYmplY3RUeXBl KG9iamVjdFR5cGUpIHsgfQorICAgICAgICBleHBsaWNpdCBJbnN0cnVtZW50ZWRQb2ludGVyKGNv bnN0IFQqIHBvaW50ZXIsIE9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlKSA6IG1fcG9pbnRlcihw b2ludGVyKSwgbV9vd25lck9iamVjdFR5cGUob3duZXJPYmplY3RUeXBlKSB7IH0KICAgICAgICAg dmlydHVhbCB2b2lkIHByb2Nlc3MoTWVtb3J5SW5zdHJ1bWVudGF0aW9uKikgT1ZFUlJJREU7CiAK ICAgICBwcml2YXRlOgogICAgICAgICBjb25zdCBUKiBtX3BvaW50ZXI7Ci0gICAgICAgIGNvbnN0 IE9iamVjdFR5cGUgbV9vYmplY3RUeXBlOworICAgICAgICBjb25zdCBPYmplY3RUeXBlIG1fb3du ZXJPYmplY3RUeXBlOwogICAgIH07CiAKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gdm9pZCBh ZGRPYmplY3QoY29uc3QgVCYgdCwgT2JqZWN0VHlwZSBvYmplY3RUeXBlKQorICAgIHRlbXBsYXRl IDx0eXBlbmFtZSBUPiB2b2lkIGFkZE9iamVjdChjb25zdCBUJiB0LCBPYmplY3RUeXBlIG93bmVy T2JqZWN0VHlwZSkKICAgICB7Ci0gICAgICAgIE93bmluZ1RyYWl0czxUPjo6YWRkT2JqZWN0KHRo aXMsIHQsIG9iamVjdFR5cGUpOworICAgICAgICBPd25pbmdUcmFpdHM8VD46OmFkZE9iamVjdCh0 aGlzLCB0LCBvd25lck9iamVjdFR5cGUpOwogICAgIH0KICAgICB2b2lkIGFkZFN0cmluZyhjb25z dCBTdHJpbmcmLCBPYmplY3RUeXBlKTsKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gdm9pZCBh ZGRJbnN0cnVtZW50ZWRPYmplY3QoY29uc3QgVCYgdCwgT2JqZWN0VHlwZSBvYmplY3RUeXBlKSB7 IE93bmluZ1RyYWl0czxUPjo6YWRkSW5zdHJ1bWVudGVkT2JqZWN0KHRoaXMsIHQsIG9iamVjdFR5 cGUpOyB9CisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFQ+IHZvaWQgYWRkSW5zdHJ1bWVudGVkT2Jq ZWN0KGNvbnN0IFQmIHQsIE9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlKSB7IE93bmluZ1RyYWl0 czxUPjo6YWRkSW5zdHJ1bWVudGVkT2JqZWN0KHRoaXMsIHQsIG93bmVyT2JqZWN0VHlwZSk7IH0K IAogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBIYXNoTWFwVHlwZT4gdm9pZCBhZGRIYXNoTWFwKGNv bnN0IEhhc2hNYXBUeXBlJiwgT2JqZWN0VHlwZSwgYm9vbCBjb250ZW50T25seSA9IGZhbHNlKTsK ICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgSGFzaFNldFR5cGU+IHZvaWQgYWRkSGFzaFNldChjb25z dCBIYXNoU2V0VHlwZSYsIE9iamVjdFR5cGUsIGJvb2wgY29udGVudE9ubHkgPSBmYWxzZSk7CiAg ICAgdGVtcGxhdGUgPHR5cGVuYW1lIENvbGxlY3Rpb25UeXBlPiB2b2lkIGFkZEluc3RydW1lbnRl ZENvbGxlY3Rpb24oY29uc3QgQ29sbGVjdGlvblR5cGUmLCBPYmplY3RUeXBlLCBib29sIGNvbnRl bnRPbmx5ID0gZmFsc2UpOwogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBMaXN0SGFzaFNldFR5cGU+ IHZvaWQgYWRkTGlzdEhhc2hTZXQoY29uc3QgTGlzdEhhc2hTZXRUeXBlJiwgT2JqZWN0VHlwZSwg Ym9vbCBjb250ZW50T25seSA9IGZhbHNlKTsKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVmVjdG9y VHlwZT4gdm9pZCBhZGRWZWN0b3IoY29uc3QgVmVjdG9yVHlwZSYsIE9iamVjdFR5cGUsIGJvb2wg Y29udGVudE9ubHkgPSBmYWxzZSk7Ci0gICAgdm9pZCBhZGRSYXdCdWZmZXIoY29uc3Qgdm9pZCog Y29uc3QmIGJ1ZmZlciwgT2JqZWN0VHlwZSBvYmplY3RUeXBlLCBzaXplX3Qgc2l6ZSkKKyAgICB2 b2lkIGFkZFJhd0J1ZmZlcihjb25zdCB2b2lkKiBjb25zdCYgYnVmZmVyLCBPYmplY3RUeXBlIG93 bmVyT2JqZWN0VHlwZSwgc2l6ZV90IHNpemUpCiAgICAgewogICAgICAgICBpZiAoIWJ1ZmZlciB8 fCB2aXNpdGVkKGJ1ZmZlcikpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGNvdW50T2Jq ZWN0U2l6ZShvYmplY3RUeXBlLCBzaXplKTsKKyAgICAgICAgY291bnRPYmplY3RTaXplKG93bmVy T2JqZWN0VHlwZSwgc2l6ZSk7CiAgICAgfQogCiAgICAgZW51bSBPd25pbmdUeXBlIHsKQEAgLTEx MywxNCArMTEzLDE0IEBAIHByaXZhdGU6CiAKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KICAg ICBzdHJ1Y3QgT3duaW5nVHJhaXRzIHsgLy8gRGVmYXVsdCBieVJlZmVyZW5jZSBpbXBsZW1lbnRh dGlvbi4KLSAgICAgICAgc3RhdGljIHZvaWQgYWRkSW5zdHJ1bWVudGVkT2JqZWN0KE1lbW9yeUlu c3RydW1lbnRhdGlvbiogaW5zdHJ1bWVudGF0aW9uLCBjb25zdCBUJiB0LCBPYmplY3RUeXBlIG9i amVjdFR5cGUpIHsgaW5zdHJ1bWVudGF0aW9uLT5hZGRJbnN0cnVtZW50ZWRPYmplY3RJbXBsKCZ0 LCBvYmplY3RUeXBlLCBieVJlZmVyZW5jZSk7IH0KLSAgICAgICAgc3RhdGljIHZvaWQgYWRkT2Jq ZWN0KE1lbW9yeUluc3RydW1lbnRhdGlvbiogaW5zdHJ1bWVudGF0aW9uLCBjb25zdCBUJiB0LCBP YmplY3RUeXBlIG9iamVjdFR5cGUpIHsgaW5zdHJ1bWVudGF0aW9uLT5hZGRPYmplY3RJbXBsKCZ0 LCBvYmplY3RUeXBlLCBieVJlZmVyZW5jZSk7IH0KKyAgICAgICAgc3RhdGljIHZvaWQgYWRkSW5z dHJ1bWVudGVkT2JqZWN0KE1lbW9yeUluc3RydW1lbnRhdGlvbiogaW5zdHJ1bWVudGF0aW9uLCBj b25zdCBUJiB0LCBPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlwZSkgeyBpbnN0cnVtZW50YXRpb24t PmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwoJnQsIG93bmVyT2JqZWN0VHlwZSwgYnlSZWZlcmVu Y2UpOyB9CisgICAgICAgIHN0YXRpYyB2b2lkIGFkZE9iamVjdChNZW1vcnlJbnN0cnVtZW50YXRp b24qIGluc3RydW1lbnRhdGlvbiwgY29uc3QgVCYgdCwgT2JqZWN0VHlwZSBvd25lck9iamVjdFR5 cGUpIHsgaW5zdHJ1bWVudGF0aW9uLT5hZGRPYmplY3RJbXBsKCZ0LCBvd25lck9iamVjdFR5cGUs IGJ5UmVmZXJlbmNlKTsgfQogICAgIH07CiAKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KICAg ICBzdHJ1Y3QgT3duaW5nVHJhaXRzPFQqPiB7IC8vIEN1c3RvbSBieVBvaW50ZXIgaW1wbGVtZW50 YXRpb24uCi0gICAgICAgIHN0YXRpYyB2b2lkIGFkZEluc3RydW1lbnRlZE9iamVjdChNZW1vcnlJ bnN0cnVtZW50YXRpb24qIGluc3RydW1lbnRhdGlvbiwgY29uc3QgVCogY29uc3QmIHQsIE9iamVj dFR5cGUgb2JqZWN0VHlwZSkgeyBpbnN0cnVtZW50YXRpb24tPmFkZEluc3RydW1lbnRlZE9iamVj dEltcGwodCwgb2JqZWN0VHlwZSwgYnlQb2ludGVyKTsgfQotICAgICAgICBzdGF0aWMgdm9pZCBh ZGRPYmplY3QoTWVtb3J5SW5zdHJ1bWVudGF0aW9uKiBpbnN0cnVtZW50YXRpb24sIGNvbnN0IFQq IGNvbnN0JiB0LCBPYmplY3RUeXBlIG9iamVjdFR5cGUpIHsgaW5zdHJ1bWVudGF0aW9uLT5hZGRP YmplY3RJbXBsKHQsIG9iamVjdFR5cGUsIGJ5UG9pbnRlcik7IH0KKyAgICAgICAgc3RhdGljIHZv aWQgYWRkSW5zdHJ1bWVudGVkT2JqZWN0KE1lbW9yeUluc3RydW1lbnRhdGlvbiogaW5zdHJ1bWVu dGF0aW9uLCBjb25zdCBUKiBjb25zdCYgdCwgT2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUpIHsg aW5zdHJ1bWVudGF0aW9uLT5hZGRJbnN0cnVtZW50ZWRPYmplY3RJbXBsKHQsIG93bmVyT2JqZWN0 VHlwZSwgYnlQb2ludGVyKTsgfQorICAgICAgICBzdGF0aWMgdm9pZCBhZGRPYmplY3QoTWVtb3J5 SW5zdHJ1bWVudGF0aW9uKiBpbnN0cnVtZW50YXRpb24sIGNvbnN0IFQqIGNvbnN0JiB0LCBPYmpl Y3RUeXBlIG93bmVyT2JqZWN0VHlwZSkgeyBpbnN0cnVtZW50YXRpb24tPmFkZE9iamVjdEltcGwo dCwgb3duZXJPYmplY3RUeXBlLCBieVBvaW50ZXIpOyB9CiAgICAgfTsKIAogICAgIHRlbXBsYXRl IDx0eXBlbmFtZSBUPiB2b2lkIGFkZEluc3RydW1lbnRlZE9iamVjdEltcGwoY29uc3QgVCogY29u c3QmLCBPYmplY3RUeXBlLCBPd25pbmdUeXBlKTsKQEAgLTEzNiw5ICsxMzYsOSBAQCBwcml2YXRl OgogCiBjbGFzcyBNZW1vcnlPYmplY3RJbmZvIHsKIHB1YmxpYzoKLSAgICBNZW1vcnlPYmplY3RJ bmZvKE1lbW9yeUluc3RydW1lbnRhdGlvbiogbWVtb3J5SW5zdHJ1bWVudGF0aW9uLCBNZW1vcnlJ bnN0cnVtZW50YXRpb246Ok9iamVjdFR5cGUgb2JqZWN0VHlwZSkKKyAgICBNZW1vcnlPYmplY3RJ bmZvKE1lbW9yeUluc3RydW1lbnRhdGlvbiogbWVtb3J5SW5zdHJ1bWVudGF0aW9uLCBNZW1vcnlJ bnN0cnVtZW50YXRpb246Ok9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlKQogICAgICAgICA6IG1f bWVtb3J5SW5zdHJ1bWVudGF0aW9uKG1lbW9yeUluc3RydW1lbnRhdGlvbikKLSAgICAgICAgLCBt X29iamVjdFR5cGUob2JqZWN0VHlwZSkKKyAgICAgICAgLCBtX29iamVjdFR5cGUob3duZXJPYmpl Y3RUeXBlKQogICAgICAgICAsIG1fb2JqZWN0U2l6ZSgwKQogICAgIHsgfQogCkBAIC0yMDEsNjQg KzIwMSw2NCBAQCBwcml2YXRlOgogfTsKIAogdGVtcGxhdGUgPHR5cGVuYW1lIFQ+Ci12b2lkIE1l bW9yeUluc3RydW1lbnRhdGlvbjo6YWRkSW5zdHJ1bWVudGVkT2JqZWN0SW1wbChjb25zdCBUKiBj b25zdCYgb2JqZWN0LCBPYmplY3RUeXBlIG9iamVjdFR5cGUsIE93bmluZ1R5cGUgb3duaW5nVHlw ZSkKK3ZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRJbnN0cnVtZW50ZWRPYmplY3RJbXBs KGNvbnN0IFQqIGNvbnN0JiBvYmplY3QsIE9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlLCBPd25p bmdUeXBlIG93bmluZ1R5cGUpCiB7CiAgICAgaWYgKG93bmluZ1R5cGUgPT0gYnlSZWZlcmVuY2Up IHsKLSAgICAgICAgTWVtb3J5T2JqZWN0SW5mbyBtZW1vcnlPYmplY3RJbmZvKHRoaXMsIG9iamVj dFR5cGUpOworICAgICAgICBNZW1vcnlPYmplY3RJbmZvIG1lbW9yeU9iamVjdEluZm8odGhpcywg b3duZXJPYmplY3RUeXBlKTsKICAgICAgICAgb2JqZWN0LT5yZXBvcnRNZW1vcnlVc2FnZSgmbWVt b3J5T2JqZWN0SW5mbyk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKCFvYmplY3QgfHwgdmlz aXRlZChvYmplY3QpKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBkZWZlckluc3RydW1l bnRlZFBvaW50ZXIoYWRvcHRQdHIobmV3IEluc3RydW1lbnRlZFBvaW50ZXI8VD4ob2JqZWN0LCBv YmplY3RUeXBlKSkpOworICAgICAgICBkZWZlckluc3RydW1lbnRlZFBvaW50ZXIoYWRvcHRQdHIo bmV3IEluc3RydW1lbnRlZFBvaW50ZXI8VD4ob2JqZWN0LCBvd25lck9iamVjdFR5cGUpKSk7CiAg ICAgfQogfQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KLXZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0 aW9uOjphZGRJbnN0cnVtZW50ZWRPYmplY3RJbXBsKGNvbnN0IERhdGFSZWY8VD4qIGNvbnN0JiBv YmplY3QsIE9iamVjdFR5cGUgb2JqZWN0VHlwZSwgT3duaW5nVHlwZSBvd25pbmdUeXBlKQordm9p ZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwoY29uc3Qg RGF0YVJlZjxUPiogY29uc3QmIG9iamVjdCwgT2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUsIE93 bmluZ1R5cGUgb3duaW5nVHlwZSkKIHsKICAgICBpZiAob3duaW5nVHlwZSA9PSBieVBvaW50ZXIp Ci0gICAgICAgIGNvdW50T2JqZWN0U2l6ZShvYmplY3RUeXBlLCBzaXplb2YoRGF0YVJlZjxUPikp OwotICAgIGFkZEluc3RydW1lbnRlZE9iamVjdEltcGwob2JqZWN0LT5nZXQoKSwgb2JqZWN0VHlw ZSwgYnlQb2ludGVyKTsKKyAgICAgICAgY291bnRPYmplY3RTaXplKG93bmVyT2JqZWN0VHlwZSwg c2l6ZW9mKERhdGFSZWY8VD4pKTsKKyAgICBhZGRJbnN0cnVtZW50ZWRPYmplY3RJbXBsKG9iamVj dC0+Z2V0KCksIG93bmVyT2JqZWN0VHlwZSwgYnlQb2ludGVyKTsKIH0KIAogdGVtcGxhdGUgPHR5 cGVuYW1lIFQ+Ci12b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRkSW5zdHJ1bWVudGVkT2Jq ZWN0SW1wbChjb25zdCBPd25QdHI8VD4qIGNvbnN0JiBvYmplY3QsIE9iamVjdFR5cGUgb2JqZWN0 VHlwZSwgT3duaW5nVHlwZSBvd25pbmdUeXBlKQordm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246 OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwoY29uc3QgT3duUHRyPFQ+KiBjb25zdCYgb2JqZWN0 LCBPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlwZSwgT3duaW5nVHlwZSBvd25pbmdUeXBlKQogewog ICAgIGlmIChvd25pbmdUeXBlID09IGJ5UG9pbnRlcikKLSAgICAgICAgY291bnRPYmplY3RTaXpl KG9iamVjdFR5cGUsIHNpemVvZihPd25QdHI8VD4pKTsKLSAgICBhZGRJbnN0cnVtZW50ZWRPYmpl Y3RJbXBsKG9iamVjdC0+Z2V0KCksIG9iamVjdFR5cGUsIGJ5UG9pbnRlcik7CisgICAgICAgIGNv dW50T2JqZWN0U2l6ZShvd25lck9iamVjdFR5cGUsIHNpemVvZihPd25QdHI8VD4pKTsKKyAgICBh ZGRJbnN0cnVtZW50ZWRPYmplY3RJbXBsKG9iamVjdC0+Z2V0KCksIG93bmVyT2JqZWN0VHlwZSwg YnlQb2ludGVyKTsKIH0KIAogdGVtcGxhdGUgPHR5cGVuYW1lIFQ+Ci12b2lkIE1lbW9yeUluc3Ry dW1lbnRhdGlvbjo6YWRkSW5zdHJ1bWVudGVkT2JqZWN0SW1wbChjb25zdCBSZWZQdHI8VD4qIGNv bnN0JiBvYmplY3QsIE9iamVjdFR5cGUgb2JqZWN0VHlwZSwgT3duaW5nVHlwZSBvd25pbmdUeXBl KQordm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwo Y29uc3QgUmVmUHRyPFQ+KiBjb25zdCYgb2JqZWN0LCBPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlw ZSwgT3duaW5nVHlwZSBvd25pbmdUeXBlKQogewogICAgIGlmIChvd25pbmdUeXBlID09IGJ5UG9p bnRlcikKLSAgICAgICAgY291bnRPYmplY3RTaXplKG9iamVjdFR5cGUsIHNpemVvZihSZWZQdHI8 VD4pKTsKLSAgICBhZGRJbnN0cnVtZW50ZWRPYmplY3RJbXBsKG9iamVjdC0+Z2V0KCksIG9iamVj dFR5cGUsIGJ5UG9pbnRlcik7CisgICAgICAgIGNvdW50T2JqZWN0U2l6ZShvd25lck9iamVjdFR5 cGUsIHNpemVvZihSZWZQdHI8VD4pKTsKKyAgICBhZGRJbnN0cnVtZW50ZWRPYmplY3RJbXBsKG9i amVjdC0+Z2V0KCksIG93bmVyT2JqZWN0VHlwZSwgYnlQb2ludGVyKTsKIH0KIAogdGVtcGxhdGUg PHR5cGVuYW1lIFQ+Ci12b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRkT2JqZWN0SW1wbChj b25zdCBEYXRhUmVmPFQ+KiBjb25zdCYgb2JqZWN0LCBPYmplY3RUeXBlIG9iamVjdFR5cGUsIE93 bmluZ1R5cGUgb3duaW5nVHlwZSkKK3ZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRPYmpl Y3RJbXBsKGNvbnN0IERhdGFSZWY8VD4qIGNvbnN0JiBvYmplY3QsIE9iamVjdFR5cGUgb3duZXJP YmplY3RUeXBlLCBPd25pbmdUeXBlIG93bmluZ1R5cGUpCiB7CiAgICAgaWYgKG93bmluZ1R5cGUg PT0gYnlQb2ludGVyKQotICAgICAgICBjb3VudE9iamVjdFNpemUob2JqZWN0VHlwZSwgc2l6ZW9m KERhdGFSZWY8VD4pKTsKLSAgICBhZGRPYmplY3RJbXBsKG9iamVjdC0+Z2V0KCksIG9iamVjdFR5 cGUsIGJ5UG9pbnRlcik7CisgICAgICAgIGNvdW50T2JqZWN0U2l6ZShvd25lck9iamVjdFR5cGUs IHNpemVvZihEYXRhUmVmPFQ+KSk7CisgICAgYWRkT2JqZWN0SW1wbChvYmplY3QtPmdldCgpLCBv d25lck9iamVjdFR5cGUsIGJ5UG9pbnRlcik7CiB9CiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBUPgot dm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZE9iamVjdEltcGwoY29uc3QgT3duUHRyPFQ+ KiBjb25zdCYgb2JqZWN0LCBPYmplY3RUeXBlIG9iamVjdFR5cGUsIE93bmluZ1R5cGUgb3duaW5n VHlwZSkKK3ZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRPYmplY3RJbXBsKGNvbnN0IE93 blB0cjxUPiogY29uc3QmIG9iamVjdCwgT2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUsIE93bmlu Z1R5cGUgb3duaW5nVHlwZSkKIHsKICAgICBpZiAob3duaW5nVHlwZSA9PSBieVBvaW50ZXIpCi0g ICAgICAgIGNvdW50T2JqZWN0U2l6ZShvYmplY3RUeXBlLCBzaXplb2YoUmVmUHRyPFQ+KSk7Ci0g ICAgYWRkT2JqZWN0SW1wbChvYmplY3QtPmdldCgpLCBvYmplY3RUeXBlLCBieVBvaW50ZXIpOwor ICAgICAgICBjb3VudE9iamVjdFNpemUob3duZXJPYmplY3RUeXBlLCBzaXplb2YoUmVmUHRyPFQ+ KSk7CisgICAgYWRkT2JqZWN0SW1wbChvYmplY3QtPmdldCgpLCBvd25lck9iamVjdFR5cGUsIGJ5 UG9pbnRlcik7CiB9CiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBUPgotdm9pZCBNZW1vcnlJbnN0cnVt ZW50YXRpb246OmFkZE9iamVjdEltcGwoY29uc3QgUmVmUHRyPFQ+KiBjb25zdCYgb2JqZWN0LCBP YmplY3RUeXBlIG9iamVjdFR5cGUsIE93bmluZ1R5cGUgb3duaW5nVHlwZSkKK3ZvaWQgTWVtb3J5 SW5zdHJ1bWVudGF0aW9uOjphZGRPYmplY3RJbXBsKGNvbnN0IFJlZlB0cjxUPiogY29uc3QmIG9i amVjdCwgT2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUsIE93bmluZ1R5cGUgb3duaW5nVHlwZSkK IHsKICAgICBpZiAob3duaW5nVHlwZSA9PSBieVBvaW50ZXIpCi0gICAgICAgIGNvdW50T2JqZWN0 U2l6ZShvYmplY3RUeXBlLCBzaXplb2YoUmVmUHRyPFQ+KSk7Ci0gICAgYWRkT2JqZWN0SW1wbChv YmplY3QtPmdldCgpLCBvYmplY3RUeXBlLCBieVBvaW50ZXIpOworICAgICAgICBjb3VudE9iamVj dFNpemUob3duZXJPYmplY3RUeXBlLCBzaXplb2YoUmVmUHRyPFQ+KSk7CisgICAgYWRkT2JqZWN0 SW1wbChvYmplY3QtPmdldCgpLCBvd25lck9iamVjdFR5cGUsIGJ5UG9pbnRlcik7CiB9CiAKIC8v IExpbmsgdGltZSBndWFyZCBmb3Igc3RyaW5nIG1lbWJlcnMuIFRoZXkgcHJvZHVjZSBsaW5rIGVy cm9yIGlzIGEgc3RyaW5nIGlzIHJlcG9ydGVkIHZpYSBhZGRPYmplY3QuCkBAIC0yNjYsNTcgKzI2 Niw1NyBAQCB0ZW1wbGF0ZSA8PiB2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRkT2JqZWN0 SW1wbDxBdG9taWNTdHJpbmc+KGNvbnN0IEF0b21pYwogdGVtcGxhdGUgPD4gdm9pZCBNZW1vcnlJ bnN0cnVtZW50YXRpb246OmFkZE9iamVjdEltcGw8U3RyaW5nPihjb25zdCBTdHJpbmcqIGNvbnN0 JiwgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpPYmplY3RUeXBlLCBNZW1vcnlJbnN0cnVtZW50YXRp b246Ok93bmluZ1R5cGUpOwogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KLXZvaWQgTWVtb3J5SW5z dHJ1bWVudGF0aW9uOjphZGRPYmplY3RJbXBsKGNvbnN0IFQqIGNvbnN0JiBvYmplY3QsIE9iamVj dFR5cGUgb2JqZWN0VHlwZSwgT3duaW5nVHlwZSBvd25pbmdUeXBlKQordm9pZCBNZW1vcnlJbnN0 cnVtZW50YXRpb246OmFkZE9iamVjdEltcGwoY29uc3QgVCogY29uc3QmIG9iamVjdCwgT2JqZWN0 VHlwZSBvd25lck9iamVjdFR5cGUsIE93bmluZ1R5cGUgb3duaW5nVHlwZSkKIHsKICAgICBpZiAo IW9iamVjdCB8fCB2aXNpdGVkKG9iamVjdCkpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAob3du aW5nVHlwZSA9PSBieVJlZmVyZW5jZSkKICAgICAgICAgcmV0dXJuOwotICAgIGNvdW50T2JqZWN0 U2l6ZShvYmplY3RUeXBlLCBzaXplb2YoVCkpOworICAgIGNvdW50T2JqZWN0U2l6ZShvd25lck9i amVjdFR5cGUsIHNpemVvZihUKSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hNYXBUeXBl Pgotdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZEhhc2hNYXAoY29uc3QgSGFzaE1hcFR5 cGUmIGhhc2hNYXAsIE9iamVjdFR5cGUgb2JqZWN0VHlwZSwgYm9vbCBjb250ZW50T25seSkKK3Zv aWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRIYXNoTWFwKGNvbnN0IEhhc2hNYXBUeXBlJiBo YXNoTWFwLCBPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlwZSwgYm9vbCBjb250ZW50T25seSkKIHsK ICAgICBpZiAodmlzaXRlZCgmaGFzaE1hcCkpCiAgICAgICAgIHJldHVybjsKLSAgICBjb3VudE9i amVjdFNpemUob2JqZWN0VHlwZSwgY2FsY3VsYXRlQ29udGFpbmVyU2l6ZShoYXNoTWFwLCBjb250 ZW50T25seSkpOworICAgIGNvdW50T2JqZWN0U2l6ZShvd25lck9iamVjdFR5cGUsIGNhbGN1bGF0 ZUNvbnRhaW5lclNpemUoaGFzaE1hcCwgY29udGVudE9ubHkpKTsKIH0KIAogdGVtcGxhdGU8dHlw ZW5hbWUgSGFzaFNldFR5cGU+Ci12b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRkSGFzaFNl dChjb25zdCBIYXNoU2V0VHlwZSYgaGFzaFNldCwgT2JqZWN0VHlwZSBvYmplY3RUeXBlLCBib29s IGNvbnRlbnRPbmx5KQordm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZEhhc2hTZXQoY29u c3QgSGFzaFNldFR5cGUmIGhhc2hTZXQsIE9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlLCBib29s IGNvbnRlbnRPbmx5KQogewogICAgIGlmICh2aXNpdGVkKCZoYXNoU2V0KSkKICAgICAgICAgcmV0 dXJuOwotICAgIGNvdW50T2JqZWN0U2l6ZShvYmplY3RUeXBlLCBjYWxjdWxhdGVDb250YWluZXJT aXplKGhhc2hTZXQsIGNvbnRlbnRPbmx5KSk7CisgICAgY291bnRPYmplY3RTaXplKG93bmVyT2Jq ZWN0VHlwZSwgY2FsY3VsYXRlQ29udGFpbmVyU2l6ZShoYXNoU2V0LCBjb250ZW50T25seSkpOwog fQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ29sbGVjdGlvblR5cGU+Ci12b2lkIE1lbW9yeUluc3Ry dW1lbnRhdGlvbjo6YWRkSW5zdHJ1bWVudGVkQ29sbGVjdGlvbihjb25zdCBDb2xsZWN0aW9uVHlw ZSYgY29sbGVjdGlvbiwgT2JqZWN0VHlwZSBvYmplY3RUeXBlLCBib29sIGNvbnRlbnRPbmx5KQor dm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZEluc3RydW1lbnRlZENvbGxlY3Rpb24oY29u c3QgQ29sbGVjdGlvblR5cGUmIGNvbGxlY3Rpb24sIE9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBl LCBib29sIGNvbnRlbnRPbmx5KQogewogICAgIGlmICh2aXNpdGVkKCZjb2xsZWN0aW9uKSkKICAg ICAgICAgcmV0dXJuOwotICAgIGNvdW50T2JqZWN0U2l6ZShvYmplY3RUeXBlLCBjYWxjdWxhdGVD b250YWluZXJTaXplKGNvbGxlY3Rpb24sIGNvbnRlbnRPbmx5KSk7CisgICAgY291bnRPYmplY3RT aXplKG93bmVyT2JqZWN0VHlwZSwgY2FsY3VsYXRlQ29udGFpbmVyU2l6ZShjb2xsZWN0aW9uLCBj b250ZW50T25seSkpOwogICAgIHR5cGVuYW1lIENvbGxlY3Rpb25UeXBlOjpjb25zdF9pdGVyYXRv ciBlbmQgPSBjb2xsZWN0aW9uLmVuZCgpOwogICAgIGZvciAodHlwZW5hbWUgQ29sbGVjdGlvblR5 cGU6OmNvbnN0X2l0ZXJhdG9yIGkgPSBjb2xsZWN0aW9uLmJlZ2luKCk7IGkgIT0gZW5kOyArK2kp Ci0gICAgICAgIGFkZEluc3RydW1lbnRlZE9iamVjdCgqaSwgb2JqZWN0VHlwZSk7CisgICAgICAg IGFkZEluc3RydW1lbnRlZE9iamVjdCgqaSwgb3duZXJPYmplY3RUeXBlKTsKIH0KIAogdGVtcGxh dGU8dHlwZW5hbWUgTGlzdEhhc2hTZXRUeXBlPgotdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246 OmFkZExpc3RIYXNoU2V0KGNvbnN0IExpc3RIYXNoU2V0VHlwZSYgaGFzaFNldCwgT2JqZWN0VHlw ZSBvYmplY3RUeXBlLCBib29sIGNvbnRlbnRPbmx5KQordm9pZCBNZW1vcnlJbnN0cnVtZW50YXRp b246OmFkZExpc3RIYXNoU2V0KGNvbnN0IExpc3RIYXNoU2V0VHlwZSYgaGFzaFNldCwgT2JqZWN0 VHlwZSBvd25lck9iamVjdFR5cGUsIGJvb2wgY29udGVudE9ubHkpCiB7CiAgICAgaWYgKHZpc2l0 ZWQoJmhhc2hTZXQpKQogICAgICAgICByZXR1cm47CiAgICAgc2l6ZV90IHNpemUgPSAoY29udGVu dE9ubHkgPyAwIDogc2l6ZW9mKExpc3RIYXNoU2V0VHlwZSkpICsgaGFzaFNldC5jYXBhY2l0eSgp ICogc2l6ZW9mKHZvaWQqKSArIGhhc2hTZXQuc2l6ZSgpICogKHNpemVvZih0eXBlbmFtZSBMaXN0 SGFzaFNldFR5cGU6OlZhbHVlVHlwZSkgKyAyICogc2l6ZW9mKHZvaWQqKSk7Ci0gICAgY291bnRP YmplY3RTaXplKG9iamVjdFR5cGUsIHNpemUpOworICAgIGNvdW50T2JqZWN0U2l6ZShvd25lck9i amVjdFR5cGUsIHNpemUpOwogfQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVmVjdG9yVHlwZT4KLXZv aWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRWZWN0b3IoY29uc3QgVmVjdG9yVHlwZSYgdmVj dG9yLCBPYmplY3RUeXBlIG9iamVjdFR5cGUsIGJvb2wgY29udGVudE9ubHkpCit2b2lkIE1lbW9y eUluc3RydW1lbnRhdGlvbjo6YWRkVmVjdG9yKGNvbnN0IFZlY3RvclR5cGUmIHZlY3RvciwgT2Jq ZWN0VHlwZSBvd25lck9iamVjdFR5cGUsIGJvb2wgY29udGVudE9ubHkpCiB7CiAgICAgaWYgKCF2 ZWN0b3IuZGF0YSgpIHx8IHZpc2l0ZWQodmVjdG9yLmRhdGEoKSkpCiAgICAgICAgIHJldHVybjsK LSAgICBjb3VudE9iamVjdFNpemUob2JqZWN0VHlwZSwgY2FsY3VsYXRlQ29udGFpbmVyU2l6ZSh2 ZWN0b3IsIGNvbnRlbnRPbmx5KSk7CisgICAgY291bnRPYmplY3RTaXplKG93bmVyT2JqZWN0VHlw ZSwgY2FsY3VsYXRlQ29udGFpbmVyU2l6ZSh2ZWN0b3IsIGNvbnRlbnRPbmx5KSk7CiB9CiAKIHRl bXBsYXRlIDx0eXBlbmFtZSBDb250YWluZXI+CkBAIC0zMjgsNyArMzI4LDcgQEAgc2l6ZV90IE1l bW9yeUluc3RydW1lbnRhdGlvbjo6Y2FsY3VsYXRlQ29udGFpbmVyU2l6ZShjb25zdCBDb250YWlu ZXImIGNvbnRhaW5lciwKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiB2b2lkIE1lbW9yeUluc3RydW1l bnRhdGlvbjo6SW5zdHJ1bWVudGVkUG9pbnRlcjxUPjo6cHJvY2VzcyhNZW1vcnlJbnN0cnVtZW50 YXRpb24qIG1lbW9yeUluc3RydW1lbnRhdGlvbikKIHsKLSAgICBNZW1vcnlPYmplY3RJbmZvIG1l bW9yeU9iamVjdEluZm8obWVtb3J5SW5zdHJ1bWVudGF0aW9uLCBtX29iamVjdFR5cGUpOworICAg IE1lbW9yeU9iamVjdEluZm8gbWVtb3J5T2JqZWN0SW5mbyhtZW1vcnlJbnN0cnVtZW50YXRpb24s IG1fb3duZXJPYmplY3RUeXBlKTsKICAgICBtX3BvaW50ZXItPnJlcG9ydE1lbW9yeVVzYWdlKCZt ZW1vcnlPYmplY3RJbmZvKTsKICAgICBtZW1vcnlJbnN0cnVtZW50YXRpb24tPmNvdW50T2JqZWN0 U2l6ZShtZW1vcnlPYmplY3RJbmZvLm9iamVjdFR5cGUoKSwgbWVtb3J5T2JqZWN0SW5mby5vYmpl Y3RTaXplKCkpOwogfQo=