53606 2011-02-02 10:36:10 -0800 Web Inspector: [Chromium] Landing detailed heap snapshots, part 2 2011-03-02 02:21:46 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 50510 1 mnaganov mnaganov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 344048 0 mnaganov 2011-02-02 10:36:10 -0800 Next part: displaying progress while taking a snapshot, and hints while loading and parsing. This is needed because taking detailed heap snapshots takes time. 344051 1 80931 mnaganov 2011-02-02 10:39:51 -0800 Created attachment 80931 patch 344054 2 80931 pfeldman 2011-02-02 10:47:20 -0800 Comment on attachment 80931 patch View in context: https://bugs.webkit.org/attachment.cgi?id=80931&action=review > Source/WebCore/inspector/front-end/ProfilesPanel.js:451 > + function doParse() { { on the next line. 344055 3 80931 mnaganov 2011-02-02 10:51:00 -0800 Comment on attachment 80931 patch View in context: https://bugs.webkit.org/attachment.cgi?id=80931&action=review >> Source/WebCore/inspector/front-end/ProfilesPanel.js:451 >> + function doParse() { > > { on the next line. Fixed. 344059 4 mnaganov 2011-02-02 10:57:26 -0800 Manually committed http://trac.webkit.org/changeset/77387 2011-02-02 Mikhail Naganov <mnaganov@chromium.org> Reviewed by Pavel Feldman. Web Inspector: [Chromium] Landing detailed heap snapshots, part 2. https://bugs.webkit.org/show_bug.cgi?id=53606 Display progress while taking a snapshot, and hints while loading and parsing. This is needed because taking detailed heap snapshots takes time. * English.lproj/localizedStrings.js: * inspector/front-end/DetailedHeapshotView.js: (WebInspector.DetailedHeapshotProfileType.prototype.buttonClicked): * inspector/front-end/ProfilesPanel.js: (WebInspector.ProfilesPanel.prototype._reset): (WebInspector.ProfilesPanel.prototype._addProfileHeader): (WebInspector.ProfilesPanel.prototype.getProfiles): (WebInspector.ProfilesPanel.prototype.loadHeapSnapshot): (WebInspector.ProfilesPanel.prototype._finishHeapSnapshot.doParse): (WebInspector.ProfilesPanel.prototype._finishHeapSnapshot): (WebInspector.ProfilesPanel.prototype.takeHeapSnapshot): (WebInspector.ProfilesPanel.prototype._reportHeapSnapshotProgress): * inspector/front-end/SidebarTreeElement.js: (WebInspector.SidebarTreeElement.prototype.refreshTitles): 80931 2011-02-02 10:39:51 -0800 2011-02-02 10:51:00 -0800 patch patch-53606 text/plain 9181 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0OGEwMzI3Li5iYjg3NDQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTEtMDItMDIgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBbQ2hyb21pdW1dIExhbmRpbmcgZGV0YWlsZWQgaGVhcCBzbmFwc2hvdHMsIHBhcnQg Mi4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM2 MDYKKworICAgICAgICBEaXNwbGF5IHByb2dyZXNzIHdoaWxlIHRha2luZyBhIHNuYXBzaG90LCBh bmQgaGludHMgd2hpbGUgbG9hZGluZworICAgICAgICBhbmQgcGFyc2luZy4gVGhpcyBpcyBuZWVk ZWQgYmVjYXVzZSB0YWtpbmcgZGV0YWlsZWQgaGVhcCBzbmFwc2hvdHMKKyAgICAgICAgdGFrZXMg dGltZS4KKworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbGVkSGVhcHNob3RQcm9maWxlVHlwZS5wcm90b3R5cGUu YnV0dG9uQ2xpY2tlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1Bh bmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLl9y ZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUuX2Fk ZFByb2ZpbGVIZWFkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJv dG90eXBlLmdldFByb2ZpbGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVs LnByb3RvdHlwZS5sb2FkSGVhcFNuYXBzaG90KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9m aWxlc1BhbmVsLnByb3RvdHlwZS5fZmluaXNoSGVhcFNuYXBzaG90LmRvUGFyc2UpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLl9maW5pc2hIZWFwU25hcHNo b3QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlLnRha2VI ZWFwU25hcHNob3QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90 eXBlLl9yZXBvcnRIZWFwU25hcHNob3RQcm9ncmVzcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TaWRlYmFyVHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lk ZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZS5yZWZyZXNoVGl0bGVzKToKKwogMjAxMS0wMi0wMiAg QW5kcmV5IEFkYWlraW4gIDxhYW5kcmV5QGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHBy b2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qcwppbmRleCAwZmI0YmU4OTYxMzI2NjQ5MGRiMDhmYmJmMGZlYTRkZGFk ZTRmYjMzLi4xMGNiNzU3MTJlNTBjYTlkN2E5MGNhODMxNzhlYTBmZmRkM2RlOGYyIDEwMDY0NApH SVQgYmluYXJ5IHBhdGNoCmRlbHRhIDg2CnpjbVYtYzBJQzEja3BxSTExRi03SWxkS0xUbGFOKnBs WGh8cmxsOzJ+bGFPKlVsZCFNXmxoOUBhbFc9a3IyVCVaRQpzMENFNnhsYUYjVWxlbWZ5MGQkalph dXQpPmlWelpYMEJIYmowQX5PdUFSKyllMDE1eUswNH5LSXNzSTIwCgpkZWx0YSA5ClFjbVpwZyF1 KUM/Xk0rUl4wMld5VWBUemdgCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanMKaW5kZXggY2JlMjY1Yy4uNTI5 MWJmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRh aWxlZEhlYXBzaG90Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzCkBAIC03MCw3ICs3MCw3IEBAIFdlYkluc3BlY3Rv ci5EZXRhaWxlZEhlYXBzaG90UHJvZmlsZVR5cGUucHJvdG90eXBlID0gewogCiAgICAgYnV0dG9u Q2xpY2tlZDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgSW5zcGVjdG9yQmFja2VuZC50YWtl SGVhcFNuYXBzaG90KHRydWUpOworICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnByb2ZpbGVz LnRha2VIZWFwU25hcHNob3QodHJ1ZSk7CiAgICAgfSwKIAogICAgIGdldCB3ZWxjb21lTWVzc2Fn ZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2Zp bGVzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVz UGFuZWwuanMKaW5kZXggNjUzNzYwYi4uMGY4NWM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwpAQCAtMTk1LDcgKzE5NSw3 IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhp cy5fcHJvZmlsZXMgPSBbXTsKICAgICAgICAgdGhpcy5fcHJvZmlsZXNJZE1hcCA9IHt9OwogICAg ICAgICB0aGlzLl9wcm9maWxlR3JvdXBzID0ge307Ci0gICAgICAgIHRoaXMuX3Byb2ZpbGVHcm91 cHNGb3JMaW5rcyA9IHt9CisgICAgICAgIHRoaXMuX3Byb2ZpbGVHcm91cHNGb3JMaW5rcyA9IHt9 OwogICAgICAgICB0aGlzLl9wcm9maWxlc1dlcmVSZXF1ZXN0ZWQgPSBmYWxzZTsKIAogICAgICAg ICB0aGlzLnNpZGViYXJUcmVlRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJzb21lLWV4cGFuZGFi bGUiKTsKQEAgLTI1OSw2ICsyNTksMTMgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJv dG90eXBlID0gewogCiAgICAgX2FkZFByb2ZpbGVIZWFkZXI6IGZ1bmN0aW9uKHByb2ZpbGUpCiAg ICAgeworICAgICAgICBpZiAodGhpcy5oYXNUZW1wb3JhcnlQcm9maWxlKHByb2ZpbGUudHlwZUlk KSkgeworICAgICAgICAgICAgaWYgKHByb2ZpbGUudHlwZUlkID09PSBXZWJJbnNwZWN0b3IuQ1BV UHJvZmlsZVR5cGUuVHlwZUlkKQorICAgICAgICAgICAgICAgIHRoaXMuX3JlbW92ZVByb2ZpbGVI ZWFkZXIodGhpcy5fdGVtcG9yYXJ5UmVjb3JkaW5nUHJvZmlsZSk7CisgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgdGhpcy5fcmVtb3ZlUHJvZmlsZUhlYWRlcih0aGlzLl90ZW1wb3Jh cnlUYWtpbmdTbmFwc2hvdCk7CisgICAgICAgIH0KKwogICAgICAgICB2YXIgdHlwZUlkID0gcHJv ZmlsZS50eXBlSWQ7CiAgICAgICAgIHZhciBwcm9maWxlVHlwZSA9IHRoaXMuZ2V0UHJvZmlsZVR5 cGUodHlwZUlkKTsKICAgICAgICAgdmFyIHNpZGViYXJQYXJlbnQgPSBwcm9maWxlVHlwZS50cmVl RWxlbWVudDsKQEAgLTMwOCw2ICszMTUsNyBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgcHJvZmlsZVRyZWVFbGVtZW50 ID0gcHJvZmlsZVR5cGUuY3JlYXRlU2lkZWJhclRyZWVFbGVtZW50Rm9yUHJvZmlsZShwcm9maWxl KTsKKyAgICAgICAgcHJvZmlsZS5zaWRlQmFyRWxlbWVudCA9IHByb2ZpbGVUcmVlRWxlbWVudDsK ICAgICAgICAgcHJvZmlsZVRyZWVFbGVtZW50LnNtYWxsID0gc21hbGw7CiAgICAgICAgIGlmIChh bHRlcm5hdGVUaXRsZSkKICAgICAgICAgICAgIHByb2ZpbGVUcmVlRWxlbWVudC5tYWluVGl0bGUg PSBhbHRlcm5hdGVUaXRsZTsKQEAgLTM3OSw5ICszODcsMTEgQEAgV2ViSW5zcGVjdG9yLlByb2Zp bGVzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIHJlc3VsdCA9IFtdOwog ICAgICAgICB2YXIgcHJvZmlsZXNDb3VudCA9IHRoaXMuX3Byb2ZpbGVzLmxlbmd0aDsKLSAgICAg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCBwcm9maWxlc0NvdW50OyArK2kpCi0gICAgICAgICAgICBp ZiAodGhpcy5fcHJvZmlsZXNbaV0udHlwZUlkID09PSB0eXBlSWQpCi0gICAgICAgICAgICAgICAg cmVzdWx0LnB1c2godGhpcy5fcHJvZmlsZXNbaV0pOworICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IHByb2ZpbGVzQ291bnQ7ICsraSkgeworICAgICAgICAgICAgdmFyIHByb2ZpbGUgPSB0aGlz Ll9wcm9maWxlc1tpXTsKKyAgICAgICAgICAgIGlmICghcHJvZmlsZS5pc1RlbXBvcmFyeSAmJiBw cm9maWxlLnR5cGVJZCA9PT0gdHlwZUlkKQorICAgICAgICAgICAgICAgIHJlc3VsdC5wdXNoKHBy b2ZpbGUpOworICAgICAgICB9CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfSwKIApAQCAt Mzk5LDE3ICs0MDksNiBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHJldHVybiAhIXRoaXMuX3Byb2ZpbGVzSWRNYXBbdGhpcy5fbWFrZUtleShwcm9m aWxlLnVpZCwgcHJvZmlsZS50eXBlSWQpXTsKICAgICB9LAogCi0gICAgdXBkYXRlUHJvZmlsZTog ZnVuY3Rpb24ocHJvZmlsZSkKLSAgICB7Ci0gICAgICAgIHZhciBwcm9maWxlc0NvdW50ID0gdGhp cy5fcHJvZmlsZXMubGVuZ3RoOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb2ZpbGVz Q291bnQ7ICsraSkKLSAgICAgICAgICAgIGlmICh0aGlzLl9wcm9maWxlc1tpXS50eXBlSWQgPT09 IHByb2ZpbGUudHlwZUlkCi0gICAgICAgICAgICAgICAgJiYgdGhpcy5fcHJvZmlsZXNbaV0udWlk ID09PSBwcm9maWxlLnVpZCkgewotICAgICAgICAgICAgICAgIHRoaXMuX3Byb2ZpbGVzW2ldID0g cHJvZmlsZTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICB9LAot CiAgICAgbG9hZEhlYXBTbmFwc2hvdDogZnVuY3Rpb24odWlkLCBjYWxsYmFjaykKICAgICB7CiAg ICAgICAgIHZhciBwcm9maWxlID0gdGhpcy5fcHJvZmlsZXNJZE1hcFt0aGlzLl9tYWtlS2V5KHVp ZCwgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb2ZpbGVUeXBlLlR5cGVJZCldOwpAQCAtNDI0 LDYgKzQyMyw3IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIHByb2ZpbGUuX2lzX2xvYWRpbmcgPSB0cnVlOwogICAgICAgICAgICAgcHJvZmls ZS5fY2FsbGJhY2tzID0gW2NhbGxiYWNrXTsKICAgICAgICAgICAgIHByb2ZpbGUuX2pzb24gPSAi IjsKKyAgICAgICAgICAgIHByb2ZpbGUuc2lkZUJhckVsZW1lbnQuc3VidGl0bGUgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkxvYWRpbmfigKYiKTsKICAgICAgICAgICAgIEluc3BlY3RvckJhY2tl bmQuZ2V0UHJvZmlsZShwcm9maWxlLnR5cGVJZCwgcHJvZmlsZS51aWQpOwogICAgICAgICB9CiAg ICAgfSwKQEAgLTQ0NSwxMyArNDQ1LDIyIEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnBy b3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgY2FsbGJhY2tzID0gcHJvZmlsZS5fY2FsbGJhY2tz OwogICAgICAgICBkZWxldGUgcHJvZmlsZS5fY2FsbGJhY2tzOwotICAgICAgICB2YXIgbG9hZGVk U25hcHNob3QgPSBKU09OLnBhcnNlKHByb2ZpbGUuX2pzb24pOwotICAgICAgICBkZWxldGUgcHJv ZmlsZS5fanNvbjsKLSAgICAgICAgZGVsZXRlIHByb2ZpbGUuX2lzX2xvYWRpbmc7Ci0gICAgICAg IHByb2ZpbGUuX2xvYWRlZCA9IHRydWU7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3RWaWV3LnByb3RvdHlwZS5wcm9jZXNzTG9hZGVkU25hcHNob3QocHJvZmlsZSwgbG9hZGVkU25h cHNob3QpOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNhbGxiYWNrcy5sZW5ndGg7ICsr aSkKLSAgICAgICAgICAgIGNhbGxiYWNrc1tpXShwcm9maWxlKTsKKyAgICAgICAgcHJvZmlsZS5z aWRlQmFyRWxlbWVudC5zdWJ0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUGFyc2luZ+KA piIpOworICAgICAgICB3aW5kb3cuc2V0VGltZW91dChkb1BhcnNlLCAwKTsKKworICAgICAgICBm dW5jdGlvbiBkb1BhcnNlKCkgeworICAgICAgICAgICAgdmFyIGxvYWRlZFNuYXBzaG90ID0gSlNP Ti5wYXJzZShwcm9maWxlLl9qc29uKTsKKyAgICAgICAgICAgIGRlbGV0ZSBwcm9maWxlLl9qc29u OworICAgICAgICAgICAgZGVsZXRlIHByb2ZpbGUuX2lzX2xvYWRpbmc7CisgICAgICAgICAgICBw cm9maWxlLl9sb2FkZWQgPSB0cnVlOworICAgICAgICAgICAgcHJvZmlsZS5zaWRlQmFyRWxlbWVu dC5zdWJ0aXRsZSA9ICIiOworICAgICAgICAgICAgaWYgKCFQcmVmZXJlbmNlcy5kZXRhaWxlZEhl YXBQcm9maWxlcykKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Vmll dy5wcm90b3R5cGUucHJvY2Vzc0xvYWRlZFNuYXBzaG90KHByb2ZpbGUsIGxvYWRlZFNuYXBzaG90 KTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuRGV0YWls ZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlLnByb2Nlc3NMb2FkZWRTbmFwc2hvdChwcm9maWxlLCBs b2FkZWRTbmFwc2hvdCk7CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNhbGxiYWNr cy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgICAgICBjYWxsYmFja3NbaV0ocHJvZmlsZSk7Cisg ICAgICAgIH0KICAgICB9LAogCiAgICAgc2hvd1ZpZXc6IGZ1bmN0aW9uKHZpZXcpCkBAIC02MzUs OCArNjQ0LDI5IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgdGhpcy51cGRhdGVQcm9maWxlVHlwZUJ1dHRvbnMoKTsKICAgICB9LAogCisgICAgdGFr ZUhlYXBTbmFwc2hvdDogZnVuY3Rpb24oZGV0YWlsZWQpCisgICAgeworICAgICAgICBpZiAoIXRo aXMuaGFzVGVtcG9yYXJ5UHJvZmlsZShXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJvZmlsZVR5 cGUuVHlwZUlkKSkgeworICAgICAgICAgICAgaWYgKCF0aGlzLl90ZW1wb3JhcnlUYWtpbmdTbmFw c2hvdCkgeworICAgICAgICAgICAgICAgIHRoaXMuX3RlbXBvcmFyeVRha2luZ1NuYXBzaG90ID0g eworICAgICAgICAgICAgICAgICAgICB0eXBlSWQ6IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQ cm9maWxlVHlwZS5UeXBlSWQsCisgICAgICAgICAgICAgICAgICAgIHRpdGxlOiBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIlNuYXBzaG90dGluZ+KApiIpLAorICAgICAgICAgICAgICAgICAgICB1aWQ6 IC0xLAorICAgICAgICAgICAgICAgICAgICBpc1RlbXBvcmFyeTogdHJ1ZQorICAgICAgICAgICAg ICAgIH07CisgICAgICAgICAgICB9CisgICAgICAgICAgICB0aGlzLl9hZGRQcm9maWxlSGVhZGVy KHRoaXMuX3RlbXBvcmFyeVRha2luZ1NuYXBzaG90KTsKKyAgICAgICAgfQorICAgICAgICBJbnNw ZWN0b3JCYWNrZW5kLnRha2VIZWFwU25hcHNob3QoZGV0YWlsZWQpOworICAgIH0sCisKICAgICBf cmVwb3J0SGVhcFNuYXBzaG90UHJvZ3Jlc3M6IGZ1bmN0aW9uKGRvbmUsIHRvdGFsKQogICAgIHsK KyAgICAgICAgaWYgKHRoaXMuaGFzVGVtcG9yYXJ5UHJvZmlsZShXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90UHJvZmlsZVR5cGUuVHlwZUlkKSkgeworICAgICAgICAgICAgdGhpcy5fdGVtcG9yYXJ5 VGFraW5nU25hcHNob3Quc2lkZUJhckVsZW1lbnQuc3VidGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIiUuMmYlJSIsIChkb25lIC8gdG90YWwpICogMTAwKTsKKyAgICAgICAgICAgIGlmIChk b25lID49IHRvdGFsKQorICAgICAgICAgICAgICAgIHRoaXMuX3JlbW92ZVByb2ZpbGVIZWFkZXIo dGhpcy5fdGVtcG9yYXJ5VGFraW5nU25hcHNob3QpOworICAgICAgICB9CiAgICAgfQogfQogCkBA IC03MzAsMTYgKzc2MCw2IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlU2lkZWJhclRyZWVFbGVtZW50 LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5yZWZyZXNoVGl0bGVzKCk7CiAgICAgfSwKIAot ICAgIGdldCBzdWJ0aXRsZSgpCi0gICAgewotICAgICAgICAvLyBUaGVyZSBpcyBubyBzdWJ0aXRs ZS4KLSAgICB9LAotCi0gICAgc2V0IHN1YnRpdGxlKHgpCi0gICAgewotICAgICAgICAvLyBDYW4n dCBjaGFuZ2Ugc3VidGl0bGUuCi0gICAgfSwKLQogICAgIHNldCBzZWFyY2hNYXRjaGVzKG1hdGNo ZXMpCiAgICAgewogICAgICAgICBpZiAoIW1hdGNoZXMpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2lkZWJhclRyZWVFbGVtZW50LmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyVHJlZUVsZW1lbnQuanMKaW5kZXgg YzA4YjBlZi4uYTI3YzQ1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TaWRlYmFyVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TaWRlYmFyVHJlZUVsZW1lbnQuanMKQEAgLTE2NCw4ICsxNjQsMTAgQEAg V2ViSW5zcGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICBpZiAodGhpcy5zdWJ0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgIT09IHN1YnRpdGxlKQogICAg ICAgICAgICAgICAgIHRoaXMuc3VidGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gc3VidGl0bGU7 CiAgICAgICAgICAgICB0aGlzLnRpdGxlc0VsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygibm8tc3Vi dGl0bGUiKTsKLSAgICAgICAgfSBlbHNlCisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICB0 aGlzLnN1YnRpdGxlRWxlbWVudC50ZXh0Q29udGVudCA9ICIiOwogICAgICAgICAgICAgdGhpcy50 aXRsZXNFbGVtZW50LmFkZFN0eWxlQ2xhc3MoIm5vLXN1YnRpdGxlIik7CisgICAgICAgIH0KICAg ICB9LAogCiAgICAgaXNFdmVudFdpdGhpbkRpc2Nsb3N1cmVUcmlhbmdsZTogZnVuY3Rpb24oZXZl bnQpCg==