136463 2014-09-02 13:51:11 -0700 Use references in public EventSender functions 2014-09-03 13:47:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue dbates dino esprehn+autocc gyuyoung.kim japhet jonlee kangil.han kling simon.fraser thorton oldest_to_newest 1032733 0 mmaxfield 2014-09-02 13:51:11 -0700 Use references in public EventSender functions 1032735 1 237512 mmaxfield 2014-09-02 13:52:47 -0700 Created attachment 237512 Patch 1032738 2 237512 dbates 2014-09-02 14:20:51 -0700 Comment on attachment 237512 Patch r=me 1032741 3 237512 dbates 2014-09-02 14:22:46 -0700 Comment on attachment 237512 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237512&action=review > Source/WebCore/dom/EventSender.h:78 > size_t size = m_dispatchSoonList.size(); > for (size_t i = 0; i < size; ++i) { Nit: We should update this code to use a C++11 range-for loop. > Source/WebCore/dom/EventSender.h:103 > size_t size = m_dispatchingList.size(); > for (size_t i = 0; i < size; ++i) { Ditto. 1033000 4 mmaxfield 2014-09-03 13:47:04 -0700 http://trac.webkit.org/changeset/173190 237512 2014-09-02 13:52:47 -0700 2014-09-02 14:22:46 -0700 Patch bug-136463-20140902135241.patch text/plain 11398 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWZjOWQ5NTM2YmU0OGRk MzY0NWI2NjhmMzVhNzZiMTE3ODUwZTAyZS4uYjViNTQxNzY1NGI5ZDg3YjRmMDgxOWY1NDI2ZTFm MGY2OWQwMDU5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE0LTA5LTAyICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHJlZmVy ZW5jZXMgaW4gcHVibGljIEV2ZW50U2VuZGVyIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2NDYzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFzc2luZyBudWxscHRyIHRvIEV2ZW50U2Vu ZGVyIHNob3VsZG4ndCBiZSBhbGxvd2VkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNl IHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGRvbS9FdmVudFNlbmRl ci5oOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRTZW5kZXI6Omhhc1BlbmRpbmdFdmVudHMpOgor ICAgICAgICAoV2ViQ29yZTo6RXZlbnRTZW5kZXI8VD46OmRpc3BhdGNoRXZlbnRTb29uKToKKyAg ICAgICAgKFdlYkNvcmU6OkV2ZW50U2VuZGVyPFQ+OjpjYW5jZWxFdmVudCk6CisgICAgICAgIChX ZWJDb3JlOjpFdmVudFNlbmRlcjxUPjo6ZGlzcGF0Y2hQZW5kaW5nRXZlbnRzKToKKyAgICAgICAg KiBodG1sL0hUTUxMaW5rRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTGlua0Vs ZW1lbnQ6On5IVE1MTGlua0VsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTExpbmtFbGVt ZW50Ojpub3RpZnlMb2FkZWRTaGVldEFuZEFsbENyaXRpY2FsU3VicmVzb3VyY2VzKToKKyAgICAg ICAgKiBodG1sL0hUTUxTdHlsZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFN0 eWxlRWxlbWVudDo6fkhUTUxTdHlsZUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFN0 eWxlRWxlbWVudDo6bm90aWZ5TG9hZGVkU2hlZXRBbmRBbGxDcml0aWNhbFN1YnJlc291cmNlcyk6 CisgICAgICAgICogbG9hZGVyL0ltYWdlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklt YWdlTG9hZGVyOjp+SW1hZ2VMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6 OnNldEltYWdlV2l0aG91dENvbnNpZGVyaW5nUGVuZGluZ0xvYWRFdmVudCk6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZUxvYWRlcjo6dXBkYXRlRnJvbUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29y ZTo6SW1hZ2VMb2FkZXI6Om5vdGlmeUZpbmlzaGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl TG9hZGVyOjpkaXNwYXRjaFBlbmRpbmdCZWZvcmVMb2FkRXZlbnQpOgorCiAyMDE0LTA5LTAyICBD b21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByMTczMTc1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L0V2ZW50U2VuZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRTZW5kZXIuaAppbmRleCAy Y2I1YWFmMThhODE0ZTFhNzFjMmNiMTQ5MmM3NDJlYjU3MGY2NzM3Li5mMDUwYTQ2NTJiMjE4NmE0 NjhhYzQ4MTJlYTM2NTllN2Y1NzE5MzdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v RXZlbnRTZW5kZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRTZW5kZXIuaApAQCAt MzcsMTQgKzM3LDE0IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBFdmVudFNlbmRlcihjb25zdCBB dG9taWNTdHJpbmcmIGV2ZW50VHlwZSk7CiAKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50 VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fZXZlbnRUeXBlOyB9Ci0gICAgdm9pZCBkaXNwYXRjaEV2 ZW50U29vbihUKik7Ci0gICAgdm9pZCBjYW5jZWxFdmVudChUKik7CisgICAgdm9pZCBkaXNwYXRj aEV2ZW50U29vbihUJik7CisgICAgdm9pZCBjYW5jZWxFdmVudChUJik7CiAgICAgdm9pZCBkaXNw YXRjaFBlbmRpbmdFdmVudHMoKTsKIAogI2lmbmRlZiBOREVCVUcKLSAgICBib29sIGhhc1BlbmRp bmdFdmVudHMoVCogc2VuZGVyKSBjb25zdAorICAgIGJvb2wgaGFzUGVuZGluZ0V2ZW50cyhUJiBz ZW5kZXIpIGNvbnN0CiAgICAgewotICAgICAgICByZXR1cm4gbV9kaXNwYXRjaFNvb25MaXN0LmZp bmQoc2VuZGVyKSAhPSBub3RGb3VuZCB8fCBtX2Rpc3BhdGNoaW5nTGlzdC5maW5kKHNlbmRlcikg IT0gbm90Rm91bmQ7CisgICAgICAgIHJldHVybiBtX2Rpc3BhdGNoU29vbkxpc3QuZmluZCgmc2Vu ZGVyKSAhPSBub3RGb3VuZCB8fCBtX2Rpc3BhdGNoaW5nTGlzdC5maW5kKCZzZW5kZXIpICE9IG5v dEZvdW5kOwogICAgIH0KICNlbmRpZgogCkBAIC02MywyNiArNjMsMjYgQEAgdGVtcGxhdGU8dHlw ZW5hbWUgVD4gRXZlbnRTZW5kZXI8VD46OkV2ZW50U2VuZGVyKGNvbnN0IEF0b21pY1N0cmluZyYg ZXZlbnRUeXBlKQogewogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBUPiB2b2lkIEV2ZW50U2VuZGVy PFQ+OjpkaXNwYXRjaEV2ZW50U29vbihUKiBzZW5kZXIpCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPiB2 b2lkIEV2ZW50U2VuZGVyPFQ+OjpkaXNwYXRjaEV2ZW50U29vbihUJiBzZW5kZXIpCiB7Ci0gICAg bV9kaXNwYXRjaFNvb25MaXN0LmFwcGVuZChzZW5kZXIpOworICAgIG1fZGlzcGF0Y2hTb29uTGlz dC5hcHBlbmQoJnNlbmRlcik7CiAgICAgaWYgKCFtX3RpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAg IG1fdGltZXIuc3RhcnRPbmVTaG90KDApOwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBUPiB2b2lk IEV2ZW50U2VuZGVyPFQ+OjpjYW5jZWxFdmVudChUKiBzZW5kZXIpCit0ZW1wbGF0ZTx0eXBlbmFt ZSBUPiB2b2lkIEV2ZW50U2VuZGVyPFQ+OjpjYW5jZWxFdmVudChUJiBzZW5kZXIpCiB7CiAgICAg Ly8gUmVtb3ZlIGluc3RhbmNlcyBvZiB0aGlzIHNlbmRlciBmcm9tIGJvdGggbGlzdHMuCiAgICAg Ly8gVXNlIGxvb3BzIGJlY2F1c2Ugd2UgYWxsb3cgbXVsdGlwbGUgaW5zdGFuY2VzIHRvIGdldCBp bnRvIHRoZSBsaXN0cy4KICAgICBzaXplX3Qgc2l6ZSA9IG1fZGlzcGF0Y2hTb29uTGlzdC5zaXpl KCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKLSAgICAgICAgaWYg KG1fZGlzcGF0Y2hTb29uTGlzdFtpXSA9PSBzZW5kZXIpCi0gICAgICAgICAgICBtX2Rpc3BhdGNo U29vbkxpc3RbaV0gPSAwOworICAgICAgICBpZiAobV9kaXNwYXRjaFNvb25MaXN0W2ldID09ICZz ZW5kZXIpCisgICAgICAgICAgICBtX2Rpc3BhdGNoU29vbkxpc3RbaV0gPSBudWxscHRyOwogICAg IH0KICAgICBzaXplID0gbV9kaXNwYXRjaGluZ0xpc3Quc2l6ZSgpOwogICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgc2l6ZTsgKytpKSB7Ci0gICAgICAgIGlmIChtX2Rpc3BhdGNoaW5nTGlzdFtp XSA9PSBzZW5kZXIpCi0gICAgICAgICAgICBtX2Rpc3BhdGNoaW5nTGlzdFtpXSA9IDA7CisgICAg ICAgIGlmIChtX2Rpc3BhdGNoaW5nTGlzdFtpXSA9PSAmc2VuZGVyKQorICAgICAgICAgICAgbV9k aXNwYXRjaGluZ0xpc3RbaV0gPSBudWxscHRyOwogICAgIH0KIH0KIApAQCAtMTAyLDcgKzEwMiw3 IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHZvaWQgRXZlbnRTZW5kZXI8VD46OmRpc3BhdGNoUGVu ZGluZ0V2ZW50cygpCiAgICAgc2l6ZV90IHNpemUgPSBtX2Rpc3BhdGNoaW5nTGlzdC5zaXplKCk7 CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpIHsKICAgICAgICAgaWYgKFQq IHNlbmRlciA9IG1fZGlzcGF0Y2hpbmdMaXN0W2ldKSB7Ci0gICAgICAgICAgICBtX2Rpc3BhdGNo aW5nTGlzdFtpXSA9IDA7CisgICAgICAgICAgICBtX2Rpc3BhdGNoaW5nTGlzdFtpXSA9IG51bGxw dHI7CiAgICAgICAgICAgICBzZW5kZXItPmRpc3BhdGNoUGVuZGluZ0V2ZW50KHRoaXMpOwogICAg ICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTGlua0Vs ZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTGlua0VsZW1lbnQuY3BwCmluZGV4 IGI4NTExNDVmMDhmNzE4MjI4NDVhMzhiNTQxNjAzNmE5ZDM2N2E1NTQuLjhjOWViYWUyNjE1ODlm ZDhjY2U4MDUyOGU0YWY4YzQzODg2ZDBkZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTExpbmtFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5r RWxlbWVudC5jcHAKQEAgLTk0LDcgKzk0LDcgQEAgSFRNTExpbmtFbGVtZW50Ojp+SFRNTExpbmtF bGVtZW50KCkKICAgICBpZiAoaW5Eb2N1bWVudCgpKQogICAgICAgICBkb2N1bWVudCgpLnN0eWxl U2hlZXRDb2xsZWN0aW9uKCkucmVtb3ZlU3R5bGVTaGVldENhbmRpZGF0ZU5vZGUoKnRoaXMpOwog Ci0gICAgbGlua0xvYWRFdmVudFNlbmRlcigpLmNhbmNlbEV2ZW50KHRoaXMpOworICAgIGxpbmtM b2FkRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCgqdGhpcyk7CiB9CiAKIHZvaWQgSFRNTExpbmtF bGVtZW50OjpzZXREaXNhYmxlZFN0YXRlKGJvb2wgZGlzYWJsZWQpCkBAIC0zODAsNyArMzgwLDcg QEAgdm9pZCBIVE1MTGlua0VsZW1lbnQ6Om5vdGlmeUxvYWRlZFNoZWV0QW5kQWxsQ3JpdGljYWxT dWJyZXNvdXJjZXMoYm9vbCBlcnJvck9jY3UKICAgICBpZiAobV9maXJlZExvYWQpCiAgICAgICAg IHJldHVybjsKICAgICBtX2xvYWRlZFNoZWV0ID0gIWVycm9yT2NjdXJyZWQ7Ci0gICAgbGlua0xv YWRFdmVudFNlbmRlcigpLmRpc3BhdGNoRXZlbnRTb29uKHRoaXMpOworICAgIGxpbmtMb2FkRXZl bnRTZW5kZXIoKS5kaXNwYXRjaEV2ZW50U29vbigqdGhpcyk7CiAgICAgbV9maXJlZExvYWQgPSB0 cnVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU3R5bGVFbGVtZW50LmNwcAppbmRleCBj NTllZjE2ODVkNmJiYzZlNWM5N2ViN2NiMWE3ODUxZTI3NzE3YTY5Li42ODA2NDk0OTI4ZGM4MzFj ODdkODlkMThlOTdmZjg1OTJhMDYxYjlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxTdHlsZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxl RWxlbWVudC5jcHAKQEAgLTYwLDcgKzYwLDcgQEAgSFRNTFN0eWxlRWxlbWVudDo6fkhUTUxTdHls ZUVsZW1lbnQoKQogICAgIC8vIFRoZXJlZm9yZSB3ZSBjYW4ndCBBU1NFUlQobV9zY29wZWRTdHls ZVJlZ2lzdHJhdGlvblN0YXRlID09IE5vdFJlZ2lzdGVyZWQpLgogICAgIG1fc3R5bGVTaGVldE93 bmVyLmNsZWFyRG9jdW1lbnREYXRhKGRvY3VtZW50KCksICp0aGlzKTsKIAotICAgIHN0eWxlTG9h ZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZlbnQodGhpcyk7CisgICAgc3R5bGVMb2FkRXZlbnRTZW5k ZXIoKS5jYW5jZWxFdmVudCgqdGhpcyk7CiB9CiAKIFBhc3NSZWZQdHI8SFRNTFN0eWxlRWxlbWVu dD4gSFRNTFN0eWxlRWxlbWVudDo6Y3JlYXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUs IERvY3VtZW50JiBkb2N1bWVudCwgYm9vbCBjcmVhdGVkQnlQYXJzZXIpCkBAIC0xMzMsNyArMTMz LDcgQEAgdm9pZCBIVE1MU3R5bGVFbGVtZW50Ojpub3RpZnlMb2FkZWRTaGVldEFuZEFsbENyaXRp Y2FsU3VicmVzb3VyY2VzKGJvb2wgZXJyb3JPY2MKICAgICBpZiAobV9maXJlZExvYWQpCiAgICAg ICAgIHJldHVybjsKICAgICBtX2xvYWRlZFNoZWV0ID0gIWVycm9yT2NjdXJyZWQ7Ci0gICAgc3R5 bGVMb2FkRXZlbnRTZW5kZXIoKS5kaXNwYXRjaEV2ZW50U29vbih0aGlzKTsKKyAgICBzdHlsZUxv YWRFdmVudFNlbmRlcigpLmRpc3BhdGNoRXZlbnRTb29uKCp0aGlzKTsKICAgICBtX2ZpcmVkTG9h ZCA9IHRydWU7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxv YWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwCmluZGV4IDdk OTRmYzg2Zjc2YThlYzY4NjVhNjcwYjQwOWQ5OWIwNjI2NmYxOTguLjliYWQ5YjQ3ZTRjNmZmNWVi OTZmOGFiYWVmOTJhNzJmNTZmNDI1NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9JbWFnZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVy LmNwcApAQCAtMTA1LDE3ICsxMDUsMTcgQEAgSW1hZ2VMb2FkZXI6On5JbWFnZUxvYWRlcigpCiAg ICAgaWYgKG1faW1hZ2UpCiAgICAgICAgIG1faW1hZ2UtPnJlbW92ZUNsaWVudCh0aGlzKTsKIAot ICAgIEFTU0VSVChtX2hhc1BlbmRpbmdCZWZvcmVMb2FkRXZlbnQgfHwgIWJlZm9yZUxvYWRFdmVu dFNlbmRlcigpLmhhc1BlbmRpbmdFdmVudHModGhpcykpOworICAgIEFTU0VSVChtX2hhc1BlbmRp bmdCZWZvcmVMb2FkRXZlbnQgfHwgIWJlZm9yZUxvYWRFdmVudFNlbmRlcigpLmhhc1BlbmRpbmdF dmVudHMoKnRoaXMpKTsKICAgICBpZiAobV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50KQotICAg ICAgICBiZWZvcmVMb2FkRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCh0aGlzKTsKKyAgICAgICAg YmVmb3JlTG9hZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZlbnQoKnRoaXMpOwogCi0gICAgQVNTRVJU KG1faGFzUGVuZGluZ0xvYWRFdmVudCB8fCAhbG9hZEV2ZW50U2VuZGVyKCkuaGFzUGVuZGluZ0V2 ZW50cyh0aGlzKSk7CisgICAgQVNTRVJUKG1faGFzUGVuZGluZ0xvYWRFdmVudCB8fCAhbG9hZEV2 ZW50U2VuZGVyKCkuaGFzUGVuZGluZ0V2ZW50cygqdGhpcykpOwogICAgIGlmIChtX2hhc1BlbmRp bmdMb2FkRXZlbnQpCi0gICAgICAgIGxvYWRFdmVudFNlbmRlcigpLmNhbmNlbEV2ZW50KHRoaXMp OworICAgICAgICBsb2FkRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCgqdGhpcyk7CiAKLSAgICBB U1NFUlQobV9oYXNQZW5kaW5nRXJyb3JFdmVudCB8fCAhZXJyb3JFdmVudFNlbmRlcigpLmhhc1Bl bmRpbmdFdmVudHModGhpcykpOworICAgIEFTU0VSVChtX2hhc1BlbmRpbmdFcnJvckV2ZW50IHx8 ICFlcnJvckV2ZW50U2VuZGVyKCkuaGFzUGVuZGluZ0V2ZW50cygqdGhpcykpOwogICAgIGlmICht X2hhc1BlbmRpbmdFcnJvckV2ZW50KQotICAgICAgICBlcnJvckV2ZW50U2VuZGVyKCkuY2FuY2Vs RXZlbnQodGhpcyk7CisgICAgICAgIGVycm9yRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCgqdGhp cyk7CiAKICAgICAvLyBJZiB0aGUgSW1hZ2VMb2FkZXIgaXMgYmVpbmcgZGVzdHJveWVkIGJ1dCBp dCBpcyBzdGlsbCBwcm90ZWN0aW5nIGl0cyBpbWFnZS1sb2FkaW5nIEVsZW1lbnQsCiAgICAgLy8g cmVtb3ZlIHRoYXQgcHJvdGVjdGlvbiBoZXJlLgpAQCAtMTM5LDE1ICsxMzksMTUgQEAgdm9pZCBJ bWFnZUxvYWRlcjo6c2V0SW1hZ2VXaXRob3V0Q29uc2lkZXJpbmdQZW5kaW5nTG9hZEV2ZW50KENh Y2hlZEltYWdlKiBuZXdJbWEKICAgICBpZiAobmV3SW1hZ2UgIT0gb2xkSW1hZ2UpIHsKICAgICAg ICAgbV9pbWFnZSA9IG5ld0ltYWdlOwogICAgICAgICBpZiAobV9oYXNQZW5kaW5nQmVmb3JlTG9h ZEV2ZW50KSB7Ci0gICAgICAgICAgICBiZWZvcmVMb2FkRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVu dCh0aGlzKTsKKyAgICAgICAgICAgIGJlZm9yZUxvYWRFdmVudFNlbmRlcigpLmNhbmNlbEV2ZW50 KCp0aGlzKTsKICAgICAgICAgICAgIG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCA9IGZhbHNl OwogICAgICAgICB9CiAgICAgICAgIGlmIChtX2hhc1BlbmRpbmdMb2FkRXZlbnQpIHsKLSAgICAg ICAgICAgIGxvYWRFdmVudFNlbmRlcigpLmNhbmNlbEV2ZW50KHRoaXMpOworICAgICAgICAgICAg bG9hZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZlbnQoKnRoaXMpOwogICAgICAgICAgICAgbV9oYXNQ ZW5kaW5nTG9hZEV2ZW50ID0gZmFsc2U7CiAgICAgICAgIH0KICAgICAgICAgaWYgKG1faGFzUGVu ZGluZ0Vycm9yRXZlbnQpIHsKLSAgICAgICAgICAgIGVycm9yRXZlbnRTZW5kZXIoKS5jYW5jZWxF dmVudCh0aGlzKTsKKyAgICAgICAgICAgIGVycm9yRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCgq dGhpcyk7CiAgICAgICAgICAgICBtX2hhc1BlbmRpbmdFcnJvckV2ZW50ID0gZmFsc2U7CiAgICAg ICAgIH0KICAgICAgICAgbV9pbWFnZUNvbXBsZXRlID0gdHJ1ZTsKQEAgLTIwNSwyNCArMjA1LDI0 IEBAIHZvaWQgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKICAgICAgICAgaWYgKCFu ZXdJbWFnZSAmJiAhcGFnZUlzQmVpbmdEaXNtaXNzZWQoZG9jdW1lbnQpKSB7CiAgICAgICAgICAg ICBtX2ZhaWxlZExvYWRVUkwgPSBhdHRyOwogICAgICAgICAgICAgbV9oYXNQZW5kaW5nRXJyb3JF dmVudCA9IHRydWU7Ci0gICAgICAgICAgICBlcnJvckV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVu dFNvb24odGhpcyk7CisgICAgICAgICAgICBlcnJvckV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVu dFNvb24oKnRoaXMpOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIGNsZWFyRmFpbGVkTG9h ZFVSTCgpOwogICAgIH0gZWxzZSBpZiAoIWF0dHIuaXNOdWxsKCkpIHsKICAgICAgICAgLy8gRmly ZSBhbiBlcnJvciBldmVudCBpZiB0aGUgdXJsIGlzIGVtcHR5LgogICAgICAgICBtX2ZhaWxlZExv YWRVUkwgPSBhdHRyOwogICAgICAgICBtX2hhc1BlbmRpbmdFcnJvckV2ZW50ID0gdHJ1ZTsKLSAg ICAgICAgZXJyb3JFdmVudFNlbmRlcigpLmRpc3BhdGNoRXZlbnRTb29uKHRoaXMpOworICAgICAg ICBlcnJvckV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVudFNvb24oKnRoaXMpOwogICAgIH0KICAg ICAKICAgICBDYWNoZWRJbWFnZSogb2xkSW1hZ2UgPSBtX2ltYWdlLmdldCgpOwogICAgIGlmIChu ZXdJbWFnZSAhPSBvbGRJbWFnZSkgewogICAgICAgICBpZiAobV9oYXNQZW5kaW5nQmVmb3JlTG9h ZEV2ZW50KSB7Ci0gICAgICAgICAgICBiZWZvcmVMb2FkRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVu dCh0aGlzKTsKKyAgICAgICAgICAgIGJlZm9yZUxvYWRFdmVudFNlbmRlcigpLmNhbmNlbEV2ZW50 KCp0aGlzKTsKICAgICAgICAgICAgIG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCA9IGZhbHNl OwogICAgICAgICB9CiAgICAgICAgIGlmIChtX2hhc1BlbmRpbmdMb2FkRXZlbnQpIHsKLSAgICAg ICAgICAgIGxvYWRFdmVudFNlbmRlcigpLmNhbmNlbEV2ZW50KHRoaXMpOworICAgICAgICAgICAg bG9hZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZlbnQoKnRoaXMpOwogICAgICAgICAgICAgbV9oYXNQ ZW5kaW5nTG9hZEV2ZW50ID0gZmFsc2U7CiAgICAgICAgIH0KIApAQCAtMjMxLDcgKzIzMSw3IEBA IHZvaWQgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKICAgICAgICAgLy8gdGhpcyBs b2FkIGFuZCB3ZSBzaG91bGQgbm90IGNhbmNlbCB0aGUgZXZlbnQuCiAgICAgICAgIC8vIEZJWE1F OiBJZiBib3RoIHByZXZpb3VzIGxvYWQgYW5kIHRoaXMgb25lIGdvdCBibG9ja2VkIHdpdGggYW4g ZXJyb3IsIHdlIGNhbiByZWNlaXZlIG9uZSBlcnJvciBldmVudCBpbnN0ZWFkIG9mIHR3by4KICAg ICAgICAgaWYgKG1faGFzUGVuZGluZ0Vycm9yRXZlbnQgJiYgbmV3SW1hZ2UpIHsKLSAgICAgICAg ICAgIGVycm9yRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCh0aGlzKTsKKyAgICAgICAgICAgIGVy cm9yRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCgqdGhpcyk7CiAgICAgICAgICAgICBtX2hhc1Bl bmRpbmdFcnJvckV2ZW50ID0gZmFsc2U7CiAgICAgICAgIH0KIApAQCAtMjQ1LDcgKzI0NSw3IEBA IHZvaWQgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKICAgICAgICAgICAgICAgICBp ZiAoIWRvY3VtZW50Lmhhc0xpc3RlbmVyVHlwZShEb2N1bWVudDo6QkVGT1JFTE9BRF9MSVNURU5F UikpCiAgICAgICAgICAgICAgICAgICAgIGRpc3BhdGNoUGVuZGluZ0JlZm9yZUxvYWRFdmVudCgp OwogICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgYmVmb3JlTG9hZEV2 ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVudFNvb24odGhpcyk7CisgICAgICAgICAgICAgICAgICAg IGJlZm9yZUxvYWRFdmVudFNlbmRlcigpLmRpc3BhdGNoRXZlbnRTb29uKCp0aGlzKTsKICAgICAg ICAgICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIHVwZGF0ZVJlbmRlcmVyKCk7CiAKQEAgLTI5 MSw3ICsyOTEsNyBAQCB2b2lkIEltYWdlTG9hZGVyOjpub3RpZnlGaW5pc2hlZChDYWNoZWRSZXNv dXJjZSogcmVzb3VyY2UpCiAgICAgICAgIHNldEltYWdlV2l0aG91dENvbnNpZGVyaW5nUGVuZGlu Z0xvYWRFdmVudCgwKTsKIAogICAgICAgICBtX2hhc1BlbmRpbmdFcnJvckV2ZW50ID0gdHJ1ZTsK LSAgICAgICAgZXJyb3JFdmVudFNlbmRlcigpLmRpc3BhdGNoRXZlbnRTb29uKHRoaXMpOworICAg ICAgICBlcnJvckV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVudFNvb24oKnRoaXMpOwogCiAgICAg ICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGNvbnNvbGVNZXNzYWdl LCAoQVNDSUlMaXRlcmFsKCJDcm9zcy1vcmlnaW4gaW1hZ2UgbG9hZCBkZW5pZWQgYnkgQ3Jvc3Mt T3JpZ2luIFJlc291cmNlIFNoYXJpbmcgcG9saWN5LiIpKSk7CiAgICAgICAgIGVsZW1lbnQoKS5k b2N1bWVudCgpLmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBNZXNz YWdlTGV2ZWw6OkVycm9yLCBjb25zb2xlTWVzc2FnZSk7CkBAIC0zMTIsNyArMzEyLDcgQEAgdm9p ZCBJbWFnZUxvYWRlcjo6bm90aWZ5RmluaXNoZWQoQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKQog ICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbG9hZEV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hF dmVudFNvb24odGhpcyk7CisgICAgbG9hZEV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVudFNvb24o KnRoaXMpOwogfQogCiBSZW5kZXJJbWFnZVJlc291cmNlKiBJbWFnZUxvYWRlcjo6cmVuZGVySW1h Z2VSZXNvdXJjZSgpCkBAIC00MDksNyArNDA5LDcgQEAgdm9pZCBJbWFnZUxvYWRlcjo6ZGlzcGF0 Y2hQZW5kaW5nQmVmb3JlTG9hZEV2ZW50KCkKICAgICAgICAgbV9pbWFnZSA9IDA7CiAgICAgfQog Ci0gICAgbG9hZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZlbnQodGhpcyk7CisgICAgbG9hZEV2ZW50 U2VuZGVyKCkuY2FuY2VsRXZlbnQoKnRoaXMpOwogICAgIG1faGFzUGVuZGluZ0xvYWRFdmVudCA9 IGZhbHNlOwogICAgIAogICAgIGlmIChpc0hUTUxPYmplY3RFbGVtZW50KGVsZW1lbnQoKSkpCg==