89968 2012-06-26 03:14:44 -0700 Web Inspector: add character data to the DOM section of native memory view 2012-06-29 01:46:22 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 87262 0 yurys yurys alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 657470 0 yurys 2012-06-26 03:14:44 -0700 A significant chunk of memory may be occupied by character data held by DOM elements, it should be included into the native memory view. 657477 1 149503 yurys 2012-06-26 03:20:13 -0700 Created attachment 149503 Patch 657485 2 149503 alph 2012-06-26 03:51:27 -0700 Comment on attachment 149503 Patch lgtm 660279 3 yurys 2012-06-29 01:46:22 -0700 Committed r121530: <http://trac.webkit.org/changeset/121530> 149503 2012-06-26 03:20:13 -0700 2012-06-29 01:35:15 -0700 Patch bug-89968-20120626142012.patch text/plain 10684 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWRlMDJmZGU2NzM3N2Zh YWUyNDhkZmI0OTZhYTk0MTU1NzY1NDA4OS4uYzdmNjlkM2E2Yzc2NGNmYjMxYTAzZmE3ZjFkMWJk ZWU3MTY3YTJjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA2LTI2ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFkZCBjaGFyYWN0ZXIgZGF0YSB0byB0aGUgRE9NIHNlY3Rpb24gb2YgbmF0aXZlIG1lbW9y eSB2aWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 OTk2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENv dW50IHN0cmluZ3MgcmVmZXJlbmNlZCBmcm9tIENoYXJhY3RlckRhdGEgbm9kZSBhbmQgaXRzIGRl c2NlbmRhbnRzCisgICAgICAgIGFzIHBhcnQgb2YgdGhlIERPTSB0cmVlIHN0cnVjdHVyZXMgaW4g dGhlIG5hdGl2ZSBtZW1vcnkgdmlldy4KKworICAgICAgICAqIGRvbS9DaGFyYWN0ZXJEYXRhLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNoYXJhY3RlckRhdGE6OnJlcG9ydE1lbW9yeVVzYWdlKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGRvbS9DaGFyYWN0ZXJEYXRhLmg6CisgICAg ICAgIChDaGFyYWN0ZXJEYXRhKToKKyAgICAgICAgKiBkb20vTWVtb3J5SW5zdHJ1bWVudGF0aW9u Lmg6CisgICAgICAgIChNZW1vcnlJbnN0cnVtZW50YXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6 TWVtb3J5T2JqZWN0SW5mbzo6cmVwb3J0U3RyaW5nKToKKyAgICAgICAgKE1lbW9yeU9iamVjdElu Zm8pOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHA6CisgICAg ICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OmRvbVRyZWVJbmZvKToKKyAgICAgICAg KFdlYkNvcmU6OmpzRXh0ZXJuYWxSZXNvdXJjZXNJbmZvKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3Rvck1lbW9yeUFnZW50OjpnZXRQcm9jZXNzTWVtb3J5RGlzdHJpYnV0aW9uKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5NZW1vcnlCbG9ja1ZpZXdQcm9wZXJ0aWVzLl9pbml0aWFsaXpl KToKKwogMjAxMi0wNi0yNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAg ICAgICBHZXQgcmlkIG9mIGZpcnN0SXRlbSBhbmQgbmV4dEl0ZW0gZnJvbSBIVE1MQ29sbGVjdGlv bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0NoYXJhY3RlckRhdGEuY3BwIGIvU291 cmNlL1dlYkNvcmUvZG9tL0NoYXJhY3RlckRhdGEuY3BwCmluZGV4IDc2MTk4ZmJlNWQ4MDE2ZjE5 MGVjODM3NWIwMDU4OTEzY2IzZDdkNzkuLjk5YTNhNzdkZTk3NmI1MTVlZWQ2ZjA4MGZiZWQ0MjUy MGUwYjkwMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ2hhcmFjdGVyRGF0YS5jcHAKQEAgLTI2LDYgKzI2 LDcgQEAKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCiAjaW5jbHVkZSAiRXhjZXB0aW9uQ29kZS5o IgogI2luY2x1ZGUgIkluc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIgorI2luY2x1ZGUgIk1lbW9y eUluc3RydW1lbnRhdGlvbi5oIgogI2luY2x1ZGUgIk11dGF0aW9uRXZlbnQuaCIKICNpbmNsdWRl ICJNdXRhdGlvbk9ic2VydmVySW50ZXJlc3RHcm91cC5oIgogI2luY2x1ZGUgIk11dGF0aW9uUmVj b3JkLmgiCkBAIC05Miw2ICs5MywxMyBAQCB1bnNpZ25lZCBDaGFyYWN0ZXJEYXRhOjpwYXJzZXJB cHBlbmREYXRhKGNvbnN0IFVDaGFyKiBkYXRhLCB1bnNpZ25lZCBkYXRhTGVuZ3RoLAogICAgIHJl dHVybiBlbmQ7CiB9CiAKK3ZvaWQgQ2hhcmFjdGVyRGF0YTo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVt b3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykgY29uc3QKK3sKKyAgICBtZW1vcnlPYmpl Y3RJbmZvLT5yZXBvcnRPYmplY3RJbmZvKHRoaXMsIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6RE9N KTsKKyAgICBOb2RlOjpyZXBvcnRNZW1vcnlVc2FnZShtZW1vcnlPYmplY3RJbmZvKTsKKyAgICBt ZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRTdHJpbmcobV9kYXRhKTsKK30KKwogdm9pZCBDaGFyYWN0 ZXJEYXRhOjphcHBlbmREYXRhKGNvbnN0IFN0cmluZyYgZGF0YSwgRXhjZXB0aW9uQ29kZSYpCiB7 CiAgICAgU3RyaW5nIG5ld1N0ciA9IG1fZGF0YTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9DaGFyYWN0ZXJEYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ2hhcmFjdGVyRGF0YS5o CmluZGV4IDVlYWVkZjNjZTRiNmQ3Y2NiZmEzYzQxZTNjYjNhODdkMDI1OWY5NTcuLjVlNDEzYTk1 Y2IyMjM1OWNlNDVlNGU0MGRhMDgwYWUwZTU0YTQ2N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9DaGFyYWN0ZXJEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0NoYXJhY3Rl ckRhdGEuaApAQCAtNDcsNiArNDcsOCBAQCBwdWJsaWM6CiAgICAgLy8gUmV0dXJucyBob3cgbXVj aCBjb3VsZCBiZSBhZGRlZCBiZWZvcmUgbGVuZ3RoIGxpbWl0IHdhcyBtZXQuCiAgICAgdW5zaWdu ZWQgcGFyc2VyQXBwZW5kRGF0YShjb25zdCBVQ2hhciosIHVuc2lnbmVkIGRhdGFMZW5ndGgsIHVu c2lnbmVkIGxlbmd0aExpbWl0KTsKIAorICAgIHZpcnR1YWwgdm9pZCByZXBvcnRNZW1vcnlVc2Fn ZShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7CisKIHByb3RlY3RlZDoKICAgICBDaGFyYWN0ZXJE YXRhKERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgU3RyaW5nJiB0ZXh0LCBDb25zdHJ1Y3Rpb25U eXBlIHR5cGUpCiAgICAgICAgIDogTm9kZShkb2N1bWVudCwgdHlwZSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9NZW1vcnlJbnN0cnVtZW50YXRpb24uaCBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9NZW1vcnlJbnN0cnVtZW50YXRpb24uaAppbmRleCA2ZjBlN2E0NzBmZTFiYTQwMmQwNWFj NWRhZTY3MTgxYzJlMjg1NTVmLi45OWZlNDZhNjc0OGViNTE1MWU1ZTg4NTRlMGQxMmJlZDkwYjIw ZDk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVtb3J5SW5zdHJ1bWVudGF0aW9u LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL01lbW9yeUluc3RydW1lbnRhdGlvbi5oCkBAIC0z MSw2ICszMSw3IEBACiAjaWZuZGVmIE1lbW9yeUluc3RydW1lbnRhdGlvbl9oCiAjZGVmaW5lIE1l bW9yeUluc3RydW1lbnRhdGlvbl9oCiAKKyNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1 ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAKQEAgLTYyLDYgKzYz LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgTWVtb3J5T2JqZWN0SW5m bzsKIAorICAgIHZpcnR1YWwgdm9pZCByZXBvcnRTdHJpbmcoT2JqZWN0VHlwZSwgY29uc3QgU3Ry aW5nJikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBjb3VudE9iamVjdFNpemUoT2JqZWN0VHlwZSwg c2l6ZV90KSA9IDA7CiAgICAgdmlydHVhbCBib29sIHZpc2l0ZWQoY29uc3Qgdm9pZCopID0gMDsK IH07CkBAIC0xMDQsNiArMTA2LDExIEBAIHB1YmxpYzoKICAgICAgICAgbV9vYmplY3RTaXplID0g c2l6ZW9mKFQpOwogICAgIH0KIAorICAgIHZvaWQgcmVwb3J0U3RyaW5nKGNvbnN0IFN0cmluZyYg c3RyaW5nKQorICAgIHsKKyAgICAgICAgbV9tZW1vcnlJbnN0cnVtZW50YXRpb24tPnJlcG9ydFN0 cmluZyhvYmplY3RUeXBlKCksIHN0cmluZyk7CisgICAgfQorCiAgICAgTWVtb3J5SW5zdHJ1bWVu dGF0aW9uOjpPYmplY3RUeXBlIG9iamVjdFR5cGUoKSBjb25zdCB7IHJldHVybiBtX29iamVjdFR5 cGU7IH0KICAgICBzaXplX3Qgb2JqZWN0U2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fb2JqZWN0U2l6 ZTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVt b3J5QWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFn ZW50LmNwcAppbmRleCBiMDVmNjIyZDAwYWNmNTYyZTRmOTQ4MDJhZTcyZjU0MTllZmM2NDI2Li4w ZTI1ZDcwMDUwNTI4YzBkNzQwMDZjMTFiMjc3NzBjMThmMzY5NzdhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKQEAgLTU1LDYgKzU1 LDggQEAKICNpbmNsdWRlIDx3dGYvQXJyYXlCdWZmZXJWaWV3Lmg+CiAjaW5jbHVkZSA8d3RmL0hh c2hTZXQuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CisjaW5jbHVkZSA8 d3RmL3RleHQvU3RyaW5nSW1wbC5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgog CiB1c2luZyBXZWJDb3JlOjpUeXBlQnVpbGRlcjo6TWVtb3J5OjpET01Hcm91cDsKIHVzaW5nIFdl YkNvcmU6OlR5cGVCdWlsZGVyOjpNZW1vcnk6Okxpc3RlbmVyQ291bnQ7CkBAIC05Miw2ICs5NCw4 IEBAIHN0YXRpYyBjb25zdCBjaGFyIGRvbVRyZWVDU1NbXSA9ICJET01UcmVlQ1NTIjsKIAogbmFt ZXNwYWNlIHsKIAordHlwZWRlZiBIYXNoU2V0PGNvbnN0IHZvaWQqPiBWaXNpdGVkT2JqZWN0czsK KwogU3RyaW5nIG5vZGVOYW1lKE5vZGUqIG5vZGUpCiB7CiAgICAgaWYgKG5vZGUtPmRvY3VtZW50 KCktPmlzWEhUTUxEb2N1bWVudCgpKQpAQCAtMTAxLDggKzEwNSwxNSBAQCBTdHJpbmcgbm9kZU5h bWUoTm9kZSogbm9kZSkKIAogc2l6ZV90IHN0cmluZ1NpemUoU3RyaW5nSW1wbCogc3RyaW5nKQog eworICAgIC8vIFRPRE86IHN1cHBvcnQgc3Vic3RyaW5ncwogICAgIHNpemVfdCBzaXplID0gc3Ry aW5nLT5sZW5ndGgoKTsKLSAgICBpZiAoIXN0cmluZy0+aXM4Qml0KCkpCisgICAgaWYgKHN0cmlu Zy0+aXM4Qml0KCkpIHsKKyAgICAgICAgaWYgKHN0cmluZy0+aGFzMTZCaXRTaGFkb3coKSkgewor ICAgICAgICAgICAgc2l6ZSArPSAyICogc2l6ZTsKKyAgICAgICAgICAgIGlmIChzdHJpbmctPmhh c1Rlcm1pbmF0aW5nTnVsbENoYXJhY3RlcigpKQorICAgICAgICAgICAgICAgIHNpemUgKz0gMjsK KyAgICAgICAgfQorICAgIH0gZWxzZQogICAgICAgICBzaXplICo9IDI7CiAgICAgcmV0dXJuIHNp emUgKyBzaXplb2YoKnN0cmluZyk7CiB9CkBAIC0zMTUsOCArMzI2LDkgQEAgcHJpdmF0ZToKIAog Y2xhc3MgRXh0ZXJuYWxSZXNvdXJjZVZpc2l0b3IgOiBwdWJsaWMgRXh0ZXJuYWxTdHJpbmdWaXNp dG9yLCBwdWJsaWMgRXh0ZXJuYWxBcnJheVZpc2l0b3IgewogcHVibGljOgotICAgIEV4dGVybmFs UmVzb3VyY2VWaXNpdG9yKCkKLSAgICAgICAgOiBtX2pzRXh0ZXJuYWxTdHJpbmdTaXplKDApCisg ICAgZXhwbGljaXQgRXh0ZXJuYWxSZXNvdXJjZVZpc2l0b3IoVmlzaXRlZE9iamVjdHMmIHZpc2l0 ZWRPYmplY3RzKQorICAgICAgICA6IG1fdmlzaXRlZE9iamVjdHModmlzaXRlZE9iamVjdHMpCisg ICAgICAgICwgbV9qc0V4dGVybmFsU3RyaW5nU2l6ZSgwKQogICAgICAgICAsIG1fZXh0ZXJuYWxB cnJheVNpemUoMCkKICAgICB7IH0KIApAQCAtMzI3LDE4ICszMzksMTggQEAgcHJpdmF0ZToKICAg ICB2aXJ0dWFsIHZvaWQgdmlzaXRKU0V4dGVybmFsQXJyYXkoQXJyYXlCdWZmZXJWaWV3KiBidWZm ZXJWaWV3KQogICAgIHsKICAgICAgICAgQXJyYXlCdWZmZXIqIGJ1ZmZlciA9IGJ1ZmZlclZpZXct PmJ1ZmZlcigpLmdldCgpOwotICAgICAgICBpZiAobV9hcnJheUJ1ZmZlcnMuYWRkKGJ1ZmZlciku aXNOZXdFbnRyeSkKKyAgICAgICAgaWYgKG1fdmlzaXRlZE9iamVjdHMuYWRkKGJ1ZmZlcikuaXNO ZXdFbnRyeSkKICAgICAgICAgICAgIG1fZXh0ZXJuYWxBcnJheVNpemUgKz0gYnVmZmVyLT5ieXRl TGVuZ3RoKCk7CiAgICAgfQogICAgIHZpcnR1YWwgdm9pZCB2aXNpdEpTRXh0ZXJuYWxTdHJpbmco U3RyaW5nSW1wbCogc3RyaW5nKQogICAgIHsKLSAgICAgICAgaW50IHNpemUgPSBzdHJpbmdTaXpl KHN0cmluZyk7Ci0gICAgICAgIG1fanNFeHRlcm5hbFN0cmluZ1NpemUgKz0gc2l6ZTsKKyAgICAg ICAgaWYgKG1fdmlzaXRlZE9iamVjdHMuYWRkKHN0cmluZykuaXNOZXdFbnRyeSkKKyAgICAgICAg ICAgIG1fanNFeHRlcm5hbFN0cmluZ1NpemUgKz0gc3RyaW5nU2l6ZShzdHJpbmcpOwogICAgIH0K IAorICAgIFZpc2l0ZWRPYmplY3RzJiBtX3Zpc2l0ZWRPYmplY3RzOwogICAgIHNpemVfdCBtX2pz RXh0ZXJuYWxTdHJpbmdTaXplOwogICAgIHNpemVfdCBtX2V4dGVybmFsQXJyYXlTaXplOwotICAg IEhhc2hTZXQ8QXJyYXlCdWZmZXIqPiBtX2FycmF5QnVmZmVyczsKIH07CiAKIH0gLy8gbmFtZXNw YWNlCkBAIC00MTgsNyArNDMwLDggQEAgbmFtZXNwYWNlIHsKIAogY2xhc3MgTWVtb3J5SW5zdHJ1 bWVudGF0aW9uSW1wbCA6IHB1YmxpYyBNZW1vcnlJbnN0cnVtZW50YXRpb24gewogcHVibGljOgot ICAgIE1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwoKQorICAgIGV4cGxpY2l0IE1lbW9yeUluc3Ry dW1lbnRhdGlvbkltcGwoVmlzaXRlZE9iamVjdHMmIHZpc2l0ZWRPYmplY3RzKQorICAgICAgICA6 IG1fdmlzaXRlZE9iamVjdHModmlzaXRlZE9iamVjdHMpCiAgICAgewogICAgICAgICBmb3IgKGlu dCBpID0gMDsgaSA8IExhc3RUeXBlRW50cnk7ICsraSkKICAgICAgICAgICAgIG1fdG90YWxTaXpl c1tpXSA9IDA7CkBAIC00NDIsNiArNDU1LDEzIEBAIHB1YmxpYzoKICAgICB9CiAKIHByaXZhdGU6 CisgICAgdmlydHVhbCB2b2lkIHJlcG9ydFN0cmluZyhPYmplY3RUeXBlIG9iamVjdFR5cGUsIGNv bnN0IFN0cmluZyYgc3RyaW5nKQorICAgIHsKKyAgICAgICAgaWYgKHZpc2l0ZWQoc3RyaW5nLmlt cGwoKSkpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGNvdW50T2JqZWN0U2l6ZShvYmpl Y3RUeXBlLCBzdHJpbmdTaXplKHN0cmluZy5pbXBsKCkpKTsKKyAgICB9CisKICAgICB2aXJ0dWFs IHZvaWQgY291bnRPYmplY3RTaXplKE9iamVjdFR5cGUgb2JqZWN0VHlwZSwgc2l6ZV90IHNpemUp CiAgICAgewogICAgICAgICBBU1NFUlQob2JqZWN0VHlwZSA+PSAwICYmIG9iamVjdFR5cGUgPCBM YXN0VHlwZUVudHJ5KTsKQEAgLTQ1MywxMyArNDczLDE2IEBAIHByaXZhdGU6CiAgICAgICAgIHJl dHVybiAhbV92aXNpdGVkT2JqZWN0cy5hZGQob2JqZWN0KS5pc05ld0VudHJ5OwogICAgIH0KICAg ICBzaXplX3QgbV90b3RhbFNpemVzW0xhc3RUeXBlRW50cnldOwotICAgIHR5cGVkZWYgSGFzaFNl dDxjb25zdCB2b2lkKj4gVmlzaXRlZE9iamVjdHM7Ci0gICAgVmlzaXRlZE9iamVjdHMgbV92aXNp dGVkT2JqZWN0czsKKyAgICBWaXNpdGVkT2JqZWN0cyYgbV92aXNpdGVkT2JqZWN0czsKIH07CiAK IGNsYXNzIERPTVRyZWVzSXRlcmF0b3IgOiBwdWJsaWMgTm9kZVdyYXBwZXJWaXNpdG9yIHsKIHB1 YmxpYzoKLSAgICBleHBsaWNpdCBET01UcmVlc0l0ZXJhdG9yKFBhZ2UqIHBhZ2UpIDogbV9wYWdl KHBhZ2UpIHsgfQorICAgIERPTVRyZWVzSXRlcmF0b3IoUGFnZSogcGFnZSwgVmlzaXRlZE9iamVj dHMmIHZpc2l0ZWRPYmplY3RzKQorICAgICAgICA6IG1fcGFnZShwYWdlKQorICAgICAgICAsIG1f ZG9tTWVtb3J5VXNhZ2UodmlzaXRlZE9iamVjdHMpCisgICAgeworICAgIH0KIAogICAgIHZpcnR1 YWwgdm9pZCB2aXNpdE5vZGUoTm9kZSogbm9kZSkKICAgICB7CkBAIC00NzgsOSArNTAxLDkgQEAg cHJpdmF0ZToKIAogfQogCi1zdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JNZW1vcnlCbG9jaz4g ZG9tVHJlZUluZm8oUGFnZSogcGFnZSkKK3N0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck1lbW9y eUJsb2NrPiBkb21UcmVlSW5mbyhQYWdlKiBwYWdlLCBWaXNpdGVkT2JqZWN0cyYgdmlzaXRlZE9i amVjdHMpCiB7Ci0gICAgRE9NVHJlZXNJdGVyYXRvciBkb21UcmVlc0l0ZXJhdG9yKHBhZ2UpOwor ICAgIERPTVRyZWVzSXRlcmF0b3IgZG9tVHJlZXNJdGVyYXRvcihwYWdlLCB2aXNpdGVkT2JqZWN0 cyk7CiAgICAgU2NyaXB0UHJvZmlsZXI6OnZpc2l0Tm9kZVdyYXBwZXJzKCZkb21UcmVlc0l0ZXJh dG9yKTsKIAogICAgIC8vIE1ha2Ugc3VyZSBhbGwgZG9jdW1lbnRzIHJlYWNoYWJsZSBmcm9tIHRo ZSBtYWluIGZyYW1lIGFyZSBhY2NvdW50ZWQuCkBAIC01MTMsOSArNTM2LDkgQEAgc3RhdGljIFBh c3NSZWZQdHI8SW5zcGVjdG9yTWVtb3J5QmxvY2s+IG1lbW9yeUNhY2hlSW5mbygpCiAgICAgcmV0 dXJuIG1lbW9yeUNhY2hlU3RhdHMucmVsZWFzZSgpOwogfQogCi1zdGF0aWMgUGFzc1JlZlB0cjxJ bnNwZWN0b3JNZW1vcnlCbG9jaz4ganNFeHRlcm5hbFJlc291cmNlc0luZm8oKQorc3RhdGljIFBh c3NSZWZQdHI8SW5zcGVjdG9yTWVtb3J5QmxvY2s+IGpzRXh0ZXJuYWxSZXNvdXJjZXNJbmZvKFZp c2l0ZWRPYmplY3RzJiB2aXNpdGVkT2JqZWN0cykKIHsKLSAgICBFeHRlcm5hbFJlc291cmNlVmlz aXRvciB2aXNpdG9yOworICAgIEV4dGVybmFsUmVzb3VyY2VWaXNpdG9yIHZpc2l0b3IodmlzaXRl ZE9iamVjdHMpOwogICAgIFNjcmlwdFByb2ZpbGVyOjp2aXNpdEV4dGVybmFsU3RyaW5ncygmdmlz aXRvcik7CiAgICAgU2NyaXB0UHJvZmlsZXI6OnZpc2l0RXh0ZXJuYWxBcnJheXMoJnZpc2l0b3Ip OwogCkBAIC01NDIsMTMgKzU2NSwxNCBAQCB2b2lkIEluc3BlY3Rvck1lbW9yeUFnZW50OjpnZXRQ cm9jZXNzTWVtb3J5RGlzdHJpYnV0aW9uKEVycm9yU3RyaW5nKiwgUmVmUHRyPElucwogICAgIHBy b2Nlc3NNZW1vcnkgPSBJbnNwZWN0b3JNZW1vcnlCbG9jazo6Y3JlYXRlKCkuc2V0TmFtZShNZW1v cnlCbG9ja05hbWU6OnByb2Nlc3NQcml2YXRlTWVtb3J5KTsKICAgICBwcm9jZXNzTWVtb3J5LT5z ZXRTaXplKHByaXZhdGVCeXRlcyk7CiAKKyAgICBWaXNpdGVkT2JqZWN0cyB2aXNpdGVkT2JqZWN0 czsKICAgICBSZWZQdHI8VHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvck1lbW9yeUJsb2NrPiA+ IGNoaWxkcmVuID0gVHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvck1lbW9yeUJsb2NrPjo6Y3Jl YXRlKCk7CiAgICAgY2hpbGRyZW4tPmFkZEl0ZW0oanNIZWFwSW5mbygpKTsKLSAgICBjaGlsZHJl bi0+YWRkSXRlbShqc0V4dGVybmFsUmVzb3VyY2VzSW5mbygpKTsKICAgICBjaGlsZHJlbi0+YWRk SXRlbShpbnNwZWN0b3JEYXRhKCkpOwogICAgIGNoaWxkcmVuLT5hZGRJdGVtKG1lbW9yeUNhY2hl SW5mbygpKTsKICAgICBjaGlsZHJlbi0+YWRkSXRlbShyZW5kZXJUcmVlSW5mbyhtX3BhZ2UpKTsg Ly8gVE9ETzogY29sbGVjdCBmb3IgYWxsIHBhZ2VzPwotICAgIGNoaWxkcmVuLT5hZGRJdGVtKGRv bVRyZWVJbmZvKG1fcGFnZSkpOyAvLyBUT0RPOiBjb2xsZWN0IGZvciBhbGwgcGFnZXM/CisgICAg Y2hpbGRyZW4tPmFkZEl0ZW0oZG9tVHJlZUluZm8obV9wYWdlLCB2aXNpdGVkT2JqZWN0cykpOyAv LyBUT0RPOiBjb2xsZWN0IGZvciBhbGwgcGFnZXM/CisgICAgY2hpbGRyZW4tPmFkZEl0ZW0oanNF eHRlcm5hbFJlc291cmNlc0luZm8odmlzaXRlZE9iamVjdHMpKTsKICAgICBwcm9jZXNzTWVtb3J5 LT5zZXRDaGlsZHJlbihjaGlsZHJlbik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvTmF0aXZlTWVtb3J5U25hcHNob3RWaWV3LmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcuanMK aW5kZXggZTEyM2I4ZmE1MmFhYzE1N2ZjNTBiN2FjODZmMjhjYWUxNGU3NzlmMi4uM2IzN2JjZGY4 ZTVlYWI0MDFlNDEwMDAxMWIxZmUwNDhhMDE2ZTY5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXRpdmVNZW1vcnlTbmFwc2hvdFZp ZXcuanMKQEAgLTIxNiw2ICsyMTYsNyBAQCBXZWJJbnNwZWN0b3IuTWVtb3J5QmxvY2tWaWV3UHJv cGVydGllcy5faW5pdGlhbGl6ZSA9IGZ1bmN0aW9uKCkKICAgICB9CiAgICAgYWRkQmxvY2soImhz bCggIDAsICAwJSwgMTAwJSkiLCAiUHJvY2Vzc1ByaXZhdGVNZW1vcnkiLCAiVG90YWwiKTsKICAg ICBhZGRCbG9jaygiaHNsKCAgMCwgIDAlLCAgODAlKSIsICJPdGhlciIsICJPdGhlciIpOworICAg IGFkZEJsb2NrKCJoc2woMzAwLCAzMCUsICA4MCUpIiwgIkRPTSIsICJET00gdHJlZSBzdHJ1Y3R1 cmVzIik7CiAgICAgYWRkQmxvY2soImhzbCggOTAsIDYwJSwgIDgwJSkiLCAiSlNIZWFwQWxsb2Nh dGVkIiwgIkphdmFTY3JpcHQgaGVhcCIpOwogICAgIGFkZEJsb2NrKCJoc2woIDkwLCA4MCUsICA4 MCUpIiwgIkpTSGVhcFVzZWQiLCAiVXNlZCBKYXZhU2NyaXB0IGhlYXAiKTsKICAgICBhZGRCbG9j aygiaHNsKCA5MCwgMzAlLCAgODAlKSIsICJKU0V4dGVybmFsUmVzb3VyY2VzIiwgIkphdmFTY3Jp cHQgZXh0ZXJuYWwgcmVzb3VyY2VzIik7Cg==