65028 2011-07-22 07:54:56 -0700 Web Inspector: [Chromium] Quick clicking on heap objects results in intermixed retaining paths 2011-07-25 05:56:01 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mnaganov mnaganov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 440946 0 mnaganov 2011-07-22 07:54:56 -0700 Take a heap snapshot of a big web app (e.g. gmail). Wait until it is loaded and parsed. Expand several object types so several object instances are visible at the same time. Start clicking on different objects to get retaining paths. As a result, retaining paths calculated will be mixed in the paths window (a clear indication is presence of several "Show next 100" buttons). Clicking on an object should either clean up previous paths and abandon their calculation, or open a new tab for retaining paths to demux calculation results. 441041 1 101744 mnaganov 2011-07-22 11:19:20 -0700 Created attachment 101744 Patch 441618 2 mnaganov 2011-07-25 05:56:01 -0700 Manually committed http://trac.webkit.org/changeset/91663 Web Inspector: [Chromium] Fix mixing of retaining path in heap profiler. https://bugs.webkit.org/show_bug.cgi?id=65028 Reviewed by Pavel Feldman. * inspector/front-end/DetailedHeapshotView.js: (WebInspector.HeapSnapshotPathFinderState): Added (WebInspector.HeapSnapshotRetainingPathsList): Extracted State-specific code 101744 2011-07-22 11:19:20 -0700 2011-07-25 00:28:29 -0700 Patch patch-65028 text/plain 8651 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MDJiMWU5Li4wZjMxZDQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTEtMDctMjIgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4K KworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbQ2hyb21pdW1dIEZpeCBtaXhpbmcgb2YgcmV0YWlu aW5nIHBhdGggaW4gaGVhcCBwcm9maWxlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY1MDI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RW aWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFBhdGhGaW5kZXJTdGF0 ZSk6IEFkZGVkCisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UmV0YWluaW5nUGF0 aHNMaXN0KTogRXh0cmFjdGVkIFN0YXRlLXNwZWNpZmljIGNvZGUKKwogMjAxMS0wNy0yMiAgS2Vu dGFybyBIYXJhICA8aGFyYWtlbkBnb29nbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjg5 NTM1KTogRm9ybSByZXNldCBkb2VzIG5vdCByZXBhaW50IGEgZmlsZSB1cGxvYWQgY29udHJvbC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRI ZWFwc2hvdFZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFp bGVkSGVhcHNob3RWaWV3LmpzCmluZGV4IDcwMTU4ZTcuLmFiZTc1MTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90 Vmlldy5qcwpAQCAtMzQxLDYgKzM0MSw2MSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RG9t aW5hdG9yc0RhdGFHcmlkLnByb3RvdHlwZSA9IHsKIE1peEluU25hcHNob3ROb2RlRnVuY3Rpb25z KFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3REb21pbmF0b3JPYmplY3ROb2RlLnByb3RvdHlwZSwg V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdERvbWluYXRvcnNEYXRhR3JpZC5wcm90b3R5cGUpOwog V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdERvbWluYXRvcnNEYXRhR3JpZC5wcm90b3R5cGUuX19w cm90b19fID0gV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQucHJvdG90 eXBlOwogCitXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UGF0aEZpbmRlclN0YXRlID0gZnVuY3Rp b24oc25hcHNob3QsIG5vZGVJbmRleCwgcm9vdEZpbHRlcikKK3sKKyAgICB0aGlzLl9wYXRoRmlu ZGVyID0gc25hcHNob3QuY3JlYXRlUGF0aEZpbmRlcihub2RlSW5kZXgsICFXZWJJbnNwZWN0b3Iu RGV0YWlsZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlLnNob3dIaWRkZW5EYXRhKTsKKyAgICB0aGlz Ll9wYXRoRmluZGVyLnVwZGF0ZVJvb3RzKHJvb3RGaWx0ZXIpOworICAgIHRoaXMuX2ZvdW5kQ291 bnQgPSAwOworICAgIHRoaXMuX2ZvdW5kQ291bnRNYXggPSBudWxsOworICAgIHRoaXMuX3RvdGFs Rm91bmRDb3VudCA9IDA7CisgICAgdGhpcy5fY2FuY2VsbGVkID0gZmFsc2U7Cit9CisKK1dlYklu c3BlY3Rvci5IZWFwU25hcHNob3RQYXRoRmluZGVyU3RhdGUucHJvdG90eXBlID0geworICAgIGJh dGNoRG9uZTogZnVuY3Rpb24oc3RhdHVzKQorICAgIHsKKyAgICB9LAorCisgICAgcGF0aEZvdW5k OiBmdW5jdGlvbihwYXRoKQorICAgIHsKKyAgICB9LAorCisgICAgY2FuY2VsOiBmdW5jdGlvbigp CisgICAgeworICAgICAgICB0aGlzLl9jYW5jZWxsZWQgPSB0cnVlOworICAgICAgICB0aGlzLl9w YXRoRmluZGVyLmRpc3Bvc2UoKTsKKyAgICB9LAorCisgICAgc3RhcnRCYXRjaDogZnVuY3Rpb24o Y291bnQpCisgICAgeworICAgICAgICBpZiAodGhpcy5fY2FuY2VsbGVkKQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB0aGlzLl9mb3VuZENvdW50ID0gMDsKKyAgICAgICAgdGhpcy5fZm91 bmRDb3VudE1heCA9IGNvdW50OworICAgICAgICB0aGlzLl9wYXRoRmluZGVyLmZpbmROZXh0KHRo aXMuX3BhdGhGb3VuZC5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisgICAgX3BhdGhGb3VuZDogZnVu Y3Rpb24ocmVzdWx0KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2NhbmNlbGxlZCkKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgaWYgKHJlc3VsdCA9PT0gbnVsbCkgeworICAgICAgICAg ICAgaWYgKCF0aGlzLl90b3RhbEZvdW5kQ291bnQpCisgICAgICAgICAgICAgICAgdGhpcy5iYXRj aERvbmUoIm5vLXBhdGhzLWF0LWFsbCIpOworICAgICAgICB9IGVsc2UgaWYgKHJlc3VsdCAhPT0g ZmFsc2UpIHsKKyAgICAgICAgICAgIHRoaXMucGF0aEZvdW5kKHJlc3VsdCk7CisgICAgICAgICAg ICArK3RoaXMuX2ZvdW5kQ291bnQ7CisgICAgICAgICAgICArK3RoaXMuX3RvdGFsRm91bmRDb3Vu dDsKKyAgICAgICAgICAgIGlmICh0aGlzLl9mb3VuZENvdW50IDwgdGhpcy5fZm91bmRDb3VudE1h eCkKKyAgICAgICAgICAgICAgICB0aGlzLl9wYXRoRmluZGVyLmZpbmROZXh0KHRoaXMuX3BhdGhG b3VuZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICB0aGlz LmJhdGNoRG9uZSgiaGF2ZS1tb3JlLXBhdGhzIik7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAg ICAgICB0aGlzLmJhdGNoRG9uZSgibm8tbW9yZS1wYXRocyIpOworICAgICAgICB9CisgICAgfQor fTsKKwogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFJldGFpbmluZ1BhdGhzTGlzdCA9IGZ1bmN0 aW9uKCkKIHsKICAgICB2YXIgY29sdW1ucyA9IHsKQEAgLTM0OSwxMyArNDA0LDE2IEBAIFdlYklu c3BlY3Rvci5IZWFwU25hcHNob3RSZXRhaW5pbmdQYXRoc0xpc3QgPSBmdW5jdGlvbigpCiAgICAg fTsKICAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90U29ydGFibGVEYXRhR3JpZC5jYWxsKHRo aXMsIGNvbHVtbnMpOwogICAgIHRoaXMuX2RlZmF1bHRQb3B1bGF0ZUNvdW50ID0gMTAwOworICAg IHRoaXMuX25vZGVJbmRleCA9IG51bGw7CisgICAgdGhpcy5fc3RhdGUgPSBudWxsOworICAgIHRo aXMuX3ByZWZpeCA9IG51bGw7CiB9CiAKIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RSZXRhaW5p bmdQYXRoc0xpc3QucHJvdG90eXBlID0gewogICAgIGRpc3Bvc2U6IGZ1bmN0aW9uKCkKICAgICB7 Ci0gICAgICAgIGlmICh0aGlzLnBhdGhGaW5kZXIpCi0gICAgICAgICAgICB0aGlzLnBhdGhGaW5k ZXIuZGlzcG9zZSgpOworICAgICAgICBpZiAodGhpcy5fc3RhdGUpCisgICAgICAgICAgICB0aGlz Ll9zdGF0ZS5jYW5jZWwoKTsKICAgICB9LCAKIAogICAgIF9zb3J0RmllbGRzOiBmdW5jdGlvbihz b3J0Q29sdW1uLCBzb3J0QXNjZW5kaW5nKQpAQCAtMzY4LDk1ICs0MjYsNzQgQEAgV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdFJldGFpbmluZ1BhdGhzTGlzdC5wcm90b3R5cGUgPSB7CiAKICAgICBf cmVzZXRQYXRoczogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fc2V0Um9vdENoaWxk cmVuRm9yRmluZGVyKCk7CisgICAgICAgIHZhciByb290RmlsdGVyID0gdGhpcy5zbmFwc2hvdFZp ZXcuaXNUcmFjaW5nVG9XaW5kb3dPYmplY3RzID8KKyAgICAgICAgICAgICJmdW5jdGlvbiAobm9k ZSkgeyByZXR1cm4gbm9kZS5uYW1lLnN1YnN0cigwLCA5KSA9PT0gXCJET01XaW5kb3dcIjsgfSIg OiBudWxsOworICAgICAgICBpZiAodGhpcy5fc3RhdGUpCisgICAgICAgICAgICB0aGlzLl9zdGF0 ZS5jYW5jZWwoKTsKKyAgICAgICAgdGhpcy5fc3RhdGUgPSBuZXcgV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdFBhdGhGaW5kZXJTdGF0ZSh0aGlzLl9zbmFwc2hvdCwgdGhpcy5fbm9kZUluZGV4LCBy b290RmlsdGVyKTsKKyAgICAgICAgdGhpcy5fc3RhdGUuYmF0Y2hEb25lID0gdGhpcy5fYmF0Y2hE b25lLmJpbmQodGhpcyk7CisgICAgICAgIHRoaXMuX3N0YXRlLnBhdGhGb3VuZCA9IHRoaXMuX3Bh dGhGb3VuZC5iaW5kKHRoaXMpOwogICAgICAgICB0aGlzLnJlbW92ZUNoaWxkcmVuKCk7CiAgICAg ICAgIHRoaXMucmVzZXRTb3J0aW5nQ2FjaGUoKTsKLSAgICAgICAgdGhpcy5fY291bnRlciA9IDA7 CiAgICAgICAgIHRoaXMuc2hvd05leHQodGhpcy5fZGVmYXVsdFBvcHVsYXRlQ291bnQpOwogICAg IH0sCiAKICAgICBzZXREYXRhU291cmNlOiBmdW5jdGlvbihzbmFwc2hvdFZpZXcsIHNuYXBzaG90 LCBub2RlSW5kZXgsIHByZWZpeCkKICAgICB7CisgICAgICAgIGlmICh0aGlzLl9ub2RlSW5kZXgg PT09IG5vZGVJbmRleCkKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5zbmFwc2hv dFZpZXcgPSBzbmFwc2hvdFZpZXc7CisgICAgICAgIHRoaXMuX3NuYXBzaG90ID0gc25hcHNob3Q7 CisgICAgICAgIHRoaXMuX25vZGVJbmRleCA9IG5vZGVJbmRleDsKICAgICAgICAgdGhpcy5fcHJl Zml4ID0gcHJlZml4OwotCi0gICAgICAgIGlmICh0aGlzLnBhdGhGaW5kZXIpIHsKLSAgICAgICAg ICAgIHRoaXMuc2VhcmNoQ2FuY2VsbGVkKCk7Ci0gICAgICAgICAgICB0aGlzLnBhdGhGaW5kZXIu ZGlzcG9zZSgpOwotICAgICAgICB9Ci0gICAgICAgIHRoaXMucGF0aEZpbmRlciA9IHNuYXBzaG90 LmNyZWF0ZVBhdGhGaW5kZXIobm9kZUluZGV4LCAhV2ViSW5zcGVjdG9yLkRldGFpbGVkSGVhcHNo b3RWaWV3LnByb3RvdHlwZS5zaG93SGlkZGVuRGF0YSk7CiAgICAgICAgIHRoaXMuX3Jlc2V0UGF0 aHMoKTsKICAgICB9LAogCiAgICAgcmVmcmVzaDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAg ZGVsZXRlIHRoaXMuX2NhbmNlbDsKICAgICAgICAgdGhpcy5fcmVzZXRQYXRocygpOwogICAgIH0s CiAKICAgICByZXNldDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgZGVsZXRlIHRoaXMuX2Nh bmNlbDsKKyAgICAgICAgaWYgKHRoaXMuX3N0YXRlKQorICAgICAgICAgICAgdGhpcy5fc3RhdGUu Y2FuY2VsKCk7CiAgICAgICAgIHRoaXMucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgdGhpcy5y ZXNldFNvcnRpbmdDYWNoZSgpOwotICAgICAgICB0aGlzLl9jb3VudGVyID0gMDsKICAgICAgICAg dGhpcy5hcHBlbmRDaGlsZChuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZSh7cGF0aDpXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkNsaWNrIG9uIGFuIG9iamVjdCB0byBzaG93IHJldGFpbmluZyBw YXRocyIpLCBsZW46IiJ9LCBmYWxzZSkpOwogICAgIH0sCiAKLSAgICBzaG93TmV4dDogZnVuY3Rp b24ocGF0aHNDb3VudCkKKyAgICBfYmF0Y2hEb25lOiBmdW5jdGlvbihzdGF0ZSkKICAgICB7Ci0g ICAgICAgIGZ1bmN0aW9uIHBhdGhGb3VuZChyZXN1bHQpCi0gICAgICAgIHsKLSAgICAgICAgICAg IGlmIChyZXN1bHQgPT09IG51bGwpIHsKLSAgICAgICAgICAgICAgICBpZiAoIXRoaXMuY2hpbGRy ZW4ubGVuZ3RoKQotICAgICAgICAgICAgICAgICAgICB0aGlzLmFwcGVuZENoaWxkKG5ldyBXZWJJ bnNwZWN0b3IuRGF0YUdyaWROb2RlKHtwYXRoOldlYkluc3BlY3Rvci5VSVN0cmluZygiQ2FuJ3Qg ZmluZCBhbnkgcGF0aHMuIiksIGxlbjoiIn0sIGZhbHNlKSk7Ci0gICAgICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICAgICAgfSBlbHNlIGlmIChyZXN1bHQgIT09IGZhbHNlKSB7Ci0gICAgICAg ICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHZW5lcmljT2JqZWN0Tm9kZS5w cm90b3R5cGUuaXNET01XaW5kb3cocmVzdWx0LnBhdGgpKQotICAgICAgICAgICAgICAgICAgICBy ZXN1bHQucGF0aCA9IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHZW5lcmljT2JqZWN0Tm9kZS5w cm90b3R5cGUuc2hvcnRlbldpbmRvd1VSTChyZXN1bHQucGF0aCwgdHJ1ZSk7Ci0gICAgICAgICAg ICAgICAgaWYgKHRoaXMuX3ByZWZpeCkKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0LnBhdGgg PSB0aGlzLl9wcmVmaXggKyByZXN1bHQucGF0aDsKLSAgICAgICAgICAgICAgICB2YXIgbm9kZSA9 IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlKHJlc3VsdCwgZmFsc2UpOwotICAgICAgICAg ICAgICAgIG5vZGUucm91dGUgPSByZXN1bHQucm91dGU7Ci0gICAgICAgICAgICAgICAgdGhpcy5h cHBlbmRDaGlsZChub2RlKTsKLSAgICAgICAgICAgICAgICArK3RoaXMuX2NvdW50ZXI7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgICAgICBzZXRUaW1lb3V0KHN0YXJ0U2VhcmNoaW5nLmJpbmQodGhp cyksIDApOwotICAgICAgICB9Ci0KLSAgICAgICAgZnVuY3Rpb24gc3RhcnRTZWFyY2hpbmcoKQot ICAgICAgICB7Ci0gICAgICAgICAgICBpZiAodGhpcy5fY2FuY2VsID09PSB0aGlzLnBhdGhGaW5k ZXIpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2Nh bmNlbDsKLSAgICAgICAgICAgIGlmICh0aGlzLl9jb3VudGVyIDwgcGF0aHNDb3VudCkKLSAgICAg ICAgICAgICAgICB0aGlzLnBhdGhGaW5kZXIuZmluZE5leHQocGF0aEZvdW5kLmJpbmQodGhpcykp OwotICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgdGhpcy5zZWFyY2hDYW5jZWxs ZWQuY2FsbCh0aGlzLCBwYXRoc0NvdW50KTsKLSAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5f Y2FuY2VsOwotICAgICAgICAgICAgfQorICAgICAgICBzd2l0Y2ggKHN0YXRlKSB7CisgICAgICAg IGNhc2UgIm5vLXBhdGhzLWF0LWFsbCI6CisgICAgICAgICAgICB0aGlzLmFwcGVuZENoaWxkKG5l dyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlKHtwYXRoOldlYkluc3BlY3Rvci5VSVN0cmluZygi Q2FuJ3QgZmluZCBhbnkgcGF0aHMuIiksIGxlbjoiIn0sIGZhbHNlKSk7CisgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgY2FzZSAiaGF2ZS1tb3JlLXBhdGhzIjoKKyAgICAgICAgICAgIHRoaXMu YXBwZW5kQ2hpbGQobmV3IFdlYkluc3BlY3Rvci5TaG93TW9yZURhdGFHcmlkTm9kZSh0aGlzLnNo b3dOZXh0LmJpbmQodGhpcyksIHRoaXMuX2RlZmF1bHRQb3B1bGF0ZUNvdW50KSk7CisgICAgICAg ICAgICB0aGlzLnJlc2V0U29ydGluZ0NhY2hlKCk7CisgICAgICAgICAgICB0aGlzLnNvcnRpbmdD aGFuZ2VkKCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSAibm8tbW9yZS1wYXRo cyI6CisgICAgICAgICAgICAvLyBOb3RoaW5nIHRvIGRvLgorICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIH0KLSAgICAgICAgc3RhcnRTZWFyY2hpbmcuY2FsbCh0aGlzKTsKICAgICB9LAogCi0g ICAgc2VhcmNoQ2FuY2VsbGVkOiBmdW5jdGlvbihwYXRoc0NvdW50KQorICAgIF9wYXRoRm91bmQ6 IGZ1bmN0aW9uKHJlc3VsdCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2NvdW50ZXIgPSAwOwotICAg ICAgICB0aGlzLl9jYW5jZWwgPSB0aGlzLnBhdGhGaW5kZXI7Ci0gICAgICAgIGlmIChwYXRoc0Nv dW50KSB7Ci0gICAgICAgICAgICB0aGlzLmFwcGVuZENoaWxkKG5ldyBXZWJJbnNwZWN0b3IuU2hv d01vcmVEYXRhR3JpZE5vZGUodGhpcy5zaG93TmV4dC5iaW5kKHRoaXMpLCBwYXRoc0NvdW50KSk7 Ci0gICAgICAgICAgICB0aGlzLnJlc2V0U29ydGluZ0NhY2hlKCk7Ci0gICAgICAgICAgICB0aGlz LnNvcnRpbmdDaGFuZ2VkKCk7Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RHZW5lcmljT2JqZWN0Tm9kZS5wcm90b3R5cGUuaXNET01XaW5kb3cocmVzdWx0 LnBhdGgpKQorICAgICAgICAgICAgcmVzdWx0LnBhdGggPSBXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90R2VuZXJpY09iamVjdE5vZGUucHJvdG90eXBlLnNob3J0ZW5XaW5kb3dVUkwocmVzdWx0LnBh dGgsIHRydWUpOworICAgICAgICBpZiAodGhpcy5fcHJlZml4KQorICAgICAgICAgICAgcmVzdWx0 LnBhdGggPSB0aGlzLl9wcmVmaXggKyByZXN1bHQucGF0aDsKKyAgICAgICAgdmFyIG5vZGUgPSBu ZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZShyZXN1bHQsIGZhbHNlKTsKKyAgICAgICAgbm9k ZS5yb3V0ZSA9IHJlc3VsdC5yb3V0ZTsKKyAgICAgICAgdGhpcy5hcHBlbmRDaGlsZChub2RlKTsK ICAgICB9LAogCi0gICAgX3NldFJvb3RDaGlsZHJlbkZvckZpbmRlcjogZnVuY3Rpb24oKQorICAg IHNob3dOZXh0OiBmdW5jdGlvbihwYXRoc0NvdW50KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMu c25hcHNob3RWaWV3LmlzVHJhY2luZ1RvV2luZG93T2JqZWN0cykKLSAgICAgICAgICAgIHRoaXMu cGF0aEZpbmRlci51cGRhdGVSb290cygKLSAgICAgICAgICAgICAgICAiZnVuY3Rpb24gKG5vZGUp IHsgcmV0dXJuIG5vZGUubmFtZS5zdWJzdHIoMCwgOSkgPT09IFwiRE9NV2luZG93XCI7IH0iKTsK LSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5wYXRoRmluZGVyLnVwZGF0ZVJvb3RzKCk7 CisgICAgICAgIHRoaXMuX3N0YXRlLnN0YXJ0QmF0Y2gocGF0aHNDb3VudCk7CiAgICAgfSwKIAog ICAgIF9wZXJmb3JtU29ydGluZzogZnVuY3Rpb24oc29ydEZ1bmN0aW9uKQo=