83374 2012-04-06 09:17:09 -0700 Web Inspector: move breakpoints active state from scripts panel to debugger presentation model. 2012-04-09 00:51:02 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 597403 0 pfeldman 2012-04-06 09:17:09 -0700 This is needed to abstract JavaScriptSourceFrame from the ScriptsPanel. 597405 1 136033 pfeldman 2012-04-06 09:22:47 -0700 Created attachment 136033 Patch 597408 2 136033 podivilov 2012-04-06 09:29:37 -0700 Comment on attachment 136033 Patch looks good. 598163 3 pfeldman 2012-04-09 00:51:02 -0700 Committed r113558: <http://trac.webkit.org/changeset/113558> 136033 2012-04-06 09:22:47 -0700 2012-04-09 00:45:18 -0700 Patch bug-83374-20120406202245.patch text/plain 11557 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU1NjhjNmE1YjdiZWM3 ZmY3NGMyOGE5NzE1ODBlMzA0ZjI4OThhZS4uN2ZhNGQyNmY4MjhhNjNmMmI1OGE4MTJmYjE0N2Qw MmZhMWIwODU0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA0LTA2ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1vdmUgYnJlYWtwb2ludHMgYWN0aXZlIHN0YXRlIGZyb20gc2NyaXB0cyBwYW5lbCB0byBk ZWJ1Z2dlciBwcmVzZW50YXRpb24gbW9kZWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04MzM3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEp1c3QgbW92ZXMgdGhlIHN0YXRlIGFuZCBhZGRzIGV2ZW50IHRv IHByb3BhZ2F0ZSBpdC4gVGhpcyBpcyBuZWVkZWQgdG8gYWJzdHJhY3QKKyAgICAgICAgSmF2YVNj cmlwdFNvdXJjZUZyYW1lIGZyb20gdGhlIFNjcmlwdHNQYW5lbC4KKworICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5zZXRCcmVha3BvaW50KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZS5fZGVidWdnZXJSZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50 YXRpb25Nb2RlbC5wcm90b3R5cGUuc2V0QnJlYWtwb2ludHNBY3RpdmUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLmJyZWFrcG9pbnRz QWN0aXZlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VG cmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJv dG90eXBlLl9zZXRCcmVha3BvaW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90 eXBlLl90b2dnbGVCcmVha3BvaW50c0NsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNj cmlwdHNQYW5lbC5wcm90b3R5cGUuX2JyZWFrcG9pbnRzQWN0aXZlU3RhdGVDaGFuZ2VkKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9jcmVhdGVEZWJ1Z1Rv b2xiYXIpOgorCiAyMDEyLTA0LTA2ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdt YWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTEzNDMxLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IGY1MjFhNDkwMGFkOTY2YWZlNGQ1MTQxMDk1 MWQ1NzkxZThjMjdiN2QuLjQ3MjRkY2NjMWZkZjkxYTljNzkzODY5YjA4ZmE0NzRjYjczMGNiYmUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTQwLDYgKzQwLDcgQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5f cHJlc2VudGF0aW9uQ2FsbEZyYW1lcyA9IFtdOwogCiAgICAgdGhpcy5fYnJlYWtwb2ludE1hbmFn ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyKFdlYkluc3BlY3Rvci5zZXR0 aW5ncy5icmVha3BvaW50cywgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwsIHRoaXMuX3Njcmlw dE1hcHBpbmcpOworICAgIHRoaXMuX2JyZWFrcG9pbnRzQWN0aXZlID0gdHJ1ZTsKIAogICAgIHRo aXMuX3BlbmRpbmdDb25zb2xlTWVzc2FnZXMgPSB7fTsKICAgICB0aGlzLl9jb25zb2xlTWVzc2Fn ZUxpdmVMb2NhdGlvbnMgPSBbXTsKQEAgLTY1LDcgKzY2LDggQEAgV2ViSW5zcGVjdG9yLkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzID0gewogICAgIERlYnVnZ2VyUmVzZXQ6ICJkZWJ1 Z2dlci1yZXNldCIsCiAgICAgQ2FsbEZyYW1lU2VsZWN0ZWQ6ICJjYWxsLWZyYW1lLXNlbGVjdGVk IiwKICAgICBDb25zb2xlQ29tbWFuZEV2YWx1YXRlZEluU2VsZWN0ZWRDYWxsRnJhbWU6ICJjb25z b2xlLWNvbW1hbmQtZXZhbHVhdGVkLWluLXNlbGVjdGVkLWNhbGwtZnJhbWUiLAotICAgIEV4ZWN1 dGlvbkxpbmVDaGFuZ2VkOiAiZXhlY3V0aW9uLWxpbmUtY2hhbmdlZCIKKyAgICBFeGVjdXRpb25M aW5lQ2hhbmdlZDogImV4ZWN1dGlvbi1saW5lLWNoYW5nZWQiLAorICAgIEJyZWFrcG9pbnRzQWN0 aXZlU3RhdGVDaGFuZ2VkOiAiYnJlYWtwb2ludHMtYWN0aXZlLXN0YXRlLWNoYW5nZWQiCiB9CiAK IFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKQEAg LTM0OSw2ICszNTEsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5w cm90b3R5cGUgPSB7CiAgICAgc2V0QnJlYWtwb2ludDogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBs aW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpCiAgICAgewogICAgICAgICB0aGlzLl9icmVh a3BvaW50TWFuYWdlci5zZXRCcmVha3BvaW50KHVpU291cmNlQ29kZSwgbGluZU51bWJlciwgY29u ZGl0aW9uLCBlbmFibGVkKTsKKyAgICAgICAgdGhpcy5zZXRCcmVha3BvaW50c0FjdGl2ZSh0cnVl KTsKICAgICB9LAogCiAgICAgLyoqCkBAIC01MTYsNiArNTE5LDI2IEBAIFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcGVu ZGluZ0NvbnNvbGVNZXNzYWdlcyA9IHt9OwogICAgICAgICB0aGlzLl9jb25zb2xlTWVzc2FnZUxp dmVMb2NhdGlvbnMgPSBbXTsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkRlYnVnZ2VyUmVz ZXQpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGFjdGl2ZQor ICAgICAqLworICAgIHNldEJyZWFrcG9pbnRzQWN0aXZlOiBmdW5jdGlvbihhY3RpdmUpCisgICAg eworICAgICAgICBpZiAodGhpcy5fYnJlYWtwb2ludHNBY3RpdmUgPT09IGFjdGl2ZSkKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fYnJlYWtwb2ludHNBY3RpdmUgPSBhY3RpdmU7 CisgICAgICAgIERlYnVnZ2VyQWdlbnQuc2V0QnJlYWtwb2ludHNBY3RpdmUoYWN0aXZlKTsKKyAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkJyZWFrcG9pbnRzQWN0aXZlU3RhdGVDaGFuZ2VkLCBh Y3RpdmUpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtib29sZWFufQorICAg ICAqLworICAgIGJyZWFrcG9pbnRzQWN0aXZlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5fYnJlYWtwb2ludHNBY3RpdmU7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZy YW1lLmpzCmluZGV4IGI1ZTM5ZjlhNzRkMDgyNGJjZDE5YmYzMzljZTgyNzQ4MzUyMDkzYzcuLmJk NmY3NjdjMTJlMmEyNDc5NGNkMTc1MjU1OWRlZTY2YjEwOWZjMWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZy YW1lLmpzCkBAIC0zNDUsNyArMzQ1LDYgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VG cmFtZS5wcm90b3R5cGUgPSB7CiAgICAgX3NldEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1i ZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCkKICAgICB7CiAgICAgICAgIHRoaXMuX21vZGVsLnNldEJy ZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJs ZWQpOwotICAgICAgICB0aGlzLl9zY3JpcHRzUGFuZWwuYWN0aXZhdGVCcmVha3BvaW50cygpOwog ICAgIH0sCiAKICAgICBfb25Nb3VzZURvd246IGZ1bmN0aW9uKGV2ZW50KQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA0NjRk YTU4Nzc5MDU2ZTZkODhiOTUwNzMxZjk2NDU4ZjljYTRkYjRiLi4wMzhjOTI1ZDYzNzgyMTU3YTgx Y2UyNGFhODU5NjYxY2I0MTBjZTE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMTgyLDYgKzE4Miw3IEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICB0aGlz Ll9wcmVzZW50YXRpb25Nb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5Db25zb2xlQ29tbWFuZEV2YWx1YXRlZEluU2VsZWN0 ZWRDYWxsRnJhbWUsIHRoaXMuX2NvbnNvbGVDb21tYW5kRXZhbHVhdGVkSW5TZWxlY3RlZENhbGxG cmFtZSwgdGhpcyk7CiAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRXhlY3V0aW9u TGluZUNoYW5nZWQsIHRoaXMuX2V4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB0aGlzKTsKICAgICB0aGlz Ll9wcmVzZW50YXRpb25Nb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5EZWJ1Z2dlclJlc2V0LCB0aGlzLl9yZXNldC5iaW5k KHRoaXMsIGZhbHNlKSk7CisgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuQnJlYWtw b2ludHNBY3RpdmVTdGF0ZUNoYW5nZWQsIHRoaXMuX2JyZWFrcG9pbnRzQWN0aXZlU3RhdGVDaGFu Z2VkLCB0aGlzKTsKIAogICAgIHZhciBlbmFibGVEZWJ1Z2dlciA9ICFDYXBhYmlsaXRpZXMuZGVi dWdnZXJDYXVzZXNSZWNvbXBpbGF0aW9uIHx8IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5kZWJ1Z2dl ckVuYWJsZWQuZ2V0KCk7CiAgICAgaWYgKGVuYWJsZURlYnVnZ2VyKQpAQCAtMjI4LDE3ICsyMjks NiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgd2lu ZG93LnNldFRpbWVvdXQodGhpcy5fbWF5YmVTaG93TmF2aWdhdG9yT3ZlcmxheS5iaW5kKHRoaXMp LCAwKTsKICAgICB9LAogCi0gICAgYnJlYWtwb2ludHNBY3RpdmF0ZWQ6IGZ1bmN0aW9uKCkKLSAg ICB7Ci0gICAgICAgIHJldHVybiB0aGlzLnRvZ2dsZUJyZWFrcG9pbnRzQnV0dG9uLnRvZ2dsZWQ7 Ci0gICAgfSwKLQotICAgIGFjdGl2YXRlQnJlYWtwb2ludHM6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIGlmICghdGhpcy5icmVha3BvaW50c0FjdGl2YXRlZCkKLSAgICAgICAgICAgIHRoaXMu X3RvZ2dsZUJyZWFrcG9pbnRzQ2xpY2tlZCgpOwotICAgIH0sCi0KICAgICBfZGlkQnVpbGRPdXRs aW5lQ2h1bms6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLkph dmFTY3JpcHRPdXRsaW5lRGlhbG9nLmRpZEFkZENodW5rKGV2ZW50LmRhdGEpOwpAQCAtODQ0LDE2 ICs4MzQsMjAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIERlYnVnZ2VyQWdlbnQuc3RlcE91dCgpOwogICAgIH0sCiAKLSAgICBfdG9nZ2xlQnJlYWtw b2ludHNDbGlja2VkOiBmdW5jdGlvbigpCisgICAgX3RvZ2dsZUJyZWFrcG9pbnRzQ2xpY2tlZDog ZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5z ZXRCcmVha3BvaW50c0FjdGl2ZSghdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYnJlYWtwb2ludHNB Y3RpdmUoKSk7CisgICAgfSwKKworICAgIF9icmVha3BvaW50c0FjdGl2ZVN0YXRlQ2hhbmdlZDog ZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLnRvZ2dsZUJyZWFrcG9pbnRzQnV0 dG9uLnRvZ2dsZWQgPSAhdGhpcy50b2dnbGVCcmVha3BvaW50c0J1dHRvbi50b2dnbGVkOwotICAg ICAgICBpZiAodGhpcy50b2dnbGVCcmVha3BvaW50c0J1dHRvbi50b2dnbGVkKSB7Ci0gICAgICAg ICAgICBEZWJ1Z2dlckFnZW50LnNldEJyZWFrcG9pbnRzQWN0aXZlKHRydWUpOwotICAgICAgICAg ICAgdGhpcy50b2dnbGVCcmVha3BvaW50c0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiRGVhY3RpdmF0ZSBhbGwgYnJlYWtwb2ludHMuIik7CisgICAgICAgIHZhciBhY3RpdmUg PSBldmVudC5kYXRhOworICAgICAgICB0aGlzLl90b2dnbGVCcmVha3BvaW50c0J1dHRvbi50b2dn bGVkID0gYWN0aXZlOworICAgICAgICBpZiAoYWN0aXZlKSB7CisgICAgICAgICAgICB0aGlzLl90 b2dnbGVCcmVha3BvaW50c0J1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGVh Y3RpdmF0ZSBhbGwgYnJlYWtwb2ludHMuIik7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuaW5z cGVjdG9yVmlldy5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImJyZWFrcG9pbnRzLWRlYWN0aXZh dGVkIik7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBEZWJ1Z2dlckFnZW50LnNldEJy ZWFrcG9pbnRzQWN0aXZlKGZhbHNlKTsKLSAgICAgICAgICAgIHRoaXMudG9nZ2xlQnJlYWtwb2lu dHNCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFjdGl2YXRlIGFsbCBicmVh a3BvaW50cy4iKTsKKyAgICAgICAgICAgIHRoaXMuX3RvZ2dsZUJyZWFrcG9pbnRzQnV0dG9uLnRp dGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBY3RpdmF0ZSBhbGwgYnJlYWtwb2ludHMuIik7 CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuaW5zcGVjdG9yVmlldy5lbGVtZW50LmFkZFN0eWxl Q2xhc3MoImJyZWFrcG9pbnRzLWRlYWN0aXZhdGVkIik7CiAgICAgICAgIH0KICAgICB9LApAQCAt OTEwLDEwICs5MDQsMTAgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHRoaXMuc3RlcE91dEJ1dHRvbiA9IHRoaXMuX2NyZWF0ZUJ1dHRvbkFuZFJlZ2lz dGVyU2hvcnRjdXRzKCJzY3JpcHRzLXN0ZXAtb3V0IiwgdGl0bGUsIGhhbmRsZXIsIHNob3J0Y3V0 cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGVwIG91dCIpKTsKICAgICAgICAgZGVidWdUb29s YmFyLmFwcGVuZENoaWxkKHRoaXMuc3RlcE91dEJ1dHRvbik7CiAKLSAgICAgICAgdGhpcy50b2dn bGVCcmVha3BvaW50c0J1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdl Ykluc3BlY3Rvci5VSVN0cmluZygiRGVhY3RpdmF0ZSBhbGwgYnJlYWtwb2ludHMuIiksICJ0b2dn bGUtYnJlYWtwb2ludHMiKTsKLSAgICAgICAgdGhpcy50b2dnbGVCcmVha3BvaW50c0J1dHRvbi50 b2dnbGVkID0gdHJ1ZTsKLSAgICAgICAgdGhpcy50b2dnbGVCcmVha3BvaW50c0J1dHRvbi5hZGRF dmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3RvZ2dsZUJyZWFrcG9pbnRzQ2xpY2tlZCwgdGhp cyk7Ci0gICAgICAgIGRlYnVnVG9vbGJhci5hcHBlbmRDaGlsZCh0aGlzLnRvZ2dsZUJyZWFrcG9p bnRzQnV0dG9uLmVsZW1lbnQpOworICAgICAgICB0aGlzLl90b2dnbGVCcmVha3BvaW50c0J1dHRv biA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiRGVhY3RpdmF0ZSBhbGwgYnJlYWtwb2ludHMuIiksICJ0b2dnbGUtYnJlYWtwb2ludHMiKTsK KyAgICAgICAgdGhpcy5fdG9nZ2xlQnJlYWtwb2ludHNCdXR0b24udG9nZ2xlZCA9IHRydWU7Cisg ICAgICAgIHRoaXMuX3RvZ2dsZUJyZWFrcG9pbnRzQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNs aWNrIiwgdGhpcy5fdG9nZ2xlQnJlYWtwb2ludHNDbGlja2VkLCB0aGlzKTsKKyAgICAgICAgZGVi dWdUb29sYmFyLmFwcGVuZENoaWxkKHRoaXMuX3RvZ2dsZUJyZWFrcG9pbnRzQnV0dG9uLmVsZW1l bnQpOwogCiAgICAgICAgIHRoaXMuZGVidWdnZXJTdGF0dXNFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHRoaXMuZGVidWdnZXJTdGF0dXNFbGVtZW50Lmlk ID0gInNjcmlwdHMtZGVidWdnZXItc3RhdHVzIjsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0No YW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2MGMwN2EzMDY4ZmI3NzM3ZjY1 ZWVkNWVjNGJkZjY0YmIxOTcxNDg1Li44YzFkMzAwN2Q4Y2FhOGJiMDIyM2MzOWVjZmI2YmE5MmI0 OTgzY2ZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDQtMDYgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbW92ZSBi cmVha3BvaW50cyBhY3RpdmUgc3RhdGUgZnJvbSBzY3JpcHRzIHBhbmVsIHRvIGRlYnVnZ2VyIHBy ZXNlbnRhdGlvbiBtb2RlbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTgzMzc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzOgorICAgICAg ICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1icmVha3BvaW50cy1ub3QtYWN0aXZhdGVk LW9uLXJlbG9hZC5odG1sOgorCiAyMDEyLTA0LTA2ICBTdGVwaGVuIENoZW5uZXkgIDxzY2hlbm5l eUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVuZGVyU1ZHUm9vdCBzaG91bGQgaW5oZXJpdCBm cm9tIFJlbmRlclJlcGxhY2VkCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXItdGVzdC5qcwppbmRleCA3MGE4ZGExOTRjMzM3MDlhYWUxZDE0MmIxYTU4MDc4 NWI0ZDZmZGM3Li41NzFkZjY4NTE2NDg1OTM2NmM3YjY2NDdiNWNhMzg2MTZjZTYxMzVkIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0Lmpz CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMK QEAgLTI2LDcgKzI2LDcgQEAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZURlYnVnZ2VyVGVzdCA9IGZ1 bmN0aW9uKCkKIHsKICAgICB2YXIgc2NyaXB0c1BhbmVsID0gV2ViSW5zcGVjdG9yLnBhbmVscy5z Y3JpcHRzOwogCi0gICAgc2NyaXB0c1BhbmVsLmFjdGl2YXRlQnJlYWtwb2ludHMoKTsKKyAgICBX ZWJJbnNwZWN0b3IuZGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5zZXRCcmVha3BvaW50c0FjdGl2 ZSh0cnVlKTsKICAgICBJbnNwZWN0b3JUZXN0LnJlc3VtZUV4ZWN1dGlvbihkaXNhYmxlRGVidWdn ZXIpOwogCiAgICAgZnVuY3Rpb24gZGlzYWJsZURlYnVnZ2VyKCkKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9kZWJ1Z2dlci1icmVha3BvaW50cy1ub3QtYWN0aXZh dGVkLW9uLXJlbG9hZC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVn Z2VyLWJyZWFrcG9pbnRzLW5vdC1hY3RpdmF0ZWQtb24tcmVsb2FkLmh0bWwKaW5kZXggNzlmOGI4 M2VlMmYxOWEyN2E5ZjIzNjQ2OTM3MmRhYjgzOTAwOGM0MC4uOTMwNjRlZDEwZjg1OTMwOGZhMWVl ZWFlZDlmZTVlZDQzNzAxMDY5NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL2RlYnVnZ2VyLWJyZWFrcG9pbnRzLW5vdC1hY3RpdmF0ZWQtb24tcmVsb2FkLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2RlYnVnZ2VyLWJyZWFrcG9pbnRz LW5vdC1hY3RpdmF0ZWQtb24tcmVsb2FkLmh0bWwKQEAgLTI1LDcgKzI1LDcgQEAgdmFyIHRlc3Qg PSBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiTWFp biByZXNvdXJjZSB3YXMgc2hvd24uIik7CiAgICAgICAgIEluc3BlY3RvclRlc3Quc2V0QnJlYWtw b2ludChzb3VyY2VGcmFtZSwgOCwgIiIsIHRydWUpOwotICAgICAgICBXZWJJbnNwZWN0b3IucGFu ZWxzLnNjcmlwdHMudG9nZ2xlQnJlYWtwb2ludHNCdXR0b24uZWxlbWVudC5jbGljaygpOworICAg ICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuX3RvZ2dsZUJyZWFrcG9pbnRzQnV0dG9u LmVsZW1lbnQuY2xpY2soKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5yZWxvYWRQYWdlKHN0ZXA0 KTsKICAgICB9CiAKQEAgLTM3LDcgKzM3LDcgQEAgdmFyIHRlc3QgPSBmdW5jdGlvbigpCiAgICAg ZnVuY3Rpb24gc3RlcDQoKQogICAgIHsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQo Ik1haW4gcmVzb3VyY2Ugd2FzIHNob3duLiIpOwotICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5w YW5lbHMuc2NyaXB0cy5icmVha3BvaW50c0FjdGl2YXRlZCgpKQorICAgICAgICBpZiAoIVdlYklu c3BlY3Rvci5kZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmJyZWFrcG9pbnRzQWN0aXZlKCkpCiAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiQnJlYWtwb2ludHMgYXJlIGRlYWN0 aXZhdGVkLiIpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJl c3VsdCgiRXJyb3I6IGJyZWFrcG9pbnRzIGFyZSBhY3RpdmF0ZWQuIik7Cg==