67620 2011-09-05 16:53:07 -0700 Use a hierarchial structure for the garden-o-matic results view 2011-09-06 11:01:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 64188 1 abarth abarth oldest_to_newest 462280 0 abarth 2011-09-05 16:53:07 -0700 Use a hierarchial structure for the garden-o-matic results view 462281 1 106365 abarth 2011-09-05 16:55:47 -0700 Created attachment 106365 Patch 462661 2 106365 abarth 2011-09-06 11:01:46 -0700 Comment on attachment 106365 Patch Clearing flags on attachment: 106365 Committed r94580: <http://trac.webkit.org/changeset/94580> 462662 3 abarth 2011-09-06 11:01:50 -0700 All reviewed patches have been landed. Closing bug. 106365 2011-09-05 16:55:47 -0700 2011-09-06 11:01:46 -0700 Patch bug-67620-20110905165546.patch text/plain 19811 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ1MzcKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9z Y3JpcHRzL2NvbnRyb2xsZXJzLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY29udHJvbGxl cnMuanMKaW5kZXggODNlMzAwZDNhZDBjYjVlNjQ0NTU1ZTMzNzYwY2ExMTVjMjhjMGNlZi4uNTBj ZjlkNjRlNDFmMDllZDZjOWRkMDQ5ZGFkM2Y2Y2E4MjM1NTdmZSAxMDA2NDQKLS0tIGEvVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVz dEZhaWx1cmVzL3NjcmlwdHMvY29udHJvbGxlcnMuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3Nj cmlwdHMvY29udHJvbGxlcnMuanMKQEAgLTMyLDM4ICszMiw4IEBAIGNvbnRyb2xsZXJzLlJlc3Vs dHNEZXRhaWxzID0gYmFzZS5leHRlbmRzKE9iamVjdCwgewogICAgIHsKICAgICAgICAgdGhpcy5f dmlldyA9IHZpZXc7CiAgICAgICAgIHRoaXMuX3Jlc3VsdHNCeVRlc3QgPSByZXN1bHRzQnlUZXN0 OwotCi0gICAgICAgIHRoaXMuX3ZpZXcuc2V0VGVzdExpc3QoT2JqZWN0LmtleXModGhpcy5fcmVz dWx0c0J5VGVzdCkpOwogICAgICAgICB0aGlzLl92aWV3LnNldFJlc3VsdHNCeVRlc3QocmVzdWx0 c0J5VGVzdCk7Ci0KLSAgICAgICAgdGhpcy5fdmlldy5hZGRBY3Rpb24obmV3IHVpLmFjdGlvbnMu UmViYXNlbGluZSgpLm1ha2VEZWZhdWx0KCkpOwotICAgICAgICB0aGlzLl92aWV3LmFkZEFjdGlv bihuZXcgdWkuYWN0aW9ucy5QcmV2aW91cygpKTsKLSAgICAgICAgdGhpcy5fdmlldy5hZGRBY3Rp b24obmV3IHVpLmFjdGlvbnMuTmV4dCgpKTsKLQotICAgICAgICAkKHRoaXMuX3ZpZXcpLmJpbmQo J3Rlc3RzZWxlY3RlZCcsIHRoaXMub25UZXN0U2VsZWN0ZWQuYmluZCh0aGlzKSk7Ci0gICAgICAg ICQodGhpcy5fdmlldykuYmluZCgnYnVpbGRlcnNlbGVjdGVkJywgdGhpcy5vbkJ1aWxkZXJTZWxl Y3RlZC5iaW5kKHRoaXMpKTsKLSAgICAgICAgJCh0aGlzLl92aWV3KS5iaW5kKCdyZWJhc2VsaW5l JywgdGhpcy5vblJlYmFzZWxpbmUuYmluZCh0aGlzKSk7Ci0gICAgfSwKLSAgICBzaG93VGVzdDog ZnVuY3Rpb24odGVzdE5hbWUpCi0gICAgewotICAgICAgICB2YXIgYnVpbGRlck5hbWVMaXN0ID0g T2JqZWN0LmtleXModGhpcy5fcmVzdWx0c0J5VGVzdFt0ZXN0TmFtZV0pOwotICAgICAgICB0aGlz Ll92aWV3LnNldEJ1aWxkZXJMaXN0KGJ1aWxkZXJOYW1lTGlzdCkKLSAgICAgICAgdGhpcy5fdmll dy5zaG93UmVzdWx0cyhyZXN1bHRzLmZhaWx1cmVJbmZvRm9yVGVzdEFuZEJ1aWxkZXIodGhpcy5f cmVzdWx0c0J5VGVzdCwgdGVzdE5hbWUsIGJ1aWxkZXJOYW1lTGlzdFswXSkpOwotICAgIH0sCi0g ICAgb25UZXN0U2VsZWN0ZWQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc2hvd1Rl c3QodGhpcy5fdmlldy5jdXJyZW50VGVzdE5hbWUoKSk7Ci0gICAgfSwKLSAgICBvbkJ1aWxkZXJT ZWxlY3RlZDogZnVuY3Rpb24oKSB7Ci0gICAgICAgIHRoaXMuX3ZpZXcuc2hvd1Jlc3VsdHMocmVz dWx0cy5mYWlsdXJlSW5mb0ZvclRlc3RBbmRCdWlsZGVyKHRoaXMuX3Jlc3VsdHNCeVRlc3QsIHRo aXMuX3ZpZXcuY3VycmVudFRlc3ROYW1lKCksIHRoaXMuX3ZpZXcuY3VycmVudEJ1aWxkZXJOYW1l KCkpKTsKLSAgICB9LAotICAgIG9uUmViYXNlbGluZTogZnVuY3Rpb24oKSB7Ci0gICAgICAgIHZh ciB0ZXN0TmFtZSA9IHRoaXMuX3ZpZXcuY3VycmVudFRlc3ROYW1lKCk7Ci0gICAgICAgIHZhciBi dWlsZGVyTmFtZSA9IHRoaXMuX3ZpZXcuY3VycmVudEJ1aWxkZXJOYW1lKCk7Ci0gICAgICAgIG1v ZGVsLnF1ZXVlRm9yUmViYXNlbGluZSh7Ci0gICAgICAgICAgICAndGVzdE5hbWUnOiB0ZXN0TmFt ZSwKLSAgICAgICAgICAgICdidWlsZGVyTmFtZSc6IGJ1aWxkZXJOYW1lCi0gICAgICAgIH0pOwor ICAgICAgICAvLyBGSVhNRTogV2lyZSB1cCBzb21lIGFjdGlvbnMuCiAgICAgfSwKIH0pOwogCkBA IC0xMTQsNyArODQsNiBAQCB2YXIgRmFpbHVyZVN0cmVhbUNvbnRyb2xsZXIgPSBiYXNlLmV4dGVu ZHMoT2JqZWN0LCB7CiAgICAgICAgICAgICB9KTsKIAogICAgICAgICB2YXIgY29udHJvbGxlciA9 IG5ldyBjb250cm9sbGVycy5SZXN1bHRzRGV0YWlscyhyZXN1bHRzVmlldywgZmFpbHVyZXNCeVRl c3QpOwotICAgICAgICBjb250cm9sbGVyLnNob3dUZXN0KHRlc3ROYW1lTGlzdFswXSk7CiAKICAg ICAgICAgLy8gRklYTUU6IFRoaXMgZG9lc24ndCBiZWxvbmcgaGVyZS4KICAgICAgICAgdmFyIG9u ZWJhciA9ICQoJyNvbmViYXInKVswXTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3Jp cHRzL3Jlc3VsdHMuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0cy9yZXN1bHRzLmpzCmluZGV4 IGZlOWI1MzcyODk5YmQ0MTJlM2Y3ZWI1Y2Y5OWUzYjk2YjU3YWM3ZWEuLjZjYmE5YTA0MTQyODg5 M2ZkY2UyYzY3NGM0ZGIxMmNmYTM5Y2RmNWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9z Y3JpcHRzL3Jlc3VsdHMuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvcmVzdWx0cy5q cwpAQCAtNDYyLDE0ICs0NjIsMTQgQEAgcmVzdWx0cy5yZXN1bHROb2RlRm9yVGVzdCA9IGZ1bmN0 aW9uKHJlc3VsdHNUcmVlLCB0ZXN0TmFtZSkKICAgICByZXR1cm4gY3VycmVudE5vZGU7CiB9Owog Ci1mdW5jdGlvbiByZXN1bHRzRGlyZWN0b3J5Rm9yQnVpbGRlcihidWlsZGVyTmFtZSkKK3Jlc3Vs dHMuZGlyZWN0b3J5Rm9yQnVpbGRlciA9IGZ1bmN0aW9uKGJ1aWxkZXJOYW1lKQogewogICAgIHJl dHVybiBidWlsZGVyTmFtZS5yZXBsYWNlKC9bIC4oKV0vZywgJ18nKTsKIH0KIAogZnVuY3Rpb24g cmVzdWx0c0RpcmVjdG9yeVVSTChidWlsZGVyTmFtZSkKIHsKLSAgICByZXR1cm4ga0xheW91dFRl c3RSZXN1bHRzU2VydmVyICsgcmVzdWx0c0RpcmVjdG9yeUZvckJ1aWxkZXIoYnVpbGRlck5hbWUp ICsga0xheW91dFRlc3RSZXN1bHRzUGF0aDsKKyAgICByZXR1cm4ga0xheW91dFRlc3RSZXN1bHRz U2VydmVyICsgcmVzdWx0cy5kaXJlY3RvcnlGb3JCdWlsZGVyKGJ1aWxkZXJOYW1lKSArIGtMYXlv dXRUZXN0UmVzdWx0c1BhdGg7CiB9CiAKIHJlc3VsdHMucmVzdWx0S2luZCA9IGZ1bmN0aW9uKHVy bCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpL3Jlc3VsdHMuanMgYi9U b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRt bC9UZXN0RmFpbHVyZXMvc2NyaXB0cy91aS9yZXN1bHRzLmpzCmluZGV4IDIzNjg2Y2M0ZTRlNzYy MGE0MWJlYmI4M2QwNDg5ZjZkODU3YWM3MmQuLjMwN2Q5ZjJlN2MzM2ZkYTRjMGQzZmJkZGQzYzNm MzJjMzliYzRhOTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpL3Jlc3Vs dHMuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvdWkvcmVzdWx0cy5qcwpAQCAtMjgs NiArMjgsOCBAQCB1aS5yZXN1bHRzID0gdWkucmVzdWx0cyB8fCB7fTsKIAogKGZ1bmN0aW9uKCl7 CiAKK3ZhciBrUmVzdWx0c1ByZWZldGNoRGVsYXlNUyA9IDUwMDsKKwogLy8gRklYTUU6IFJhdGhl ciB0aGFuIHVzaW5nIHRhYmxlLCBzaG91bGQgd2UgYmUgdXNpbmcgc29tZXRoaW5nIGZhbmNpZXI/ CiB1aS5yZXN1bHRzLkNvbXBhcmlzb24gPSBiYXNlLmV4dGVuZHMoJ3RhYmxlJywgewogICAgIGlu aXQ6IGZ1bmN0aW9uKCkKQEAgLTEzNywxMyArMTM5LDE4IEBAIHVpLnJlc3VsdHMuUmVzdWx0c0dy aWQgPSBiYXNlLmV4dGVuZHMoJ2RpdicsIHsKIH0pOwogCiB1aS5yZXN1bHRzLlJlc3VsdHNEZXRh aWxzID0gYmFzZS5leHRlbmRzKCdkaXYnLCB7Ci0gICAgaW5pdDogZnVuY3Rpb24oZGVsZWdhdGUp CisgICAgaW5pdDogZnVuY3Rpb24oZGVsZWdhdGUsIGZhaWx1cmVJbmZvKQogICAgIHsKICAgICAg ICAgdGhpcy5jbGFzc05hbWUgPSAncmVzdWx0cy1kZXRhaWwnOwogICAgICAgICB0aGlzLl9kZWxl Z2F0ZSA9IGRlbGVnYXRlOworICAgICAgICB0aGlzLl9mYWlsdXJlSW5mbyA9IGZhaWx1cmVJbmZv OworICAgICAgICB0aGlzLl9oYXZlU2hvd25PbmNlID0gZmFsc2U7CiAgICAgfSwKLSAgICBzaG93 OiBmdW5jdGlvbihmYWlsdXJlSW5mbykgewotICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5mZXRjaFJl c3VsdHNVUkxzKGZhaWx1cmVJbmZvLCBmdW5jdGlvbihyZXN1bHRzVVJMcykgeworICAgIHNob3c6 IGZ1bmN0aW9uKCkgeworICAgICAgICBpZiAodGhpcy5faGF2ZVNob3duT25jZSkKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5faGF2ZVNob3duT25jZSA9IHRydWU7CisgICAgICAg IHRoaXMuX2RlbGVnYXRlLmZldGNoUmVzdWx0c1VSTHModGhpcy5fZmFpbHVyZUluZm8sIGZ1bmN0 aW9uKHJlc3VsdHNVUkxzKSB7CiAgICAgICAgICAgICB2YXIgcmVzdWx0c0dyaWQgPSBuZXcgdWku cmVzdWx0cy5SZXN1bHRzR3JpZCgpOwogICAgICAgICAgICAgcmVzdWx0c0dyaWQuYWRkUmVzdWx0 cyhyZXN1bHRzVVJMcyk7CiAgICAgICAgICAgICAkKHRoaXMpLmVtcHR5KCkuYXBwZW5kKHJlc3Vs dHNHcmlkKTsKQEAgLTE1MSwxNjEgKzE1OCw5NCBAQCB1aS5yZXN1bHRzLlJlc3VsdHNEZXRhaWxz ID0gYmFzZS5leHRlbmRzKCdkaXYnLCB7CiAgICAgfSwKIH0pOwogCi12YXIgU2VsZWN0b3IgPSBi YXNlLmV4dGVuZHMoJ3NlbGVjdCcsIHsKLSAgICBpbml0OiBmdW5jdGlvbigpCi0gICAgewotICAg ICAgICB0aGlzLl9ldmVudE5hbWUgPSBudWxsOwotICAgICAgICAkKHRoaXMpLmNoYW5nZShmdW5j dGlvbigpIHsKLSAgICAgICAgICAgIGlmICh0aGlzLl9ldmVudE5hbWUpCi0gICAgICAgICAgICAg ICAgJCh0aGlzKS50cmlnZ2VyKHRoaXMuX2V2ZW50TmFtZSk7Ci0gICAgICAgIH0uYmluZCh0aGlz KSk7Ci0gICAgfSwKLSAgICBzZXRJdGVtTGlzdDogZnVuY3Rpb24oaXRlbUxpc3QpCi0gICAgewot ICAgICAgICAkKHRoaXMpLmVtcHR5KCk7Ci0gICAgICAgIGl0ZW1MaXN0LmZvckVhY2goZnVuY3Rp b24oaXRlbSkgewotICAgICAgICAgICAgdmFyIGVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCdvcHRpb24nKTsKLSAgICAgICAgICAgIGVsZW1lbnQudGV4dENvbnRlbnQgPSBpdGVtLmRp c3BsYXlOYW1lOwotICAgICAgICAgICAgZWxlbWVudC52YWx1ZSA9IGl0ZW0ubmFtZTsKLSAgICAg ICAgICAgIHRoaXMuYXBwZW5kQ2hpbGQoZWxlbWVudCk7Ci0gICAgICAgIH0uYmluZCh0aGlzKSk7 Ci0gICAgICAgICQodGhpcykuc2hvdygpOwotICAgIH0sCi0gICAgc2VsZWN0OiBmdW5jdGlvbihp dGVtTmFtZSkgewotICAgICAgICB2YXIgaW5kZXggPSAtMTsKLSAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCB0aGlzLm9wdGlvbnMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIGlmICh0aGlz Lm9wdGlvbnNbaV0udmFsdWUgPT0gaXRlbU5hbWUpIHsKLSAgICAgICAgICAgICAgICBpbmRleCA9 IGk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAg ICAgICAgaWYgKGluZGV4ID09IC0xKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB0aGlz LnNlbGVjdGVkSW5kZXggPSBpbmRleDsKLSAgICB9LAotICAgIHNlbGVjdGVkSXRlbTogZnVuY3Rp b24oKSB7Ci0gICAgICAgIGlmICh0aGlzLnNlbGVjdGVkSW5kZXggPT0gLTEpCi0gICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgIHJldHVybiB0aGlzLm9wdGlvbnNbdGhpcy5zZWxlY3RlZEluZGV4 XS52YWx1ZTsKLSAgICB9Ci19KTsKLQotdWkucmVzdWx0cy5UZXN0U2VsZWN0b3IgPSBiYXNlLmV4 dGVuZHMoU2VsZWN0b3IsIHsKLSAgICBpbml0OiBmdW5jdGlvbigpCit1aS5yZXN1bHRzLlRlc3RT ZWxlY3RvciA9IGJhc2UuZXh0ZW5kcygnZGl2JywgeworICAgIGluaXQ6IGZ1bmN0aW9uKGRlbGVn YXRlLCByZXN1bHRzQnlUZXN0KQogICAgIHsKICAgICAgICAgdGhpcy5jbGFzc05hbWUgPSAndGVz dC1zZWxlY3Rvcic7Ci0gICAgICAgIHRoaXMuX2V2ZW50TmFtZSA9ICd0ZXN0c2VsZWN0ZWQnOwot ICAgIH0sCi0gICAgc2V0VGVzdExpc3Q6IGZ1bmN0aW9uKHRlc3ROYW1lTGlzdCkKLSAgICB7Ci0g ICAgICAgIHRoaXMuc2V0SXRlbUxpc3QodGVzdE5hbWVMaXN0Lm1hcChmdW5jdGlvbih0ZXN0TmFt ZSkgewotICAgICAgICAgICAgcmV0dXJuIHsKLSAgICAgICAgICAgICAgICAnZGlzcGxheU5hbWUn OiB0ZXN0TmFtZSwKLSAgICAgICAgICAgICAgICAnbmFtZSc6IHRlc3ROYW1lCi0gICAgICAgICAg ICB9OwotICAgICAgICB9KSk7CisgICAgICAgIHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGU7CisK KyAgICAgICAgT2JqZWN0LmtleXMocmVzdWx0c0J5VGVzdCkuZm9yRWFjaChmdW5jdGlvbiAodGVz dE5hbWUpIHsKKyAgICAgICAgICAgIHZhciBsaW5rID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgn YScpOworICAgICAgICAgICAgJChsaW5rKS5hdHRyKCdocmVmJywgJyMnKS50ZXh0KHRlc3ROYW1l KTsKKyAgICAgICAgICAgIHRoaXMuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgn aDMnKSkuYXBwZW5kQ2hpbGQobGluayk7CisgICAgICAgICAgICB0aGlzLmFwcGVuZENoaWxkKHRo aXMuX2RlbGVnYXRlLmNvbnRlbnRGb3JUZXN0KHRlc3ROYW1lKSk7CisgICAgICAgIH0sIHRoaXMp OworCisgICAgICAgICQodGhpcykuYWNjb3JkaW9uKHsKKyAgICAgICAgICAgIGNvbGxhcHNpYmxl OiB0cnVlLAorICAgICAgICAgICAgYXV0b0hlaWdodDogZmFsc2UsCisgICAgICAgIH0pOworICAg ICAgICAkKHRoaXMpLmFjY29yZGlvbigiYWN0aXZhdGUiLCBmYWxzZSk7CiAgICAgfQogfSk7CiAK LXVpLnJlc3VsdHMuQnVpbGRlclNlbGVjdG9yID0gYmFzZS5leHRlbmRzKFNlbGVjdG9yLCB7Ci0g ICAgaW5pdDogZnVuY3Rpb24oKQordWkucmVzdWx0cy5CdWlsZGVyU2VsZWN0b3IgPSBiYXNlLmV4 dGVuZHMoJ2RpdicsIHsKKyAgICBpbml0OiBmdW5jdGlvbihkZWxlZ2F0ZSwgdGVzdE5hbWUsIHJl c3VsdHNCeUJ1aWxkZXIpCiAgICAgewogICAgICAgICB0aGlzLmNsYXNzTmFtZSA9ICdidWlsZGVy LXNlbGVjdG9yJzsKLSAgICAgICAgdGhpcy5fZXZlbnROYW1lID0gJ2J1aWxkZXJzZWxlY3RlZCc7 Ci0gICAgfSwKLSAgICBzZXRCdWlsZGVyTGlzdDogZnVuY3Rpb24oYnVpbGRlck5hbWVMaXN0KSB7 Ci0gICAgICAgIHRoaXMuc2V0SXRlbUxpc3QoYnVpbGRlck5hbWVMaXN0Lm1hcChmdW5jdGlvbihi dWlsZGVyTmFtZSkgewotICAgICAgICAgICAgcmV0dXJuIHsKLSAgICAgICAgICAgICAgICAnZGlz cGxheU5hbWUnOiB1aS5kaXNwbGF5TmFtZUZvckJ1aWxkZXIoYnVpbGRlck5hbWUpLAotICAgICAg ICAgICAgICAgICduYW1lJzogYnVpbGRlck5hbWUKLSAgICAgICAgICAgIH07Ci0gICAgICAgIH0p KTsKLSAgICB9Ci19KTsKKyAgICAgICAgdGhpcy5fZGVsZWdhdGUgPSBkZWxlZ2F0ZTsKIAotdWku cmVzdWx0cy5SZXN1bHRzU2VsZWN0b3IgPSBiYXNlLmV4dGVuZHMoJ3RhYmxlJywgewotICAgIGlu aXQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuY2xhc3NOYW1lID0gJ3Jlc3VsdHMt c2VsZWN0b3InOwotICAgIH0sCi0gICAgc2V0UmVzdWx0c0J5VGVzdDogZnVuY3Rpb24ocmVzdWx0 c0J5VGVzdCkKLSAgICB7Ci0gICAgICAgIHZhciBidWlsZGVyc0J5VGVzdCA9IGJhc2UubWFwRGlj dGlvbmFyeShyZXN1bHRzQnlUZXN0LCBPYmplY3Qua2V5cyk7CisgICAgICAgIHZhciB0YWJTdHJp cCA9IHRoaXMuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgndWwnKSk7CiAKLSAg ICAgICAgdmFyIHRlc3ROYW1lTGlzdCA9IE9iamVjdC5rZXlzKGJ1aWxkZXJzQnlUZXN0KTsKLSAg ICAgICAgdmFyIGJ1aWxkZXJOYW1lTGlzdCA9IGJhc2UudW5pcXVpZnlBcnJheShiYXNlLmZsYXR0 ZW5BcnJheShiYXNlLnZhbHVlcyhidWlsZGVyc0J5VGVzdCkpKTsKLSAgICAgICAgYnVpbGRlck5h bWVMaXN0LnNvcnQoKTsKKyAgICAgICAgT2JqZWN0LmtleXMocmVzdWx0c0J5QnVpbGRlcikuZm9y RWFjaChmdW5jdGlvbihidWlsZGVyTmFtZSkgeworICAgICAgICAgICAgdmFyIGJ1aWxkZXJEaXJl Y3RvcnkgPSByZXN1bHRzLmRpcmVjdG9yeUZvckJ1aWxkZXIoYnVpbGRlck5hbWUpOwogCi0gICAg ICAgIHZhciB0aXRsZXMgPSB0aGlzLmNyZWF0ZVRIZWFkKCkuaW5zZXJ0Um93KCk7Ci0gICAgICAg IC8vIE5vdGUgdGhlIHJldmVyc2UgaXRlcmF0aW9uIGJlY2F1c2UgaW5zZXJ0Q2VsbCgpIGluc2Vy dHMgYXQgdGhlIGJlZ2lubmluZyBvZiB0aGUgcm93LgotICAgICAgICBmb3IgKHZhciBpID0gYnVp bGRlck5hbWVMaXN0Lmxlbmd0aCAtIDE7IGkgPj0gMDsgLS1pKSB7Ci0gICAgICAgICAgICB0aXRs ZXMuaW5zZXJ0Q2VsbCgpLnRleHRDb250ZW50ID0gYnVpbGRlck5hbWVMaXN0W2ldOwotICAgICAg ICB9Ci0gICAgICAgIHRpdGxlcy5pbnNlcnRDZWxsKCk7IC8vIEZvciB0aGUgdGVzdCBuYW1lcy4K KyAgICAgICAgICAgIHZhciBsaW5rID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnYScpOworICAg ICAgICAgICAgJChsaW5rKS5hdHRyKCdocmVmJywgIiMiICsgYnVpbGRlckRpcmVjdG9yeSkudGV4 dCh1aS5kaXNwbGF5TmFtZUZvckJ1aWxkZXIoYnVpbGRlck5hbWUpKTsKKyAgICAgICAgICAgIHRh YlN0cmlwLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2xpJykpLmFwcGVuZENo aWxkKGxpbmspOwogCi0gICAgICAgIHRoaXMuX2JvZHkgPSB0aGlzLmFwcGVuZENoaWxkKGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoJ3Rib2R5JykpOworICAgICAgICAgICAgdmFyIGNvbnRlbnQgPSB0 aGlzLl9kZWxlZ2F0ZS5jb250ZW50Rm9yVGVzdEFuZEJ1aWxkZXIodGVzdE5hbWUsIGJ1aWxkZXJO YW1lKTsKKyAgICAgICAgICAgIGNvbnRlbnQuaWQgPSBidWlsZGVyRGlyZWN0b3J5OworICAgICAg ICAgICAgdGhpcy5hcHBlbmRDaGlsZChjb250ZW50KTsKKyAgICAgICAgfSwgdGhpcyk7CiAKLSAg ICAgICAgdGVzdE5hbWVMaXN0LmZvckVhY2goZnVuY3Rpb24odGVzdE5hbWUpIHsKLSAgICAgICAg ICAgIHZhciByb3cgPSB0aGlzLl9ib2R5Lmluc2VydFJvdygpOwotICAgICAgICAgICAgZm9yICh2 YXIgaSA9IGJ1aWxkZXJOYW1lTGlzdC5sZW5ndGggLSAxOyBpID49IDA7IC0taSkgewotICAgICAg ICAgICAgICAgIHZhciBjZWxsID0gcm93Lmluc2VydENlbGwoKTsKLSAgICAgICAgICAgICAgICB2 YXIgYnVpbGRlck5hbWUgPSBidWlsZGVyTmFtZUxpc3RbaV07Ci0gICAgICAgICAgICAgICAgaWYg KGJ1aWxkZXJzQnlUZXN0W3Rlc3ROYW1lXS5pbmRleE9mKGJ1aWxkZXJOYW1lKSAhPSAtMSkgewot ICAgICAgICAgICAgICAgICAgICBjZWxsLmNsYXNzTmFtZSA9ICdyZXN1bHQnOwotICAgICAgICAg ICAgICAgICAgICBjZWxsLnRleHRDb250ZW50ID0gcmVzdWx0c0J5VGVzdFt0ZXN0TmFtZV1bYnVp bGRlck5hbWVdLmFjdHVhbDsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAg ICAgICAgICB2YXIgY2VsbCA9IHJvdy5pbnNlcnRDZWxsKCkKLSAgICAgICAgICAgIGNlbGwuY2xh c3NOYW1lID0gJ3Rlc3QtbmFtZSc7Ci0gICAgICAgICAgICBjZWxsLnRleHRDb250ZW50ID0gdGVz dE5hbWU7Ci0gICAgICAgIH0uYmluZCh0aGlzKSk7Ci0gICAgfSwKKyAgICAgICAgJCh0aGlzKS50 YWJzKCk7CisgICAgfQogfSk7CiAKIHVpLnJlc3VsdHMuVmlldyA9IGJhc2UuZXh0ZW5kcygnZGl2 JywgewogICAgIGluaXQ6IGZ1bmN0aW9uKGRlbGVnYXRlKQogICAgIHsKICAgICAgICAgdGhpcy5j bGFzc05hbWUgPSAncmVzdWx0cy12aWV3JzsKLSAgICAgICAgdGhpcy5pbm5lckhUTUwgPSAnPGRp diBjbGFzcz0idG9vbGJhciI+PC9kaXY+PGRpdiBjbGFzcz0iY29udGVudCI+PC9kaXY+JzsKLQot ICAgICAgICB0aGlzLl90ZXN0U2VsZWN0b3IgPSBuZXcgdWkucmVzdWx0cy5UZXN0U2VsZWN0b3Io KTsKLSAgICAgICAgdGhpcy5fYnVpbGRlclNlbGVjdG9yID0gbmV3IHVpLnJlc3VsdHMuQnVpbGRl clNlbGVjdG9yKCk7Ci0gICAgICAgIHRoaXMuX3Jlc3VsdHNTZWxlY3RvciA9IG5ldyB1aS5yZXN1 bHRzLlJlc3VsdHNTZWxlY3RvcigpOwotICAgICAgICB0aGlzLl9yZXN1bHRzRGV0YWlscyA9IG5l dyB1aS5yZXN1bHRzLlJlc3VsdHNEZXRhaWxzKGRlbGVnYXRlKTsKLSAgICAgICAgdGhpcy5fYWN0 aW9uTGlzdCA9IG5ldyB1aS5hY3Rpb25zLkxpc3QoKTsKLQotICAgICAgICAkKCcudG9vbGJhcics IHRoaXMpLmFwcGVuZCh0aGlzLl90ZXN0U2VsZWN0b3IpLmFwcGVuZCh0aGlzLl9idWlsZGVyU2Vs ZWN0b3IpLmFwcGVuZCh0aGlzLl9yZXN1bHRzU2VsZWN0b3IpLmFwcGVuZCh0aGlzLl9hY3Rpb25M aXN0KTsKLSAgICAgICAgJCgnLmNvbnRlbnQnLCB0aGlzKS5hcHBlbmQodGhpcy5fcmVzdWx0c0Rl dGFpbHMpOwotICAgIH0sCi0gICAgYWRkQWN0aW9uOiBmdW5jdGlvbihhY3Rpb24pCi0gICAgewot ICAgICAgICB0aGlzLl9hY3Rpb25MaXN0LmFkZChhY3Rpb24pOworICAgICAgICB0aGlzLl9kZWxl Z2F0ZSA9IGRlbGVnYXRlOwogICAgIH0sCi0gICAgc2V0VGVzdExpc3Q6IGZ1bmN0aW9uKHRlc3RO YW1lTGlzdCkKKyAgICBjb250ZW50Rm9yVGVzdDogZnVuY3Rpb24odGVzdE5hbWUpCiAgICAgewot ICAgICAgICB0aGlzLl90ZXN0U2VsZWN0b3Iuc2V0VGVzdExpc3QodGVzdE5hbWVMaXN0KTsKKyAg ICAgICAgdmFyIGJ1aWxkZXJTZWxlY3RvciA9IG5ldyB1aS5yZXN1bHRzLkJ1aWxkZXJTZWxlY3Rv cih0aGlzLCB0ZXN0TmFtZSwgdGhpcy5fcmVzdWx0c0J5VGVzdFt0ZXN0TmFtZV0pOworICAgICAg ICAkKGJ1aWxkZXJTZWxlY3RvcikuYmluZCgndGFic3NlbGVjdCcsIGZ1bmN0aW9uKGV2ZW50LCB1 aSkgeworICAgICAgICAgICAgLy8gV2Ugd2lsbCBwcm9iYWJseSBoYXZlIHByZS1mZXRjaGVkIHRo ZSB0YWIgYWxyZWFkeSwgYnV0IHdlIG5lZWQgdG8gbWFrZSBzdXJlLgorICAgICAgICAgICAgdWku cGFuZWwuc2hvdygpOworICAgICAgICB9KTsKKyAgICAgICAgcmV0dXJuIGJ1aWxkZXJTZWxlY3Rv cjsKICAgICB9LAotICAgIHNldEJ1aWxkZXJMaXN0OiBmdW5jdGlvbihidWlsZE5hbWVMaXN0KQor ICAgIGNvbnRlbnRGb3JUZXN0QW5kQnVpbGRlcjogZnVuY3Rpb24odGVzdE5hbWUsIGJ1aWxkZXJO YW1lKQogICAgIHsKLSAgICAgICAgdGhpcy5fYnVpbGRlclNlbGVjdG9yLnNldEJ1aWxkZXJMaXN0 KGJ1aWxkTmFtZUxpc3QpOworICAgICAgICB2YXIgZmFpbHVyZUluZm8gPSByZXN1bHRzLmZhaWx1 cmVJbmZvRm9yVGVzdEFuZEJ1aWxkZXIodGhpcy5fcmVzdWx0c0J5VGVzdCwgdGVzdE5hbWUsIGJ1 aWxkZXJOYW1lKTsKKyAgICAgICAgcmV0dXJuIG5ldyB1aS5yZXN1bHRzLlJlc3VsdHNEZXRhaWxz KHRoaXMsIGZhaWx1cmVJbmZvKTsKICAgICB9LAogICAgIHNldFJlc3VsdHNCeVRlc3Q6IGZ1bmN0 aW9uKHJlc3VsdHNCeVRlc3QpCiAgICAgewotICAgICAgICB0aGlzLl9yZXN1bHRzU2VsZWN0b3Iu c2V0UmVzdWx0c0J5VGVzdChyZXN1bHRzQnlUZXN0KTsKLSAgICB9LAotICAgIGN1cnJlbnRUZXN0 TmFtZTogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3Rlc3RTZWxlY3Rv ci5zZWxlY3RlZEl0ZW0oKTsKLSAgICB9LAotICAgIGN1cnJlbnRCdWlsZGVyTmFtZTogZnVuY3Rp b24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2J1aWxkZXJTZWxlY3Rvci5zZWxlY3Rl ZEl0ZW0oKTsKKyAgICAgICAgJCh0aGlzKS5lbXB0eSgpOworICAgICAgICB0aGlzLl9yZXN1bHRz QnlUZXN0ID0gcmVzdWx0c0J5VGVzdDsKKworICAgICAgICB2YXIgdGVzdFNlbGVjdG9yID0gbmV3 IHVpLnJlc3VsdHMuVGVzdFNlbGVjdG9yKHRoaXMsIHJlc3VsdHNCeVRlc3QpOworICAgICAgICAk KHRlc3RTZWxlY3RvcikuYmluZCgiYWNjb3JkaW9uY2hhbmdlc3RhcnQiLCBmdW5jdGlvbihldmVu dCwgdWkpIHsKKyAgICAgICAgICAgIC8vIFByZWZldGNoIHRoZSBmaXJzdCByZXN1bHRzIGZyb20g dGhlIG5ldHdvcmsuCisgICAgICAgICAgICB2YXIgcmVzdWx0c0RldGFpbHMgPSAkKCcucmVzdWx0 cy1kZXRhaWwnLCB1aS5uZXdDb250ZW50KTsKKyAgICAgICAgICAgIGlmIChyZXN1bHRzRGV0YWls cy5sZW5ndGgpCisgICAgICAgICAgICAgICAgcmVzdWx0c0RldGFpbHNbMF0uc2hvdygpOworICAg ICAgICAgICAgLy8gUHJlZmV0Y2ggdGhlIHJlc3Qga1Jlc3VsdHNQcmVmZXRjaERlbGF5TVMgbGF0 ZXIuCisgICAgICAgICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAg IHJlc3VsdHNEZXRhaWxzLmVhY2goZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAgIHRo aXMuc2hvdygpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSwga1Jlc3VsdHNQ cmVmZXRjaERlbGF5TVMpOworICAgICAgICB9KTsKKyAgICAgICAgdGhpcy5hcHBlbmRDaGlsZCh0 ZXN0U2VsZWN0b3IpOwogICAgIH0sCi0gICAgc2hvd1Jlc3VsdHM6IGZ1bmN0aW9uKGZhaWx1cmVJ bmZvKQorICAgIGZldGNoUmVzdWx0c1VSTHM6IGZ1bmN0aW9uKGZhaWx1cmVJbmZvLCBjYWxsYmFj aykKICAgICB7Ci0gICAgICAgIHRoaXMuX3Rlc3RTZWxlY3Rvci5zZWxlY3QoZmFpbHVyZUluZm8u dGVzdE5hbWUpOwotICAgICAgICB0aGlzLl9idWlsZGVyU2VsZWN0b3Iuc2VsZWN0KGZhaWx1cmVJ bmZvLmJ1aWxkZXJOYW1lKTsKLSAgICAgICAgdGhpcy5fcmVzdWx0c0RldGFpbHMuc2hvdyhmYWls dXJlSW5mbyk7CisgICAgICAgIHRoaXMuX2RlbGVnYXRlLmZldGNoUmVzdWx0c1VSTHMoZmFpbHVy ZUluZm8sIGNhbGxiYWNrKQogICAgIH0KIH0pOwogCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVy ZXMvc2NyaXB0cy91aS9yZXN1bHRzX3VuaXR0ZXN0cy5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3Jp cHRzL3VpL3Jlc3VsdHNfdW5pdHRlc3RzLmpzCmluZGV4IGU5M2FmNjdkNmZjZWM2OGJjNmM4NWU4 YjdkZTYyMTI2ZmU5MTJiMzEuLjg1Y2U5MDE1MTYwMWFhZmNiZmM3YmEwM2IxZjI3M2FmN2U2Mzc3 NjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpL3Jlc3VsdHNfdW5pdHRl c3RzLmpzCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpL3Jlc3VsdHNfdW5pdHRlc3Rz LmpzCkBAIC00Niw1MCArNDYsNiBAQCB2YXIga0V4YW1wbGVSZXN1bHRzQnlUZXN0ID0gewogICAg IH0KIH0KIAotdGVzdCgiVmlldyIsIDYsIGZ1bmN0aW9uKCkgewotICAgIHZhciByZXN1bHRzVmll dyA9IG5ldyB1aS5yZXN1bHRzLlZpZXcoewotICAgICAgICBmZXRjaFJlc3VsdHNVUkxzOiAkLm5v b3AKLSAgICB9KTsKLSAgICB2YXIgY29udHJvbGxlciA9IG5ldyBjb250cm9sbGVycy5SZXN1bHRz RGV0YWlscyhyZXN1bHRzVmlldywga0V4YW1wbGVSZXN1bHRzQnlUZXN0KTsKLSAgICBjb250cm9s bGVyLnNob3dUZXN0KCJzY3JvbGxiYXJzL2N1c3RvbS1zY3JvbGxiYXItd2l0aC1pbmNvbXBsZXRl LXN0eWxlLmh0bWwiKTsKLSAgICBlcXVhbChyZXN1bHRzVmlldy5jdXJyZW50VGVzdE5hbWUoKSwg InNjcm9sbGJhcnMvY3VzdG9tLXNjcm9sbGJhci13aXRoLWluY29tcGxldGUtc3R5bGUuaHRtbCIp OwotICAgIGVxdWFsKHJlc3VsdHNWaWV3LmN1cnJlbnRCdWlsZGVyTmFtZSgpLCAiTW9jayBCdWls ZGVyIik7Ci0gICAgcmVzdWx0c1ZpZXcuc2hvd1Jlc3VsdHMoewotICAgICAgICAidGVzdE5hbWUi OiAidXNlcnNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwiLAotICAgICAgICAiYnVpbGRlck5hbWUi OiAiTW9jayBCdWlsZGVyIiwKLSAgICB9KTsKLSAgICBlcXVhbChyZXN1bHRzVmlldy5jdXJyZW50 VGVzdE5hbWUoKSwgInVzZXJzY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sIik7Ci0gICAgZXF1YWwo cmVzdWx0c1ZpZXcuY3VycmVudEJ1aWxkZXJOYW1lKCksICJNb2NrIEJ1aWxkZXIiKTsKLSAgICBy ZXN1bHRzVmlldy5zaG93UmVzdWx0cyh7Ci0gICAgICAgICJ0ZXN0TmFtZSI6ICJzY3JvbGxiYXJz L2N1c3RvbS1zY3JvbGxiYXItd2l0aC1pbmNvbXBsZXRlLXN0eWxlLmh0bWwiLAotICAgICAgICAi YnVpbGRlck5hbWUiOiAiTW9jayBMaW51eCIsCi0gICAgfSk7Ci0gICAgZXF1YWwocmVzdWx0c1Zp ZXcuY3VycmVudFRlc3ROYW1lKCksICJzY3JvbGxiYXJzL2N1c3RvbS1zY3JvbGxiYXItd2l0aC1p bmNvbXBsZXRlLXN0eWxlLmh0bWwiKTsKLSAgICBlcXVhbChyZXN1bHRzVmlldy5jdXJyZW50QnVp bGRlck5hbWUoKSwgIk1vY2sgTGludXgiKTsKLX0pOwotCi10ZXN0KCJSZXN1bHRzU2VsZWN0b3Ii LCAxLCBmdW5jdGlvbigpIHsKLSAgICB2YXIgcmVzdWx0c1NlbGVjdG9yID0gbmV3IHVpLnJlc3Vs dHMuUmVzdWx0c1NlbGVjdG9yKCk7Ci0gICAgcmVzdWx0c1NlbGVjdG9yLnNldFJlc3VsdHNCeVRl c3Qoa0V4YW1wbGVSZXN1bHRzQnlUZXN0KTsKLSAgICBlcXVhbCgkKHJlc3VsdHNTZWxlY3Rvciku d3JhcCgnPGRpdj4nKS5wYXJlbnQoKS5odG1sKCksCi0gICAgICAgICc8dGFibGUgY2xhc3M9InJl c3VsdHMtc2VsZWN0b3IiPicgKwotICAgICAgICAgICAgJzx0aGVhZD4nICsKLSAgICAgICAgICAg ICAgICAnPHRyPjx0ZD48L3RkPjx0ZD5Nb2NrIEJ1aWxkZXI8L3RkPjx0ZD5Nb2NrIExpbnV4PC90 ZD48L3RyPicgKwotICAgICAgICAgICAgJzwvdGhlYWQ+JyArCi0gICAgICAgICAgICAnPHRib2R5 PicgKwotICAgICAgICAgICAgICAgICc8dHI+JyArCi0gICAgICAgICAgICAgICAgICAgICc8dGQg Y2xhc3M9InRlc3QtbmFtZSI+dXNlcnNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWw8L3RkPicgKwot ICAgICAgICAgICAgICAgICAgICAnPHRkIGNsYXNzPSJyZXN1bHQiPlRFWFQ8L3RkPicgKwotICAg ICAgICAgICAgICAgICAgICAnPHRkPjwvdGQ+JyArCi0gICAgICAgICAgICAgICAgJzwvdHI+JyAr Ci0gICAgICAgICAgICAgICAgJzx0cj4nICsKLSAgICAgICAgICAgICAgICAgICAgJzx0ZCBjbGFz cz0idGVzdC1uYW1lIj5zY3JvbGxiYXJzL2N1c3RvbS1zY3JvbGxiYXItd2l0aC1pbmNvbXBsZXRl LXN0eWxlLmh0bWw8L3RkPicgKwotICAgICAgICAgICAgICAgICAgICAnPHRkIGNsYXNzPSJyZXN1 bHQiPkNSQVNIPC90ZD4nICsKLSAgICAgICAgICAgICAgICAgICAgJzx0ZCBjbGFzcz0icmVzdWx0 Ij5DUkFTSDwvdGQ+JyArCi0gICAgICAgICAgICAgICAgJzwvdHI+JyArCi0gICAgICAgICAgICAn PC90Ym9keT4nICsKLSAgICAgICAgJzwvdGFibGU+Jyk7Ci19KTsKLQorLy8gRklYTUU6IEFkZCBz b21lIHVuaXQgdGVzdHMuCiAKIH0pKCk7CmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc3R5 bGVzL3Jlc3VsdHMuY3NzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9y Zy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3N0eWxlcy9yZXN1bHRzLmNzcwppbmRl eCA2NjMwZjc1YmIyNTcxMWM4NjA1ZDJiYjI1YWQyOTkxOTc1MTkxYThjLi40Y2M0YjI2YmU0MzFh NTIzYjgxNzFmYjI1ZjgxODVmOWE5OGEwNDlkIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMv c3R5bGVzL3Jlc3VsdHMuY3NzCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zdHlsZXMvcmVzdWx0cy5j c3MKQEAgLTIzLDUzICsyMyw0NSBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogICovCiAKLS5yZXN1bHRzLXZpZXcgdGFibGUgeworLnJlc3VsdHMtdmlldz4udG9vbGJhciB7 CisgICAgcGFkZGluZy1ib3R0b206IDE1cHg7Cit9CisKKyAgICAucmVzdWx0cy12aWV3Pi50b29s YmFyIHVsLmFjdGlvbnMgeworICAgICAgICBmbG9hdDogcmlnaHQ7CisgICAgICAgIG1hcmdpbjog MDsKKyAgICAgICAgcGFkZGluZzogMDsKKyAgICAgICAgbGlzdC1zdHlsZTogbm9uZTsKKyAgICAg ICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworICAgIH0KKworICAgIC5yZXN1bHRzLXZpZXc+LnRv b2xiYXIgdWwuYWN0aW9ucyBsaSB7CisgICAgICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAg ICB9CisKKy5yZXN1bHRzLWdyaWQgdGFibGUgewogICAgIHRhYmxlLWxheW91dDogZml4ZWQ7CiAg ICAgd2lkdGg6IDEwMCU7CiAgICAgYm9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTsKIH0KIAotLnJl c3VsdHMtdmlldyB0YWJsZSB0ZCwgLnJlc3VsdHMtdmlldyB0YWJsZSB0aCB7CisucmVzdWx0cy1n cmlkIHRhYmxlIHRkLCAucmVzdWx0cy12aWV3IHRhYmxlIHRoIHsKICAgICBvdmVyZmxvdzogaGlk ZGVuOwogICAgIHZlcnRpY2FsLWFsaWduOiB0b3A7CiB9CiAKLS5yZXN1bHRzLXZpZXcgdGFibGUg dGggeworLnJlc3VsdHMtZ3JpZCB0YWJsZSB0aCB7CiAgICAgcGFkZGluZzogM3B4OwogICAgIGJv cmRlci1ib3R0b206IDFweCBzb2xpZCAjQUFBOwogfQogCi0ucmVzdWx0cy12aWV3IC50b29sYmFy IHsKLSAgICBwYWRkaW5nLWJvdHRvbTogMTVweDsKLX0KLQotLnJlc3VsdHMtdmlldyAudGVzdC1z ZWxlY3RvciB7Ci0gICAgd2lkdGg6IDQwMHB4OwotICAgIG1hcmdpbi1yaWdodDogNnB4OwotfQot Ci0ucmVzdWx0cy12aWV3IC5hY3Rpb25zIHsKLSAgICBmbG9hdDogcmlnaHQ7Ci19Ci0KLS5yZXN1 bHRzLXZpZXcgLnRvb2xiYXIgdWwuYWN0aW9ucyB7Ci0gICAgbWFyZ2luOiAwOwotICAgIHBhZGRp bmc6IDA7Ci0gICAgbGlzdC1zdHlsZTogbm9uZTsKLSAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7 Ci19Ci0KLS5yZXN1bHRzLXZpZXcgLnRvb2xiYXIgdWwuYWN0aW9ucyBsaSB7Ci0gICAgZGlzcGxh eTogaW5saW5lLWJsb2NrOwotfQotCi0ucmVzdWx0cy12aWV3IC50ZXh0LXJlc3VsdCB7CisucmVz dWx0cy1ncmlkIC50ZXh0LXJlc3VsdCB7CiAgICAgYm9yZGVyOiBub25lOwogICAgIHdpZHRoOiAx MDAlOwogICAgIGhlaWdodDogNDAwcHg7IC8qIEZJWE1FOiBIb3cgZG8gd2UgZ2V0IGEgcmVhc29u YWJsZSBoZWlnaHQgaGVyZT8gKi8KIH0KIAotLnJlc3VsdHMtdmlldyAuaW1hZ2UtcmVzdWx0IHsK Ky5yZXN1bHRzLWdyaWQgLmltYWdlLXJlc3VsdCB7CiAgICAgd2lkdGg6IDEwMCU7CiAgICAgaGVp Z2h0OiBhdXRvOwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IGMyMzgxMGNlNmU5ZDUyNDU2NmIyYTZkNzBmMWI3YmRmMmQzY2RmNzUuLjlhY2U0 MzNmOWQ5NWYzZGQ0OGE1ODIxNTUwYTQzMDEzYzRlMTMzYWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNSBAQAogMjAxMS0wOS0w NSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCisgICAgICAgIFVzZSBhIGhpZXJh cmNoaWFsIHN0cnVjdHVyZSBmb3IgdGhlIGdhcmRlbi1vLW1hdGljIHJlc3VsdHMgdmlldworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njc2MjAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHJl LW9yZ2FuaXplcyB0aGUgcmVzdWx0cyB2aWV3IHRvIHVzZSBhIGhpZXJhY2hpYWwgc3RydWN0dXJl CisgICAgICAgIGZvciBzZWxlY3Rpb24uICBBdCB0aGUgdG9wLWxldmVsIGFyZSBzZWN0aW9ucyBm b3IgZWFjaCB0ZXN0LiAgRXhwYW5kaW5nCisgICAgICAgIHRoZSB0ZXN0IHNlY3Rpb24gc2hvd3Mg YSB0YWIgc2VsZWN0b3IgZm9yIGJ1aWxkZXJzLgorCisgICAgICAgIFRoaXMgc3RydWN0dXJlIHBy ZXBhcmVzIHVzIGZvciB3aXJpbmcgdXAgdmFyaW91cyBhY3Rpb25zIHRvIHRoaXMgdmlldy4KKwor ICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1Ymxp Y19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL2NvbnRyb2xsZXJzLmpzOgorICAgICAgICAoLik6 CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvcmVzdWx0cy5qczoKKyAgICAgICAgKCk6Cisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvdWkvcmVzdWx0cy5qczoKKyAgICAgICAgKC4pOgor ICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1Ymxp Y19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpL3Jlc3VsdHNfdW5pdHRlc3RzLmpzOgorICAg ICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL1Rlc3RGYWlsdXJlcy9zdHlsZXMvcmVzdWx0cy5jc3M6CisgICAgICAgICgucmVzdWx0cy12 aWV3Pi50b29sYmFyKToKKyAgICAgICAgKC5yZXN1bHRzLXZpZXc+LnRvb2xiYXIgdWwuYWN0aW9u cyk6CisgICAgICAgICgucmVzdWx0cy12aWV3Pi50b29sYmFyIHVsLmFjdGlvbnMgbGkpOgorICAg ICAgICAoLnJlc3VsdHMtZ3JpZCB0YWJsZSk6CisgICAgICAgICgucmVzdWx0cy1ncmlkIHRhYmxl IHRkLCAucmVzdWx0cy12aWV3IHRhYmxlIHRoKToKKyAgICAgICAgKC5yZXN1bHRzLWdyaWQgdGFi bGUgdGgpOgorICAgICAgICAoLnJlc3VsdHMtZ3JpZCAudGV4dC1yZXN1bHQpOgorICAgICAgICAo LnJlc3VsdHMtZ3JpZCAuaW1hZ2UtcmVzdWx0KToKKworMjAxMS0wOS0wNSAgQWRhbSBCYXJ0aCAg PGFiYXJ0aEB3ZWJraXQub3JnPgorCiAgICAgICAgIEFkZCBhIHRhYiB0byBnYXJkZW4tby1tYXRp YyBmb3Igdmlld2luZyBleHBlY3RlZCBmYWlsdXJlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njc2MTkKIAo=