107450 2013-01-21 07:24:57 -0800 Web Inspector: do not serialize native heap graph when collecting information about memory distribution 2013-01-21 07:31:59 -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 812130 0 yurys 2013-01-21 07:24:57 -0800 Native heap graph is going to be a separate profile type and we shouldn't serialize and send it along with information about memory distribution between high-level categories. 812132 1 183783 yurys 2013-01-21 07:26:42 -0800 Created attachment 183783 Patch 812133 2 183783 loislo 2013-01-21 07:28:21 -0800 Comment on attachment 183783 Patch lgtm 812134 3 yurys 2013-01-21 07:31:59 -0800 Committed r140332: <http://trac.webkit.org/changeset/140332> 183783 2013-01-21 07:26:42 -0800 2013-01-21 07:29:03 -0800 Patch bug-107450-20130121192337.patch text/plain 9210 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMzA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU2MWIyZjlkNjQzYjE2 OTNlODhkYTU1MGZkOTkwM2Y2YmIyMGM1OC4uZjU4ZGEyZDBjMTNmYzEyNWU5YWFkZmUxNmEzMTMz NTFhMWE4NzRkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAxLTIxICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGRvIG5vdCBzZXJpYWxpemUgbmF0aXZlIGhlYXAgZ3JhcGggd2hlbiBjb2xsZWN0aW5nIGlu Zm9ybWF0aW9uIGFib3V0IG1lbW9yeSBkaXN0cmlidXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzQ1MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5hdGl2ZSBoZWFwIGdyYXBoIGlzIG5vdCByZXBv cnRlZCB3aGVuIHdlIG5lZWQgdG8gc2hvdyBvbmx5IGhpZ2gtbGV2ZWwgbWVtb3J5IGRpc3RyaWJ1 dGlvbi4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmF0aXZlTWVtb3J5U25hcHNo b3RWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVNuYXBzaG90Vmll dyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UHJvZmlsZVR5cGUucHJvdG90 eXBlLmJ1dHRvbkNsaWNrZWQuZGlkUmVjZWl2ZU1lbW9yeVNuYXBzaG90KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5OYXRpdmVNZW1vcnlQcm9maWxlVHlwZS5wcm90b3R5cGUuYnV0dG9uQ2xpY2tl ZCk6CisKIDIwMTMtMDEtMjEgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFVzZSBJU084NjAxIGRhdGUvdGltZSBmb3JtYXRzIGFzIGZhbGxiYWNrcyBmb3IgZGF0 ZS90aW1lIGlucHV0IHR5cGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmF0aXZlTWVtb3J5U25hcHNob3RWaWV3LmpzCmluZGV4IGQ2ZmM4 OWVlMmYwMGE3M2FkMmY2MjI4MDRlMzdjNGUxNzIwMWQwZWQuLmZhYjE0YzA3MGI3MzEwNTQ1NWUy MmU1OWNiZjdmZDVhZjk5YzlmZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmF0aXZlTWVtb3J5U25hcHNob3RWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF0aXZlTWVtb3J5U25hcHNob3RWaWV3LmpzCkBAIC00 MSw1MiArNDEsMTMgQEAgV2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVNuYXBzaG90VmlldyA9IGZ1 bmN0aW9uKHByb2ZpbGUpCiAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoIm5hdGl2ZS1z bmFwc2hvdC12aWV3Iik7CiAgICAgdGhpcy5fY29udGFpbm1lbnREYXRhR3JpZCA9IG5ldyBXZWJJ bnNwZWN0b3IuTmF0aXZlU25hcHNob3REYXRhR3JpZChwcm9maWxlKTsKICAgICB0aGlzLl9jb250 YWlubWVudERhdGFHcmlkLnNob3codGhpcy5lbGVtZW50KTsKLQotICAgIHRoaXMuX2hlYXBHcmFw aERhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5OYXRpdmVIZWFwR3JhcGhEYXRhR3JpZChwcm9m aWxlLl9ncmFwaCk7Ci0KLSAgICB0aGlzLl92aWV3U2VsZWN0RWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoInNlbGVjdCIpOwotICAgIHRoaXMuX3ZpZXdTZWxlY3RFbGVtZW50LmNsYXNz TmFtZSA9ICJzdGF0dXMtYmFyLWl0ZW0iOwotICAgIHRoaXMuX3ZpZXdTZWxlY3RFbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIsIHRoaXMuX29uU2VsZWN0ZWRWaWV3Q2hhbmdlZC5iaW5k KHRoaXMpLCBmYWxzZSk7Ci0KLSAgICB0aGlzLl92aWV3cyA9IFt7dGl0bGU6ICJBZ2dyZWdhdGVk IiwgdmlldzogdGhpcy5fY29udGFpbm1lbnREYXRhR3JpZH0sCi0gICAgICAgICAgICAgICAgICB7 dGl0bGU6ICJHcmFwaCIsIHZpZXc6IHRoaXMuX2hlYXBHcmFwaERhdGFHcmlkfV07Ci0gICAgdGhp cy5fY3VycmVudFZpZXdJbmRleCA9IDA7Ci0gICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl92 aWV3cy5sZW5ndGg7ICsraSkgewotICAgICAgICB2YXIgdmlldyA9IHRoaXMuX3ZpZXdzW2ldOwot ICAgICAgICB2YXIgb3B0aW9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib3B0aW9uIik7Ci0g ICAgICAgIG9wdGlvbi5sYWJlbCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZyh2aWV3LnRpdGxlKTsK LSAgICAgICAgdGhpcy5fdmlld1NlbGVjdEVsZW1lbnQuYXBwZW5kQ2hpbGQob3B0aW9uKTsKLSAg ICB9CiB9CiAKIFdlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcucHJvdG90eXBl ID0gewotICAgIF9vblNlbGVjdGVkVmlld0NoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsK LSAgICAgICAgdmFyIGluZGV4ID0gZXZlbnQudGFyZ2V0LnNlbGVjdGVkSW5kZXg7Ci0gICAgICAg IGlmIChpbmRleCA9PT0gdGhpcy5fY3VycmVudFZpZXdJbmRleCkKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICB2YXIgY3VycmVudFZpZXcgPSB0aGlzLl92aWV3c1t0aGlzLl9jdXJyZW50 Vmlld0luZGV4XS52aWV3OwotICAgICAgICBjdXJyZW50Vmlldy5kZXRhY2goKTsKLQotICAgICAg ICB0aGlzLl9jdXJyZW50Vmlld0luZGV4ID0gaW5kZXg7Ci0gICAgICAgIHZhciBzZWxlY3RlZFZp ZXcgPSB0aGlzLl92aWV3c1tpbmRleF0udmlldzsKLSAgICAgICAgc2VsZWN0ZWRWaWV3LnNob3co dGhpcy5lbGVtZW50KTsKLSAgICB9LAotCi0gICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKLSAgICB7 Ci0gICAgICAgIHZhciBzcGFuID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAg ICAgICBzcGFuLmNsYXNzTmFtZSA9ICJzdGF0dXMtYmFyLXNlbGVjdC1jb250YWluZXIiOwotICAg ICAgICBzcGFuLmFwcGVuZENoaWxkKHRoaXMuX3ZpZXdTZWxlY3RFbGVtZW50KTsKLSAgICAgICAg cmV0dXJuIFtzcGFuXTsKLSAgICB9LAotCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuVmll dy5wcm90b3R5cGUKIH0KIAogCi0KIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7 V2ViSW5zcGVjdG9yLkRhdGFHcmlkfQpAQCAtMjYzLDE0NCArMjI0LDExIEBAIFdlYkluc3BlY3Rv ci5OYXRpdmVTbmFwc2hvdE5vZGUucHJvdG90eXBlID0gewogCiAgICAgICAgIGZvciAodmFyIG5v ZGUgaW4gdGhpcy5fbm9kZURhdGEuY2hpbGRyZW4pIHsKICAgICAgICAgICAgIHZhciBub2RlRGF0 YSA9IHRoaXMuX25vZGVEYXRhLmNoaWxkcmVuW25vZGVdOwotICAgICAgICAgICAgdGhpcy5fYWRk Q2hpbGRyZW5Gcm9tR3JhcGgobm9kZURhdGEpOwogICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5zZXR0aW5ncy5zaG93TmF0aXZlU25hcHNob3RVbmluc3RydW1lbnRlZFNpemUuZ2V0KCkgfHwg bm9kZURhdGEubmFtZSAhPT0gIk90aGVyIikKICAgICAgICAgICAgICAgICB0aGlzLmFwcGVuZENo aWxkKG5ldyBXZWJJbnNwZWN0b3IuTmF0aXZlU25hcHNob3ROb2RlKG5vZGVEYXRhLCB0aGlzLl9y b290TWVtb3J5QmxvY2spKTsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICAvKioKLSAgICAgKiBA cGFyYW0ge01lbW9yeUFnZW50Lk1lbW9yeUJsb2NrfSBtZW1vcnlCbG9jawotICAgICAqLwotICAg IF9hZGRDaGlsZHJlbkZyb21HcmFwaDogZnVuY3Rpb24obWVtb3J5QmxvY2spCi0gICAgewotICAg ICAgICBpZiAobWVtb3J5QmxvY2suY2hpbGRyZW4pCi0gICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIGlmIChtZW1vcnlCbG9jay5uYW1lICE9PSAiSW1hZ2UiIHx8IHRoaXMuX25vZGVEYXRhLm5h bWUgIT09ICJNZW1vcnlDYWNoZSIpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgLy8g Q29sbGVjdCBvYmplY3RzIG9uIHRoZSBwYXRoIE1lbW9yeUNhY2hlIC0+IENhY2hlZEltYWdlIC1t X2ltYWdlLT4gQml0bWFwSW1hZ2UgLW1fZnJhbWVzLT4gRnJhbWVEYXRhIC1tX2ZyYW1lLT4gU2tC aXRtYXAgLT4gU2tQaXhlbFJlZgotICAgICAgICB2YXIgZ3JhcGggPSB0aGlzLmRhdGFHcmlkLl9w cm9maWxlLl9ncmFwaDsKLSAgICAgICAgdmFyIHJvb3RzID0gZ3JhcGgucm9vdCgpLnJlZmVyZW5j ZWROb2RlcygpOwotICAgICAgICB2YXIgbWVtb3J5Q2FjaGU7Ci0gICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgcm9vdHMubGVuZ3RoOyBpKyspIHsKLSAgICAgICAgICAgIHZhciByb290ID0gcm9v dHNbaV07Ci0gICAgICAgICAgICBpZiAocm9vdC5jbGFzc05hbWUoKSA9PT0gIk1lbW9yeUNhY2hl IikgewotICAgICAgICAgICAgICAgIG1lbW9yeUNhY2hlID0gcm9vdDsKLSAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgICB2YXIgZWRnZXMgPSBt ZW1vcnlDYWNoZS5vdXRnb2luZ0VkZ2VzKCk7Ci0gICAgICAgIHZhciBjYWNoZWRJbWFnZXMgPSBb XTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBlZGdlcy5sZW5ndGg7IGkrKykgewotICAg ICAgICAgICAgdmFyIHRhcmdldCA9IGVkZ2VzW2ldLnRhcmdldCgpOwotICAgICAgICAgICAgaWYg KHRhcmdldC5jbGFzc05hbWUoKSA9PT0gIkNhY2hlZEltYWdlIikgewotICAgICAgICAgICAgICAg IHZhciBjYWNoZWRJbWFnZSA9IHsKLSAgICAgICAgICAgICAgICAgICAgbmFtZTogdGFyZ2V0Lm5h bWUoKSwKLSAgICAgICAgICAgICAgICAgICAgc2l6ZTogdGFyZ2V0LnNpemUoKSwKLSAgICAgICAg ICAgICAgICAgICAgY2hpbGRyZW46IFtdCi0gICAgICAgICAgICAgICAgfTsKLSAgICAgICAgICAg ICAgICBjYWNoZWRJbWFnZXMucHVzaChjYWNoZWRJbWFnZSk7Ci0gICAgICAgICAgICAgICAgdmFy IGltYWdlID0gdGFyZ2V0LnRhcmdldE9mRWRnZSgibV9pbWFnZSIpOwotICAgICAgICAgICAgICAg IGlmIChpbWFnZS5jbGFzc05hbWUoKSA9PT0gIkJpdG1hcEltYWdlIikgewotICAgICAgICAgICAg ICAgICAgICB2YXIgZnJhbWVzID0gaW1hZ2UudGFyZ2V0c09mQWxsRWRnZXMoIm1fZnJhbWUiKTsK LSAgICAgICAgICAgICAgICAgICAgZm9yICh2YXIgaiA9IDA7IGogPCBmcmFtZXMubGVuZ3RoOyBq KyspIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHZhciBwaXhlbHMgPSBmcmFtZXNbal0udGFy Z2V0T2ZFZGdlKCJwaXhlbHMiKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChwaXhlbHMp IHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYWNoZWRJbWFnZS5zaXplICs9IHBpeGVs cy5zaXplKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FjaGVkSW1hZ2UuY2hpbGRy ZW4ucHVzaCh7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5hbWU6ICJCaXRtYXAg cGl4ZWxzIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZTogcGl4ZWxzLnNp emUoKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIG1lbW9yeUJsb2NrLmNoaWxkcmVuID0gY2FjaGVk SW1hZ2VzOwotICAgIH0sCi0KLSAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5EYXRhR3JpZE5v ZGUucHJvdG90eXBlCi19Ci0KLQotLyoqCi0gKiBAY29uc3RydWN0b3IKLSAqIEBleHRlbmRzIHtX ZWJJbnNwZWN0b3IuRGF0YUdyaWR9Ci0gKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5OYXRpdmVIZWFw R3JhcGh9IG5hdGl2ZUhlYXBHcmFwaAotICovCi1XZWJJbnNwZWN0b3IuTmF0aXZlSGVhcEdyYXBo RGF0YUdyaWQgPSBmdW5jdGlvbihuYXRpdmVIZWFwR3JhcGgpCi17Ci0gICAgdmFyIGNvbHVtbnMg PSB7Ci0gICAgICAgIGlkOiB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoImlkIiksIHdp ZHRoOiAiODBweCIsIGRpc2Nsb3N1cmU6IHRydWUsIHNvcnRhYmxlOiB0cnVlIH0sCi0gICAgICAg IHR5cGU6IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVHlwZSIpLCB3aWR0aDogIjIw MHB4Iiwgc29ydGFibGU6IHRydWUgfSwKLSAgICAgICAgY2xhc3NOYW1lOiB7IHRpdGxlOiBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkNsYXNzIG5hbWUiKSwgd2lkdGg6ICIyMDBweCIsIHNvcnRhYmxl OiB0cnVlIH0sCi0gICAgICAgIG5hbWU6IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygi TmFtZSIpLCB3aWR0aDogIjIwMHB4Iiwgc29ydGFibGU6IHRydWUgfSwKLSAgICAgICAgc2l6ZTog eyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaXplIiksIHNvcnRhYmxlOiB0cnVlLCBz b3J0OiAiZGVzY2VuZGluZyIgfSwKLSAgICB9OwotICAgIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5j YWxsKHRoaXMsIGNvbHVtbnMpOwotICAgIHRoaXMuX25hdGl2ZUhlYXBHcmFwaCA9IG5hdGl2ZUhl YXBHcmFwaDsKLSAgICB0aGlzLl9yb290ID0gbmV3IFdlYkluc3BlY3Rvci5OYXRpdmVIZWFwR3Jh cGhEYXRhR3JpZFJvb3QodGhpcy5fbmF0aXZlSGVhcEdyYXBoKTsKLSAgICB0aGlzLnNldFJvb3RO b2RlKHRoaXMuX3Jvb3QpOwotICAgIHRoaXMuX3Jvb3QuX3BvcHVsYXRlKCk7Ci19Ci0KLVdlYklu c3BlY3Rvci5OYXRpdmVIZWFwR3JhcGhEYXRhR3JpZC5wcm90b3R5cGUgPSB7Ci0gICAgX19wcm90 b19fOiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlCi19Ci0KLQotLyoqCi0gKiBAY29u c3RydWN0b3IKLSAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlfQotICogQHBh cmFtIHtXZWJJbnNwZWN0b3IuTmF0aXZlSGVhcEdyYXBofSBncmFwaAotICovCi1XZWJJbnNwZWN0 b3IuTmF0aXZlSGVhcEdyYXBoRGF0YUdyaWRSb290ID0gZnVuY3Rpb24oZ3JhcGgpCi17Ci0gICAg V2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZS5jYWxsKHRoaXMsIHsgaWQ6ICJyb290IiB9LCB0cnVl KTsKLSAgICB0aGlzLl9ncmFwaCA9IGdyYXBoOwotICAgIHRoaXMuYWRkRXZlbnRMaXN0ZW5lcigi cG9wdWxhdGUiLCB0aGlzLl9wb3B1bGF0ZSwgdGhpcyk7Ci19Ci0KLVdlYkluc3BlY3Rvci5OYXRp dmVIZWFwR3JhcGhEYXRhR3JpZFJvb3QucHJvdG90eXBlID0gewotICAgIF9wb3B1bGF0ZTogZnVu Y3Rpb24oKSB7Ci0gICAgICAgIHRoaXMucmVtb3ZlRXZlbnRMaXN0ZW5lcigicG9wdWxhdGUiLCB0 aGlzLl9wb3B1bGF0ZSwgdGhpcyk7Ci0gICAgICAgIHZhciByb290cyA9IHRoaXMuX2dyYXBoLnJv b3QoKS5yZWZlcmVuY2VkTm9kZXMoKTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCByb290 cy5sZW5ndGg7IGkrKykKLSAgICAgICAgICAgIHRoaXMuYXBwZW5kQ2hpbGQobmV3IFdlYkluc3Bl Y3Rvci5OYXRpdmVIZWFwR3JhcGhEYXRhR3JpZE5vZGUocm9vdHNbaV0pKTsKLSAgICB9LAotCi0g ICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlLnByb3RvdHlwZQotfQotCi0K LS8qKgotICogQGNvbnN0cnVjdG9yCi0gKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLkRhdGFHcmlk Tm9kZX0KLSAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLk5hdGl2ZUhlYXBHcmFwaC5Ob2RlfSBub2Rl Ci0gKi8KLVdlYkluc3BlY3Rvci5OYXRpdmVIZWFwR3JhcGhEYXRhR3JpZE5vZGUgPSBmdW5jdGlv bihub2RlKQotewotICAgIHZhciBkYXRhID0gewotICAgICAgICBpZDogbm9kZS5pZCgpLAotICAg ICAgICBzaXplOiBub2RlLnNpemUoKSwKLSAgICAgICAgdHlwZTogbm9kZS50eXBlKCksCi0gICAg ICAgIGNsYXNzTmFtZTogbm9kZS5jbGFzc05hbWUoKSwKLSAgICAgICAgbmFtZTogbm9kZS5uYW1l KCksCi0gICAgfTsKLSAgICBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlLmNhbGwodGhpcywgZGF0 YSwgbm9kZS5oYXNSZWZlcmVuY2VkTm9kZXMoKSk7Ci0gICAgdGhpcy5fbm9kZSA9IG5vZGU7Ci0g ICAgdGhpcy5hZGRFdmVudExpc3RlbmVyKCJwb3B1bGF0ZSIsIHRoaXMuX3BvcHVsYXRlLCB0aGlz KTsKLX0KLQotV2ViSW5zcGVjdG9yLk5hdGl2ZUhlYXBHcmFwaERhdGFHcmlkTm9kZS5wcm90b3R5 cGUgPSB7Ci0gICAgX3BvcHVsYXRlOiBmdW5jdGlvbigpIHsKLSAgICAgICAgdGhpcy5yZW1vdmVF dmVudExpc3RlbmVyKCJwb3B1bGF0ZSIsIHRoaXMuX3BvcHVsYXRlLCB0aGlzKTsKLSAgICAgICAg dmFyIGNoaWxkcmVuID0gdGhpcy5fbm9kZS5yZWZlcmVuY2VkTm9kZXMoKTsKLSAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCBjaGlsZHJlbi5sZW5ndGg7IGkrKykKLSAgICAgICAgICAgIHRoaXMu YXBwZW5kQ2hpbGQobmV3IFdlYkluc3BlY3Rvci5OYXRpdmVIZWFwR3JhcGhEYXRhR3JpZE5vZGUo Y2hpbGRyZW5baV0pKTsKLSAgICB9LAotCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuRGF0 YUdyaWROb2RlLnByb3RvdHlwZQogfQogCkBAIC00NTgsMTEgKzI4NiwxMCBAQCBXZWJJbnNwZWN0 b3IuTmF0aXZlTWVtb3J5UHJvZmlsZVR5cGUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHByb2ZpbGVIZWFkZXIuX21lbW9yeUJsb2Nr ID0gbWVtb3J5QmxvY2s7Ci0gICAgICAgICAgICBwcm9maWxlSGVhZGVyLl9ncmFwaCA9IG5ldyBX ZWJJbnNwZWN0b3IuTmF0aXZlSGVhcEdyYXBoKGdyYXBoKTsKICAgICAgICAgICAgIHByb2ZpbGVI ZWFkZXIuaXNUZW1wb3JhcnkgPSBmYWxzZTsKICAgICAgICAgICAgIHByb2ZpbGVIZWFkZXIuc2lk ZWJhckVsZW1lbnQuc3VidGl0bGUgPSBOdW1iZXIuYnl0ZXNUb1N0cmluZygvKiogQHR5cGV7bnVt YmVyfSAqLyhtZW1vcnlCbG9jay5zaXplKSk7CiAgICAgICAgIH0KLSAgICAgICAgTWVtb3J5QWdl bnQuZ2V0UHJvY2Vzc01lbW9yeURpc3RyaWJ1dGlvbih0cnVlLCBkaWRSZWNlaXZlTWVtb3J5U25h cHNob3QuYmluZCh0aGlzKSk7CisgICAgICAgIE1lbW9yeUFnZW50LmdldFByb2Nlc3NNZW1vcnlE aXN0cmlidXRpb24oZmFsc2UsIGRpZFJlY2VpdmVNZW1vcnlTbmFwc2hvdC5iaW5kKHRoaXMpKTsK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0sCiAK