81018 2012-03-13 11:55:33 -0700 Web Inspector: Add snippets tab to scripts navigator. 2012-03-14 05:23:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 75094 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 577622 0 vsevik 2012-03-13 11:55:33 -0700 Add snippets tab to scripts navigator. 577656 1 131691 vsevik 2012-03-13 12:22:10 -0700 Created attachment 131691 Patch 578269 2 131691 pfeldman 2012-03-14 02:25:22 -0700 Comment on attachment 131691 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131691&action=review > Source/WebCore/inspector/front-end/ScriptsNavigator.js:67 > + this._snippetsTreeElement = document.createElement("ol"); This can be a local variable (or even encapsulated into NavigatorTreeOutline) 578325 3 vsevik 2012-03-14 05:23:26 -0700 Committed r110694: <http://trac.webkit.org/changeset/110694> 131691 2012-03-13 12:22:10 -0700 2012-03-14 02:25:22 -0700 Patch bug-81018-20120313232208.patch text/plain 10979 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQ3ODkxZGU4NWFjOGYz MjI5YTQwN2IwZjU2OThmODY5NWFmYTQ0NS4uMzlhMTEzOTI0MmQ0MDMxNTJmNmE2MjQwNmUyMDg0 NTljMzA5ZTU2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEyLTAzLTEzICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCBzbmlwcGV0cyB0YWIgdG8gc2NyaXB0cyBuYXZpZ2F0b3IuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTAxOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmln YXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZS5fc2hvd1NjcmlwdEZv bGRlcnNTZXR0aW5nQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmln YXRvci5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZp Z2F0b3IucHJvdG90eXBlLl9nZXRPckNyZWF0ZUZvbGRlclRyZWVFbGVtZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZS5fY3JlYXRlRm9sZGVyVHJl ZUVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90 eXBlLl9nZXRPckNyZWF0ZVNuaXBwZXRFdmFsdWF0aW9uc0ZvbGRlclRyZWVFbGVtZW50KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl91aVNvdXJjZUNvZGVBZGRlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fcmV2ZWFsRXhlY3V0 aW9uTGluZSk6CisKKzIwMTItMDMtMTMgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1 bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIHNuaXBwZXRzIG1vZGVsLgogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODA4NjMKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz IGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4 IDY0OGViNTExMjUxMTVhNmM1MDlmZGU4NWEyZGUyZGE3MzNlOGNlZmUuLjhhMTgwZDBlNzY5ODY5 NTQwYWVlZTA4OGY3N2E1ZmEwYzdkOGUzMjYgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEg NzEKemNtWEB7al4pXlVtV0N+aTlfR3tJJW90VXRNPUxRMzImWFY4RmNkVDdGPVIzbjBBVlVhMn1B S0BoYlVQfEVhRDdHCkk0QXUtPjBQTHl9WnZYJVEKCmRlbHRhIDExClNjbVheMXA1Pz9sbVdDfmk5 XzljZmB2b1dmCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzTmF2aWdhdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzTmF2aWdhdG9yLmpzCmluZGV4IDAwNDY1MTdmNWEwMGI2NjJkYTM3ZjMyOWVhN2Iz NmZhODViYzk2M2YuLjExZWY4ZDMwNjJiYTc1MmNhMzU0Yjc4MzVmNDM1OGJlYjVjNTY4MDMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmln YXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNO YXZpZ2F0b3IuanMKQEAgLTY0LDYgKzY0LDE1IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdh dG9yID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX25hdmlnYXRvckNvbnRlbnRTY3JpcHRzVHJlZSA9 IG5ldyBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVHJlZU91dGxpbmUodGhpcywgdGhpcy5fbmF2aWdh dG9yQ29udGVudFNjcmlwdHNUcmVlRWxlbWVudCk7CiAgICAgdGhpcy5fdGFiYmVkUGFuZS5hcHBl bmRUYWIoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IuQ29udGVudFNjcmlwdHNUYWIsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiQ29udGVudCBzY3JpcHRzIiksIGNvbnRlbnRTY3JpcHRzVmll dyk7CiAKKyAgICB0aGlzLl9zbmlwcGV0c1RyZWVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgib2wiKTsKKyAgICB2YXIgc25pcHBldHNWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5WaWV3 KCk7CisgICAgc25pcHBldHNWaWV3LmVsZW1lbnQuYWRkU3R5bGVDbGFzcygib3V0bGluZS1kaXNj bG9zdXJlIik7CisgICAgc25pcHBldHNWaWV3LmVsZW1lbnQuYWRkU3R5bGVDbGFzcygibmF2aWdh dG9yIik7CisgICAgc25pcHBldHNWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fc25pcHBl dHNUcmVlRWxlbWVudCk7CisgICAgdGhpcy5fc25pcHBldHNUcmVlID0gbmV3IFdlYkluc3BlY3Rv ci5OYXZpZ2F0b3JUcmVlT3V0bGluZSh0aGlzLCB0aGlzLl9zbmlwcGV0c1RyZWVFbGVtZW50KTsK KyAgICBpZiAoV2ViSW5zcGVjdG9yLmV4cGVyaW1lbnRzU2V0dGluZ3Muc25pcHBldHNTdXBwb3J0 LmlzRW5hYmxlZCgpKQorICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNw ZWN0b3IuU2NyaXB0c05hdmlnYXRvci5TbmlwcGV0c1RhYiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJTbmlwcGV0cyIpLCBzbmlwcGV0c1ZpZXcpOworCiAgICAgdGhpcy5fZm9sZGVyVHJlZUVsZW1l bnRzID0ge307CiAgICAgCiAgICAgdGhpcy5fc2NyaXB0VHJlZUVsZW1lbnRzQnlVSVNvdXJjZUNv ZGUgPSBuZXcgTWFwKCk7CkBAIC03Myw2ICs4Miw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2 aWdhdG9yID0gZnVuY3Rpb24oKQogCiBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5TY3Jp cHRzVGFiID0gInNjcmlwdHMiOwogV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IuQ29udGVu dFNjcmlwdHNUYWIgPSAiY29udGVudFNjcmlwdHMiOworV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZp Z2F0b3IuU25pcHBldHNUYWIgPSAic25pcHBldHMiOwogCiBXZWJJbnNwZWN0b3IuU2NyaXB0c05h dmlnYXRvci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCkBAIC0xMjYsOCArMTM2LDggQEAgV2ViSW5z cGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlID0gewogICAgICAgICB2YXIgc2NyaXB0 VGl0bGUgPSB1aVNvdXJjZUNvZGUuZmlsZU5hbWUgfHwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIo cHJvZ3JhbSkiKTsKICAgICAgICAgdmFyIHNjcmlwdFRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3Bl Y3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVlRWxlbWVudCh0aGlzLCB1aVNvdXJjZUNvZGUsIHNjcmlw dFRpdGxlKTsKICAgICAgICAgdGhpcy5fc2NyaXB0VHJlZUVsZW1lbnRzQnlVSVNvdXJjZUNvZGUu cHV0KHVpU291cmNlQ29kZSwgc2NyaXB0VHJlZUVsZW1lbnQpOwotICAgICAgICAKLSAgICAgICAg dmFyIGZvbGRlclRyZWVFbGVtZW50ID0gdGhpcy5fZ2V0T3JDcmVhdGVGb2xkZXJUcmVlRWxlbWVu dCh1aVNvdXJjZUNvZGUuaXNDb250ZW50U2NyaXB0LCB1aVNvdXJjZUNvZGUuZG9tYWluLCB1aVNv dXJjZUNvZGUuZm9sZGVyTmFtZSk7CisKKyAgICAgICAgdmFyIGZvbGRlclRyZWVFbGVtZW50ID0g dGhpcy5fZ2V0T3JDcmVhdGVGb2xkZXJUcmVlRWxlbWVudCh1aVNvdXJjZUNvZGUpOwogICAgICAg ICBmb2xkZXJUcmVlRWxlbWVudC5hcHBlbmRDaGlsZChzY3JpcHRUcmVlRWxlbWVudCk7CiAgICAg fSwKIApAQCAtMTQ2LDggKzE1NiwyMiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5w cm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgcmV2ZWFsVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1 aVNvdXJjZUNvZGUpCiAgICAgeworICAgICAgICBpZiAodGhpcy5fbmF2aWdhdG9yU2NyaXB0c1Ry ZWUuc2VsZWN0ZWRUcmVlRWxlbWVudCkKKyAgICAgICAgICAgIHRoaXMuX25hdmlnYXRvclNjcmlw dHNUcmVlLnNlbGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxlY3QoKTsKKyAgICAgICAgaWYgKHRoaXMu X25hdmlnYXRvckNvbnRlbnRTY3JpcHRzVHJlZS5zZWxlY3RlZFRyZWVFbGVtZW50KQorICAgICAg ICAgICAgdGhpcy5fbmF2aWdhdG9yQ29udGVudFNjcmlwdHNUcmVlLnNlbGVjdGVkVHJlZUVsZW1l bnQuZGVzZWxlY3QoKTsKKyAgICAgICAgaWYgKHRoaXMuX3NuaXBwZXRzVHJlZS5zZWxlY3RlZFRy ZWVFbGVtZW50KQorICAgICAgICAgICAgdGhpcy5fc25pcHBldHNUcmVlLnNlbGVjdGVkVHJlZUVs ZW1lbnQuZGVzZWxlY3QoKTsKKwogICAgICAgICB0aGlzLl9sYXN0U2VsZWN0ZWRVSVNvdXJjZUNv ZGUgPSB1aVNvdXJjZUNvZGU7Ci0gICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuc2VsZWN0VGFiKHVp U291cmNlQ29kZS5pc0NvbnRlbnRTY3JpcHQgPyBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRv ci5Db250ZW50U2NyaXB0c1RhYiA6IFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLlNjcmlw dHNUYWIpOworCisgICAgICAgIHZhciB0YWIgPSBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRv ci5TY3JpcHRzVGFiOworICAgICAgICBpZiAodWlTb3VyY2VDb2RlLmlzQ29udGVudFNjcmlwdCkK KyAgICAgICAgICAgIHRhYiA9IFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLkNvbnRlbnRT Y3JpcHRzVGFiOworICAgICAgICBpZiAodWlTb3VyY2VDb2RlLmlzU25pcHBldCB8fCB1aVNvdXJj ZUNvZGUuaXNTbmlwcGV0RXZhbHVhdGlvbikKKyAgICAgICAgICAgIHRhYiA9IFdlYkluc3BlY3Rv ci5TY3JpcHRzTmF2aWdhdG9yLlNuaXBwZXRzVGFiOworCisgICAgICAgIHRoaXMuX3RhYmJlZFBh bmUuc2VsZWN0VGFiKHRhYik7CiAKICAgICAgICAgdmFyIHNjcmlwdFRyZWVFbGVtZW50ID0gdGhp cy5fc2NyaXB0VHJlZUVsZW1lbnRzQnlVSVNvdXJjZUNvZGUuZ2V0KHVpU291cmNlQ29kZSk7CiAg ICAgICAgIHNjcmlwdFRyZWVFbGVtZW50LnJldmVhbEFuZFNlbGVjdCh0cnVlKTsKQEAgLTIyNSw2 ICsyNDksNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHZhciB1aVNvdXJjZUNvZGVzID0gdGhpcy5fbmF2aWdhdG9yU2NyaXB0c1RyZWUuc2Ny aXB0VHJlZUVsZW1lbnRzKCk7CiAgICAgICAgIHVpU291cmNlQ29kZXMgPSB1aVNvdXJjZUNvZGVz LmNvbmNhdCh0aGlzLl9uYXZpZ2F0b3JDb250ZW50U2NyaXB0c1RyZWUuc2NyaXB0VHJlZUVsZW1l bnRzKCkpOwogICAgICAgICB0aGlzLnJlc2V0KCk7CisKICAgICAgICAgZm9yICh2YXIgaSA9IDA7 IGkgPCB1aVNvdXJjZUNvZGVzLmxlbmd0aDsgKytpKQogICAgICAgICAgICAgdGhpcy5hZGRVSVNv dXJjZUNvZGUodWlTb3VyY2VDb2Rlc1tpXSk7CiAgICAgICAgIApAQCAtMjM4LDE2ICsyNjMsNTIg QEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl9uYXZpZ2F0b3JTY3JpcHRzVHJlZS5yZW1vdmVDaGlsZHJlbigpOwogICAgICAgICB0aGlz Ll9uYXZpZ2F0b3JDb250ZW50U2NyaXB0c1RyZWUuc3RvcFNlYXJjaCgpOwogICAgICAgICB0aGlz Ll9uYXZpZ2F0b3JDb250ZW50U2NyaXB0c1RyZWUucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAg dGhpcy5fc25pcHBldHNUcmVlLnN0b3BTZWFyY2goKTsKKyAgICAgICAgdGhpcy5fc25pcHBldHNU cmVlLnJlbW92ZUNoaWxkcmVuKCk7CiAgICAgICAgIHRoaXMuX2ZvbGRlclRyZWVFbGVtZW50cyA9 IHt9OwogICAgICAgICB0aGlzLl9zY3JpcHRUcmVlRWxlbWVudHNCeVVJU291cmNlQ29kZS5jbGVh cigpOwogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGV9IHVpU291cmNlQ29kZQorICAgICAqLworICAgIF9nZXRPckNyZWF0ZUZvbGRlclRy ZWVFbGVtZW50OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCisgICAgeworICAgICAgICBpZiAodWlT b3VyY2VDb2RlLmlzU25pcHBldCkKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9zbmlwcGV0c1Ry ZWU7CisgICAgICAgIGlmICh1aVNvdXJjZUNvZGUuaXNTbmlwcGV0RXZhbHVhdGlvbikKKyAgICAg ICAgICAgIHJldHVybiB0aGlzLl9nZXRPckNyZWF0ZVNuaXBwZXRFdmFsdWF0aW9uc0ZvbGRlclRy ZWVFbGVtZW50KCk7CisgICAgICAgIHJldHVybiB0aGlzLl9nZXRPckNyZWF0ZVNjcmlwdEZvbGRl clRyZWVFbGVtZW50KHVpU291cmNlQ29kZS5pc0NvbnRlbnRTY3JpcHQsIHVpU291cmNlQ29kZS5k b21haW4sIHVpU291cmNlQ29kZS5mb2xkZXJOYW1lKTsKKyAgICB9LAorCisgICAgLyoqCisgICAg ICogQHBhcmFtIHtzdHJpbmd9IGZvbGRlcklkZW50aWZpZXIKKyAgICAgKiBAcGFyYW0ge3N0cmlu Z30gZG9tYWluCisgICAgICogQHBhcmFtIHtzdHJpbmd9IGZvbGRlck5hbWUKKyAgICAgKi8KKyAg ICBfY3JlYXRlRm9sZGVyVHJlZUVsZW1lbnQ6IGZ1bmN0aW9uKHBhcmVudEZvbGRlckVsZW1lbnQs IGZvbGRlcklkZW50aWZpZXIsIGRvbWFpbiwgZm9sZGVyTmFtZSkKKyAgICB7CisgICAgICAgIHZh ciBmb2xkZXJUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yRm9sZGVyVHJl ZUVsZW1lbnQoZm9sZGVySWRlbnRpZmllciwgZG9tYWluLCBmb2xkZXJOYW1lKTsKKyAgICAgICAg cGFyZW50Rm9sZGVyRWxlbWVudC5hcHBlbmRDaGlsZChmb2xkZXJUcmVlRWxlbWVudCk7CisgICAg ICAgIHRoaXMuX2ZvbGRlclRyZWVFbGVtZW50c1tmb2xkZXJJZGVudGlmaWVyXSA9IGZvbGRlclRy ZWVFbGVtZW50OworICAgICAgICByZXR1cm4gZm9sZGVyVHJlZUVsZW1lbnQ7CisgICAgfSwKKwor ICAgIF9nZXRPckNyZWF0ZVNuaXBwZXRFdmFsdWF0aW9uc0ZvbGRlclRyZWVFbGVtZW50OiBmdW5j dGlvbigpCisgICAgeworICAgICAgICBjb25zdCBzbmlwcGV0RXZhbHVhdGlvbnNGb2xkZXJJZGVu dGlmaWVyID0gInNuaXBwZXRFdmFsdWF0aW9uc0ZvbGRlciI7CisgICAgICAgIHZhciBmb2xkZXJU cmVlRWxlbWVudCA9IHRoaXMuX2ZvbGRlclRyZWVFbGVtZW50c1tzbmlwcGV0RXZhbHVhdGlvbnNG b2xkZXJJZGVudGlmaWVyXTsKKyAgICAgICAgaWYgKGZvbGRlclRyZWVFbGVtZW50KQorICAgICAg ICAgICAgcmV0dXJuIGZvbGRlclRyZWVFbGVtZW50OworICAgICAgICByZXR1cm4gdGhpcy5fY3Jl YXRlRm9sZGVyVHJlZUVsZW1lbnQodGhpcy5fc25pcHBldHNUcmVlLCBzbmlwcGV0RXZhbHVhdGlv bnNGb2xkZXJJZGVudGlmaWVyLCAiIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFdmFsdWF0ZWQg c25pcHBldHMiKSk7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0g aXNDb250ZW50U2NyaXB0CiAgICAgICogQHBhcmFtIHtzdHJpbmd9IGRvbWFpbgogICAgICAqIEBw YXJhbSB7c3RyaW5nfSBmb2xkZXJOYW1lCiAgICAgICovCi0gICAgX2ZvbGRlcklkZW50aWZpZXI6 IGZ1bmN0aW9uKGlzQ29udGVudFNjcmlwdCwgZG9tYWluLCBmb2xkZXJOYW1lKQorICAgIF9zY3Jp cHRGb2xkZXJJZGVudGlmaWVyOiBmdW5jdGlvbihpc0NvbnRlbnRTY3JpcHQsIGRvbWFpbiwgZm9s ZGVyTmFtZSkKICAgICB7CiAgICAgICAgIHZhciBjb250ZW50U2NyaXB0UHJlZml4ID0gaXNDb250 ZW50U2NyaXB0ID8gIjAiIDogIjEiOwogICAgICAgICByZXR1cm4gY29udGVudFNjcmlwdFByZWZp eCArICI6IiArIGRvbWFpbiArIGZvbGRlck5hbWU7CkBAIC0yNTgsOSArMzE5LDkgQEAgV2ViSW5z cGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlID0gewogICAgICAqIEBwYXJhbSB7c3Ry aW5nfSBkb21haW4KICAgICAgKiBAcGFyYW0ge3N0cmluZ30gZm9sZGVyTmFtZQogICAgICAqLwot ICAgIF9nZXRPckNyZWF0ZUZvbGRlclRyZWVFbGVtZW50OiBmdW5jdGlvbihpc0NvbnRlbnRTY3Jp cHQsIGRvbWFpbiwgZm9sZGVyTmFtZSkKKyAgICBfZ2V0T3JDcmVhdGVTY3JpcHRGb2xkZXJUcmVl RWxlbWVudDogZnVuY3Rpb24oaXNDb250ZW50U2NyaXB0LCBkb21haW4sIGZvbGRlck5hbWUpCiAg ICAgewotICAgICAgICB2YXIgZm9sZGVySWRlbnRpZmllciA9IHRoaXMuX2ZvbGRlcklkZW50aWZp ZXIoaXNDb250ZW50U2NyaXB0LCBkb21haW4sIGZvbGRlck5hbWUpOworICAgICAgICB2YXIgZm9s ZGVySWRlbnRpZmllciA9IHRoaXMuX3NjcmlwdEZvbGRlcklkZW50aWZpZXIoaXNDb250ZW50U2Ny aXB0LCBkb21haW4sIGZvbGRlck5hbWUpOwogICAgICAgICAKICAgICAgICAgaWYgKHRoaXMuX2Zv bGRlclRyZWVFbGVtZW50c1tmb2xkZXJJZGVudGlmaWVyXSkKICAgICAgICAgICAgIHJldHVybiB0 aGlzLl9mb2xkZXJUcmVlRWxlbWVudHNbZm9sZGVySWRlbnRpZmllcl07CkBAIC0yNzAsMTggKzMz MSwxMyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGlmICgoZG9tYWluID09PSAiIiAmJiBmb2xkZXJOYW1lID09PSAiIikgfHwgIXNob3dTY3Jp cHRGb2xkZXJzKQogICAgICAgICAgICAgcmV0dXJuIGlzQ29udGVudFNjcmlwdCA/IHRoaXMuX25h dmlnYXRvckNvbnRlbnRTY3JpcHRzVHJlZSA6IHRoaXMuX25hdmlnYXRvclNjcmlwdHNUcmVlOwog ICAgICAgICAKLSAgICAgICAgdmFyIGZvbGRlclRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rv ci5OYXZpZ2F0b3JGb2xkZXJUcmVlRWxlbWVudChmb2xkZXJJZGVudGlmaWVyLCBkb21haW4sIGZv bGRlck5hbWUpOwotICAgICAgICAKICAgICAgICAgdmFyIHBhcmVudEZvbGRlckVsZW1lbnQ7CiAg ICAgICAgIGlmIChmb2xkZXJOYW1lID09PSAiIikKICAgICAgICAgICAgIHBhcmVudEZvbGRlckVs ZW1lbnQgPSBpc0NvbnRlbnRTY3JpcHQgPyB0aGlzLl9uYXZpZ2F0b3JDb250ZW50U2NyaXB0c1Ry ZWUgOiB0aGlzLl9uYXZpZ2F0b3JTY3JpcHRzVHJlZTsKICAgICAgICAgZWxzZQotICAgICAgICAg ICAgcGFyZW50Rm9sZGVyRWxlbWVudCA9IHRoaXMuX2dldE9yQ3JlYXRlRm9sZGVyVHJlZUVsZW1l bnQoaXNDb250ZW50U2NyaXB0LCBkb21haW4sICIiKTsKKyAgICAgICAgICAgIHBhcmVudEZvbGRl ckVsZW1lbnQgPSB0aGlzLl9nZXRPckNyZWF0ZVNjcmlwdEZvbGRlclRyZWVFbGVtZW50KGlzQ29u dGVudFNjcmlwdCwgZG9tYWluLCAiIik7CiAgICAgICAgIAotICAgICAgICBwYXJlbnRGb2xkZXJF bGVtZW50LmFwcGVuZENoaWxkKGZvbGRlclRyZWVFbGVtZW50KTsKLSAgICAgICAgCi0gICAgICAg IHRoaXMuX2ZvbGRlclRyZWVFbGVtZW50c1tmb2xkZXJJZGVudGlmaWVyXSA9IGZvbGRlclRyZWVF bGVtZW50OwotICAgICAgICByZXR1cm4gZm9sZGVyVHJlZUVsZW1lbnQ7CisgICAgICAgIHJldHVy biB0aGlzLl9jcmVhdGVGb2xkZXJUcmVlRWxlbWVudChwYXJlbnRGb2xkZXJFbGVtZW50LCBmb2xk ZXJJZGVudGlmaWVyLCBkb21haW4sIGZvbGRlck5hbWUpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA4 ODFjYTNkZjNhMGFhNjVkMDc0MmExNWI0OGY3MGI0MjE5ZmUxZjQ5Li43MTZiZmZkMzBhZmY5ZGQ1 NTdmMDgzODEzM2VkNGI2ODNlNjkzZjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMjU5LDggKzI1OSw4IEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdmFyIHVp U291cmNlQ29kZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gKi8gZXZl bnQuZGF0YTsKIAotICAgICAgICBpZiAoIXVpU291cmNlQ29kZS51cmwpIHsKLSAgICAgICAgICAg IC8vIEFub255bW91cyBzb3VyY2VzIGFyZSBzaG93biBvbmx5IHdoZW4gc3RlcHBpbmcuCisgICAg ICAgIGlmICghdWlTb3VyY2VDb2RlLnVybCB8fCB1aVNvdXJjZUNvZGUuaXNTbmlwcGV0RXZhbHVh dGlvbikgeworICAgICAgICAgICAgLy8gQW5vbnltb3VzIHNvdXJjZXMgYW5kIHNuaXBwZXRzIGV2 YWx1YXRpb25zIGFyZSBzaG93biBvbmx5IHdoZW4gc3RlcHBpbmcuCiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KIApAQCAtNjE0LDcgKzYxNCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlID0gewogCiAgICAgX3JldmVhbEV4ZWN1dGlvbkxpbmU6IGZ1bmN0aW9u KHVpTG9jYXRpb24pCiAgICAgewotICAgICAgICAvLyBBbm9ueW1vdXMgc2NyaXB0cyBhcmUgbm90 IGFkZGVkIHRvIGZpbGVzIHNlbGVjdCBieSBkZWZhdWx0LgorICAgICAgICAvLyBTb21lIHNjcmlw dHMgKGFub255bW91cyBhbmQgc25pcHBldHMgZXZhbHVhdGlvbnMpIGFyZSBub3QgYWRkZWQgdG8g ZmlsZXMgc2VsZWN0IGJ5IGRlZmF1bHQuCiAgICAgICAgIHRoaXMuX2FkZFVJU291cmNlQ29kZSh1 aUxvY2F0aW9uLnVpU291cmNlQ29kZSk7CiAgICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IHRoaXMu X3Nob3dGaWxlKHVpTG9jYXRpb24udWlTb3VyY2VDb2RlKTsKICAgICAgICAgc291cmNlRnJhbWUu cmV2ZWFsTGluZSh1aUxvY2F0aW9uLmxpbmVOdW1iZXIpOwo=