77850 2012-02-05 22:06:44 -0800 Web Inspector: get rid of artificial heap snapshot nodes from the retaining tree. 2012-02-11 01:26:39 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 78411 0 loislo loislo apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 549727 0 loislo 2012-02-05 22:06:44 -0800 %subj% 549731 1 125572 loislo 2012-02-05 22:11:10 -0800 Created attachment 125572 Patch 549757 2 125572 yurys 2012-02-05 23:18:03 -0800 Comment on attachment 125572 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125572&action=review > Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js:399 > + " && (" + !this.showRetainingEdges + " || (!edge.node.id !== 1 && !edge.node.isArtificial))\n" + !edge.node.id !== 1 will always evaluate to true, r- for this. 549760 3 125580 loislo 2012-02-05 23:26:06 -0800 Created attachment 125580 Patch 549772 4 125580 loislo 2012-02-05 23:53:15 -0800 Comment on attachment 125580 Patch Clearing flags on attachment: 125580 Committed r106778: <http://trac.webkit.org/changeset/106778> 549774 5 loislo 2012-02-05 23:53:24 -0800 All reviewed patches have been landed. Closing bug. 125572 2012-02-05 22:11:10 -0800 2012-02-05 23:25:58 -0800 Patch bug-77850-20120206101108.patch text/plain 4847 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2Nzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdlZWI3OWNmOWI2YWE2 MDZjM2ViZmRjZjkwMzk2NTc5MDQxZjIyZS4uNTE3ZjFkNTc0MDk3ODkwNWE5MmU0MWZkMDQ0MGMz YmU1N2IyYTAwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAyLTA1ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBnZXQgcmlkIG9mIGFydGlmaWNpYWwgaGVhcCBzbmFwc2hvdCBub2RlcyBmcm9tIHRoZSBy ZXRhaW5pbmcgdHJlZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc3ODUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9kZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9kZS5wcm90b3R5cGUudXBkYXRlSGFz Q2hpbGRyZW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE9iamVjdE5vZGUu cHJvdG90eXBlLl9wcmVmaXhPYmplY3RDZWxsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0hlYXBTbmFwc2hvdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RO b2RlLnByb3RvdHlwZS5nZXQgaXNBcnRpZmljaWFsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3QucHJvdG90eXBlLl9pbml0KToKKwogMjAxMi0wMi0wNSAgS2VudGFybyBIYXJh ICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVuYW1lIFtKU0NDdXN0b20qXSBJ REwgdG8gW0pTQ3VzdG9tKl0gSURMCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanMKaW5kZXgg N2NjOGE5Njk2Y2I0NGRhYWM1ZjUzNTI0ZjU2NWUyY2IxNmQyOWMyMC4uYWYxNjAxNWNiYzkyMDU3 NTgyYmE1YzdlMjk2NDhmMWQ5YmY2Y2ZiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5q cwpAQCAtMzYzLDcgKzM2Myw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RPYmplY3ROb2Rl ID0gZnVuY3Rpb24odHJlZSwgaXNGcm9tQmFzZVNuYXBzaG90LCBlZGdlLCBwCiAgICAgdGhpcy5f cmVmZXJlbmNlTmFtZSA9IGVkZ2UubmFtZTsKICAgICB0aGlzLl9yZWZlcmVuY2VUeXBlID0gZWRn ZS50eXBlOwogICAgIHRoaXMuX3Byb3BlcnR5QWNjZXNzb3IgPSBlZGdlLnByb3BlcnR5QWNjZXNz b3I7Ci0gICAgdGhpcy5fcmV0YWluZXJOb2RlID0gdHJlZS5zaG93UmV0YWluaW5nRWRnZXM7Cisg ICAgdGhpcy5zaG93UmV0YWluaW5nRWRnZXMgPSB0cmVlLnNob3dSZXRhaW5pbmdFZGdlczsKICAg ICB0aGlzLl9pc0Zyb21CYXNlU25hcHNob3QgPSBpc0Zyb21CYXNlU25hcHNob3Q7CiAgICAgdGhp cy5fcHJvdmlkZXIgPSB0aGlzLl9jcmVhdGVQcm92aWRlcighaXNGcm9tQmFzZVNuYXBzaG90ID8g dHJlZS5zbmFwc2hvdCA6IHRyZWUuYmFzZVNuYXBzaG90LCBlZGdlLm5vZGVJbmRleCwgdHJlZSk7 CiAgICAgdGhpcy51cGRhdGVIYXNDaGlsZHJlbihwYXJlbnRHcmlkTm9kZSk7CkBAIC0zNzIsNyAr MzcyLDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE9iamVjdE5vZGUgPSBmdW5jdGlvbih0 cmVlLCBpc0Zyb21CYXNlU25hcHNob3QsIGVkZ2UsIHAKIFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3RPYmplY3ROb2RlLnByb3RvdHlwZSA9IHsKICAgICB1cGRhdGVIYXNDaGlsZHJlbjogZnVuY3Rp b24ocGFyZW50R3JpZE5vZGUpCiAgICAgewotICAgICAgICBpZiAodGhpcy5fcmV0YWluZXJOb2Rl KSB7CisgICAgICAgIGlmICh0aGlzLnNob3dSZXRhaW5pbmdFZGdlcykgewogICAgICAgICAgICAg dGhpcy5fcGFyZW50R3JpZE5vZGUgPSBwYXJlbnRHcmlkTm9kZTsKICAgICAgICAgICAgIHZhciBh bmNlc3RvciA9IHBhcmVudEdyaWROb2RlOwogICAgICAgICAgICAgd2hpbGUgKGFuY2VzdG9yKSB7 CkBAIC0zOTQsMTAgKzM5NCwxMSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9k ZS5wcm90b3R5cGUgPSB7CiAgICAgX2NyZWF0ZVByb3ZpZGVyOiBmdW5jdGlvbihzbmFwc2hvdCwg bm9kZUluZGV4LCB0cmVlKQogICAgIHsKICAgICAgICAgdmFyIHNob3dIaWRkZW5EYXRhID0gV2Vi SW5zcGVjdG9yLnNldHRpbmdzLnNob3dIZWFwU25hcHNob3RPYmplY3RzSGlkZGVuUHJvcGVydGll cy5nZXQoKTsKLSAgICAgICAgdmFyIGZpbHRlciA9ICJmdW5jdGlvbihlZGdlKSB7IiArCi0gICAg ICAgICAgICAiICAgIHJldHVybiAhZWRnZS5pc0ludmlzaWJsZSIgKwotICAgICAgICAgICAgIiAg ICAgICAgJiYgKCIgKyBzaG93SGlkZGVuRGF0YSArICIgfHwgKCFlZGdlLmlzSGlkZGVuICYmICFl ZGdlLm5vZGUuaXNIaWRkZW4pKTsiICsKLSAgICAgICAgICAgICJ9IjsKKyAgICAgICAgdmFyIGZp bHRlciA9ICJmdW5jdGlvbihlZGdlKSB7XG4iICsKKyAgICAgICAgICAgICIgICAgcmV0dXJuICFl ZGdlLmlzSW52aXNpYmxlXG4iICsKKyAgICAgICAgICAgICIgICAgICAgICYmICgiICsgIXRoaXMu c2hvd1JldGFpbmluZ0VkZ2VzICsgIiB8fCAoIWVkZ2Uubm9kZS5pZCAhPT0gMSAmJiAhZWRnZS5u b2RlLmlzQXJ0aWZpY2lhbCkpXG4iICsKKyAgICAgICAgICAgICIgICAgICAgICYmICgiICsgc2hv d0hpZGRlbkRhdGEgKyAiIHx8ICghZWRnZS5pc0hpZGRlbiAmJiAhZWRnZS5ub2RlLmlzSGlkZGVu KSk7XG4iICsKKyAgICAgICAgICAgICJ9XG4iOwogICAgICAgICBpZiAodHJlZS5zaG93UmV0YWlu aW5nRWRnZXMpCiAgICAgICAgICAgICByZXR1cm4gc25hcHNob3QuY3JlYXRlUmV0YWluaW5nRWRn ZXNQcm92aWRlcihub2RlSW5kZXgsIGZpbHRlcik7CiAgICAgICAgIGVsc2UKQEAgLTQ1Myw3ICs0 NTQsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9kZS5wcm90b3R5cGUgPSB7 CiAKICAgICBfcHJlZml4T2JqZWN0Q2VsbDogZnVuY3Rpb24oZGl2LCBkYXRhKQogICAgIHsKLSAg ICAgICAgaWYgKHRoaXMuX3JldGFpbmVyTm9kZSkgeworICAgICAgICBpZiAodGhpcy5zaG93UmV0 YWluaW5nRWRnZXMpIHsKICAgICAgICAgICAgIGlmICh0aGlzLl9jeWNsZWRXaXRoQW5jZXN0b3JH cmlkTm9kZSkKICAgICAgICAgICAgICAgICBkaXYuY2xhc3NOYW1lICs9ICIgY3ljbGVkLWFuY2Vz c29yLW5vZGUiOwogICAgICAgICAgICAgdmFyIHJlZmVyZW5jZU5hbWVTcGFuID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgic3BhbiIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcwppbmRleCA1ZTI0M2FhMTRlMjk4NTI5ODI4MzlmZWEy NWZiZTEyNjdkZWM1YjVlLi40YTU3YWQ3ZTYxYzc5NDk5NWE3Y2VmMGJhOGI2OTg0N2Q4ZThjZTA1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFw c2hvdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFw c2hvdC5qcwpAQCAtNTY2LDYgKzU2NiwxMSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Tm9k ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl90eXBlKCkgPT09IHRoaXMuX3Nu YXBzaG90Ll9ub2RlSGlkZGVuVHlwZTsKICAgICB9LAogCisgICAgZ2V0IGlzQXJ0aWZpY2lhbCgp CisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fdHlwZSgpID09PSB0aGlzLl9zbmFwc2hvdC5f bm9kZUFydGlmaWNpYWxUeXBlOworICAgIH0sCisKICAgICBnZXQgaXNET01XaW5kb3coKQogICAg IHsKICAgICAgICAgcmV0dXJuIHRoaXMubmFtZS5zdWJzdHIoMCwgOSkgPT09ICJET01XaW5kb3ci OwpAQCAtNzA2LDYgKzcxMSw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBl ID0gewogICAgICAgICB0aGlzLl9maXJzdEVkZ2VPZmZzZXQgPSBtZXRhLmZpZWxkcy5pbmRleE9m KCJjaGlsZHJlbiIpOwogICAgICAgICB0aGlzLl9ub2RlVHlwZXMgPSBtZXRhLnR5cGVzW3RoaXMu X25vZGVUeXBlT2Zmc2V0XTsKICAgICAgICAgdGhpcy5fbm9kZUhpZGRlblR5cGUgPSB0aGlzLl9u b2RlVHlwZXMuaW5kZXhPZigiaGlkZGVuIik7CisgICAgICAgIHRoaXMuX25vZGVBcnRpZmljaWFs VHlwZSA9IHRoaXMuX25vZGVUeXBlcy5pbmRleE9mKCJhcnRpZmljaWFsIik7CiAgICAgICAgIHZh ciBlZGdlc01ldGEgPSBtZXRhLnR5cGVzW3RoaXMuX2ZpcnN0RWRnZU9mZnNldF07CiAgICAgICAg IHRoaXMuX2VkZ2VGaWVsZHNDb3VudCA9IGVkZ2VzTWV0YS5maWVsZHMubGVuZ3RoOwogICAgICAg ICB0aGlzLl9lZGdlVHlwZU9mZnNldCA9IGVkZ2VzTWV0YS5maWVsZHMuaW5kZXhPZigidHlwZSIp Owo= 125580 2012-02-05 23:26:06 -0800 2012-02-05 23:53:15 -0800 Patch bug-77850-20120206112604.patch text/plain 4846 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2Nzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdlZWI3OWNmOWI2YWE2 MDZjM2ViZmRjZjkwMzk2NTc5MDQxZjIyZS4uNTE3ZjFkNTc0MDk3ODkwNWE5MmU0MWZkMDQ0MGMz YmU1N2IyYTAwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAyLTA1ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBnZXQgcmlkIG9mIGFydGlmaWNpYWwgaGVhcCBzbmFwc2hvdCBub2RlcyBmcm9tIHRoZSBy ZXRhaW5pbmcgdHJlZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc3ODUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9kZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9kZS5wcm90b3R5cGUudXBkYXRlSGFz Q2hpbGRyZW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE9iamVjdE5vZGUu cHJvdG90eXBlLl9wcmVmaXhPYmplY3RDZWxsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0hlYXBTbmFwc2hvdC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RO b2RlLnByb3RvdHlwZS5nZXQgaXNBcnRpZmljaWFsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3QucHJvdG90eXBlLl9pbml0KToKKwogMjAxMi0wMi0wNSAgS2VudGFybyBIYXJh ICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVuYW1lIFtKU0NDdXN0b20qXSBJ REwgdG8gW0pTQ3VzdG9tKl0gSURMCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanMKaW5kZXgg N2NjOGE5Njk2Y2I0NGRhYWM1ZjUzNTI0ZjU2NWUyY2IxNmQyOWMyMC4uYTc3MWVjNDJmMmNhYzNk NGYzZGVlM2M0NDQzYTIxNjhlZDA2ZDQ4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5q cwpAQCAtMzYzLDcgKzM2Myw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RPYmplY3ROb2Rl ID0gZnVuY3Rpb24odHJlZSwgaXNGcm9tQmFzZVNuYXBzaG90LCBlZGdlLCBwCiAgICAgdGhpcy5f cmVmZXJlbmNlTmFtZSA9IGVkZ2UubmFtZTsKICAgICB0aGlzLl9yZWZlcmVuY2VUeXBlID0gZWRn ZS50eXBlOwogICAgIHRoaXMuX3Byb3BlcnR5QWNjZXNzb3IgPSBlZGdlLnByb3BlcnR5QWNjZXNz b3I7Ci0gICAgdGhpcy5fcmV0YWluZXJOb2RlID0gdHJlZS5zaG93UmV0YWluaW5nRWRnZXM7Cisg ICAgdGhpcy5zaG93UmV0YWluaW5nRWRnZXMgPSB0cmVlLnNob3dSZXRhaW5pbmdFZGdlczsKICAg ICB0aGlzLl9pc0Zyb21CYXNlU25hcHNob3QgPSBpc0Zyb21CYXNlU25hcHNob3Q7CiAgICAgdGhp cy5fcHJvdmlkZXIgPSB0aGlzLl9jcmVhdGVQcm92aWRlcighaXNGcm9tQmFzZVNuYXBzaG90ID8g dHJlZS5zbmFwc2hvdCA6IHRyZWUuYmFzZVNuYXBzaG90LCBlZGdlLm5vZGVJbmRleCwgdHJlZSk7 CiAgICAgdGhpcy51cGRhdGVIYXNDaGlsZHJlbihwYXJlbnRHcmlkTm9kZSk7CkBAIC0zNzIsNyAr MzcyLDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE9iamVjdE5vZGUgPSBmdW5jdGlvbih0 cmVlLCBpc0Zyb21CYXNlU25hcHNob3QsIGVkZ2UsIHAKIFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3RPYmplY3ROb2RlLnByb3RvdHlwZSA9IHsKICAgICB1cGRhdGVIYXNDaGlsZHJlbjogZnVuY3Rp b24ocGFyZW50R3JpZE5vZGUpCiAgICAgewotICAgICAgICBpZiAodGhpcy5fcmV0YWluZXJOb2Rl KSB7CisgICAgICAgIGlmICh0aGlzLnNob3dSZXRhaW5pbmdFZGdlcykgewogICAgICAgICAgICAg dGhpcy5fcGFyZW50R3JpZE5vZGUgPSBwYXJlbnRHcmlkTm9kZTsKICAgICAgICAgICAgIHZhciBh bmNlc3RvciA9IHBhcmVudEdyaWROb2RlOwogICAgICAgICAgICAgd2hpbGUgKGFuY2VzdG9yKSB7 CkBAIC0zOTQsMTAgKzM5NCwxMSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9k ZS5wcm90b3R5cGUgPSB7CiAgICAgX2NyZWF0ZVByb3ZpZGVyOiBmdW5jdGlvbihzbmFwc2hvdCwg bm9kZUluZGV4LCB0cmVlKQogICAgIHsKICAgICAgICAgdmFyIHNob3dIaWRkZW5EYXRhID0gV2Vi SW5zcGVjdG9yLnNldHRpbmdzLnNob3dIZWFwU25hcHNob3RPYmplY3RzSGlkZGVuUHJvcGVydGll cy5nZXQoKTsKLSAgICAgICAgdmFyIGZpbHRlciA9ICJmdW5jdGlvbihlZGdlKSB7IiArCi0gICAg ICAgICAgICAiICAgIHJldHVybiAhZWRnZS5pc0ludmlzaWJsZSIgKwotICAgICAgICAgICAgIiAg ICAgICAgJiYgKCIgKyBzaG93SGlkZGVuRGF0YSArICIgfHwgKCFlZGdlLmlzSGlkZGVuICYmICFl ZGdlLm5vZGUuaXNIaWRkZW4pKTsiICsKLSAgICAgICAgICAgICJ9IjsKKyAgICAgICAgdmFyIGZp bHRlciA9ICJmdW5jdGlvbihlZGdlKSB7XG4iICsKKyAgICAgICAgICAgICIgICAgcmV0dXJuICFl ZGdlLmlzSW52aXNpYmxlXG4iICsKKyAgICAgICAgICAgICIgICAgICAgICYmICgiICsgIXRoaXMu c2hvd1JldGFpbmluZ0VkZ2VzICsgIiB8fCAoZWRnZS5ub2RlLmlkICE9PSAxICYmICFlZGdlLm5v ZGUuaXNBcnRpZmljaWFsKSlcbiIgKworICAgICAgICAgICAgIiAgICAgICAgJiYgKCIgKyBzaG93 SGlkZGVuRGF0YSArICIgfHwgKCFlZGdlLmlzSGlkZGVuICYmICFlZGdlLm5vZGUuaXNIaWRkZW4p KTtcbiIgKworICAgICAgICAgICAgIn1cbiI7CiAgICAgICAgIGlmICh0cmVlLnNob3dSZXRhaW5p bmdFZGdlcykKICAgICAgICAgICAgIHJldHVybiBzbmFwc2hvdC5jcmVhdGVSZXRhaW5pbmdFZGdl c1Byb3ZpZGVyKG5vZGVJbmRleCwgZmlsdGVyKTsKICAgICAgICAgZWxzZQpAQCAtNDUzLDcgKzQ1 NCw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RPYmplY3ROb2RlLnByb3RvdHlwZSA9IHsK IAogICAgIF9wcmVmaXhPYmplY3RDZWxsOiBmdW5jdGlvbihkaXYsIGRhdGEpCiAgICAgewotICAg ICAgICBpZiAodGhpcy5fcmV0YWluZXJOb2RlKSB7CisgICAgICAgIGlmICh0aGlzLnNob3dSZXRh aW5pbmdFZGdlcykgewogICAgICAgICAgICAgaWYgKHRoaXMuX2N5Y2xlZFdpdGhBbmNlc3Rvckdy aWROb2RlKQogICAgICAgICAgICAgICAgIGRpdi5jbGFzc05hbWUgKz0gIiBjeWNsZWQtYW5jZXNz b3Itbm9kZSI7CiAgICAgICAgICAgICB2YXIgcmVmZXJlbmNlTmFtZVNwYW4gPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJzcGFuIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSGVhcFNuYXBzaG90LmpzCmluZGV4IDVlMjQzYWExNGUyOTg1Mjk4MjgzOWZlYTI1 ZmJlMTI2N2RlYzViNWUuLjRhNTdhZDdlNjFjNzk0OTk1YTdjZWYwYmE4YjY5ODQ3ZDhlOGNlMDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBz aG90LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBz aG90LmpzCkBAIC01NjYsNiArNTY2LDExIEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3ROb2Rl LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3R5cGUoKSA9PT0gdGhpcy5fc25h cHNob3QuX25vZGVIaWRkZW5UeXBlOwogICAgIH0sCiAKKyAgICBnZXQgaXNBcnRpZmljaWFsKCkK KyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl90eXBlKCkgPT09IHRoaXMuX3NuYXBzaG90Ll9u b2RlQXJ0aWZpY2lhbFR5cGU7CisgICAgfSwKKwogICAgIGdldCBpc0RPTVdpbmRvdygpCiAgICAg ewogICAgICAgICByZXR1cm4gdGhpcy5uYW1lLnN1YnN0cigwLCA5KSA9PT0gIkRPTVdpbmRvdyI7 CkBAIC03MDYsNiArNzExLDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuX2ZpcnN0RWRnZU9mZnNldCA9IG1ldGEuZmllbGRzLmluZGV4T2Yo ImNoaWxkcmVuIik7CiAgICAgICAgIHRoaXMuX25vZGVUeXBlcyA9IG1ldGEudHlwZXNbdGhpcy5f bm9kZVR5cGVPZmZzZXRdOwogICAgICAgICB0aGlzLl9ub2RlSGlkZGVuVHlwZSA9IHRoaXMuX25v ZGVUeXBlcy5pbmRleE9mKCJoaWRkZW4iKTsKKyAgICAgICAgdGhpcy5fbm9kZUFydGlmaWNpYWxU eXBlID0gdGhpcy5fbm9kZVR5cGVzLmluZGV4T2YoImFydGlmaWNpYWwiKTsKICAgICAgICAgdmFy IGVkZ2VzTWV0YSA9IG1ldGEudHlwZXNbdGhpcy5fZmlyc3RFZGdlT2Zmc2V0XTsKICAgICAgICAg dGhpcy5fZWRnZUZpZWxkc0NvdW50ID0gZWRnZXNNZXRhLmZpZWxkcy5sZW5ndGg7CiAgICAgICAg IHRoaXMuX2VkZ2VUeXBlT2Zmc2V0ID0gZWRnZXNNZXRhLmZpZWxkcy5pbmRleE9mKCJ0eXBlIik7 Cg==