79906 2012-02-29 07:10:40 -0800 Web Inspector: abstract out the common pattern of creating auto-updated locations. 2012-03-01 02:29:24 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 567586 0 podivilov 2012-02-29 07:10:40 -0800 Web Inspector: abstract out the common pattern of creating auto-updated locations. 567589 1 129441 podivilov 2012-02-29 07:12:52 -0800 Created attachment 129441 Patch 567666 2 129441 vsevik 2012-02-29 09:05:23 -0800 Comment on attachment 129441 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129441&action=review > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:891 > + formatRawSourceCodeAnchor: function(anchor, uiLocation) Could you please rename this method to something like formatLiveAnchor now that it does not depend on rawSourceCode? 568494 3 podivilov 2012-03-01 02:29:24 -0800 Committed r109328: <http://trac.webkit.org/changeset/109328> 129441 2012-02-29 07:12:52 -0800 2012-02-29 09:05:23 -0800 Patch bug-79906-20120229191250.patch text/plain 14538 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODdjOTUwMTZiZGEwN2Vh ZTE3MWEzYTJmMWFmYjUwYjYxZmRiZjkxOC4uMzI0YmNlYjk4ZjkwODBmNTk2ZDAyZGU4MWU0ZDE5 MjU4OTA3ZjZlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAyLTI5ICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGFic3RyYWN0IG91dCB0aGUgY29tbW9uIHBhdHRlcm4gb2YgY3JlYXRpbmcgYXV0by11 cGRhdGVkIGxvY2F0aW9ucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc5OTA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ2FsbEZyYW1lLnByb3RvdHlw ZS51aUxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLkNhbGxGcmFtZVBsYWNhcmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwuQ2FsbEZyYW1lUGxhY2FyZC5wcm90b3R5cGUuZGlzY2FyZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5DYWxsRnJhbWVQ bGFjYXJkLnByb3RvdHlwZS5fdXBkYXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLkxpbmtpZmllckZvcm1hdHRlci5wcm90b3R5cGUuZm9ybWF0UmF3 U291cmNlQ29kZUFuY2hvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50 YXRpb25Nb2RlbC5EZWZhdWx0TGlua2lmaWVyRm9ybWF0dGVyLnByb3RvdHlwZS5mb3JtYXRSYXdT b3VyY2VDb2RlQW5jaG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRh dGlvbk1vZGVsLkxpbmtpZmllcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5MaW5raWZpZXIucHJvdG90eXBlLmxpbmtpZnlSYXdTb3VyY2VDb2RlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkxpbmtpZmll ci5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2Vu dGF0aW9uTW9kZWwuTGlua2lmaWVyLnByb3RvdHlwZS5fdXBkYXRlQW5jaG9yKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jhd1NvdXJjZUNvZGUuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUuY3JlYXRlTGl2ZUxvY2F0aW9uKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkxpdmVMb2NhdGlvbik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5MaXZlTG9jYXRpb24ucHJvdG90eXBlLmluaXQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuTGl2ZUxvY2F0aW9uLnByb3RvdHlw ZS5kaXNwb3NlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkxpdmVMb2Nh dGlvbi5wcm90b3R5cGUuX3VwZGF0ZSk6CisKIDIwMTItMDItMjggIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogbW92ZSBET00g Y291bnRlciBncmFwaHMgb3V0IG9mIGV4cGVyaW1lbnRhbApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLmpzCmluZGV4IGI3YmYxZmEyMzVkOTlmMmNjMjk1MDlmOTQ2YTc2NmI4Njk1MWU2ZDEuLmJh YWY4ZDdjYjljMGEyMjE5MDAzMzRjNzMyYWMwMzk4N2QzNzM2MWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2Vu dGF0aW9uTW9kZWwuanMKQEAgLTc1MywxNiArNzUzLDEzIEBAIFdlYkluc3BlY3Rvci5QcmVzZW50 YXRpb25DYWxsRnJhbWUucHJvdG90eXBlID0gewogICAgICAqLwogICAgIHVpTG9jYXRpb246IGZ1 bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgZnVuY3Rpb24gdWlTb3VyY2VDb2RlTGlz dENoYW5nZWQoKQorICAgICAgICBmdW5jdGlvbiBsb2NhdGlvblVwZGF0ZWQodWlMb2NhdGlvbikK ICAgICAgICAgewotICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5fcmF3U291cmNlQ29kZS5yYXdM b2NhdGlvblRvVUlMb2NhdGlvbih0aGlzLl9jYWxsRnJhbWUubG9jYXRpb24pKTsKLSAgICAgICAg ICAgIHRoaXMuX3Jhd1NvdXJjZUNvZGUucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu UmF3U291cmNlQ29kZS5FdmVudHMuVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIHVpU291cmNlQ29k ZUxpc3RDaGFuZ2VkLCB0aGlzKTsKLSAgICAgICAgfQotICAgICAgICB2YXIgdWlMb2NhdGlvbiA9 IHRoaXMuX3Jhd1NvdXJjZUNvZGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24odGhpcy5fY2FsbEZy YW1lLmxvY2F0aW9uKTsKLSAgICAgICAgaWYgKHVpTG9jYXRpb24pCiAgICAgICAgICAgICBjYWxs YmFjayh1aUxvY2F0aW9uKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fcmF3U291 cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2ZW50 cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgdWlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIHRoaXMp OworICAgICAgICAgICAgbGl2ZUxvY2F0aW9uLmRpc3Bvc2UoKTsKKyAgICAgICAgfQorICAgICAg ICB2YXIgbGl2ZUxvY2F0aW9uID0gdGhpcy5fcmF3U291cmNlQ29kZS5jcmVhdGVMaXZlTG9jYXRp b24odGhpcy5fY2FsbEZyYW1lLmxvY2F0aW9uLCBsb2NhdGlvblVwZGF0ZWQuYmluZCh0aGlzKSk7 CisgICAgICAgIGxpdmVMb2NhdGlvbi5pbml0KCk7CiAgICAgfQogfQogCkBAIC03NzQsMjMgKzc3 MSwxOSBAQCBXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ2FsbEZyYW1lLnByb3RvdHlwZSA9IHsK IFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkNhbGxGcmFtZVBsYWNhcmQg PSBmdW5jdGlvbihjYWxsRnJhbWUpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlBsYWNhcmQuY2FsbCh0 aGlzLCBjYWxsRnJhbWUuX2NhbGxGcmFtZS5mdW5jdGlvbk5hbWUgfHwgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCIoYW5vbnltb3VzIGZ1bmN0aW9uKSIpLCAiIik7Ci0gICAgdGhpcy5fY2FsbEZyYW1l ID0gY2FsbEZyYW1lOwotICAgIHRoaXMuX3VwZGF0ZSgpOwotICAgIHRoaXMuX2NhbGxGcmFtZS5f cmF3U291cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2Rl LkV2ZW50cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgdGhpcy5fdXBkYXRlLCB0aGlzKTsKKyAg ICB0aGlzLl9saXZlTG9jYXRpb24gPSBjYWxsRnJhbWUuX3Jhd1NvdXJjZUNvZGUuY3JlYXRlTGl2 ZUxvY2F0aW9uKGNhbGxGcmFtZS5fY2FsbEZyYW1lLmxvY2F0aW9uLCB0aGlzLl91cGRhdGUuYmlu ZCh0aGlzKSk7CisgICAgdGhpcy5fbGl2ZUxvY2F0aW9uLmluaXQoKTsKIH0KIAogV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuQ2FsbEZyYW1lUGxhY2FyZC5wcm90b3R5cGUg PSB7CiAgICAgZGlzY2FyZDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fY2FsbEZy YW1lLl9yYXdTb3VyY2VDb2RlLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJhd1Nv dXJjZUNvZGUuRXZlbnRzLlVJU291cmNlQ29kZUxpc3RDaGFuZ2VkLCB0aGlzLl91cGRhdGUsIHRo aXMpOworICAgICAgICB0aGlzLl9saXZlTG9jYXRpb24uZGlzcG9zZSgpOwogICAgIH0sCiAKLSAg ICBfdXBkYXRlOiBmdW5jdGlvbigpCisgICAgX3VwZGF0ZTogZnVuY3Rpb24odWlMb2NhdGlvbikK ICAgICB7Ci0gICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0gdGhpcy5fY2FsbEZyYW1lLl9yYXdT b3VyY2VDb2RlOwotICAgICAgICB2YXIgdWlMb2NhdGlvbiA9IHJhd1NvdXJjZUNvZGUucmF3TG9j YXRpb25Ub1VJTG9jYXRpb24odGhpcy5fY2FsbEZyYW1lLl9jYWxsRnJhbWUubG9jYXRpb24pOwot ICAgICAgICBpZiAodWlMb2NhdGlvbikKLSAgICAgICAgICAgIHRoaXMuc3VidGl0bGUgPSBXZWJJ bnNwZWN0b3IuZGlzcGxheU5hbWVGb3JVUkwodWlMb2NhdGlvbi51aVNvdXJjZUNvZGUudXJsKSAr ICI6IiArICh1aUxvY2F0aW9uLmxpbmVOdW1iZXIgKyAxKTsKKyAgICAgICAgdGhpcy5zdWJ0aXRs ZSA9IFdlYkluc3BlY3Rvci5kaXNwbGF5TmFtZUZvclVSTCh1aUxvY2F0aW9uLnVpU291cmNlQ29k ZS51cmwpICsgIjoiICsgKHVpTG9jYXRpb24ubGluZU51bWJlciArIDEpOwogICAgIH0KIH0KIApA QCAtODYzLDYgKzg1Niw4IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVs UmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZSA9IHsKICAgICB9CiB9CiAKK1dlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsUmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZS5fX3Byb3Rv X18gPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2VEb21haW5Nb2RlbEJpbmRpbmcucHJvdG90eXBlOwor CiAvKioKICAqIEBpbnRlcmZhY2UKICAqLwpAQCAtODcyLDEwICs4NjcsMTAgQEAgV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuTGlua2lmaWVyRm9ybWF0dGVyID0gZnVuY3Rp b24oKQogCiBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5MaW5raWZpZXJG b3JtYXR0ZXIucHJvdG90eXBlID0gewogICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLlJhd1NvdXJjZUNvZGV9IHJhd1NvdXJjZUNvZGUKICAgICAgKiBAcGFyYW0ge0VsZW1lbnR9 IGFuY2hvcgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJTG9jYXRpb259IHVpTG9jYXRp b24KICAgICAgKi8KLSAgICBmb3JtYXRSYXdTb3VyY2VDb2RlQW5jaG9yOiBmdW5jdGlvbihyYXdT b3VyY2VDb2RlLCBhbmNob3IpIHsgfSwKKyAgICBmb3JtYXRSYXdTb3VyY2VDb2RlQW5jaG9yOiBm dW5jdGlvbihhbmNob3IsIHVpTG9jYXRpb24pIHsgfSwKIH0KIAogLyoqCkBAIC04OTAsMTUgKzg4 NSwxMSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5EZWZhdWx0TGlu a2lmaWVyRm9ybWF0dGVyID0gZnVuY3Rpb24obWF4TAogCiBXZWJJbnNwZWN0b3IuRGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbC5EZWZhdWx0TGlua2lmaWVyRm9ybWF0dGVyLnByb3RvdHlwZSA9IHsK ICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlfSByYXdT b3VyY2VDb2RlCiAgICAgICogQHBhcmFtIHtFbGVtZW50fSBhbmNob3IKKyAgICAgKiBAcGFyYW0g e1dlYkluc3BlY3Rvci5VSUxvY2F0aW9ufSB1aUxvY2F0aW9uCiAgICAgICovCi0gICAgZm9ybWF0 UmF3U291cmNlQ29kZUFuY2hvcjogZnVuY3Rpb24ocmF3U291cmNlQ29kZSwgYW5jaG9yKQorICAg IGZvcm1hdFJhd1NvdXJjZUNvZGVBbmNob3I6IGZ1bmN0aW9uKGFuY2hvciwgdWlMb2NhdGlvbikK ICAgICB7Ci0gICAgICAgIHZhciB1aUxvY2F0aW9uID0gcmF3U291cmNlQ29kZS5yYXdMb2NhdGlv blRvVUlMb2NhdGlvbihhbmNob3IucmF3TG9jYXRpb24pOwotICAgICAgICBpZiAoIXVpTG9jYXRp b24pCi0gICAgICAgICAgICByZXR1cm47Ci0KICAgICAgICAgYW5jaG9yLnRleHRDb250ZW50ID0g V2ViSW5zcGVjdG9yLmZvcm1hdExpbmtUZXh0KHVpTG9jYXRpb24udWlTb3VyY2VDb2RlLnVybCwg dWlMb2NhdGlvbi5saW5lTnVtYmVyKTsKIAogICAgICAgICB2YXIgdGV4dCA9IFdlYkluc3BlY3Rv ci5mb3JtYXRMaW5rVGV4dCh1aUxvY2F0aW9uLnVpU291cmNlQ29kZS51cmwsIHVpTG9jYXRpb24u bGluZU51bWJlcik7CkBAIC05MTksNyArOTEwLDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJl c2VudGF0aW9uTW9kZWwuTGlua2lmaWVyID0gZnVuY3Rpb24obW9kZWwsIGZvcm1hdHRlcikKIHsK ICAgICB0aGlzLl9tb2RlbCA9IG1vZGVsOwogICAgIHRoaXMuX2Zvcm1hdHRlciA9IGZvcm1hdHRl ciB8fCBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRGVmYXVsdExp bmtpZmllckZvcm1hdHRlcigpOwotICAgIHRoaXMuX2FuY2hvcnNGb3JSYXdTb3VyY2VDb2RlID0g e307CisgICAgdGhpcy5fbGl2ZUxvY2F0aW9ucyA9IFtdOwogfQogCiBXZWJJbnNwZWN0b3IuRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5MaW5raWZpZXIucHJvdG90eXBlID0gewpAQCAtOTQ3LDE3 ICs5MzgsMTAgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuTGlua2lm aWVyLnByb3RvdHlwZSA9IHsKICAgICBsaW5raWZ5UmF3U291cmNlQ29kZTogZnVuY3Rpb24ocmF3 U291cmNlQ29kZSwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyLCBjbGFzc2VzKQogICAgIHsKICAg ICAgICAgdmFyIGFuY2hvciA9IFdlYkluc3BlY3Rvci5saW5raWZ5VVJMQXNOb2RlKHJhd1NvdXJj ZUNvZGUudXJsLCAiIiwgY2xhc3NlcywgZmFsc2UpOwotICAgICAgICBhbmNob3IucmF3TG9jYXRp b24gPSB7IGxpbmVOdW1iZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcjogY29sdW1uTnVtYmVy IH07Ci0KLSAgICAgICAgdmFyIGFuY2hvcnMgPSB0aGlzLl9hbmNob3JzRm9yUmF3U291cmNlQ29k ZVtyYXdTb3VyY2VDb2RlLmlkXTsKLSAgICAgICAgaWYgKCFhbmNob3JzKSB7Ci0gICAgICAgICAg ICBhbmNob3JzID0gW107Ci0gICAgICAgICAgICB0aGlzLl9hbmNob3JzRm9yUmF3U291cmNlQ29k ZVtyYXdTb3VyY2VDb2RlLmlkXSA9IGFuY2hvcnM7Ci0gICAgICAgICAgICByYXdTb3VyY2VDb2Rl LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuRXZlbnRzLlVJU291 cmNlQ29kZUxpc3RDaGFuZ2VkLCB0aGlzLl91cGRhdGVTb3VyY2VBbmNob3JzLCB0aGlzKTsKLSAg ICAgICAgfQotCi0gICAgICAgIHRoaXMuX3VwZGF0ZUFuY2hvcihyYXdTb3VyY2VDb2RlLCBhbmNo b3IpOwotICAgICAgICBhbmNob3JzLnB1c2goYW5jaG9yKTsKKyAgICAgICAgdmFyIHJhd0xvY2F0 aW9uID0geyBsaW5lTnVtYmVyOiBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IGNvbHVtbk51bWJl ciB9OworICAgICAgICB2YXIgbGl2ZUxvY2F0aW9uID0gcmF3U291cmNlQ29kZS5jcmVhdGVMaXZl TG9jYXRpb24ocmF3TG9jYXRpb24sIHRoaXMuX3VwZGF0ZUFuY2hvci5iaW5kKHRoaXMsIGFuY2hv cikpOworICAgICAgICBsaXZlTG9jYXRpb24uaW5pdCgpOworICAgICAgICB0aGlzLl9saXZlTG9j YXRpb25zLnB1c2gobGl2ZUxvY2F0aW9uKTsKICAgICAgICAgcmV0dXJuIGFuY2hvcjsKICAgICB9 LAogCkBAIC05NzEsNDQgKzk1NSwyNCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbC5MaW5raWZpZXIucHJvdG90eXBlID0gewogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkK ICAgICB7Ci0gICAgICAgIGZvciAodmFyIGlkIGluIHRoaXMuX2FuY2hvcnNGb3JSYXdTb3VyY2VD b2RlKSB7Ci0gICAgICAgICAgICBpZiAodGhpcy5fbW9kZWwuX3Jhd1NvdXJjZUNvZGVGb3JTY3Jp cHRJZFtpZF0pIC8vIEluIGNhc2Ugb2YgbmF2aWdhdGlvbiB0aGUgbGlzdCBvZiByYXdTb3VyY2VD b2RlcyBpcyBlbXB0eS4KLSAgICAgICAgICAgICAgICB0aGlzLl9tb2RlbC5fcmF3U291cmNlQ29k ZUZvclNjcmlwdElkW2lkXS5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SYXdTb3Vy Y2VDb2RlLkV2ZW50cy5VSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgdGhpcy5fdXBkYXRlU291cmNl QW5jaG9ycywgdGhpcyk7Ci0gICAgICAgIH0KLSAgICAgICAgdGhpcy5fYW5jaG9yc0ZvclJhd1Nv dXJjZUNvZGUgPSB7fTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuRXZlbnR9IGV2ZW50Ci0gICAgICovCi0gICAgX3VwZGF0ZVNvdXJjZUFuY2hvcnM6IGZ1 bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSAvKiogQHR5 cGUge1dlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlfSAqLyBldmVudC50YXJnZXQ7Ci0gICAgICAg IHZhciBhbmNob3JzID0gdGhpcy5fYW5jaG9yc0ZvclJhd1NvdXJjZUNvZGVbcmF3U291cmNlQ29k ZS5pZF07Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgYW5jaG9ycy5sZW5ndGg7ICsraSkK LSAgICAgICAgICAgIHRoaXMuX3VwZGF0ZUFuY2hvcihyYXdTb3VyY2VDb2RlLCBhbmNob3JzW2ld KTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9saXZlTG9jYXRpb25zLmxlbmd0 aDsgKytpKQorICAgICAgICAgICAgdGhpcy5fbGl2ZUxvY2F0aW9uc1tpXS5kaXNwb3NlKCk7Cisg ICAgICAgIHRoaXMuX2xpdmVMb2NhdGlvbnMgPSBbXTsKICAgICB9LAogCiAgICAgLyoqCi0gICAg ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQogICAg ICAqIEBwYXJhbSB7RWxlbWVudH0gYW5jaG9yCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3Iu VUlMb2NhdGlvbn0gdWlMb2NhdGlvbgogICAgICAqLwotICAgIF91cGRhdGVBbmNob3I6IGZ1bmN0 aW9uKHJhd1NvdXJjZUNvZGUsIGFuY2hvcikKKyAgICBfdXBkYXRlQW5jaG9yOiBmdW5jdGlvbihh bmNob3IsIHVpTG9jYXRpb24pCiAgICAgewotICAgICAgICB2YXIgdWlMb2NhdGlvbiA9IHJhd1Nv dXJjZUNvZGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24oYW5jaG9yLnJhd0xvY2F0aW9uKTsKLSAg ICAgICAgaWYgKCF1aUxvY2F0aW9uKQotICAgICAgICAgICAgcmV0dXJuOwotCiAgICAgICAgIGFu Y2hvci5wcmVmZXJyZWRQYW5lbCA9ICJzY3JpcHRzIjsKICAgICAgICAgYW5jaG9yLnVpU291cmNl Q29kZSA9IHVpTG9jYXRpb24udWlTb3VyY2VDb2RlOwogICAgICAgICBhbmNob3IubGluZU51bWJl ciA9IHVpTG9jYXRpb24ubGluZU51bWJlcjsKLQotICAgICAgICB0aGlzLl9mb3JtYXR0ZXIuZm9y bWF0UmF3U291cmNlQ29kZUFuY2hvcihyYXdTb3VyY2VDb2RlLCBhbmNob3IpOworICAgICAgICB0 aGlzLl9mb3JtYXR0ZXIuZm9ybWF0UmF3U291cmNlQ29kZUFuY2hvcihhbmNob3IsIHVpTG9jYXRp b24pOwogICAgIH0KIH0KIAotV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWxS ZXNvdXJjZUJpbmRpbmcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5SZXNvdXJj ZURvbWFpbk1vZGVsQmluZGluZy5wcm90b3R5cGU7Ci0KIC8qKgogICogQHR5cGUgez9XZWJJbnNw ZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbH0KICAqLwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SYXdTb3VyY2VDb2RlLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SYXdTb3VyY2VDb2RlLmpzCmluZGV4IGI1OTA4ZThh NTlmZTY1ODViNzc1OThjNzI5MDc5MGZkYjY4NjQ3NWIuLmY4NWZiZjkxYjNiNzIzYzY3MjU1MzQ5 MzZjMzAxYzc1Y2RhNWE5ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmF3U291cmNlQ29kZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jhd1NvdXJjZUNvZGUuanMKQEAgLTEwOSw2ICsxMDksMTEgQEAgV2ViSW5zcGVj dG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gW107CiAgICAg fSwKIAorICAgIGNyZWF0ZUxpdmVMb2NhdGlvbjogZnVuY3Rpb24ocmF3TG9jYXRpb24sIHVwZGF0 ZURlbGVnYXRlKQorICAgIHsKKyAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUmF3U291 cmNlQ29kZS5MaXZlTG9jYXRpb24odGhpcywgcmF3TG9jYXRpb24sIHVwZGF0ZURlbGVnYXRlKTsK KyAgICB9LAorCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtib29sZWFufSBmb3JtYXR0ZWQKICAg ICAgKi8KQEAgLTI3OCw2ICsyODMsMzkgQEAgV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJv dG90eXBlID0gewogV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlLl9fcHJvdG9f XyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlOwogCiAvKioKKyAqIEBjb25zdHJ1Y3Rv cgorICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQor ICogQHBhcmFtIHtEZWJ1Z2dlckFnZW50LkxvY2F0aW9ufSByYXdMb2NhdGlvbgorICogQHBhcmFt IHtmdW5jdGlvbihXZWJJbnNwZWN0b3IuVUlMb2NhdGlvbil9IHVwZGF0ZURlbGVnYXRlCisgKi8K K1dlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkxpdmVMb2NhdGlvbiA9IGZ1bmN0aW9uKHJhd1Nv dXJjZUNvZGUsIHJhd0xvY2F0aW9uLCB1cGRhdGVEZWxlZ2F0ZSkKK3sKKyAgICB0aGlzLl9yYXdT b3VyY2VDb2RlID0gcmF3U291cmNlQ29kZTsKKyAgICB0aGlzLl9yYXdMb2NhdGlvbiA9IHJhd0xv Y2F0aW9uOworICAgIHRoaXMuX3VwZGF0ZURlbGVnYXRlID0gdXBkYXRlRGVsZWdhdGU7Cit9CisK K1dlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkxpdmVMb2NhdGlvbi5wcm90b3R5cGUgPSB7Cisg ICAgaW5pdDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZS5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLkV2ZW50cy5VSVNvdXJj ZUNvZGVMaXN0Q2hhbmdlZCwgdGhpcy5fdXBkYXRlLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fdXBk YXRlKCk7CisgICAgfSwKKworICAgIGRpc3Bvc2U6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IHRoaXMuX3Jhd1NvdXJjZUNvZGUucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmF3 U291cmNlQ29kZS5FdmVudHMuVUlTb3VyY2VDb2RlTGlzdENoYW5nZWQsIHRoaXMuX3VwZGF0ZSwg dGhpcyk7CisgICAgfSwKKworICAgIF91cGRhdGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IHZhciB1aUxvY2F0aW9uID0gdGhpcy5fcmF3U291cmNlQ29kZS5yYXdMb2NhdGlvblRvVUlMb2Nh dGlvbih0aGlzLl9yYXdMb2NhdGlvbik7CisgICAgICAgIGlmICh1aUxvY2F0aW9uKQorICAgICAg ICAgICAgdGhpcy5fdXBkYXRlRGVsZWdhdGUodWlMb2NhdGlvbik7CisgICAgfQorfQorCisvKioK ICAqIEBpbnRlcmZhY2UKICAqLwogV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuU291cmNlTWFw cGluZyA9IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1NlYXJjaFNjb3BlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzU2VhcmNoU2NvcGUuanMKaW5kZXggZmI2NTk5MjQ2ZTYxM2NiMWE4 N2IyNjQ1NDJjNzNkODlkZTZkOTBiZC4uZDI1ZDU2MDM1YmE1NTY4OTNjZWFiNGNlZDA5MThmMGM0 Yjc2YTI3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzU2VhcmNoU2NvcGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzU2VhcmNoU2NvcGUuanMKQEAgLTE3NiwxMCArMTc2LDEwIEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRzU2VhcmNoUmVzdWx0c1BhbmUuTGlua2lmaWVyRm9ybWF0dGVyID0gZnVuY3Rp b24oKQogCiBXZWJJbnNwZWN0b3IuU2NyaXB0c1NlYXJjaFJlc3VsdHNQYW5lLkxpbmtpZmllckZv cm1hdHRlci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQogICAgICAqIEBwYXJhbSB7RWxlbWVudH0g YW5jaG9yCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlMb2NhdGlvbn0gdWlMb2NhdGlv bgogICAgICAqLwotICAgIGZvcm1hdFJhd1NvdXJjZUNvZGVBbmNob3I6IGZ1bmN0aW9uKHJhd1Nv dXJjZUNvZGUsIGFuY2hvcikKKyAgICBmb3JtYXRSYXdTb3VyY2VDb2RlQW5jaG9yOiBmdW5jdGlv bihhbmNob3IsIHVpTG9jYXRpb24pCiAgICAgewogICAgICAgICAvLyBFbXB0eSBiZWNhdXNlIHdl IGRvbid0IHdhbnQgdG8gZXZlciB1cGRhdGUgYW5jaG9yIGNvbnRlbnRzIGFmdGVyIGNyZWF0aW9u LgogICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCBmZWI2ZjNmZjgyZDJjMTI3MWUwNzdjM2U1NjRjMGFhZjZlMGNlYmYy Li40YjNhN2QzMmEyYjMyYmU5MmEzODMwMjBkMDY2NmNkMzgxNjg0YmNkIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTIgQEAKKzIwMTItMDItMjkgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWJzdHJhY3Qgb3V0IHRoZSBjb21tb24g cGF0dGVybiBvZiBjcmVhdGluZyBhdXRvLXVwZGF0ZWQgbG9jYXRpb25zLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk5MDYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9s aW5raWZpZXIuaHRtbDoKKwogMjAxMi0wMi0yOSAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1l cm1hbm5AcmltLmNvbT4KIAogICAgICAgICBOb3QgcmV2aWV3ZWQuIE5leHQgY2h1bmsgb2YgU0wg cGl4ZWwgdGVzdCB1cGRhdGVzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL2xpbmtpZmllci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2xp bmtpZmllci5odG1sCmluZGV4IDcyNWRkMjBhMDQ3NjgyMGM1ZWJhNmUzNTdlZjQ2MTNjOGQyY2Rl MjAuLmUwZmI4NWU0MjkwYTZiNDU1MjgxZDcyNmE0MDU2YjQwNDI1NzQ2ZmMgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saW5raWZpZXIuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGlua2lmaWVyLmh0bWwKQEAgLTQzLDE0ICs0Mywx NCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoImxp c3RlbmVycyBhZGRlZCBvbiByYXcgc291cmNlIGNvZGU6ICIgKyAoY291bnQyIC0gY291bnQxKSk7 CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJvcmlnaW5hbCBsb2NhdGlvbjogIiAr IGxpbmsudGV4dENvbnRlbnQpOwogCi0gICAgICAgIEluc3BlY3RvclRlc3QuYWRkU25pZmZlcihs aW5raWZpZXIsICJfdXBkYXRlQW5jaG9yIiwgbGlua1VwZGF0ZWQpOworICAgICAgICBJbnNwZWN0 b3JUZXN0LmFkZFNuaWZmZXIobGlua2lmaWVyLl9mb3JtYXR0ZXIsICJmb3JtYXRSYXdTb3VyY2VD b2RlQW5jaG9yIiwgbGlua1VwZGF0ZWQpOwogICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbC5zZXRGb3JtYXRTb3VyY2UodHJ1ZSk7CiAgICAgfQogCiAgICAgZnVu Y3Rpb24gbGlua1VwZGF0ZWQoKQogICAgIHsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1 bHQoInByZXR0eSBwcmludGVkIGxvY2F0aW9uOiAiICsgbGluay50ZXh0Q29udGVudCk7Ci0gICAg ICAgIEluc3BlY3RvclRlc3QuYWRkU25pZmZlcihsaW5raWZpZXIsICJfdXBkYXRlQW5jaG9yIiwg bGlua1JldmVydGVkKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKGxpbmtpZmll ci5fZm9ybWF0dGVyLCAiZm9ybWF0UmF3U291cmNlQ29kZUFuY2hvciIsIGxpbmtSZXZlcnRlZCk7 CiAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnNldEZvcm1h dFNvdXJjZShmYWxzZSk7CiAgICAgfQogCkBAIC03NSw3ICs3NSw3IEBAIGZ1bmN0aW9uIHRlc3Qo KQogICAgICAgICAgICAgdmFyIGxpc3RlbmVyc0FycmF5ID0gbGlzdGVuZXJzW2V2ZW50VHlwZXNd OwogICAgICAgICAgICAgY291bnQgKz0gbGlzdGVuZXJzQXJyYXkubGVuZ3RoOwogICAgICAgICB9 Ci0gICAgICAgIHJldHVybiBjb3VudDsgCisgICAgICAgIHJldHVybiBjb3VudDsKICAgICB9CiB9 CiAK