105852 2012-12-29 02:41:03 -0800 Web Inspector: Native Memory Instrumentation plugin: move function bodies out of class declarations. 2012-12-29 02:54:30 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 798089 0 loislo 2012-12-29 02:41:03 -0800 This is a mechanical change before refactoring. 798091 1 180927 loislo 2012-12-29 02:48:32 -0800 Created attachment 180927 Patch 798092 2 loislo 2012-12-29 02:54:30 -0800 Committed r138562: <http://trac.webkit.org/changeset/138562> 180927 2012-12-29 02:48:32 -0800 2012-12-29 02:52:23 -0800 Patch bug-105852-20121229144541.patch text/plain 10986 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NTYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDg5NTRjZTI2NWIwZDRiYmRkOTJjNzg2NWI3Yjc5OTBl Y2U1NzJiNS4uZjZiMWRmNTZjODQ1MmFiZThlMDBjZjY4N2E3ODhjMWRmY2FkYWY4MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTEyLTI5ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4K KworICAgICAgICBXZWIgSW5zcGVjdG9yOiBOYXRpdmUgTWVtb3J5IEluc3RydW1lbnRhdGlvbiBw bHVnaW46IG1vdmUgZnVuY3Rpb24gYm9kaWVzIG91dCBvZiBjbGFzcyBkZWNsYXJhdGlvbnMuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU4NTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNsYW5nL1Jl cG9ydE1lbW9yeVVzYWdlUGx1Z2luL1JlcG9ydE1lbW9yeVVzYWdlLmNwcDoKKyAgICAgICAgKGNs YW5nKToKKyAgICAgICAgKEFkZE1lbWJlckNhbGxWaXNpdG9yKToKKyAgICAgICAgKFJlcG9ydE1l bW9yeVVzYWdlVmlzaXRvcik6CisgICAgICAgIChjbGFuZzo6UmVwb3J0TWVtb3J5VXNhZ2VBY3Rp b246OlBhcnNlQXJncyk6CisgICAgICAgIChjbGFuZzo6QWRkTWVtYmVyQ2FsbFZpc2l0b3I6OlZp c2l0Q2FsbEV4cHIpOgorICAgICAgICAoY2xhbmc6OlJlcG9ydE1lbW9yeVVzYWdlVmlzaXRvcjo6 VmlzaXRDWFhNZXRob2REZWNsKToKKyAgICAgICAgKGNsYW5nOjpSZXBvcnRNZW1vcnlVc2FnZVZp c2l0b3I6OmVtaXRXYXJuaW5nKToKKyAgICAgICAgKGNsYW5nOjpSZXBvcnRNZW1vcnlVc2FnZVZp c2l0b3I6OmZpbmRJbnN0cnVtZW50YXRpb25NZXRob2QpOgorICAgICAgICAoY2xhbmc6OlJlcG9y dE1lbW9yeVVzYWdlVmlzaXRvcjo6bmVlZHNUb0JlSW5zdHJ1bWVudGVkKToKKyAgICAgICAgKGNs YW5nOjpSZXBvcnRNZW1vcnlVc2FnZVZpc2l0b3I6OkNoZWNrTWVtYmVyc0NvdmVyYWdlKToKKwog MjAxMi0xMi0yOSAgWmFuIERvYmVyc2VrICA8emFuZG9iZXJzZWtAZ21haWwuY29tPgogCiAgICAg ICAgIFt3ZWJraXRweV0gT21pdCB3ZWJraXRweS90aGlyZHBhcnR5L0JlYXV0aWZ1bFNvdXAucHkg ZnJvbSBjb2RlIGNvdmVyYWdlIGNoZWNraW5nCmRpZmYgLS1naXQgYS9Ub29scy9jbGFuZy9SZXBv cnRNZW1vcnlVc2FnZVBsdWdpbi9SZXBvcnRNZW1vcnlVc2FnZS5jcHAgYi9Ub29scy9jbGFuZy9S ZXBvcnRNZW1vcnlVc2FnZVBsdWdpbi9SZXBvcnRNZW1vcnlVc2FnZS5jcHAKaW5kZXggYTYyY2Yy YjkxZTYwZGRjNjM2OGRkNDAyYTlmZjhjYTc3YzQzZGY0NS4uYWZjMjE3ZGIyZjZiZDAxYzZmNDRh N2FhOGM4NTAxMDM1ZDI0NTg5MyAxMDA2NDQKLS0tIGEvVG9vbHMvY2xhbmcvUmVwb3J0TWVtb3J5 VXNhZ2VQbHVnaW4vUmVwb3J0TWVtb3J5VXNhZ2UuY3BwCisrKyBiL1Rvb2xzL2NsYW5nL1JlcG9y dE1lbW9yeVVzYWdlUGx1Z2luL1JlcG9ydE1lbW9yeVVzYWdlLmNwcApAQCAtMzksMzEgKzM5LDE2 IEBAIHVzaW5nIG5hbWVzcGFjZSBjbGFuZzsKIAogbmFtZXNwYWNlIHsKIAotdHlwZWRlZiBzdGQ6 OnZlY3RvcjxzdGQ6OnN0cmluZz4gU3RyaW5nczsKK3VzaW5nIG5hbWVzcGFjZSBzdGQ7Cit0eXBl ZGVmIHZlY3RvcjxzdHJpbmc+IFN0cmluZ3M7CiAKIFN0cmluZ3MgaW5zdHJ1bWVudGF0aW9uTWV0 aG9kczsKLWNvbnN0IHN0ZDo6c3RyaW5nIGluc3RyaW1lbnRpbmdNZXRob2ROYW1lKCJyZXBvcnRN ZW1vcnlVc2FnZSIpOworY29uc3QgY2hhciBpbnN0cnVtZW50aW5nTWV0aG9kTmFtZVtdID0gInJl cG9ydE1lbW9yeVVzYWdlIjsKIAogY2xhc3MgQWRkTWVtYmVyQ2FsbFZpc2l0b3IgOiBwdWJsaWMg UmVjdXJzaXZlQVNUVmlzaXRvcjxBZGRNZW1iZXJDYWxsVmlzaXRvcj4gewogcHVibGljOgotICAg IGJvb2wgVmlzaXRDYWxsRXhwcihDYWxsRXhwciogY2FsbEV4cHIpCi0gICAgewotICAgICAgICBD WFhNZW1iZXJDYWxsRXhwciogbWV0aG9kQ2FsbEV4cHIgPSBkeW5fY2FzdDxDWFhNZW1iZXJDYWxs RXhwcj4oY2FsbEV4cHIpOwotICAgICAgICBib29sIGluc3RydW1lbnRlZCA9IGZhbHNlOwotICAg ICAgICBpZiAobWV0aG9kQ2FsbEV4cHIpIHsKLSAgICAgICAgICAgIHN0ZDo6c3RyaW5nIG1ldGhv ZE5hbWUgPSBtZXRob2RDYWxsRXhwci0+Z2V0TWV0aG9kRGVjbCgpLT5nZXROYW1lQXNTdHJpbmco KTsKLSAgICAgICAgICAgIFN0cmluZ3M6Oml0ZXJhdG9yIGkgPSBmaW5kKGluc3RydW1lbnRhdGlv bk1ldGhvZHMuYmVnaW4oKSwgaW5zdHJ1bWVudGF0aW9uTWV0aG9kcy5lbmQoKSwgbWV0aG9kTmFt ZSk7Ci0gICAgICAgICAgICBpbnN0cnVtZW50ZWQgPSBpICE9IGluc3RydW1lbnRhdGlvbk1ldGhv ZHMuZW5kKCk7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGluc3RydW1lbnRlZCB8fCAhbWV0aG9k Q2FsbEV4cHIpIHsKLSAgICAgICAgICAgIGZvciAoQ2FsbEV4cHI6OmFyZ19pdGVyYXRvciBpID0g Y2FsbEV4cHItPmFyZ19iZWdpbigpOyBpICE9IGNhbGxFeHByLT5hcmdfZW5kKCk7ICsraSkgewot ICAgICAgICAgICAgICAgIGlmIChNZW1iZXJFeHByKiBtZW1iZXJFeHByID0gZHluX2Nhc3Q8TWVt YmVyRXhwcj4oKmkpKQotICAgICAgICAgICAgICAgICAgICBtX2luc3RydW1lbnRlZE1lbWJlcnMu cHVzaF9iYWNrKG1lbWJlckV4cHItPmdldE1lbWJlck5hbWVJbmZvKCkuZ2V0QXNTdHJpbmcoKSk7 Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQog CisgICAgYm9vbCBWaXNpdENhbGxFeHByKENhbGxFeHByKik7CiAgICAgY29uc3QgU3RyaW5ncyYg aW5zdHJ1bWVudGVkTWVtYmVycygpIGNvbnN0IHsgcmV0dXJuIG1faW5zdHJ1bWVudGVkTWVtYmVy czsgfQogCiBwcml2YXRlOgpAQCAtNzYsNzUgKzYxLDEzIEBAIHB1YmxpYzoKICAgICAgICAgOiBt X2luc3RhbmNlKGluc3RhbmNlKQogICAgICAgICAsIG1fY29udGV4dChjb250ZXh0KSB7IH0KIAot ICAgIGJvb2wgVmlzaXRDWFhNZXRob2REZWNsKGNsYW5nOjpDWFhNZXRob2REZWNsKiBkZWNsKQot ICAgIHsKLSAgICAgICAgaWYgKGRlY2wtPmRvZXNUaGlzRGVjbGFyYXRpb25IYXZlQUJvZHkoKSAm JiBkZWNsLT5nZXROYW1lQXNTdHJpbmcoKSA9PSBpbnN0cmltZW50aW5nTWV0aG9kTmFtZSkgewot ICAgICAgICAgICAgRnVsbFNvdXJjZUxvYyBmdWxsTG9jYXRpb24gPSBtX2NvbnRleHQtPmdldEZ1 bGxMb2MoZGVjbC0+Z2V0TG9jU3RhcnQoKSk7Ci0gICAgICAgICAgICBpZiAoZnVsbExvY2F0aW9u LmlzVmFsaWQoKSkgewotICAgICAgICAgICAgICAgIEFkZE1lbWJlckNhbGxWaXNpdG9yIHZpc2l0 b3I7Ci0gICAgICAgICAgICAgICAgdmlzaXRvci5UcmF2ZXJzZVN0bXQoZGVjbC0+Z2V0Qm9keSgp KTsKLSAgICAgICAgICAgICAgICBDaGVja01lbWJlcnNDb3ZlcmFnZShkZWNsLT5nZXRQYXJlbnQo KSwgdmlzaXRvci5pbnN0cnVtZW50ZWRNZW1iZXJzKCksIGRlY2wtPmdldExvY1N0YXJ0KCkpOwot ICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KKyAg ICBib29sIFZpc2l0Q1hYTWV0aG9kRGVjbChjbGFuZzo6Q1hYTWV0aG9kRGVjbCopOwogCiBwcml2 YXRlOgotICAgIHZvaWQgZW1pdFdhcm5pbmcoU291cmNlTG9jYXRpb24gbG9jLCBjb25zdCBjaGFy KiByYXdFcnJvcikKLSAgICB7Ci0gICAgICAgIEZ1bGxTb3VyY2VMb2MgZnVsbChsb2MsIG1faW5z dGFuY2UuZ2V0U291cmNlTWFuYWdlcigpKTsKLSAgICAgICAgc3RkOjpzdHJpbmcgZXJyKCJbd2Vi a2l0LXN0eWxlXSAiKTsKLSAgICAgICAgZXJyICs9IHJhd0Vycm9yOwotICAgICAgICBEaWFnbm9z dGljc0VuZ2luZSYgZGlhZ25vc3RpYyA9IG1faW5zdGFuY2UuZ2V0RGlhZ25vc3RpY3MoKTsKLSAg ICAgICAgRGlhZ25vc3RpY3NFbmdpbmU6OkxldmVsIGxldmVsID0gZGlhZ25vc3RpYy5nZXRXYXJu aW5nc0FzRXJyb3JzKCkgPyBEaWFnbm9zdGljc0VuZ2luZTo6RXJyb3IgOiBEaWFnbm9zdGljc0Vu Z2luZTo6V2FybmluZzsKLSAgICAgICAgdW5zaWduZWQgaWQgPSBkaWFnbm9zdGljLmdldEN1c3Rv bURpYWdJRChsZXZlbCwgZXJyKTsKLSAgICAgICAgRGlhZ25vc3RpY0J1aWxkZXIgYnVpbGRlciA9 IGRpYWdub3N0aWMuUmVwb3J0KGZ1bGwsIGlkKTsKLSAgICB9Ci0KLSAgICBDWFhNZXRob2REZWNs KiBmaW5kSW5zdHJ1bWVudGF0aW9uTWV0aG9kKENYWFJlY29yZERlY2wqIHJlY29yZCkKLSAgICB7 Ci0gICAgICAgIGZvciAoQ1hYUmVjb3JkRGVjbDo6bWV0aG9kX2l0ZXJhdG9yIG0gPSByZWNvcmQt Pm1ldGhvZF9iZWdpbigpOyBtICE9IHJlY29yZC0+bWV0aG9kX2VuZCgpOyArK20pIHsKLSAgICAg ICAgICAgIGlmIChtLT5nZXROYW1lSW5mbygpLmdldEFzU3RyaW5nKCkgPT0gaW5zdHJpbWVudGlu Z01ldGhvZE5hbWUpCi0gICAgICAgICAgICAgICAgcmV0dXJuICptOwotICAgICAgICB9Ci0gICAg ICAgIHJldHVybiAwOwotICAgIH0KLQotICAgIGJvb2wgbmVlZHNUb0JlSW5zdHJ1bWVudGVkKGNv bnN0IFR5cGUqIHR5cGUpCi0gICAgewotICAgICAgICBpZiAodHlwZS0+aXNCdWlsdGluVHlwZSgp KQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAodHlwZS0+aXNFbnVtZXJh bFR5cGUoKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYgKHR5cGUtPmlz Q2xhc3NUeXBlKCkpIHsKLSAgICAgICAgICAgIGNvbnN0IFJlY29yZFR5cGUqIHJlY29yZFR5cGUg PSBkeW5fY2FzdDxSZWNvcmRUeXBlPih0eXBlKTsKLSAgICAgICAgICAgIGlmIChyZWNvcmRUeXBl KSB7Ci0gICAgICAgICAgICAgICAgQ1hYUmVjb3JkRGVjbCogZGVjbCA9IGR5bl9jYXN0PENYWFJl Y29yZERlY2w+KHJlY29yZFR5cGUtPmdldERlY2woKSk7Ci0gICAgICAgICAgICAgICAgaWYgKGRl Y2wtPmdldE5hbWVBc1N0cmluZygpID09ICJTdHJpbmciKQotICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgICAgICBpZiAoIWRlY2wgfHwgIWZpbmRJbnN0cnVtZW50 YXRpb25NZXRob2QoZGVjbCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgICBpZiAodHlwZS0+aXNBcnJheVR5cGUoKSkg ewotICAgICAgICAgICAgY29uc3QgQXJyYXlUeXBlKiBhcnJheVR5cGUgPSBkeW5fY2FzdDxjb25z dCBBcnJheVR5cGU+KHR5cGUpOwotICAgICAgICAgICAgcmV0dXJuIG5lZWRzVG9CZUluc3RydW1l bnRlZChhcnJheVR5cGUtPmdldEVsZW1lbnRUeXBlKCkuZ2V0VHlwZVB0cigpKTsKLSAgICAgICAg fQotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0KLSAgICB2b2lkIENoZWNrTWVtYmVyc0Nv dmVyYWdlKGNvbnN0IENYWFJlY29yZERlY2wqIGluc3RydW1lbnRlZENsYXNzLCBjb25zdCBTdHJp bmdzJiBpbnN0cnVtZW50ZWRNZW1iZXJzLCBTb3VyY2VMb2NhdGlvbiBsb2NhdGlvbikKLSAgICB7 Ci0gICAgICAgIGZvciAoQ1hYUmVjb3JkRGVjbDo6ZmllbGRfaXRlcmF0b3IgaSA9IGluc3RydW1l bnRlZENsYXNzLT5maWVsZF9iZWdpbigpOyBpICE9IGluc3RydW1lbnRlZENsYXNzLT5maWVsZF9l bmQoKTsgKytpKSB7Ci0gICAgICAgICAgICBzdGQ6OnN0cmluZyBmaWVsZE5hbWUgPSBpLT5nZXRO YW1lQXNTdHJpbmcoKTsKLSAgICAgICAgICAgIGlmIChmaW5kKGluc3RydW1lbnRlZE1lbWJlcnMu YmVnaW4oKSwgaW5zdHJ1bWVudGVkTWVtYmVycy5lbmQoKSwgZmllbGROYW1lKSA9PSBpbnN0cnVt ZW50ZWRNZW1iZXJzLmVuZCgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFuZWVkc1RvQmVJbnN0 cnVtZW50ZWQoaS0+Z2V0VHlwZSgpLmdldFR5cGVQdHIoKSkpCi0gICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIGVtaXRXYXJuaW5nKGktPmdldFNvdXJjZVJhbmdl KCkuZ2V0QmVnaW4oKSwgImNsYXNzIG1lbWJlciBuZWVkcyB0byBiZSBpbnN0cnVtZW50ZWQgaW4g cmVwb3J0TWVtb3J5VXNhZ2UgZnVuY3Rpb24iKTsKLSAgICAgICAgICAgICAgICBlbWl0V2Fybmlu Zyhsb2NhdGlvbiwgImxvY2F0ZWQgaGVyZSIpOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0g ICAgfQorICAgIHZvaWQgZW1pdFdhcm5pbmcoU291cmNlTG9jYXRpb24sIGNvbnN0IGNoYXIqIHJh d0Vycm9yKTsKKyAgICBDWFhNZXRob2REZWNsKiBmaW5kSW5zdHJ1bWVudGF0aW9uTWV0aG9kKENY WFJlY29yZERlY2wqKTsKKyAgICBib29sIG5lZWRzVG9CZUluc3RydW1lbnRlZChjb25zdCBUeXBl Kik7CisgICAgdm9pZCBDaGVja01lbWJlcnNDb3ZlcmFnZShjb25zdCBDWFhSZWNvcmREZWNsKiBp bnN0cnVtZW50ZWRDbGFzcywgY29uc3QgU3RyaW5ncyYgaW5zdHJ1bWVudGVkTWVtYmVycywgU291 cmNlTG9jYXRpb24pOwogCiAgICAgQ29tcGlsZXJJbnN0YW5jZSYgbV9pbnN0YW5jZTsKICAgICBB U1RDb250ZXh0KiBtX2NvbnRleHQ7CkBAIC0xNzcsNyArMTAwLDcgQEAgcHJvdGVjdGVkOgogICAg ICAgICByZXR1cm4gbmV3IFJlcG9ydE1lbW9yeVVzYWdlQ29uc3VtZXIoQ0ksICZDSS5nZXRBU1RD b250ZXh0KCkpOwogICAgIH0KIAotICAgIGJvb2wgUGFyc2VBcmdzKGNvbnN0IENvbXBpbGVySW5z dGFuY2UmIENJLCBjb25zdCBzdGQ6OnZlY3RvcjxzdGQ6OnN0cmluZz4mIGFyZ3MpCisgICAgYm9v bCBQYXJzZUFyZ3MoY29uc3QgQ29tcGlsZXJJbnN0YW5jZSYgQ0ksIGNvbnN0IHZlY3RvcjxzdHJp bmc+JiBhcmdzKQogICAgIHsKICAgICAgICAgaWYgKGFyZ3Muc2l6ZSgpICYmIGFyZ3NbMF0gPT0g ImhlbHAiKQogICAgICAgICAgICAgbGx2bTo6ZXJycygpIDw8IG1faGVscFRleHQ7CkBAIC0yMTEs OCArMTM0LDk1IEBAIGNvbnN0IGNoYXIqIFJlcG9ydE1lbW9yeVVzYWdlQWN0aW9uOjptX2hlbHBU ZXh0ID0KICAgICAiICAgIERhdGEqIG1fcG9pbnRlclRvSW50ZXJuYWxGaWVsZDtcbiIKICAgICAi fVxuIjsKIAorYm9vbCBBZGRNZW1iZXJDYWxsVmlzaXRvcjo6VmlzaXRDYWxsRXhwcihDYWxsRXhw ciogY2FsbEV4cHIpCit7CisgICAgQ1hYTWVtYmVyQ2FsbEV4cHIqIG1ldGhvZENhbGxFeHByID0g ZHluX2Nhc3Q8Q1hYTWVtYmVyQ2FsbEV4cHI+KGNhbGxFeHByKTsKKyAgICBib29sIGluc3RydW1l bnRlZCA9IGZhbHNlOworICAgIGlmIChtZXRob2RDYWxsRXhwcikgeworICAgICAgICBzdHJpbmcg bWV0aG9kTmFtZSA9IG1ldGhvZENhbGxFeHByLT5nZXRNZXRob2REZWNsKCktPmdldE5hbWVBc1N0 cmluZygpOworICAgICAgICBTdHJpbmdzOjppdGVyYXRvciBpID0gZmluZChpbnN0cnVtZW50YXRp b25NZXRob2RzLmJlZ2luKCksIGluc3RydW1lbnRhdGlvbk1ldGhvZHMuZW5kKCksIG1ldGhvZE5h bWUpOworICAgICAgICBpbnN0cnVtZW50ZWQgPSBpICE9IGluc3RydW1lbnRhdGlvbk1ldGhvZHMu ZW5kKCk7CisgICAgfQorICAgIGlmIChpbnN0cnVtZW50ZWQgfHwgIW1ldGhvZENhbGxFeHByKSB7 CisgICAgICAgIGZvciAoQ2FsbEV4cHI6OmFyZ19pdGVyYXRvciBpID0gY2FsbEV4cHItPmFyZ19i ZWdpbigpOyBpICE9IGNhbGxFeHByLT5hcmdfZW5kKCk7ICsraSkgeworICAgICAgICAgICAgaWYg KE1lbWJlckV4cHIqIG1lbWJlckV4cHIgPSBkeW5fY2FzdDxNZW1iZXJFeHByPigqaSkpCisgICAg ICAgICAgICAgICAgbV9pbnN0cnVtZW50ZWRNZW1iZXJzLnB1c2hfYmFjayhtZW1iZXJFeHByLT5n ZXRNZW1iZXJOYW1lSW5mbygpLmdldEFzU3RyaW5nKCkpOworICAgICAgICB9CisgICAgfQorICAg IHJldHVybiB0cnVlOworfQorCitib29sIFJlcG9ydE1lbW9yeVVzYWdlVmlzaXRvcjo6VmlzaXRD WFhNZXRob2REZWNsKGNsYW5nOjpDWFhNZXRob2REZWNsKiBkZWNsKQoreworICAgIGlmIChkZWNs LT5kb2VzVGhpc0RlY2xhcmF0aW9uSGF2ZUFCb2R5KCkgJiYgZGVjbC0+Z2V0TmFtZUFzU3RyaW5n KCkgPT0gaW5zdHJ1bWVudGluZ01ldGhvZE5hbWUpIHsKKyAgICAgICAgRnVsbFNvdXJjZUxvYyBm dWxsTG9jYXRpb24gPSBtX2NvbnRleHQtPmdldEZ1bGxMb2MoZGVjbC0+Z2V0TG9jU3RhcnQoKSk7 CisgICAgICAgIGlmIChmdWxsTG9jYXRpb24uaXNWYWxpZCgpKSB7CisgICAgICAgICAgICBBZGRN ZW1iZXJDYWxsVmlzaXRvciB2aXNpdG9yOworICAgICAgICAgICAgdmlzaXRvci5UcmF2ZXJzZVN0 bXQoZGVjbC0+Z2V0Qm9keSgpKTsKKyAgICAgICAgICAgIENoZWNrTWVtYmVyc0NvdmVyYWdlKGRl Y2wtPmdldFBhcmVudCgpLCB2aXNpdG9yLmluc3RydW1lbnRlZE1lbWJlcnMoKSwgZGVjbC0+Z2V0 TG9jU3RhcnQoKSk7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisKK3Zv aWQgUmVwb3J0TWVtb3J5VXNhZ2VWaXNpdG9yOjplbWl0V2FybmluZyhTb3VyY2VMb2NhdGlvbiBs b2MsIGNvbnN0IGNoYXIqIHJhd0Vycm9yKQoreworICAgIEZ1bGxTb3VyY2VMb2MgZnVsbChsb2Ms IG1faW5zdGFuY2UuZ2V0U291cmNlTWFuYWdlcigpKTsKKyAgICBzdHJpbmcgZXJyKCJbd2Via2l0 LXN0eWxlXSAiKTsKKyAgICBlcnIgKz0gcmF3RXJyb3I7CisgICAgRGlhZ25vc3RpY3NFbmdpbmUm IGRpYWdub3N0aWMgPSBtX2luc3RhbmNlLmdldERpYWdub3N0aWNzKCk7CisgICAgRGlhZ25vc3Rp Y3NFbmdpbmU6OkxldmVsIGxldmVsID0gZGlhZ25vc3RpYy5nZXRXYXJuaW5nc0FzRXJyb3JzKCkg PyBEaWFnbm9zdGljc0VuZ2luZTo6RXJyb3IgOiBEaWFnbm9zdGljc0VuZ2luZTo6V2FybmluZzsK KyAgICB1bnNpZ25lZCBpZCA9IGRpYWdub3N0aWMuZ2V0Q3VzdG9tRGlhZ0lEKGxldmVsLCBlcnIp OworICAgIERpYWdub3N0aWNCdWlsZGVyIGJ1aWxkZXIgPSBkaWFnbm9zdGljLlJlcG9ydChmdWxs LCBpZCk7CiB9CiAKK0NYWE1ldGhvZERlY2wqIFJlcG9ydE1lbW9yeVVzYWdlVmlzaXRvcjo6Zmlu ZEluc3RydW1lbnRhdGlvbk1ldGhvZChDWFhSZWNvcmREZWNsKiByZWNvcmQpCit7CisgICAgZm9y IChDWFhSZWNvcmREZWNsOjptZXRob2RfaXRlcmF0b3IgbSA9IHJlY29yZC0+bWV0aG9kX2JlZ2lu KCk7IG0gIT0gcmVjb3JkLT5tZXRob2RfZW5kKCk7ICsrbSkgeworICAgICAgICBpZiAobS0+Z2V0 TmFtZUluZm8oKS5nZXRBc1N0cmluZygpID09IGluc3RydW1lbnRpbmdNZXRob2ROYW1lKQorICAg ICAgICAgICAgcmV0dXJuICptOworICAgIH0KKyAgICByZXR1cm4gMDsKK30KKworYm9vbCBSZXBv cnRNZW1vcnlVc2FnZVZpc2l0b3I6Om5lZWRzVG9CZUluc3RydW1lbnRlZChjb25zdCBUeXBlKiB0 eXBlKQoreworICAgIGlmICh0eXBlLT5pc0J1aWx0aW5UeXBlKCkpCisgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICBpZiAodHlwZS0+aXNFbnVtZXJhbFR5cGUoKSkKKyAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIGlmICh0eXBlLT5pc0NsYXNzVHlwZSgpKSB7CisgICAgICAgIGNvbnN0IFJlY29y ZFR5cGUqIHJlY29yZFR5cGUgPSBkeW5fY2FzdDxSZWNvcmRUeXBlPih0eXBlKTsKKyAgICAgICAg aWYgKHJlY29yZFR5cGUpIHsKKyAgICAgICAgICAgIENYWFJlY29yZERlY2wqIGRlY2wgPSBkeW5f Y2FzdDxDWFhSZWNvcmREZWNsPihyZWNvcmRUeXBlLT5nZXREZWNsKCkpOworICAgICAgICAgICAg aWYgKGRlY2wtPmdldE5hbWVBc1N0cmluZygpID09ICJTdHJpbmciKQorICAgICAgICAgICAgICAg IHJldHVybiB0cnVlOworICAgICAgICAgICAgaWYgKCFkZWNsIHx8ICFmaW5kSW5zdHJ1bWVudGF0 aW9uTWV0aG9kKGRlY2wpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg fQorICAgIH0KKyAgICBpZiAodHlwZS0+aXNBcnJheVR5cGUoKSkgeworICAgICAgICBjb25zdCBB cnJheVR5cGUqIGFycmF5VHlwZSA9IGR5bl9jYXN0PGNvbnN0IEFycmF5VHlwZT4odHlwZSk7Cisg ICAgICAgIHJldHVybiBuZWVkc1RvQmVJbnN0cnVtZW50ZWQoYXJyYXlUeXBlLT5nZXRFbGVtZW50 VHlwZSgpLmdldFR5cGVQdHIoKSk7CisgICAgfQorICAgIHJldHVybiB0cnVlOworfQorCit2b2lk IFJlcG9ydE1lbW9yeVVzYWdlVmlzaXRvcjo6Q2hlY2tNZW1iZXJzQ292ZXJhZ2UoY29uc3QgQ1hY UmVjb3JkRGVjbCogaW5zdHJ1bWVudGVkQ2xhc3MsIGNvbnN0IFN0cmluZ3MmIGluc3RydW1lbnRl ZE1lbWJlcnMsIFNvdXJjZUxvY2F0aW9uIGxvY2F0aW9uKQoreworICAgIGZvciAoQ1hYUmVjb3Jk RGVjbDo6ZmllbGRfaXRlcmF0b3IgaSA9IGluc3RydW1lbnRlZENsYXNzLT5maWVsZF9iZWdpbigp OyBpICE9IGluc3RydW1lbnRlZENsYXNzLT5maWVsZF9lbmQoKTsgKytpKSB7CisgICAgICAgIHN0 cmluZyBmaWVsZE5hbWUgPSBpLT5nZXROYW1lQXNTdHJpbmcoKTsKKyAgICAgICAgaWYgKGZpbmQo aW5zdHJ1bWVudGVkTWVtYmVycy5iZWdpbigpLCBpbnN0cnVtZW50ZWRNZW1iZXJzLmVuZCgpLCBm aWVsZE5hbWUpID09IGluc3RydW1lbnRlZE1lbWJlcnMuZW5kKCkpIHsKKyAgICAgICAgICAgIGlm ICghbmVlZHNUb0JlSW5zdHJ1bWVudGVkKGktPmdldFR5cGUoKS5nZXRUeXBlUHRyKCkpKQorICAg ICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgZW1pdFdhcm5pbmcoaS0+Z2V0U291 cmNlUmFuZ2UoKS5nZXRCZWdpbigpLCAiY2xhc3MgbWVtYmVyIG5lZWRzIHRvIGJlIGluc3RydW1l bnRlZCBpbiByZXBvcnRNZW1vcnlVc2FnZSBmdW5jdGlvbiIpOworICAgICAgICAgICAgZW1pdFdh cm5pbmcobG9jYXRpb24sICJsb2NhdGVkIGhlcmUiKTsKKyAgICAgICAgfQorICAgIH0KK30KKwor fSAvLyBuYW1lc3BhY2UKKwogc3RhdGljIEZyb250ZW5kUGx1Z2luUmVnaXN0cnk6OkFkZDxSZXBv cnRNZW1vcnlVc2FnZUFjdGlvbj4KIFgoInJlcG9ydC1tZW1vcnktdXNhZ2UiLCAiQ2hlY2tzIHJl cG9ydE1lbW9yeVVzYWdlIGZ1bmN0aW9uIGNvbnNpc3RlbmN5Iik7CiAK