39953 2010-05-31 06:52:11 -0700 Web Inspector: support "Continue to Here" in debugger 2010-06-02 08:20:50 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys webkit-unassigned bweinstein joepeck keishi pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 232347 0 yurys 2010-05-31 06:52:11 -0700 Support "Run To Cursor" functionality in script debugger. 232378 1 timothy 2010-05-31 08:17:48 -0700 Please describe this, I don't know what this means. (I have some wild guesses but I'll let you go first.) 232634 2 yurys 2010-05-31 23:27:08 -0700 It's like a one-time breakpoint. I think it'd be best to describe it as a step in/over/out counterpart that allows to continue program until given statement is reached. When you're debugging a program you may want to inspect its state at some execution point but you might not want to set a regular breakpoint which would cause the program to stop every time when the control flow reaches that line. MS Visual Studio and Eclipse provide such capability, I don't see it in Xcode though. 232637 3 timothy 2010-05-31 23:47:58 -0700 Ah. Xcode has this, if you right click in the line number column you will see "Continue to Here". I think Xcode's wording is more clear than "Run To Cursor". Cursor can mean so many things… 233249 4 57651 yurys 2010-06-02 07:04:39 -0700 Created attachment 57651 Patch 233263 5 57651 pfeldman 2010-06-02 07:49:36 -0700 Comment on attachment 57651 Patch Overall, this looks good, so I am open to landing this. However, the change uncovers some problems with our design in the area of passing numerous callbacks into SourceFrame. As we discussed offline, I would suggest the following refactorings: 1. Make SourceFrame BreakpointManager's listener 1.1. Make SourceFrame responsible for filling breakpoints on creation (few addBreakpoint snippets will go away from ScriptsPanel) 2. Remove sourceFrameForScriptOrResource from the scripts panel. 233272 6 yurys 2010-06-02 08:15:50 -0700 (In reply to comment #5) > (From update of attachment 57651 [details]) > Overall, this looks good, so I am open to landing this. However, the change uncovers some problems with our design in the area of passing numerous callbacks into SourceFrame. > As we discussed offline, I would suggest the following refactorings: > 1. Make SourceFrame BreakpointManager's listener > 1.1. Make SourceFrame responsible for filling breakpoints on creation (few addBreakpoint snippets will go away from ScriptsPanel) > 2. Remove sourceFrameForScriptOrResource from the scripts panel. Filed a new bug on this: https://bugs.webkit.org/show_bug.cgi?id=40063 233273 7 yurys 2010-06-02 08:20:50 -0700 Committed r60567 57651 2010-06-02 07:04:39 -0700 2010-06-02 07:49:36 -0700 Patch bug-39953-20100602180437.patch text/plain 10431 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTM4NzdjN2E3N2FhNWQzYTMzZTI4MGY2MGJkMjM4NDJkYmU5ODg2Zi4uYzg2YmRlMmQ4Mjg1YjEz OWJjODNjMTMxMDIyMGQwMWY3ZjA3NmUxMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMC0wNi0wMiAgWXVy eSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzdXBwb3J0ICJDb250 aW51ZSB0byBIZXJlIiBpbiBkZWJ1Z2dlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mzk5NTMKKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkK KworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZS5zZXRPbmVUaW1lQnJlYWtwb2lu dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIucHJvdG90eXBlLnJl bW92ZU9uZVRpbWVCcmVha3BvaW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVha3BvaW50 TWFuYWdlci5wcm90b3R5cGUuYWRkQnJlYWtwb2ludCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFZpZXcp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFZpZXcucHJvdG90eXBlLl9jb250aW51ZVRv TGluZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5jb250aW51ZVRvTGlu ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5kZWJ1Z2dl clBhdXNlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZSk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZVZp ZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlLl9jb250aW51 ZVRvTGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUudXBk YXRlTG9jYWxDb250ZW50KToKKwogMjAxMC0wNi0wMiAgVmFuZ2VsaXMgS29ra2V2aXMgIDx2YW5n ZWxpc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292 LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMg Yi9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBlNTliNjZk NTA4MGRmNTdhMTFmOTYxZjYwYzMyMmM2MTExYzljYzlmLi42M2E1ODhmZDI3NTBhNmNhY2ViZjNk YTgyYzBjNzYwYjhkZmU1NTBhIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDY2CnpjbWFF fW85V1JXclZXUVJDZDtkSGgtTmI2Rl9iYy1HQUo7VkZ5c1NDNDxOZn12Vm9mRDxreENreXJgbFJi b0RuTQpJKWxlQDUwRmV8RGdhN35sCgpkZWx0YSAxNApXY21hRX5odzA2M3JWV1FSSGR8X0htSTQ0 Y3swNWkrCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9p bnRNYW5hZ2VyLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5h Z2VyLmpzCmluZGV4IGMyNzdmYjE3YTM3NTgwOWMwMDJiNWJiN2QwNzFiM2JjYThkOGI5MzcuLjNj Y2NjYWMxNmMwMTIyYjQ5NTg1N2IxODFiYTk0OTEwMWVlYjY2OGUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdlci5qcworKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludE1hbmFnZXIuanMKQEAgLTMwLDExICszMCwz MiBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIgPSBmdW5jdGlvbigpCiB9CiAKIFdl Ykluc3BlY3Rvci5CcmVha3BvaW50TWFuYWdlci5wcm90b3R5cGUgPSB7CisgICAgc2V0T25lVGlt ZUJyZWFrcG9pbnQ6IGZ1bmN0aW9uKHNvdXJjZUlELCBsaW5lKQorICAgIHsKKyAgICAgICAgdmFy IGJyZWFrcG9pbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQodGhpcywgc291cmNlSUQs IHVuZGVmaW5lZCwgbGluZSwgdHJ1ZSwgdW5kZWZpbmVkKTsKKyAgICAgICAgaWYgKHRoaXMuX2Jy ZWFrcG9pbnRzW2JyZWFrcG9pbnQuaWRdKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBp ZiAodGhpcy5fb25lVGltZUJyZWFrcG9pbnQpCisgICAgICAgICAgICB0aGlzLl9yZW1vdmVCcmVh a3BvaW50RnJvbUJhY2tlbmQodGhpcy5fb25lVGltZUJyZWFrcG9pbnQpOworICAgICAgICB0aGlz Ll9vbmVUaW1lQnJlYWtwb2ludCA9IGJyZWFrcG9pbnQ7CisgICAgICAgIHRoaXMuX3NhdmVCcmVh a3BvaW50T25CYWNrZW5kKGJyZWFrcG9pbnQpOworICAgIH0sCisKKyAgICByZW1vdmVPbmVUaW1l QnJlYWtwb2ludDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX29uZVRpbWVC cmVha3BvaW50KSB7CisgICAgICAgICAgICB0aGlzLl9yZW1vdmVCcmVha3BvaW50RnJvbUJhY2tl bmQodGhpcy5fb25lVGltZUJyZWFrcG9pbnQpOworICAgICAgICAgICAgZGVsZXRlIHRoaXMuX29u ZVRpbWVCcmVha3BvaW50OworICAgICAgICB9CisgICAgfSwKKwogICAgIGFkZEJyZWFrcG9pbnQ6 IGZ1bmN0aW9uKHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmUsIGVuYWJsZWQsIGNvbmRpdGlvbikK ICAgICB7CiAgICAgICAgIHZhciBicmVha3BvaW50ID0gbmV3IFdlYkluc3BlY3Rvci5CcmVha3Bv aW50KHRoaXMsIHNvdXJjZUlELCBzb3VyY2VVUkwsIGxpbmUsIGVuYWJsZWQsIGNvbmRpdGlvbik7 CiAgICAgICAgIGlmICh0aGlzLl9icmVha3BvaW50c1ticmVha3BvaW50LmlkXSkKICAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgaWYgKHRoaXMuX29uZVRpbWVCcmVha3BvaW50ICYmICh0aGlz Ll9vbmVUaW1lQnJlYWtwb2ludC5pZCA9PSBicmVha3BvaW50LmlkKSkKKyAgICAgICAgICAgIGRl bGV0ZSB0aGlzLl9vbmVUaW1lQnJlYWtwb2ludDsKICAgICAgICAgdGhpcy5fYnJlYWtwb2ludHNb YnJlYWtwb2ludC5pZF0gPSBicmVha3BvaW50OwogICAgICAgICB0aGlzLl9zYXZlQnJlYWtwb2lu dE9uQmFja2VuZChicmVha3BvaW50KTsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0 ZW5lcnMoImJyZWFrcG9pbnQtYWRkZWQiLCBicmVha3BvaW50KTsKQEAgLTcyLDYgKzkzLDcgQEAg V2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICByZXNldDog ZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fYnJlYWtwb2ludHMgPSB7fTsKKyAgICAg ICAgZGVsZXRlIHRoaXMuX29uZVRpbWVCcmVha3BvaW50OwogICAgIH0sCiAKICAgICBfc2F2ZUJy ZWFrcG9pbnRPbkJhY2tlbmQ6IGZ1bmN0aW9uKGJyZWFrcG9pbnQpCmRpZmYgLS1naXQgYS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0Vmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRWaWV3LmpzCmluZGV4IDFhMjQyMTFmMzQwOTk4ZTJkMjU4NjVmYWFk MTc5ZjQyZTU2NTJmMzAuLjcxZTc4YWQ4Yjc0OGVkZWFiYmNhNzIyNTVmZjdlNzg4ZTdiNWI5NmMg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRWaWV3LmpzCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRWaWV3LmpzCkBAIC0zNCw3ICsz NCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRWaWV3ID0gZnVuY3Rpb24oc2NyaXB0KQogICAgIHRo aXMuX2ZyYW1lTmVlZHNTZXR1cCA9IHRydWU7CiAgICAgdGhpcy5fc291cmNlRnJhbWVTZXR1cCA9 IGZhbHNlOwogICAgIHZhciBjYW5FZGl0U2NyaXB0cyA9IFdlYkluc3BlY3Rvci5wYW5lbHMuc2Ny aXB0cy5jYW5FZGl0U2NyaXB0cygpOwotICAgIHRoaXMuc291cmNlRnJhbWUgPSBuZXcgV2ViSW5z cGVjdG9yLlNvdXJjZUZyYW1lKHRoaXMuZWxlbWVudCwgdGhpcy5fYWRkQnJlYWtwb2ludC5iaW5k KHRoaXMpLCB0aGlzLl9yZW1vdmVCcmVha3BvaW50LmJpbmQodGhpcyksIGNhbkVkaXRTY3JpcHRz ID8gdGhpcy5fZWRpdExpbmUuYmluZCh0aGlzKSA6IG51bGwpOworICAgIHRoaXMuc291cmNlRnJh bWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKHRoaXMuZWxlbWVudCwgdGhpcy5fYWRk QnJlYWtwb2ludC5iaW5kKHRoaXMpLCB0aGlzLl9yZW1vdmVCcmVha3BvaW50LmJpbmQodGhpcyks IGNhbkVkaXRTY3JpcHRzID8gdGhpcy5fZWRpdExpbmUuYmluZCh0aGlzKSA6IG51bGwsIHRoaXMu X2NvbnRpbnVlVG9MaW5lLmJpbmQodGhpcykpOwogfQogCiBXZWJJbnNwZWN0b3IuU2NyaXB0Vmll dy5wcm90b3R5cGUgPSB7CkBAIC03MSw2ICs3MSwxMyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0Vmll dy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2Ny aXB0LXJlc291cmNlLXZpZXdzIikuYXBwZW5kQ2hpbGQodGhpcy5lbGVtZW50KTsKICAgICB9LAog CisgICAgX2NvbnRpbnVlVG9MaW5lOiBmdW5jdGlvbihsaW5lKQorICAgIHsKKyAgICAgICAgdmFy IHNjcmlwdHNQYW5lbCA9IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0czsKKyAgICAgICAgaWYg KHNjcmlwdHNQYW5lbCkKKyAgICAgICAgICAgIHNjcmlwdHNQYW5lbC5jb250aW51ZVRvTGluZSh0 aGlzLnNjcmlwdC5zb3VyY2VJRCwgbGluZSk7CisgICAgfSwKKwogICAgIF9hZGRCcmVha3BvaW50 OiBmdW5jdGlvbihsaW5lKQogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLmJyZWFrcG9pbnRN YW5hZ2VyLmFkZEJyZWFrcG9pbnQodGhpcy5zY3JpcHQuc291cmNlSUQsIHRoaXMuc2NyaXB0LnNv dXJjZVVSTCwgbGluZSwgdHJ1ZSwgIiIpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanMKaW5kZXggNzU1ZGFmZmE1N2FkYjc5ZWJlYzM5YTZkM2FiYzg3MDhkNmZh N2ZkMC4uZDYzY2Y4Y2ZhYTJjZWEyYTlhMGJjY2ZiYzRhODFiOTBiMzVkZjY4OSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0yNjQsNiArMjY0LDEz IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlz Ll9hZGRTY3JpcHRUb0ZpbGVzTWVudShzY3JpcHQpOwogICAgIH0sCiAKKyAgICBjb250aW51ZVRv TGluZTogZnVuY3Rpb24oc291cmNlSUQsIGxpbmUpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0 b3IuYnJlYWtwb2ludE1hbmFnZXIuc2V0T25lVGltZUJyZWFrcG9pbnQoc291cmNlSUQsIGxpbmUp OworICAgICAgICBpZiAodGhpcy5wYXVzZWQpCisgICAgICAgICAgICB0aGlzLl90b2dnbGVQYXVz ZSgpOworICAgIH0sCisKICAgICBfcmVzb3VyY2VMb2FkaW5nRmluaXNoZWQ6IGZ1bmN0aW9uKGUp CiAgICAgewogICAgICAgICB2YXIgcmVzb3VyY2UgPSBlLnRhcmdldDsKQEAgLTQwMCw2ICs0MDcs NyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIGRlYnVn Z2VyUGF1c2VkOiBmdW5jdGlvbihjYWxsRnJhbWVzKQogICAgIHsKKyAgICAgICAgV2ViSW5zcGVj dG9yLmJyZWFrcG9pbnRNYW5hZ2VyLnJlbW92ZU9uZVRpbWVCcmVha3BvaW50KCk7CiAgICAgICAg IHRoaXMuX3BhdXNlZCA9IHRydWU7CiAgICAgICAgIHRoaXMuX3dhaXRpbmdUb1BhdXNlID0gZmFs c2U7CiAgICAgICAgIHRoaXMuX3N0ZXBwaW5nID0gZmFsc2U7CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggNWU1MjlhZTg3MThiNGMwZjI3YTRlYTBiMzIz NDgzZTYzMmM0MTI4Yi4uZjIyMTA4Njc4MWI1MWFiM2JlN2ZkMmIyOTk1ODliOTZjYTQ5NjA1YSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtMjgsNyAr MjgsNyBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3IuU291cmNlRnJhbWUg PSBmdW5jdGlvbihwYXJlbnRFbGVtZW50LCBhZGRCcmVha3BvaW50RGVsZWdhdGUsIHJlbW92ZUJy ZWFrcG9pbnREZWxlZ2F0ZSwgZWRpdERlbGVnYXRlKQorV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l ID0gZnVuY3Rpb24ocGFyZW50RWxlbWVudCwgYWRkQnJlYWtwb2ludERlbGVnYXRlLCByZW1vdmVC cmVha3BvaW50RGVsZWdhdGUsIGVkaXREZWxlZ2F0ZSwgY29udGludWVUb0hlcmVEZWxlZ2F0ZSkK IHsKICAgICB0aGlzLl9wYXJlbnRFbGVtZW50ID0gcGFyZW50RWxlbWVudDsKIApAQCAtNDIsNiAr NDIsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUgPSBmdW5jdGlvbihwYXJlbnRFbGVtZW50 LCBhZGRCcmVha3BvaW50RGVsZWdhdGUsIHJlbW92ZQogCiAgICAgdGhpcy5fbG9hZGVkID0gZmFs c2U7CiAKKyAgICB0aGlzLl9jb250aW51ZVRvSGVyZURlbGVnYXRlID0gY29udGludWVUb0hlcmVE ZWxlZ2F0ZTsKICAgICB0aGlzLl9hZGRCcmVha3BvaW50RGVsZWdhdGUgPSBhZGRCcmVha3BvaW50 RGVsZWdhdGU7CiAgICAgdGhpcy5fcmVtb3ZlQnJlYWtwb2ludERlbGVnYXRlID0gcmVtb3ZlQnJl YWtwb2ludERlbGVnYXRlOwogICAgIHRoaXMuX2VkaXREZWxlZ2F0ZSA9IGVkaXREZWxlZ2F0ZTsK QEAgLTQwOSw5ICs0MTAsMTQgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdmFyIHJvdyA9IHRhcmdldC5wYXJlbnRF bGVtZW50OwogCisgICAgICAgIGlmICghV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzKQorICAg ICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIHZhciBsaW5lTnVtYmVyID0gcm93LmxpbmVOdW1i ZXI7CiAgICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1l bnUoKTsKIAorICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0 cmluZygiQ29udGludWUgdG8gSGVyZSIpLCB0aGlzLl9jb250aW51ZVRvSGVyZURlbGVnYXRlLmJp bmQodGhpcywgbGluZU51bWJlciArIDEpKTsKKwogICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRo aXMuX3RleHRNb2RlbC5nZXRBdHRyaWJ1dGUobGluZU51bWJlciwgImJyZWFrcG9pbnQiKTsKICAg ICAgICAgaWYgKCFicmVha3BvaW50KSB7CiAgICAgICAgICAgICAvLyBUaGlzIHJvdyBkb2Vzbid0 IGhhdmUgYSBicmVha3BvaW50OiBXZSB3YW50IHRvIHNob3cgQWRkIEJyZWFrcG9pbnQgYW5kIEFk ZCBhbmQgRWRpdCBCcmVha3BvaW50LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NvdXJjZVZpZXcuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNl Vmlldy5qcwppbmRleCBmMDFjMjQxYzllNWVkYTg1MzA1M2ZjMmU4ODIwZWY4NzE5NjNhODUxLi40 M2ZkNmY2ODgyZWZhOTAyZmJhMmViZmU2YTM5Y2JlZjdkNWE4YzA3IDEwMDY0NAotLS0gYS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qcwpAQCAtMzIsOCArMzIsOCBAQCBXZWJJbnNwZWN0 b3IuU291cmNlVmlldyA9IGZ1bmN0aW9uKHJlc291cmNlKQogCiAgICAgdGhpcy5lbGVtZW50LmFk ZFN0eWxlQ2xhc3MoInNvdXJjZSIpOwogCi0gICAgdmFyIGNhbkVkaXRTY3JpcHRzID0gV2ViSW5z cGVjdG9yLnBhbmVscy5zY3JpcHRzLmNhbkVkaXRTY3JpcHRzKCkgJiYgcmVzb3VyY2UudHlwZSA9 PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuU2NyaXB0OwotICAgIHRoaXMuc291cmNlRnJh bWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKHRoaXMuY29udGVudEVsZW1lbnQsIHRo aXMuX2FkZEJyZWFrcG9pbnQuYmluZCh0aGlzKSwgdGhpcy5fcmVtb3ZlQnJlYWtwb2ludC5iaW5k KHRoaXMpLCBjYW5FZGl0U2NyaXB0cyA/IHRoaXMuX2VkaXRMaW5lLmJpbmQodGhpcykgOiBudWxs KTsKKyAgICB2YXIgY2FuRWRpdFNjcmlwdHMgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMg JiYgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLmNhbkVkaXRTY3JpcHRzKCkgJiYgcmVzb3Vy Y2UudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuU2NyaXB0OworICAgIHRoaXMu c291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKHRoaXMuY29udGVudEVs ZW1lbnQsIHRoaXMuX2FkZEJyZWFrcG9pbnQuYmluZCh0aGlzKSwgdGhpcy5fcmVtb3ZlQnJlYWtw b2ludC5iaW5kKHRoaXMpLCBjYW5FZGl0U2NyaXB0cyA/IHRoaXMuX2VkaXRMaW5lLmJpbmQodGhp cykgOiBudWxsLCB0aGlzLl9jb250aW51ZVRvTGluZS5iaW5kKHRoaXMpKTsKICAgICByZXNvdXJj ZS5hZGRFdmVudExpc3RlbmVyKCJmaW5pc2hlZCIsIHRoaXMuX3Jlc291cmNlTG9hZGluZ0Zpbmlz aGVkLCB0aGlzKTsKICAgICB0aGlzLl9mcmFtZU5lZWRzU2V0dXAgPSB0cnVlOwogfQpAQCAtMTE1 LDYgKzExNSwxNSBAQCBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHRoaXMucmVzb3VyY2UucmVtb3ZlRXZlbnRMaXN0ZW5lcigiZmluaXNoZWQiLCB0aGlzLl9y ZXNvdXJjZUxvYWRpbmdGaW5pc2hlZCwgdGhpcyk7CiAgICAgfSwKIAorICAgIF9jb250aW51ZVRv TGluZTogZnVuY3Rpb24obGluZSkKKyAgICB7CisgICAgICAgIHZhciBzY3JpcHRzUGFuZWwgPSBX ZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHM7CisgICAgICAgIGlmIChzY3JpcHRzUGFuZWwpIHsK KyAgICAgICAgICAgIHZhciBzb3VyY2VJRCA9IHRoaXMuX3NvdXJjZUlERm9yTGluZShsaW5lKTsK KyAgICAgICAgICAgIHNjcmlwdHNQYW5lbC5jb250aW51ZVRvTGluZShzb3VyY2VJRCwgbGluZSk7 CisgICAgICAgIH0KKyAgICB9LAorCiAgICAgX2FkZEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmUp CiAgICAgewogICAgICAgICB2YXIgc291cmNlSUQgPSB0aGlzLl9zb3VyY2VJREZvckxpbmUobGlu ZSk7CkBAIC0yMDIsNyArMjExLDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBl ID0gewogICAgICAgICAgICAgdGhpcy5sb2NhbENvbnRlbnRFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgICAgICB0aGlzLmxvY2FsQ29udGVudEVsZW1lbnQu Y2xhc3NOYW1lID0gInJlc291cmNlLXZpZXctY29udGVudCI7CiAgICAgICAgICAgICB0aGlzLnRh YmJlZFBhbmUuYXBwZW5kVGFiKCJsb2NhbCIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9jYWwi KSwgdGhpcy5sb2NhbENvbnRlbnRFbGVtZW50LCB0aGlzLnNlbGVjdExvY2FsQ29udGVudFRhYi5i aW5kKHRoaXMpKTsKLSAgICAgICAgICAgIHRoaXMubG9jYWxTb3VyY2VGcmFtZSA9IG5ldyBXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWUodGhpcy5sb2NhbENvbnRlbnRFbGVtZW50LCB0aGlzLl9hZGRC cmVha3BvaW50LmJpbmQodGhpcyksIHRoaXMuX3JlbW92ZUJyZWFrcG9pbnQuYmluZCh0aGlzKSk7 CisgICAgICAgICAgICB0aGlzLmxvY2FsU291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lKHRoaXMubG9jYWxDb250ZW50RWxlbWVudCwgdGhpcy5fYWRkQnJlYWtwb2ludC5i aW5kKHRoaXMpLCB0aGlzLl9yZW1vdmVCcmVha3BvaW50LmJpbmQodGhpcyksIG51bGwsIHRoaXMu X2NvbnRpbnVlVG9MaW5lLmJpbmQodGhpcykpOwogICAgICAgICB9CiAgICAgICAgIHRoaXMubG9j YWxTb3VyY2VGcmFtZS5zZXRDb250ZW50KG1pbWVUeXBlLCBjb250ZW50LCAiIik7CiAgICAgfSwK