95716 2012-09-04 00:26:17 -0700 Web Inspector: NMI: cosmetic change, rename m_domMemoryUsage to m_memoryInstrumentation 2012-09-04 01:18:42 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 loislo loislo alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 710856 0 loislo 2012-09-04 00:26:17 -0700 EOM 710858 1 161979 loislo 2012-09-04 00:28:20 -0700 Created attachment 161979 Patch 710878 2 loislo 2012-09-04 01:18:42 -0700 Committed r127443: <http://trac.webkit.org/changeset/127443> 161979 2012-09-04 00:28:20 -0700 2012-09-04 00:31:47 -0700 Patch bug-95716-20120904112803.patch text/plain 8925 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY5MDI2YjcxMmIyYjBm YjJiNzRiNmU4MjM0ZDEzZDE1MWNhY2FlYi4uOWE4ZWI3ZWMxMjFhMDcxNTZmZGNkOGQ4MmMyMzQ0 NDNjZGUxODhhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA5LTA0ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBOTUk6IGNvc21ldGljIGNoYW5nZSwgcmVuYW1lIG1fZG9tTWVtb3J5VXNhZ2UgdG8gbV9t ZW1vcnlJbnN0cnVtZW50YXRpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05NTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Y29sbGVjdERvbVRyZWVJbmZvKToKKwog MjAxMi0wOC0zMSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAK ICAgICAgICAgW1F0XSBQb3J0IHRoZSBRdCBwaXhtYXAgSlMgYmluZGluZ3MgdG8gdXNlIHRoZSBK U0MgQyBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JN ZW1vcnlBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5 QWdlbnQuY3BwCmluZGV4IGVhNTI1NGFhYjU5ZTMyNGJhY2JhOTc3N2I2NmRmMzgwYTI1YjRjN2Eu LmE1YmQyMTA2MWUyNzgyM2ZiMGRkZjA0MmEwYzYxOTFiODc3M2RlZGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcApAQCAtNDUxLDkg KzQ1MSw5IEBAIG5hbWVzcGFjZSB7CiAKIGNsYXNzIERPTVRyZWVzSXRlcmF0b3IgOiBwdWJsaWMg Tm9kZVdyYXBwZXJWaXNpdG9yIHsKIHB1YmxpYzoKLSAgICBET01UcmVlc0l0ZXJhdG9yKFBhZ2Uq IHBhZ2UsIFZpc2l0ZWRPYmplY3RzJiB2aXNpdGVkT2JqZWN0cykKKyAgICBET01UcmVlc0l0ZXJh dG9yKFBhZ2UqIHBhZ2UsIE1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwmIG1lbW9yeUluc3RydW1l bnRhdGlvbikKICAgICAgICAgOiBtX3BhZ2UocGFnZSkKLSAgICAgICAgLCBtX2RvbU1lbW9yeVVz YWdlKHZpc2l0ZWRPYmplY3RzKQorICAgICAgICAsIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uKG1l bW9yeUluc3RydW1lbnRhdGlvbikKICAgICB7CiAgICAgfQogCkBAIC00NjIsMjIgKzQ2MiwyMiBA QCBwdWJsaWM6CiAgICAgICAgIGlmIChub2RlLT5kb2N1bWVudCgpICYmIG5vZGUtPmRvY3VtZW50 KCktPmZyYW1lKCkgJiYgbV9wYWdlICE9IG5vZGUtPmRvY3VtZW50KCktPmZyYW1lKCktPnBhZ2Uo KSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBtX2RvbU1lbW9yeVVzYWdlLmFkZFJv b3RPYmplY3Qobm9kZSk7CisgICAgICAgIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLmFkZFJvb3RP YmplY3Qobm9kZSk7CiAgICAgfQogCiAgICAgdm9pZCB2aXNpdEZyYW1lKEZyYW1lKiBmcmFtZSkK ICAgICB7Ci0gICAgICAgIG1fZG9tTWVtb3J5VXNhZ2UuYWRkUm9vdE9iamVjdChmcmFtZSk7Cisg ICAgICAgIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLmFkZFJvb3RPYmplY3QoZnJhbWUpOwogICAg IH0KIAogICAgIHZvaWQgdmlzaXRCaW5kaW5ncygpCiAgICAgewotICAgICAgICBTY3JpcHRQcm9m aWxlcjo6Y29sbGVjdEJpbmRpbmdNZW1vcnlJbmZvKCZtX2RvbU1lbW9yeVVzYWdlKTsKKyAgICAg ICAgU2NyaXB0UHJvZmlsZXI6OmNvbGxlY3RCaW5kaW5nTWVtb3J5SW5mbygmbV9tZW1vcnlJbnN0 cnVtZW50YXRpb24pOwogICAgIH0KIAogICAgIHZvaWQgdmlzaXRNZW1vcnlDYWNoZSgpCiAgICAg ewotICAgICAgICBtX2RvbU1lbW9yeVVzYWdlLmFkZFJvb3RPYmplY3QobWVtb3J5Q2FjaGUoKSk7 CisgICAgICAgIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLmFkZFJvb3RPYmplY3QobWVtb3J5Q2Fj aGUoKSk7CiAgICAgfQogCiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JNZW1vcnlCbG9jaz4gYnVp bGRPYmplY3RGb3JNZW1vcnlDYWNoZSgpIGNvbnN0CkBAIC00ODYsMTggKzQ4NiwxOCBAQCBwdWJs aWM6CiAKICAgICAgICAgQ09NUElMRV9BU1NFUlQoTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpMYXN0 VHlwZUVudHJ5ID09IE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Q2FjaGVkUmVzb3VyY2VYU0xUICsg MSwgb2JqZWN0X3R5cGVfZW51bV93YXNfY2hhbmdlZF9wbGVhc2VfZml4X3RoZV9pbXBsZW1lbnRh dGlvbik7CiAgICAgICAgIGZvciAoaW50IGkgPSBNZW1vcnlJbnN0cnVtZW50YXRpb246Ok1lbW9y eUNhY2hlU3RydWN0dXJlczsgaSA8IE1lbW9yeUluc3RydW1lbnRhdGlvbjo6TGFzdFR5cGVFbnRy eTsgKytpKQotICAgICAgICAgICAgdG90YWxTaXplICs9IG1fZG9tTWVtb3J5VXNhZ2UudG90YWxT aXplKHN0YXRpY19jYXN0PE1lbW9yeUluc3RydW1lbnRhdGlvbjo6T2JqZWN0VHlwZT4oaSkpOwor ICAgICAgICAgICAgdG90YWxTaXplICs9IG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLnRvdGFsU2l6 ZShzdGF0aWNfY2FzdDxNZW1vcnlJbnN0cnVtZW50YXRpb246Ok9iamVjdFR5cGU+KGkpKTsKIAog ICAgICAgICBSZWZQdHI8VHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvck1lbW9yeUJsb2NrPiA+ IGNoaWxkcmVuID0gVHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvck1lbW9yeUJsb2NrPjo6Y3Jl YXRlKCk7Ci0gICAgICAgIGFkZE1lbW9yeUJsb2NrRm9yKGNoaWxkcmVuLmdldCgpLCBtX2RvbU1l bW9yeVVzYWdlLnRvdGFsU2l6ZShNZW1vcnlJbnN0cnVtZW50YXRpb246Ok1lbW9yeUNhY2hlU3Ry dWN0dXJlcyksIE1lbW9yeUJsb2NrTmFtZTo6bWVtb3J5Q2FjaGVTdHJ1Y3R1cmVzKTsKLSAgICAg ICAgYWRkTWVtb3J5QmxvY2tGb3IoY2hpbGRyZW4uZ2V0KCksIG1fZG9tTWVtb3J5VXNhZ2UudG90 YWxTaXplKE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Q2FjaGVkUmVzb3VyY2UpLCBNZW1vcnlCbG9j a05hbWU6OmNhY2hlZFJlc291cmNlKTsKLSAgICAgICAgYWRkTWVtb3J5QmxvY2tGb3IoY2hpbGRy ZW4uZ2V0KCksIG1fZG9tTWVtb3J5VXNhZ2UudG90YWxTaXplKE1lbW9yeUluc3RydW1lbnRhdGlv bjo6Q2FjaGVkUmVzb3VyY2VDU1MpLCBNZW1vcnlCbG9ja05hbWU6OmNhY2hlZFJlc291cmNlQ1NT KTsKLSAgICAgICAgYWRkTWVtb3J5QmxvY2tGb3IoY2hpbGRyZW4uZ2V0KCksIG1fZG9tTWVtb3J5 VXNhZ2UudG90YWxTaXplKE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Q2FjaGVkUmVzb3VyY2VGb250 KSwgTWVtb3J5QmxvY2tOYW1lOjpjYWNoZWRSZXNvdXJjZUZvbnQpOwotICAgICAgICBhZGRNZW1v cnlCbG9ja0ZvcihjaGlsZHJlbi5nZXQoKSwgbV9kb21NZW1vcnlVc2FnZS50b3RhbFNpemUoTWVt b3J5SW5zdHJ1bWVudGF0aW9uOjpDYWNoZWRSZXNvdXJjZUltYWdlKSwgTWVtb3J5QmxvY2tOYW1l OjpjYWNoZWRSZXNvdXJjZUltYWdlKTsKLSAgICAgICAgYWRkTWVtb3J5QmxvY2tGb3IoY2hpbGRy ZW4uZ2V0KCksIG1fZG9tTWVtb3J5VXNhZ2UudG90YWxTaXplKE1lbW9yeUluc3RydW1lbnRhdGlv bjo6Q2FjaGVkUmVzb3VyY2VTY3JpcHQpLCBNZW1vcnlCbG9ja05hbWU6OmNhY2hlZFJlc291cmNl U2NyaXB0KTsKLSAgICAgICAgYWRkTWVtb3J5QmxvY2tGb3IoY2hpbGRyZW4uZ2V0KCksIG1fZG9t TWVtb3J5VXNhZ2UudG90YWxTaXplKE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Q2FjaGVkUmVzb3Vy Y2VTVkcpLCBNZW1vcnlCbG9ja05hbWU6OmNhY2hlZFJlc291cmNlU1ZHKTsKLSAgICAgICAgYWRk TWVtb3J5QmxvY2tGb3IoY2hpbGRyZW4uZ2V0KCksIG1fZG9tTWVtb3J5VXNhZ2UudG90YWxTaXpl KE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Q2FjaGVkUmVzb3VyY2VTaGFkZXIpLCBNZW1vcnlCbG9j a05hbWU6OmNhY2hlZFJlc291cmNlU2hhZGVyKTsKLSAgICAgICAgYWRkTWVtb3J5QmxvY2tGb3Io Y2hpbGRyZW4uZ2V0KCksIG1fZG9tTWVtb3J5VXNhZ2UudG90YWxTaXplKE1lbW9yeUluc3RydW1l bnRhdGlvbjo6Q2FjaGVkUmVzb3VyY2VYU0xUKSwgTWVtb3J5QmxvY2tOYW1lOjpjYWNoZWRSZXNv dXJjZVhTTFQpOworICAgICAgICBhZGRNZW1vcnlCbG9ja0ZvcihjaGlsZHJlbi5nZXQoKSwgbV9t ZW1vcnlJbnN0cnVtZW50YXRpb24udG90YWxTaXplKE1lbW9yeUluc3RydW1lbnRhdGlvbjo6TWVt b3J5Q2FjaGVTdHJ1Y3R1cmVzKSwgTWVtb3J5QmxvY2tOYW1lOjptZW1vcnlDYWNoZVN0cnVjdHVy ZXMpOworICAgICAgICBhZGRNZW1vcnlCbG9ja0ZvcihjaGlsZHJlbi5nZXQoKSwgbV9tZW1vcnlJ bnN0cnVtZW50YXRpb24udG90YWxTaXplKE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Q2FjaGVkUmVz b3VyY2UpLCBNZW1vcnlCbG9ja05hbWU6OmNhY2hlZFJlc291cmNlKTsKKyAgICAgICAgYWRkTWVt b3J5QmxvY2tGb3IoY2hpbGRyZW4uZ2V0KCksIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLnRvdGFs U2l6ZShNZW1vcnlJbnN0cnVtZW50YXRpb246OkNhY2hlZFJlc291cmNlQ1NTKSwgTWVtb3J5Qmxv Y2tOYW1lOjpjYWNoZWRSZXNvdXJjZUNTUyk7CisgICAgICAgIGFkZE1lbW9yeUJsb2NrRm9yKGNo aWxkcmVuLmdldCgpLCBtX21lbW9yeUluc3RydW1lbnRhdGlvbi50b3RhbFNpemUoTWVtb3J5SW5z dHJ1bWVudGF0aW9uOjpDYWNoZWRSZXNvdXJjZUZvbnQpLCBNZW1vcnlCbG9ja05hbWU6OmNhY2hl ZFJlc291cmNlRm9udCk7CisgICAgICAgIGFkZE1lbW9yeUJsb2NrRm9yKGNoaWxkcmVuLmdldCgp LCBtX21lbW9yeUluc3RydW1lbnRhdGlvbi50b3RhbFNpemUoTWVtb3J5SW5zdHJ1bWVudGF0aW9u OjpDYWNoZWRSZXNvdXJjZUltYWdlKSwgTWVtb3J5QmxvY2tOYW1lOjpjYWNoZWRSZXNvdXJjZUlt YWdlKTsKKyAgICAgICAgYWRkTWVtb3J5QmxvY2tGb3IoY2hpbGRyZW4uZ2V0KCksIG1fbWVtb3J5 SW5zdHJ1bWVudGF0aW9uLnRvdGFsU2l6ZShNZW1vcnlJbnN0cnVtZW50YXRpb246OkNhY2hlZFJl c291cmNlU2NyaXB0KSwgTWVtb3J5QmxvY2tOYW1lOjpjYWNoZWRSZXNvdXJjZVNjcmlwdCk7Cisg ICAgICAgIGFkZE1lbW9yeUJsb2NrRm9yKGNoaWxkcmVuLmdldCgpLCBtX21lbW9yeUluc3RydW1l bnRhdGlvbi50b3RhbFNpemUoTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpDYWNoZWRSZXNvdXJjZVNW RyksIE1lbW9yeUJsb2NrTmFtZTo6Y2FjaGVkUmVzb3VyY2VTVkcpOworICAgICAgICBhZGRNZW1v cnlCbG9ja0ZvcihjaGlsZHJlbi5nZXQoKSwgbV9tZW1vcnlJbnN0cnVtZW50YXRpb24udG90YWxT aXplKE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Q2FjaGVkUmVzb3VyY2VTaGFkZXIpLCBNZW1vcnlC bG9ja05hbWU6OmNhY2hlZFJlc291cmNlU2hhZGVyKTsKKyAgICAgICAgYWRkTWVtb3J5QmxvY2tG b3IoY2hpbGRyZW4uZ2V0KCksIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLnRvdGFsU2l6ZShNZW1v cnlJbnN0cnVtZW50YXRpb246OkNhY2hlZFJlc291cmNlWFNMVCksIE1lbW9yeUJsb2NrTmFtZTo6 Y2FjaGVkUmVzb3VyY2VYU0xUKTsKIAogICAgICAgICBSZWZQdHI8SW5zcGVjdG9yTWVtb3J5Qmxv Y2s+IGJsb2NrID0gSW5zcGVjdG9yTWVtb3J5QmxvY2s6OmNyZWF0ZSgpLnNldE5hbWUoTWVtb3J5 QmxvY2tOYW1lOjptZW1vcnlDYWNoZSk7CiAgICAgICAgIGJsb2NrLT5zZXRTaXplKHRvdGFsU2l6 ZSk7CkBAIC01MDksMTQgKzUwOSwxNCBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBzaXplX3Qg dG90YWxTaXplID0gMDsKICAgICAgICAgZm9yIChpbnQgaSA9IE1lbW9yeUluc3RydW1lbnRhdGlv bjo6T3RoZXI7IGkgPCBNZW1vcnlJbnN0cnVtZW50YXRpb246Ok1lbW9yeUNhY2hlU3RydWN0dXJl czsgKytpKQotICAgICAgICAgICAgdG90YWxTaXplICs9IG1fZG9tTWVtb3J5VXNhZ2UudG90YWxT aXplKHN0YXRpY19jYXN0PE1lbW9yeUluc3RydW1lbnRhdGlvbjo6T2JqZWN0VHlwZT4oaSkpOwor ICAgICAgICAgICAgdG90YWxTaXplICs9IG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLnRvdGFsU2l6 ZShzdGF0aWNfY2FzdDxNZW1vcnlJbnN0cnVtZW50YXRpb246Ok9iamVjdFR5cGU+KGkpKTsKIAog ICAgICAgICBSZWZQdHI8VHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvck1lbW9yeUJsb2NrPiA+ IGRvbUNoaWxkcmVuID0gVHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvck1lbW9yeUJsb2NrPjo6 Y3JlYXRlKCk7Ci0gICAgICAgIGFkZE1lbW9yeUJsb2NrRm9yKGRvbUNoaWxkcmVuLmdldCgpLCBt X2RvbU1lbW9yeVVzYWdlLnRvdGFsU2l6ZShNZW1vcnlJbnN0cnVtZW50YXRpb246Ok90aGVyKSwg TWVtb3J5QmxvY2tOYW1lOjpkb21UcmVlT3RoZXIpOwotICAgICAgICBhZGRNZW1vcnlCbG9ja0Zv cihkb21DaGlsZHJlbi5nZXQoKSwgbV9kb21NZW1vcnlVc2FnZS50b3RhbFNpemUoTWVtb3J5SW5z dHJ1bWVudGF0aW9uOjpET00pLCBNZW1vcnlCbG9ja05hbWU6OmRvbVRyZWVET00pOwotICAgICAg ICBhZGRNZW1vcnlCbG9ja0Zvcihkb21DaGlsZHJlbi5nZXQoKSwgbV9kb21NZW1vcnlVc2FnZS50 b3RhbFNpemUoTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpDU1MpLCBNZW1vcnlCbG9ja05hbWU6OmRv bVRyZWVDU1MpOwotICAgICAgICBhZGRNZW1vcnlCbG9ja0Zvcihkb21DaGlsZHJlbi5nZXQoKSwg bV9kb21NZW1vcnlVc2FnZS50b3RhbFNpemUoTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpCaW5kaW5n KSwgTWVtb3J5QmxvY2tOYW1lOjpkb21UcmVlQmluZGluZyk7Ci0gICAgICAgIGFkZE1lbW9yeUJs b2NrRm9yKGRvbUNoaWxkcmVuLmdldCgpLCBtX2RvbU1lbW9yeVVzYWdlLnRvdGFsU2l6ZShNZW1v cnlJbnN0cnVtZW50YXRpb246OkxvYWRlciksIE1lbW9yeUJsb2NrTmFtZTo6ZG9tVHJlZUxvYWRl cik7CisgICAgICAgIGFkZE1lbW9yeUJsb2NrRm9yKGRvbUNoaWxkcmVuLmdldCgpLCBtX21lbW9y eUluc3RydW1lbnRhdGlvbi50b3RhbFNpemUoTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpPdGhlciks IE1lbW9yeUJsb2NrTmFtZTo6ZG9tVHJlZU90aGVyKTsKKyAgICAgICAgYWRkTWVtb3J5QmxvY2tG b3IoZG9tQ2hpbGRyZW4uZ2V0KCksIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLnRvdGFsU2l6ZShN ZW1vcnlJbnN0cnVtZW50YXRpb246OkRPTSksIE1lbW9yeUJsb2NrTmFtZTo6ZG9tVHJlZURPTSk7 CisgICAgICAgIGFkZE1lbW9yeUJsb2NrRm9yKGRvbUNoaWxkcmVuLmdldCgpLCBtX21lbW9yeUlu c3RydW1lbnRhdGlvbi50b3RhbFNpemUoTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpDU1MpLCBNZW1v cnlCbG9ja05hbWU6OmRvbVRyZWVDU1MpOworICAgICAgICBhZGRNZW1vcnlCbG9ja0Zvcihkb21D aGlsZHJlbi5nZXQoKSwgbV9tZW1vcnlJbnN0cnVtZW50YXRpb24udG90YWxTaXplKE1lbW9yeUlu c3RydW1lbnRhdGlvbjo6QmluZGluZyksIE1lbW9yeUJsb2NrTmFtZTo6ZG9tVHJlZUJpbmRpbmcp OworICAgICAgICBhZGRNZW1vcnlCbG9ja0Zvcihkb21DaGlsZHJlbi5nZXQoKSwgbV9tZW1vcnlJ bnN0cnVtZW50YXRpb24udG90YWxTaXplKE1lbW9yeUluc3RydW1lbnRhdGlvbjo6TG9hZGVyKSwg TWVtb3J5QmxvY2tOYW1lOjpkb21UcmVlTG9hZGVyKTsKIAogICAgICAgICBSZWZQdHI8SW5zcGVj dG9yTWVtb3J5QmxvY2s+IGRvbSA9IEluc3BlY3Rvck1lbW9yeUJsb2NrOjpjcmVhdGUoKS5zZXRO YW1lKE1lbW9yeUJsb2NrTmFtZTo6ZG9tKTsKICAgICAgICAgZG9tLT5zZXRTaXplKHRvdGFsU2l6 ZSk7CkBAIC01MjgsMTkgKzUyOCwyMCBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBjaGlsZHJl bi0+YWRkSXRlbShidWlsZE9iamVjdEZvck1lbW9yeUNhY2hlKCkpOwogICAgICAgICBjaGlsZHJl bi0+YWRkSXRlbShidWlsZE9iamVjdEZvckRPTSgpKTsKLSAgICAgICAgaW5zcGVjdG9yRGF0YS0+ YWRkQ29tcG9uZW50KE1lbW9yeUJsb2NrTmFtZTo6aW5zcGVjdG9yRE9NRGF0YSwgbV9kb21NZW1v cnlVc2FnZS5zZWxmU2l6ZSgpKTsKKyAgICAgICAgaW5zcGVjdG9yRGF0YS0+YWRkQ29tcG9uZW50 KE1lbW9yeUJsb2NrTmFtZTo6aW5zcGVjdG9yRE9NRGF0YSwgbV9tZW1vcnlJbnN0cnVtZW50YXRp b24uc2VsZlNpemUoKSk7CiAgICAgfQogCiBwcml2YXRlOgogICAgIFBhZ2UqIG1fcGFnZTsKLSAg ICBNZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsIG1fZG9tTWVtb3J5VXNhZ2U7CisgICAgTWVtb3J5 SW5zdHJ1bWVudGF0aW9uSW1wbCYgbV9tZW1vcnlJbnN0cnVtZW50YXRpb247CiB9OwogCiB9CiAK IHN0YXRpYyB2b2lkIGNvbGxlY3REb21UcmVlSW5mbyhQYWdlKiBwYWdlLCBWaXNpdGVkT2JqZWN0 cyYgdmlzaXRlZE9iamVjdHMsIFR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0b3JNZW1vcnlCbG9j az4qIGNoaWxkcmVuLCBJbnNwZWN0b3JEYXRhQ291bnRlciogaW5zcGVjdG9yRGF0YSkKIHsKLSAg ICBET01UcmVlc0l0ZXJhdG9yIGRvbVRyZWVzSXRlcmF0b3IocGFnZSwgdmlzaXRlZE9iamVjdHMp OworICAgIE1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwgbWVtb3J5SW5zdHJ1bWVudGF0aW9uKHZp c2l0ZWRPYmplY3RzKTsKKyAgICBET01UcmVlc0l0ZXJhdG9yIGRvbVRyZWVzSXRlcmF0b3IocGFn ZSwgbWVtb3J5SW5zdHJ1bWVudGF0aW9uKTsKIAogICAgIFNjcmlwdFByb2ZpbGVyOjp2aXNpdE5v ZGVXcmFwcGVycygmZG9tVHJlZXNJdGVyYXRvcik7CiAK