109299 2013-02-08 07:02:09 -0800 Web Inspector: refactor MemoryStatistics.js 2013-02-08 07:46:15 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 828538 0 yurys 2013-02-08 07:02:09 -0800 We are going to reuse some of its implementation for native memory graph. 828539 1 187313 yurys 2013-02-08 07:04:42 -0800 Created attachment 187313 Patch 828568 2 yurys 2013-02-08 07:46:15 -0800 Committed r142278: <http://trac.webkit.org/changeset/142278> 187313 2013-02-08 07:04:42 -0800 2013-02-08 07:08:23 -0800 Patch bug-109299-20130208190116.patch text/plain 9272 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQzYjYwZGFhNmY1OWU0 ODA1NDdiNTg5MTVmNDUwOTQ2NjI3Nzc1YS4uYmNhMWZlMGVkMGQ2ZGYwM2MwNmRiZTRkZjMyYTA2 NDQxM2NlMWZiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTAyLTA4ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlZmFjdG9yIE1lbW9yeVN0YXRpc3RpY3MuanMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTI5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4dHJhY3RlZCBmdW5jdGlvbmFsaXR5IHNwZWNpZmlj IHRvIERPTSBjb3VudGVyIGdyYXBocyBkcmF3aW5nIGludG8KKyAgICAgICAgc2VwYXJhdGUgbWV0 aG9kcyBvbiBNZW1vcnlTdGF0aXN0aWNzIGNsYXNzLgorICAgICAgICBJbnRyb2R1Y2VkIENvdW50 ZXJVSUJhc2UgYmFzZSBjbGFzcyBmb3IgRE9NQ291bnRlclVJIHRoYXQgY29udGFpbnMKKyAgICAg ICAgZnVuY3Rpb25hbGl0eSB3aGljaCBjYW4gYmUgc2hhcmVkIHdpdGggbmF0aXZlIG1lbW9yeSBn cmFwaC4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTWVtb3J5U3RhdGlzdGljcy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Db3VudGVyVUlCYXNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db3VudGVy VUlCYXNlLnByb3RvdHlwZS51cGRhdGVDdXJyZW50VmFsdWUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNvdW50ZXJVSUJhc2UucHJvdG90eXBlLmNsZWFyQ3VycmVudFZhbHVlQW5kTWFya2VyKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Db3VudGVyVUlCYXNlLnByb3RvdHlwZS5nZXQgdmlzaWJs ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NQ291bnRlclVJKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5ET01Db3VudGVyVUkucHJvdG90eXBlLmRpc2NhcmRJbWFnZVVuZGVyTWFya2VyKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlwZS5fb25Nb3Vz ZU91dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGljcy5wcm90b3R5cGUu X2NsZWFyQ3VycmVudFZhbHVlQW5kTWFya2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5NZW1v cnlTdGF0aXN0aWNzLnByb3RvdHlwZS5fcmVmcmVzaEN1cnJlbnRWYWx1ZXMpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MucHJvdG90eXBlLl91cGRhdGVDdXJyZW50VmFs dWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MucHJvdG90eXBlLl9o aWdobGlnaHRDdXJyZW50UG9zaXRpb25PbkdyYXBocyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TWVtb3J5U3RhdGlzdGljcy5wcm90b3R5cGUuX3Jlc3RvcmVJbWFnZVVuZGVyTWFya2VyKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlwZS5fc2F2ZUltYWdl VW5kZXJNYXJrZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MucHJv dG90eXBlLl9kcmF3TWFya2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0 aWNzLnByb3RvdHlwZS5fY2xlYXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRp c3RpY3MucHJvdG90eXBlLl9kaXNjYXJkSW1hZ2VVbmRlck1hcmtlcik6CisKIDIwMTMtMDItMDgg IEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFN1cHBvcnQg YSByZWxhdGVkVGFyZ2V0IGF0dHJpYnV0ZSBvbiBmb2N1cy9ibHVyIGV2ZW50cwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZW1vcnlTdGF0aXN0aWNzLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZW1vcnlTdGF0aXN0aWNzLmpz CmluZGV4IDY1ZWQzNTcxOGYzNjY1OTQ1NjRiMWMyYTZjMDNlOGU1MDYyYzQyZjEuLjNmM2I4ZDAw MjlkMDZhZTJjM2RhN2IxZDI5YjQ3NTE2NzFkNTUyMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTWVtb3J5U3RhdGlzdGljcy5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01lbW9yeVN0YXRpc3RpY3MuanMKQEAgLTgwLDkg KzgwLDkgQEAgV2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MgPSBmdW5jdGlvbih0aW1lbGlu ZVBhbmVsLCBtb2RlbCwgc2lkZWJhcldpZHRoKQogICAgICAgICByZXR1cm4gZW50cnkubGlzdGVu ZXJDb3VudDsKICAgICB9CiAgICAgdGhpcy5fY291bnRlclVJID0gWwotICAgICAgICBuZXcgV2Vi SW5zcGVjdG9yLkNvdW50ZXJVSSh0aGlzLCAiRG9jdW1lbnQgQ291bnQiLCAiRG9jdW1lbnRzOiAl ZCIsIFsxMDAsMCwwXSwgZ2V0RG9jdW1lbnRDb3VudCksCi0gICAgICAgIG5ldyBXZWJJbnNwZWN0 b3IuQ291bnRlclVJKHRoaXMsICJET00gTm9kZSBDb3VudCIsICJOb2RlczogJWQiLCBbMCwxMDAs MF0sIGdldE5vZGVDb3VudCksCi0gICAgICAgIG5ldyBXZWJJbnNwZWN0b3IuQ291bnRlclVJKHRo aXMsICJFdmVudCBMaXN0ZW5lciBDb3VudCIsICJMaXN0ZW5lcnM6ICVkIiwgWzAsMCwxMDBdLCBn ZXRMaXN0ZW5lckNvdW50KQorICAgICAgICBuZXcgV2ViSW5zcGVjdG9yLkRPTUNvdW50ZXJVSSh0 aGlzLCAiRG9jdW1lbnQgQ291bnQiLCAiRG9jdW1lbnRzOiAlZCIsIFsxMDAsMCwwXSwgZ2V0RG9j dW1lbnRDb3VudCksCisgICAgICAgIG5ldyBXZWJJbnNwZWN0b3IuRE9NQ291bnRlclVJKHRoaXMs ICJET00gTm9kZSBDb3VudCIsICJOb2RlczogJWQiLCBbMCwxMDAsMF0sIGdldE5vZGVDb3VudCks CisgICAgICAgIG5ldyBXZWJJbnNwZWN0b3IuRE9NQ291bnRlclVJKHRoaXMsICJFdmVudCBMaXN0 ZW5lciBDb3VudCIsICJMaXN0ZW5lcnM6ICVkIiwgWzAsMCwxMDBdLCBnZXRMaXN0ZW5lckNvdW50 KQogICAgIF07CiAKICAgICBUaW1lbGluZUFnZW50LnNldEluY2x1ZGVNZW1vcnlEZXRhaWxzKHRy dWUpOwpAQCAtMTM0LDI2ICsxMzQsMjMgQEAgV2ViSW5zcGVjdG9yLlN3YXRjaENoZWNrYm94LnBy b3RvdHlwZSA9IHsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKi8KLVdlYkluc3BlY3Rvci5Db3Vu dGVyVUkgPSBmdW5jdGlvbihtZW1vcnlDb3VudGVyc1BhbmUsIHRpdGxlLCBjdXJyZW50VmFsdWVM YWJlbCwgcmdiLCB2YWx1ZUdldHRlcikKK1dlYkluc3BlY3Rvci5Db3VudGVyVUlCYXNlID0gZnVu Y3Rpb24obWVtb3J5Q291bnRlcnNQYW5lLCB0aXRsZSwgZ3JhcGhDb2xvciwgdmFsdWVHZXR0ZXIp CiB7CiAgICAgdGhpcy5fbWVtb3J5Q291bnRlcnNQYW5lID0gbWVtb3J5Q291bnRlcnNQYW5lOwog ICAgIHRoaXMudmFsdWVHZXR0ZXIgPSB2YWx1ZUdldHRlcjsKICAgICB2YXIgY29udGFpbmVyID0g bWVtb3J5Q291bnRlcnNQYW5lLl9tZW1vcnlTaWRlYmFyVmlldy5zaWRlYmFyRWxlbWVudC5jcmVh dGVDaGlsZCgiZGl2IiwgIm1lbW9yeS1jb3VudGVyLXNpZGViYXItaW5mbyIpOwotICAgIHZhciBz d2F0Y2hDb2xvciA9ICJyZ2IoIiArIHJnYi5qb2luKCIsIikgKyAiKSI7CisgICAgdmFyIHN3YXRj aENvbG9yID0gZ3JhcGhDb2xvcjsKICAgICB0aGlzLl9zd2F0Y2ggPSBuZXcgV2ViSW5zcGVjdG9y LlN3YXRjaENoZWNrYm94KFdlYkluc3BlY3Rvci5VSVN0cmluZyh0aXRsZSksIHN3YXRjaENvbG9y KTsKICAgICB0aGlzLl9zd2F0Y2guYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU3dhdGNo Q2hlY2tib3guRXZlbnRzLkNoYW5nZWQsIHRoaXMuX3RvZ2dsZUNvdW50ZXJHcmFwaC5iaW5kKHRo aXMpKTsKICAgICBjb250YWluZXIuYXBwZW5kQ2hpbGQodGhpcy5fc3dhdGNoLmVsZW1lbnQpOwot ICAgIHRoaXMuX3JhbmdlID0gdGhpcy5fc3dhdGNoLmVsZW1lbnQuY3JlYXRlQ2hpbGQoInNwYW4i KTsKLQotICAgIHRoaXMuX3ZhbHVlID0gbWVtb3J5Q291bnRlcnNQYW5lLl9jdXJyZW50VmFsdWVz QmFyLmNyZWF0ZUNoaWxkKCJzcGFuIiwgIm1lbW9yeS1jb3VudGVyLXZhbHVlIik7Ci0gICAgdGhp cy5fdmFsdWUuc3R5bGUuY29sb3IgPSBzd2F0Y2hDb2xvcjsKLSAgICB0aGlzLl9jdXJyZW50VmFs dWVMYWJlbCA9IGN1cnJlbnRWYWx1ZUxhYmVsOwogCi0gICAgdGhpcy5ncmFwaENvbG9yID0gInJn YmEoIiArIHJnYi5qb2luKCIsIikgKyAiLDAuOCkiOworICAgIHRoaXMuX3ZhbHVlID0gbnVsbDsK KyAgICB0aGlzLmdyYXBoQ29sb3IgPWdyYXBoQ29sb3I7CisgICAgdGhpcy5zdHJva2VDb2xvciA9 IGdyYXBoQ29sb3I7CiAgICAgdGhpcy5ncmFwaFlWYWx1ZXMgPSBbXTsKIH0KIAotV2ViSW5zcGVj dG9yLkNvdW50ZXJVSS5wcm90b3R5cGUgPSB7CitXZWJJbnNwZWN0b3IuQ291bnRlclVJQmFzZS5w cm90b3R5cGUgPSB7CiAgICAgX3RvZ2dsZUNvdW50ZXJHcmFwaDogZnVuY3Rpb24oZXZlbnQpCiAg ICAgewogICAgICAgICBpZiAodGhpcy5fc3dhdGNoLmNoZWNrZWQpCkBAIC0xNjMsNiArMTYwLDQx IEBAIFdlYkluc3BlY3Rvci5Db3VudGVyVUkucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9t ZW1vcnlDb3VudGVyc1BhbmUucmVmcmVzaCgpOwogICAgIH0sCiAKKyAgICB1cGRhdGVDdXJyZW50 VmFsdWU6IGZ1bmN0aW9uKGNvdW50ZXJzRW50cnkpCisgICAgeworICAgICAgICB0aGlzLl92YWx1 ZS50ZXh0Q29udGVudCA9IE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMudmFsdWVHZXR0ZXIoY291 bnRlcnNFbnRyeSkpOworICAgIH0sCisKKyAgICBjbGVhckN1cnJlbnRWYWx1ZUFuZE1hcmtlcjog ZnVuY3Rpb24oY3R4KQorICAgIHsKKyAgICAgICAgdGhpcy5fdmFsdWUudGV4dENvbnRlbnQgPSAi IjsKKyAgICB9LAorCisgICAgZ2V0IHZpc2libGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRo aXMuX3N3YXRjaC5jaGVja2VkOworICAgIH0sCit9CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisg KiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLkNvdW50ZXJVSUJhc2V9CisgKi8KK1dlYkluc3BlY3Rv ci5ET01Db3VudGVyVUkgPSBmdW5jdGlvbihtZW1vcnlDb3VudGVyc1BhbmUsIHRpdGxlLCBjdXJy ZW50VmFsdWVMYWJlbCwgcmdiLCB2YWx1ZUdldHRlcikKK3sKKyAgICB2YXIgc3dhdGNoQ29sb3Ig PSAicmdiKCIgKyByZ2Iuam9pbigiLCIpICsgIikiOworICAgIFdlYkluc3BlY3Rvci5Db3VudGVy VUlCYXNlLmNhbGwodGhpcywgbWVtb3J5Q291bnRlcnNQYW5lLCB0aXRsZSwgc3dhdGNoQ29sb3Is IHZhbHVlR2V0dGVyKQorICAgIHRoaXMuX3JhbmdlID0gdGhpcy5fc3dhdGNoLmVsZW1lbnQuY3Jl YXRlQ2hpbGQoInNwYW4iKTsKKworICAgIHRoaXMuX3ZhbHVlID0gbWVtb3J5Q291bnRlcnNQYW5l Ll9jdXJyZW50VmFsdWVzQmFyLmNyZWF0ZUNoaWxkKCJzcGFuIiwgIm1lbW9yeS1jb3VudGVyLXZh bHVlIik7CisgICAgdGhpcy5fdmFsdWUuc3R5bGUuY29sb3IgPSBzd2F0Y2hDb2xvcjsKKyAgICB0 aGlzLl9jdXJyZW50VmFsdWVMYWJlbCA9IGN1cnJlbnRWYWx1ZUxhYmVsOworCisgICAgdGhpcy5n cmFwaENvbG9yID0gInJnYmEoIiArIHJnYi5qb2luKCIsIikgKyAiLDAuOCkiOworICAgIHRoaXMu Z3JhcGhZVmFsdWVzID0gW107Cit9CisKK1dlYkluc3BlY3Rvci5ET01Db3VudGVyVUkucHJvdG90 eXBlID0gewogICAgIHNldFJhbmdlOiBmdW5jdGlvbihtaW5WYWx1ZSwgbWF4VmFsdWUpCiAgICAg ewogICAgICAgICB0aGlzLl9yYW5nZS50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiWyAlZCAtICVkIF0iLCBtaW5WYWx1ZSwgbWF4VmFsdWUpOwpAQCAtMTc5LDExICsyMTEsNiBA QCBXZWJJbnNwZWN0b3IuQ291bnRlclVJLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5yZXN0 b3JlSW1hZ2VVbmRlck1hcmtlcihjdHgpOwogICAgIH0sCiAKLSAgICBnZXQgdmlzaWJsZSgpCi0g ICAgewotICAgICAgICByZXR1cm4gdGhpcy5fc3dhdGNoLmNoZWNrZWQ7Ci0gICAgfSwKLQogICAg IHNhdmVJbWFnZVVuZGVyTWFya2VyOiBmdW5jdGlvbihjdHgsIHgsIHksIHJhZGl1cykKICAgICB7 CiAgICAgICAgIGNvbnN0IHcgPSByYWRpdXMgKyAxOwpAQCAtMjA2LDcgKzIzMyw5IEBAIFdlYklu c3BlY3Rvci5Db3VudGVyVUkucHJvdG90eXBlID0gewogICAgIGRpc2NhcmRJbWFnZVVuZGVyTWFy a2VyOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBkZWxldGUgdGhpcy5faW1hZ2VVbmRlck1h cmtlcjsKLSAgICB9CisgICAgfSwKKworICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLkNvdW50 ZXJVSUJhc2UucHJvdG90eXBlCiB9CiAKIApAQCAtMzI2LDYgKzM1NSwxMSBAQCBXZWJJbnNwZWN0 b3IuTWVtb3J5U3RhdGlzdGljcy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9t YXJrZXJYUG9zaXRpb247CiAKICAgICAgICAgdmFyIGN0eCA9IHRoaXMuX2NhbnZhcy5nZXRDb250 ZXh0KCIyZCIpOworICAgICAgICB0aGlzLl9jbGVhckN1cnJlbnRWYWx1ZUFuZE1hcmtlcihjdHgp OworICAgIH0sCisKKyAgICBfY2xlYXJDdXJyZW50VmFsdWVBbmRNYXJrZXI6IGZ1bmN0aW9uKGN0 eCkKKyAgICB7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fY291bnRlclVJLmxl bmd0aDsgaSsrKQogICAgICAgICAgICAgdGhpcy5fY291bnRlclVJW2ldLmNsZWFyQ3VycmVudFZh bHVlQW5kTWFya2VyKGN0eCk7CiAgICAgfSwKQEAgLTM1MCwxMiArMzg0LDE3IEBAIFdlYkluc3Bl Y3Rvci5NZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgdmFyIGkgPSB0aGlzLl9yZWNvcmRJbmRleEF0KHRoaXMuX21hcmtlclhQb3NpdGlv bik7CiAKLSAgICAgICAgZm9yICh2YXIgaiA9IDA7IGogPCB0aGlzLl9jb3VudGVyVUkubGVuZ3Ro OyBqKyspCi0gICAgICAgICAgICB0aGlzLl9jb3VudGVyVUlbal0udXBkYXRlQ3VycmVudFZhbHVl KHRoaXMuX2NvdW50ZXJzW2ldKTsKKyAgICAgICAgdGhpcy5fdXBkYXRlQ3VycmVudFZhbHVlKHRo aXMuX2NvdW50ZXJzW2ldKTsKIAogICAgICAgICB0aGlzLl9oaWdobGlnaHRDdXJyZW50UG9zaXRp b25PbkdyYXBocyh0aGlzLl9tYXJrZXJYUG9zaXRpb24sIGkpOwogICAgIH0sCiAKKyAgICBfdXBk YXRlQ3VycmVudFZhbHVlOiBmdW5jdGlvbihjb3VudGVyRW50cnkpCisgICAgeworICAgICAgICBm b3IgKHZhciBqID0gMDsgaiA8IHRoaXMuX2NvdW50ZXJVSS5sZW5ndGg7IGorKykKKyAgICAgICAg ICAgIHRoaXMuX2NvdW50ZXJVSVtqXS51cGRhdGVDdXJyZW50VmFsdWUoY291bnRlckVudHJ5KTsK KyAgICB9LAorCiAgICAgX3JlY29yZEluZGV4QXQ6IGZ1bmN0aW9uKHgpCiAgICAgewogICAgICAg ICB2YXIgaTsKQEAgLTM3MSwxMyArNDEwLDIzIEBAIFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0 aWNzLnByb3RvdHlwZSA9IHsKICAgICBfaGlnaGxpZ2h0Q3VycmVudFBvc2l0aW9uT25HcmFwaHM6 IGZ1bmN0aW9uKHgsIGluZGV4KQogICAgIHsKICAgICAgICAgdmFyIGN0eCA9IHRoaXMuX2NhbnZh cy5nZXRDb250ZXh0KCIyZCIpOworICAgICAgICB0aGlzLl9yZXN0b3JlSW1hZ2VVbmRlck1hcmtl cihjdHgpOworICAgICAgICB0aGlzLl9zYXZlSW1hZ2VVbmRlck1hcmtlcihjdHgsIHgsIGluZGV4 KTsKKyAgICAgICAgdGhpcy5fZHJhd01hcmtlcihjdHgsIHgsIGluZGV4KTsKKyAgICB9LAorCisg ICAgX3Jlc3RvcmVJbWFnZVVuZGVyTWFya2VyOiBmdW5jdGlvbihjdHgpCisgICAgewogICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2NvdW50ZXJVSS5sZW5ndGg7IGkrKykgewogICAg ICAgICAgICAgdmFyIGNvdW50ZXJVSSA9IHRoaXMuX2NvdW50ZXJVSVtpXTsKICAgICAgICAgICAg IGlmICghY291bnRlclVJLnZpc2libGUpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAg ICAgICAgICBjb3VudGVyVUkucmVzdG9yZUltYWdlVW5kZXJNYXJrZXIoY3R4KTsKICAgICAgICAg fQorICAgIH0sCiAKKyAgICBfc2F2ZUltYWdlVW5kZXJNYXJrZXI6IGZ1bmN0aW9uKGN0eCwgeCwg aW5kZXgpCisgICAgewogICAgICAgICBjb25zdCByYWRpdXMgPSAyOwogICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHRoaXMuX2NvdW50ZXJVSS5sZW5ndGg7IGkrKykgewogICAgICAgICAgICAg dmFyIGNvdW50ZXJVSSA9IHRoaXMuX2NvdW50ZXJVSVtpXTsKQEAgLTM4Niw3ICs0MzUsMTEgQEAg V2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MucHJvdG90eXBlID0gewogICAgICAgICAgICAg dmFyIHkgPSBjb3VudGVyVUkuZ3JhcGhZVmFsdWVzW2luZGV4XTsKICAgICAgICAgICAgIGNvdW50 ZXJVSS5zYXZlSW1hZ2VVbmRlck1hcmtlcihjdHgsIHgsIHksIHJhZGl1cyk7CiAgICAgICAgIH0K KyAgICB9LAogCisgICAgX2RyYXdNYXJrZXI6IGZ1bmN0aW9uKGN0eCwgeCwgaW5kZXgpCisgICAg eworICAgICAgICBjb25zdCByYWRpdXMgPSAyOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8 IHRoaXMuX2NvdW50ZXJVSS5sZW5ndGg7IGkrKykgewogICAgICAgICAgICAgdmFyIGNvdW50ZXJV SSA9IHRoaXMuX2NvdW50ZXJVSVtpXTsKICAgICAgICAgICAgIGlmICghY291bnRlclVJLnZpc2li bGUpCkBAIC01MDksNiArNTYyLDExIEBAIFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzLnBy b3RvdHlwZSA9IHsKICAgICBfY2xlYXI6IGZ1bmN0aW9uKCkgewogICAgICAgICB2YXIgY3R4ID0g dGhpcy5fY2FudmFzLmdldENvbnRleHQoIjJkIik7CiAgICAgICAgIGN0eC5jbGVhclJlY3QoMCwg MCwgY3R4LmNhbnZhcy53aWR0aCwgY3R4LmNhbnZhcy5oZWlnaHQpOworICAgICAgICB0aGlzLl9k aXNjYXJkSW1hZ2VVbmRlck1hcmtlcigpOworICAgIH0sCisKKyAgICBfZGlzY2FyZEltYWdlVW5k ZXJNYXJrZXI6IGZ1bmN0aW9uKCkKKyAgICB7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg dGhpcy5fY291bnRlclVJLmxlbmd0aDsgaSsrKQogICAgICAgICAgICAgdGhpcy5fY291bnRlclVJ W2ldLmRpc2NhcmRJbWFnZVVuZGVyTWFya2VyKCk7CiAgICAgfQo=