80023 2012-03-01 06:31:16 -0800 Web Inspector: use live location to update console message bubbles. 2012-03-01 09:31:23 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 568624 0 podivilov 2012-03-01 06:31:16 -0800 Web Inspector: use live location to update console message bubbles. 568625 1 129697 podivilov 2012-03-01 06:32:44 -0800 Created attachment 129697 Patch 568646 2 timothy 2012-03-01 07:17:20 -0800 What is a "live location"? 568656 3 podivilov 2012-03-01 07:43:54 -0800 (In reply to comment #2) > What is a "live location"? LiveLocation class encapsulates common logic for handling script locations in UI. It is currently used to update script anchors, search results, and call frames when switching to pretty-print mode and back. See bug 79906 for more details. 568718 4 podivilov 2012-03-01 09:31:23 -0800 Committed r109351: <http://trac.webkit.org/changeset/109351> 129697 2012-03-01 06:32:44 -0800 2012-03-01 08:27:23 -0800 Patch bug-80023-20120301183242.patch text/plain 11181 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MzI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTJhMmNhMTM4ZGM1NzY3 NjkxOWI5NjZmYTVmYTg2OWNmZmE1ODlkNS4uYjJhMDc5Y2EyMDI5NDQyZDMyNDRmMTg0OWEyNDE2 ZjQzYWUwNzc5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAzLTAxICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IHVzZSBsaXZlIGxvY2F0aW9uIHRvIHVwZGF0ZSBjb25zb2xlIG1lc3NhZ2UgYnViYmxl cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwMDIz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX3VpU291cmNlQ29kZUxp c3RDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLnByb3RvdHlwZS5fY29uc29sZU1lc3NhZ2VBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX2FkZENvbnNvbGVNZXNzYWdl VG9TY3JpcHQudXBkYXRlTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9hZGRDb25zb2xlTWVzc2FnZVRvU2NyaXB0KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZS5fYWRkUGVuZGluZ0NvbnNvbGVNZXNzYWdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fYWRkUGVuZGluZ0NvbnNvbGVNZXNzYWdl c1RvU2NyaXB0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLnByb3RvdHlwZS5fY29uc29sZUNsZWFyZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLm1lc3NhZ2VzRm9yVUlTb3VyY2VDb2Rl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3Rv dHlwZS5fc2NyaXB0Rm9yVVJMQW5kTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl9kZWJ1Z2dlclJlc2V0KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jhd1NvdXJjZUNvZGUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmF3U291cmNlQ29kZSk6CisKIDIwMTItMDItMjkgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWJzdHJh Y3Qgb3V0IHRoZSBjb21tb24gcGF0dGVybiBvZiBjcmVhdGluZyBhdXRvLXVwZGF0ZWQgbG9jYXRp b25zLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IGQ2MmQzOTkwYjE5M2I0ODY1 MjA1MjNjYTBlMGQ0MGYzYTU3MzY5MjQuLjc3Yjk0YTdhMTJmZWJlOWYzZjE0MjI3MzQwYjIwM2Rk ZmY4NmM5ZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTQ0LDYgKzQ0LDEw IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsID0gZnVuY3Rpb24oKQog CiAgICAgdGhpcy5fYnJlYWtwb2ludE1hbmFnZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9p bnRNYW5hZ2VyKFdlYkluc3BlY3Rvci5zZXR0aW5ncy5icmVha3BvaW50cywgdGhpcy5fYnJlYWtw b2ludEFkZGVkLmJpbmQodGhpcyksIHRoaXMuX2JyZWFrcG9pbnRSZW1vdmVkLmJpbmQodGhpcyks IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsKTsKIAorICAgIHRoaXMuX3BlbmRpbmdDb25zb2xl TWVzc2FnZXMgPSB7fTsKKyAgICB0aGlzLl9jb25zb2xlTWVzc2FnZUxpdmVMb2NhdGlvbnMgPSBb XTsKKyAgICB0aGlzLl9wcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZXMgPSBbXTsKKwogICAgIFdl Ykluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyTW9kZWwuRXZlbnRzLlBhcnNlZFNjcmlwdFNvdXJjZSwgdGhpcy5fcGFyc2VkU2NyaXB0 U291cmNlLCB0aGlzKTsKICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5hZGRFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50cy5GYWlsZWRUb1BhcnNlU2Ny aXB0U291cmNlLCB0aGlzLl9mYWlsZWRUb1BhcnNlU2NyaXB0U291cmNlLCB0aGlzKTsKICAgICBX ZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlck1vZGVsLkV2ZW50cy5EZWJ1Z2dlclBhdXNlZCwgdGhpcy5fZGVidWdnZXJQYXVzZWQs IHRoaXMpOwpAQCAtMTQ5LDYgKzE1Myw4IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRh dGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKGlzSW5saW5lU2NyaXB0KQogICAg ICAgICAgICAgdGhpcy5fcmF3U291cmNlQ29kZUZvckRvY3VtZW50VVJMW3NjcmlwdC5zb3VyY2VV UkxdID0gcmF3U291cmNlQ29kZTsKIAorICAgICAgICB0aGlzLl9hZGRQZW5kaW5nQ29uc29sZU1l c3NhZ2VzVG9TY3JpcHQoc2NyaXB0KTsKKwogICAgICAgICBpZiAocmF3U291cmNlQ29kZS51aVNv dXJjZUNvZGVMaXN0KCkubGVuZ3RoKQogICAgICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlTGlz dENoYW5nZWQocmF3U291cmNlQ29kZSwgW10pOwogICAgICAgICByYXdTb3VyY2VDb2RlLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUuRXZlbnRzLlVJU291cmNlQ29k ZUxpc3RDaGFuZ2VkLCB0aGlzLl9oYW5kbGVVSVNvdXJjZUNvZGVMaXN0Q2hhbmdlZCwgdGhpcyk7 CkBAIC0yMDQsNyArMjEwLDYgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fcmVzdG9yZUJyZWFr cG9pbnRzKHJhd1NvdXJjZUNvZGUpOwotICAgICAgICB0aGlzLl9yZXN0b3JlQ29uc29sZU1lc3Nh Z2VzKHJhd1NvdXJjZUNvZGUpOwogICAgICAgICB0aGlzLl9yZXN0b3JlRXhlY3V0aW9uTGluZShy YXdTb3VyY2VDb2RlKTsKIAogICAgICAgICB2YXIgdWlTb3VyY2VDb2RlTGlzdCA9IHJhd1NvdXJj ZUNvZGUudWlTb3VyY2VDb2RlTGlzdCgpOwpAQCAtMjM1LDIwICsyNDAsNiBAQCBXZWJJbnNwZWN0 b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAg ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZX0gcmF3U291cmNlQ29kZQogICAg ICAqLwotICAgIF9yZXN0b3JlQ29uc29sZU1lc3NhZ2VzOiBmdW5jdGlvbihyYXdTb3VyY2VDb2Rl KQotICAgIHsKLSAgICAgICAgdmFyIG1lc3NhZ2VzID0gcmF3U291cmNlQ29kZS5tZXNzYWdlczsK LSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBtZXNzYWdlcy5sZW5ndGg7ICsraSkgewotICAg ICAgICAgICAgdmFyIG1lc3NhZ2UgPSBtZXNzYWdlc1tpXTsKLSAgICAgICAgICAgIHZhciB1aUxv Y2F0aW9uID0gcmF3U291cmNlQ29kZS5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbihtZXNzYWdlLmxv Y2F0aW9uKTsKLSAgICAgICAgICAgIGlmICh1aUxvY2F0aW9uKQotICAgICAgICAgICAgICAgIG1l c3NhZ2UuX3ByZXNlbnRhdGlvbk1lc3NhZ2UgPSBuZXcgV2ViSW5zcGVjdG9yLlByZXNlbnRhdGlv bkNvbnNvbGVNZXNzYWdlKHVpTG9jYXRpb24udWlTb3VyY2VDb2RlLCB1aUxvY2F0aW9uLmxpbmVO dW1iZXIsIG1lc3NhZ2UpOwotICAgICAgICB9Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGV9IHJhd1NvdXJjZUNvZGUKLSAgICAgKi8K ICAgICBfcmVzdG9yZUV4ZWN1dGlvbkxpbmU6IGZ1bmN0aW9uKHJhd1NvdXJjZUNvZGUpCiAgICAg ewogICAgICAgICBpZiAoIXRoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lIHx8IHRoaXMuX3NlbGVjdGVk Q2FsbEZyYW1lLnJhd1NvdXJjZUNvZGUgIT09IHJhd1NvdXJjZUNvZGUpCkBAIC0zNTcsMjIgKzM0 OCw3MiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIGlmICghbWVzc2FnZS51cmwgfHwgIW1lc3NhZ2UuaXNFcnJvck9yV2Fybmlu ZygpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0g dGhpcy5fcmF3U291cmNlQ29kZUZvclNjcmlwdFdpdGhVUkwobWVzc2FnZS51cmwpOwotICAgICAg ICBpZiAoIXJhd1NvdXJjZUNvZGUpCisgICAgICAgIHZhciBzY3JpcHQgPSB0aGlzLl9zY3JpcHRG b3JVUkxBbmRMb2NhdGlvbihtZXNzYWdlLnVybCwgbWVzc2FnZS5sb2NhdGlvbik7CisgICAgICAg IGlmIChzY3JpcHQpCisgICAgICAgICAgICB0aGlzLl9hZGRDb25zb2xlTWVzc2FnZVRvU2NyaXB0 KG1lc3NhZ2UsIHNjcmlwdCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMuX2FkZFBl bmRpbmdDb25zb2xlTWVzc2FnZShtZXNzYWdlKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2V9IG1lc3NhZ2UKKyAgICAgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5TY3JpcHR9IHNjcmlwdAorICAgICAqLworICAgIF9hZGRDb25zb2xl TWVzc2FnZVRvU2NyaXB0OiBmdW5jdGlvbihtZXNzYWdlLCBzY3JpcHQpCisgICAgeworICAgICAg ICB2YXIgcmF3U291cmNlQ29kZSA9IHRoaXMuX3Jhd1NvdXJjZUNvZGVGb3JTY3JpcHQoc2NyaXB0 KTsKKyAgICAgICAgZnVuY3Rpb24gdXBkYXRlTG9jYXRpb24odWlMb2NhdGlvbikKKyAgICAgICAg eworICAgICAgICAgICAgdmFyIHByZXNlbnRhdGlvbk1lc3NhZ2UgPSBuZXcgV2ViSW5zcGVjdG9y LlByZXNlbnRhdGlvbkNvbnNvbGVNZXNzYWdlKHVpTG9jYXRpb24udWlTb3VyY2VDb2RlLCB1aUxv Y2F0aW9uLmxpbmVOdW1iZXIsIG1lc3NhZ2UpOworICAgICAgICAgICAgdGhpcy5fcHJlc2VudGF0 aW9uQ29uc29sZU1lc3NhZ2VzLnB1c2gocHJlc2VudGF0aW9uTWVzc2FnZSk7CisgICAgICAgICAg ICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbC5FdmVudHMuQ29uc29sZU1lc3NhZ2VBZGRlZCwgcHJlc2VudGF0aW9uTWVz c2FnZSk7CisgICAgICAgIH0KKyAgICAgICAgdmFyIGxpdmVMb2NhdGlvbiA9IHJhd1NvdXJjZUNv ZGUuY3JlYXRlTGl2ZUxvY2F0aW9uKG1lc3NhZ2UubG9jYXRpb24sIHVwZGF0ZUxvY2F0aW9uLmJp bmQodGhpcykpOworICAgICAgICBsaXZlTG9jYXRpb24uaW5pdCgpOworICAgICAgICB0aGlzLl9j b25zb2xlTWVzc2FnZUxpdmVMb2NhdGlvbnMucHVzaChsaXZlTG9jYXRpb24pOworICAgIH0sCisK KyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZX0gbWVz c2FnZQorICAgICAqLworICAgIF9hZGRQZW5kaW5nQ29uc29sZU1lc3NhZ2U6IGZ1bmN0aW9uKG1l c3NhZ2UpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX3BlbmRpbmdDb25zb2xlTWVzc2FnZXNb bWVzc2FnZS51cmxdKQorICAgICAgICAgICAgdGhpcy5fcGVuZGluZ0NvbnNvbGVNZXNzYWdlc1tt ZXNzYWdlLnVybF0gPSBbXTsKKyAgICAgICAgdGhpcy5fcGVuZGluZ0NvbnNvbGVNZXNzYWdlc1tt ZXNzYWdlLnVybF0ucHVzaChtZXNzYWdlKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBh cmFtIHtXZWJJbnNwZWN0b3IuU2NyaXB0fSBzY3JpcHQKKyAgICAgKi8KKyAgICBfYWRkUGVuZGlu Z0NvbnNvbGVNZXNzYWdlc1RvU2NyaXB0OiBmdW5jdGlvbihzY3JpcHQpCisgICAgeworICAgICAg ICB2YXIgbWVzc2FnZXMgPSB0aGlzLl9wZW5kaW5nQ29uc29sZU1lc3NhZ2VzW3NjcmlwdC5zb3Vy Y2VVUkxdOworICAgICAgICBpZiAoIW1lc3NhZ2VzKQogICAgICAgICAgICAgcmV0dXJuOwogCi0g ICAgICAgIHJhd1NvdXJjZUNvZGUubWVzc2FnZXMucHVzaChtZXNzYWdlKTsKLSAgICAgICAgdmFy IHVpTG9jYXRpb24gPSByYXdTb3VyY2VDb2RlLnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uKG1lc3Nh Z2UubG9jYXRpb24pOwotICAgICAgICBpZiAodWlMb2NhdGlvbikgewotICAgICAgICAgICAgbWVz c2FnZS5fcHJlc2VudGF0aW9uTWVzc2FnZSA9IG5ldyBXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9u Q29uc29sZU1lc3NhZ2UodWlMb2NhdGlvbi51aVNvdXJjZUNvZGUsIHVpTG9jYXRpb24ubGluZU51 bWJlciwgbWVzc2FnZSk7Ci0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuQ29uc29sZU1l c3NhZ2VBZGRlZCwgbWVzc2FnZS5fcHJlc2VudGF0aW9uTWVzc2FnZSk7CisgICAgICAgIHZhciBw ZW5kaW5nTWVzc2FnZXMgPSBbXTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBtZXNzYWdl cy5sZW5ndGg7IGkrKykgeworICAgICAgICAgICAgdmFyIG1lc3NhZ2UgPSBtZXNzYWdlc1tpXTsK KyAgICAgICAgICAgIGlmIChzY3JpcHQgPT09IHRoaXMuX3NjcmlwdEZvclVSTEFuZExvY2F0aW9u KG1lc3NhZ2UudXJsLCBtZXNzYWdlLmxvY2F0aW9uKSkKKyAgICAgICAgICAgICAgICB0aGlzLl9h ZGRDb25zb2xlTWVzc2FnZVRvU2NyaXB0KG1lc3NhZ2VzLCBzY3JpcHQpOworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIHBlbmRpbmdNZXNzYWdlcy5wdXNoKG1lc3NhZ2UpOwogICAg ICAgICB9CisKKyAgICAgICAgaWYgKHBlbmRpbmdNZXNzYWdlcy5sZW5ndGgpCisgICAgICAgICAg ICB0aGlzLl9wZW5kaW5nQ29uc29sZU1lc3NhZ2VzW3NjcmlwdC5zb3VyY2VVUkxdID0gcGVuZGlu Z01lc3NhZ2VzOworICAgICAgICBlbHNlCisgICAgICAgICAgICBkZWxldGUgdGhpcy5fcGVuZGlu Z0NvbnNvbGVNZXNzYWdlc1tzY3JpcHQuc291cmNlVVJMXTsKICAgICB9LAogCiAgICAgX2NvbnNv bGVDbGVhcmVkOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8 IHRoaXMuX3Jhd1NvdXJjZUNvZGVzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgdGhpcy5fcmF3 U291cmNlQ29kZXNbaV0ubWVzc2FnZXMgPSBbXTsKKyAgICAgICAgdGhpcy5fcGVuZGluZ0NvbnNv bGVNZXNzYWdlcyA9IHt9OworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2NvbnNv bGVNZXNzYWdlTGl2ZUxvY2F0aW9ucy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgIHRoaXMuX2Nv bnNvbGVNZXNzYWdlTGl2ZUxvY2F0aW9uc1tpXS5kaXNwb3NlKCk7CisgICAgICAgIHRoaXMuX2Nv bnNvbGVNZXNzYWdlTGl2ZUxvY2F0aW9ucyA9IFtdOworICAgICAgICB0aGlzLl9wcmVzZW50YXRp b25Db25zb2xlTWVzc2FnZXMgPSBbXTsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkNvbnNv bGVNZXNzYWdlc0NsZWFyZWQpOwogICAgIH0sCiAKQEAgLTQwMSwxNCArNDQyLDE2IEBAIFdlYklu c3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKIAogICAgIC8q KgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2Rl Ci0gICAgICogQHJldHVybiB7QXJyYXkuPFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZT59Cisg ICAgICogQHJldHVybiB7QXJyYXkuPFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVz c2FnZT59CiAgICAgICovCiAgICAgbWVzc2FnZXNGb3JVSVNvdXJjZUNvZGU6IGZ1bmN0aW9uKHVp U291cmNlQ29kZSkKICAgICB7Ci0gICAgICAgIHZhciByYXdTb3VyY2VDb2RlID0gdWlTb3VyY2VD b2RlLnJhd1NvdXJjZUNvZGU7CiAgICAgICAgIHZhciBtZXNzYWdlcyA9IFtdOwotICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IHJhd1NvdXJjZUNvZGUubWVzc2FnZXMubGVuZ3RoOyArK2kpCi0g ICAgICAgICAgICBtZXNzYWdlcy5wdXNoKHJhd1NvdXJjZUNvZGUubWVzc2FnZXNbaV0uX3ByZXNl bnRhdGlvbk1lc3NhZ2UpOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3ByZXNl bnRhdGlvbkNvbnNvbGVNZXNzYWdlcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgdmFyIG1l c3NhZ2UgPSB0aGlzLl9wcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZXNbaV07CisgICAgICAgICAg ICBpZiAobWVzc2FnZS51aVNvdXJjZUNvZGUgPT09IHVpU291cmNlQ29kZSkKKyAgICAgICAgICAg ICAgICBtZXNzYWdlcy5wdXNoKG1lc3NhZ2UpOworICAgICAgICB9CiAgICAgICAgIHJldHVybiBt ZXNzYWdlczsKICAgICB9LAogCkBAIC02MjYsNiArNjY5LDI0IEBAIFdlYkluc3BlY3Rvci5EZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIFdlYklu c3BlY3Rvci5kZWJ1Z2dlck1vZGVsLnF1ZXJ5U2NyaXB0cyhmaWx0ZXIuYmluZCh0aGlzKSlbMF07 CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSB1cmwKKyAgICAgKiBA cGFyYW0ge0RlYnVnZ2VyQWdlbnQuTG9jYXRpb259IHJhd0xvY2F0aW9uCisgICAgICovCisgICAg X3NjcmlwdEZvclVSTEFuZExvY2F0aW9uOiBmdW5jdGlvbih1cmwsIHJhd0xvY2F0aW9uKQorICAg IHsKKyAgICAgICAgdmFyIHNjcmlwdHMgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5zY3Jp cHRzRm9yVVJMKHVybCk7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc2NyaXB0cy5sZW5n dGg7ICsraSkgeworICAgICAgICAgICAgdmFyIHNjcmlwdCA9IHNjcmlwdHNbaV07CisgICAgICAg ICAgICBpZiAoc2NyaXB0LmxpbmVPZmZzZXQgPiByYXdMb2NhdGlvbi5saW5lTnVtYmVyIHx8IChz Y3JpcHQubGluZU9mZnNldCA9PT0gcmF3TG9jYXRpb24ubGluZU51bWJlciAmJiBzY3JpcHQuY29s dW1uT2Zmc2V0ID4gcmF3TG9jYXRpb24uY29sdW1uTnVtYmVyKSkKKyAgICAgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgICAgIGlmIChzY3JpcHQuZW5kTGluZSA8IHJhd0xvY2F0aW9uLmxp bmVOdW1iZXIgfHwgKHNjcmlwdC5lbmRMaW5lID09PSByYXdMb2NhdGlvbi5saW5lTnVtYmVyICYm IHNjcmlwdC5lbmRDb2x1bW4gPD0gcmF3TG9jYXRpb24uY29sdW1uTnVtYmVyKSkKKyAgICAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIHJldHVybiBzY3JpcHQ7CisgICAgICAgIH0K KyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgfSwKKwogICAgIF9kZWJ1Z2dlclJlc2V0OiBmdW5j dGlvbigpCiAgICAgewogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3Jhd1NvdXJj ZUNvZGVzLmxlbmd0aDsgKytpKSB7CkBAIC02NDIsNiArNzAzLDkgQEAgV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9wcmVz ZW50YXRpb25DYWxsRnJhbWVzID0gW107CiAgICAgICAgIHRoaXMuX3NlbGVjdGVkQ2FsbEZyYW1l ID0gbnVsbDsKICAgICAgICAgdGhpcy5fYnJlYWtwb2ludE1hbmFnZXIuZGVidWdnZXJSZXNldCgp OworICAgICAgICB0aGlzLl9wZW5kaW5nQ29uc29sZU1lc3NhZ2VzID0ge307CisgICAgICAgIHRo aXMuX2NvbnNvbGVNZXNzYWdlTGl2ZUxvY2F0aW9ucyA9IFtdOworICAgICAgICB0aGlzLl9wcmVz ZW50YXRpb25Db25zb2xlTWVzc2FnZXMgPSBbXTsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRz LkRlYnVnZ2VyUmVzZXQpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmF3U291cmNlQ29kZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmF3U291cmNlQ29kZS5qcwppbmRleCA2YjY5NWIxOWMwOWQzNzNiNTg4 MDAwNTkxMmU1NTU4M2I4MWEzOWFjLi5mNjllNmEzZWYzOWZkMmNlYzkwNDhiOGVjNDZlNzQ5NTQ5 MmY4OTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jh d1NvdXJjZUNvZGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S YXdTb3VyY2VDb2RlLmpzCkBAIC01MSw3ICs1MSw2IEBAIFdlYkluc3BlY3Rvci5SYXdTb3VyY2VD b2RlID0gZnVuY3Rpb24oaWQsIHNjcmlwdCwgcmVzb3VyY2UsIGZvcm1hdHRlciwgZm9ybWF0dGVk CiAgICAgdGhpcy5fZm9ybWF0dGVkID0gZm9ybWF0dGVkOwogICAgIHRoaXMuX2NvbXBpbGVyU291 cmNlTWFwcGluZyA9IGNvbXBpbGVyU291cmNlTWFwcGluZzsKICAgICB0aGlzLl9yZXNvdXJjZSA9 IHJlc291cmNlOwotICAgIHRoaXMubWVzc2FnZXMgPSBbXTsKIAogICAgIHRoaXMuX3VzZVRlbXBv cmFyeUNvbnRlbnQgPSAhdGhpcy5fY29tcGlsZXJTb3VyY2VNYXBwaW5nICYmIHRoaXMuX3Jlc291 cmNlICYmICF0aGlzLl9yZXNvdXJjZS5maW5pc2hlZDsKICAgICB0aGlzLl9oYXNOZXdTY3JpcHRz ID0gdHJ1ZTsK