47442 2010-10-08 17:32:43 -0700 Web Inspector: add a "create breakpoint" context menu item for linkified source locations 2017-03-08 18:13:39 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED EasyFix, InRadar P2 Enhancement --- 1 hartman.wiki hi apavlov bweinstein commit-queue graouts hi inspector-bugzilla-changes keishi loislo pfeldman pmuellr rik webkit-bug-importer yurys oldest_to_newest 291979 0 hartman.wiki 2010-10-08 17:32:43 -0700 I've been working with webapps a bit lately, and I think it could be very useful, if in the DOM inspector, specifically the Event Listeners section, you could set a break point on the function that gets triggered by the event, straight from the DOM inspector. This would especially be handy when you have to deal with anonymous functions attached to events. 292022 1 loislo 2010-10-08 19:10:57 -0700 Web Inspector already has DOM breakpoints, XHR Breakpoints and Event Listener breakpoints. All these things are available at ToT of Chromium and WebKit. 292032 2 joepeck 2010-10-08 20:02:06 -0700 Derk has some good points. "specifically the Event Listeners section, you could set a break point on the function that gets triggered by the event, straight from the DOM inspector" I think Chromium linkify's the function in the Event Listener's sidebar and ToT WebKit doesn't yet. But linkification would handle this use case pretty easily as you could jump to the function's def'n and set the breakpoint on that line. But it might make sense to repurpose this and have it request the functionality to set a breakpoint for an Event type automatically from the Event Listener's sidebar. Ilya, is that possible right now? I regret that I've fallen a bit behind there. Derk, were all your concerns handled by the new breakpoint functionality? 292044 3 loislo 2010-10-08 21:39:28 -0700 (In reply to comment #2) > Derk has some good points. > > "specifically the Event Listeners section, you could set a break point > on the function that gets triggered by the event, straight from the > DOM inspector" > > I think Chromium linkify's the function in the Event Listener's sidebar > and ToT WebKit doesn't yet. But linkification would handle this use > case pretty easily as you could jump to the function's def'n and set > the breakpoint on that line. > > But it might make sense to repurpose this and have it request the > functionality to set a breakpoint for an Event type automatically from > the Event Listener's sidebar. Ilya, is that possible right now? I regret > that I've fallen a bit behind there. > > Derk, were all your concerns handled by the new breakpoint > functionality? You are right. It is not possible to setup a breakpoint from Event Listener's sidebar of Elements panel. 921895 4 hartman.wiki 2013-08-28 02:42:09 -0700 I never followed up on this I see. My concern was partly solved by the linkification. However, what I really would like is to just put a breakpoint on that specific function right from the sidepanel. The reason is minified code. Putting breakpoints on minified code is a PITA right now. If you could set a breakpoint on a specific function straight from the Event Listener's sidebar, then debugging minified code would be significantly simpler. I guess this first requires adding some functionality to the debugger to not fully rely on line information for breakpoints, but also on blocks/expressions/conditions. 1051345 5 burg 2014-11-29 17:53:12 -0800 (Migrating component) I believe that linkified positions now always use line + column so it should work for minified code just fine. However there is still the indirection of clicking link and then navigating it. I renamed the bug to better reflect what the fix would be. This could be added for any linkified location- I think it would be great in the timeline records UI. 1051346 6 webkit-bug-importer 2014-11-29 17:53:33 -0800 <rdar://problem/19096426> 1282123 7 303028 hi 2017-02-28 19:19:14 -0800 Created attachment 303028 Patch 1285098 8 303028 bburg 2017-03-08 16:45:32 -0800 Comment on attachment 303028 Patch r=me 1285134 9 303028 commit-queue 2017-03-08 17:36:46 -0800 Comment on attachment 303028 Patch Rejecting attachment 303028 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 303028, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: ile Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js patching file Source/WebInspectorUI/UserInterface/Views/DetailsSection.css Hunk #1 FAILED at 31. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebInspectorUI/UserInterface/Views/DetailsSection.css.rej patching file Source/WebInspectorUI/UserInterface/Views/Main.css Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Brian Burg']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/3273030 1285143 10 303877 hi 2017-03-08 17:52:10 -0800 Created attachment 303877 Patch 1285150 11 303877 commit-queue 2017-03-08 18:13:34 -0800 Comment on attachment 303877 Patch Clearing flags on attachment: 303877 Committed r213617: <http://trac.webkit.org/changeset/213617> 1285151 12 commit-queue 2017-03-08 18:13:39 -0800 All reviewed patches have been landed. Closing bug. 303028 2017-02-28 19:19:14 -0800 2017-03-08 17:52:10 -0800 Patch bug-47442-20170228191617.patch text/plain 8443 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNhZDJhNjhiZmFhZWIyZjY0MmY3ZjVhYzY5MDEz ZDRmZWVhZDA2OTYuLmI0MjhlNmNlYjQ0MmRhZTFjZTdhNTczMzM5MDc0MTdjMmUxNDI4Y2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE3LTAyLTI4ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgogCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGFkZCBhICJjcmVhdGUgYnJlYWtwb2ludCIgY29udGV4dCBtZW51IGl0ZW0gZm9yIGxp bmtpZmllZCBzb3VyY2UgbG9jYXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00NzQ0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuaXNTaG93aW5nUmVzb3VyY2VzVGFiKTogQWRkZWQuCisgICAgICAgIChXZWJJ bnNwZWN0b3IubGlua2lmeUVsZW1lbnQpOgorICAgICAgICBOb3cgY2FsbHMgV2ViSW5zcGVjdG9y LmFwcGVuZENvbnRleHRNZW51SXRlbXNGb3JTb3VyY2VDb2RlIG9uICJjb250ZXh0bWVudSIgZXZl bnRzIGZvciB0aGUKKyAgICAgICAgY3JlYXRlZCBlbGVtZW50LgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRGVidWdnZXJNYW5hZ2VyLnByb3RvdHlwZS5icmVha3BvaW50Rm9yU291cmNlQ29kZUxv Y2F0aW9uKToKKyAgICAgICAgUmV0dXJucyB0aGUgZmlyc3QgYnJlYWtwb2ludCAoc2luY2UgdGhl cmUgc2hvdWxkIG9ubHkgYmUgb25lKSB0aGF0IG1hdGNoZXMgdGhlIGdpdmVuIGxvY2F0aW9uLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5hcHBlbmRDb250ZXh0TWVudUl0ZW1zRm9yU291cmNlQ29k ZSk6CisgICAgICAgIFJld29yayBwYXJhbWV0ZXJzIHRvIGFsc28gYWNjZXB0IGEgV2ViSW5zcGVj dG9yLlNvdXJjZUNvZGVMb2NhdGlvbiwgdGhlcmVieSBhbGxvd2luZyB0aGUKKyAgICAgICAgc2V0 dGluZyBvZiBicmVha3BvaW50cyBzbyBsb25nIGFzIHRoZSBhc3NvY2lhdGVkIFdlYkluc3BlY3Rv ci5Tb3VyY2VDb2RlIGlzIGEgc2NyaXB0LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9NYWluLmNzczoKKyAgICAgICAgKC5yZXNvdXJjZS1saW5rLCAuZ28tdG8tbGluayk6CisgICAg ICAgIFByZXZlbnQgbGluayBmcm9tIGJlaW5nIHNlbGVjdGVkLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3M6CisgICAgICAgICguZGV0YWlscy1zZWN0 aW9uKToKKyAgICAgICAgRHJpdmUtYnk6IGZpeCB0eXBvIG9mIENTUyB2YXJpYWJsZS4KKworMjAx Ny0wMi0yOCAgRGV2aW4gUm91c3NvICA8ZGNyb3Vzc28rd2Via2l0QGdtYWlsLmNvbT4KKwogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBJdCBpcyBwb3NzaWJsZSB0byBnZXQgdGhlIE5ldyBUYWIgYnV0 dG9uIGluIGFkZGl0aW9uIHRvIHRoZSBzZXZlbiBleHBlY3RlZCB0YWJzCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjg5NzYKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IDBhN2Q3ZTQ5 NTU1NjRjZDhhMzBjNjBiYzBkY2E5OGU0YzdiNWM4NzUuLjAxNDJlZjAwMTI5NDg3YTU2ZjA4OTE3 YjVkNGZlMWQ1ZDY1NTg0NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTEwMjcsNiArMTAyNywxMSBAQCBXZWJJbnNwZWN0b3Iu c2hvd1Jlc291cmNlc1RhYiA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnRhYkJyb3dzZXIuc2hvd1Rh YkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3KTsKIH07CiAKK1dlYkluc3BlY3Rvci5pc1No b3dpbmdSZXNvdXJjZXNUYWIgPSBmdW5jdGlvbigpCit7CisgICAgcmV0dXJuIHRoaXMudGFiQnJv d3Nlci5zZWxlY3RlZFRhYkNvbnRlbnRWaWV3IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291 cmNlc1RhYkNvbnRlbnRWaWV3OworfTsKKwogV2ViSW5zcGVjdG9yLnNob3dTdG9yYWdlVGFiID0g ZnVuY3Rpb24oKQogewogICAgIHZhciB0YWJDb250ZW50VmlldyA9IHRoaXMudGFiQnJvd3Nlci5i ZXN0VGFiQ29udGVudFZpZXdGb3JDbGFzcyhXZWJJbnNwZWN0b3IuU3RvcmFnZVRhYkNvbnRlbnRW aWV3KTsKQEAgLTIzNTMsNiArMjM1OCwxMCBAQCBXZWJJbnNwZWN0b3IubGlua2lmeUVsZW1lbnQg PSBmdW5jdGlvbihsaW5rRWxlbWVudCwgc291cmNlQ29kZUxvY2F0aW9uKSB7CiAgICAgfQogCiAg ICAgbGlua0VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCBzaG93U291cmNlQ29kZUxv Y2F0aW9uLmJpbmQodGhpcykpOworICAgIGxpbmtFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNv bnRleHRtZW51IiwgKGV2ZW50KSA9PiB7CisgICAgICAgIGxldCBjb250ZXh0TWVudSA9IFdlYklu c3BlY3Rvci5Db250ZXh0TWVudS5jcmVhdGVGcm9tRXZlbnQoZXZlbnQpOworICAgICAgICBXZWJJ bnNwZWN0b3IuYXBwZW5kQ29udGV4dE1lbnVJdGVtc0ZvclNvdXJjZUNvZGUoY29udGV4dE1lbnUs IHNvdXJjZUNvZGVMb2NhdGlvbik7CisgICAgfSk7CiB9OwogCiBXZWJJbnNwZWN0b3Iuc291cmNl Q29kZUZvclVSTCA9IGZ1bmN0aW9uKHVybCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdl ci5qcwppbmRleCA4MjcyNjNhZGQwMTlmNjA3YzIwNGM2MTFhODAzY2Y0MDZiNWRhMTUwLi42Yzli ZWNkYzA3MzdhY2ExZWIxYTliNGRkYjZlMjEzZDhlNzIxNjdlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv RGVidWdnZXJNYW5hZ2VyLmpzCkBAIC0yMDQsNiArMjA0LDE4IEBAIFdlYkluc3BlY3Rvci5EZWJ1 Z2dlck1hbmFnZXIgPSBjbGFzcyBEZWJ1Z2dlck1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu T2JqZWN0CiAgICAgICAgIHJldHVybiBbXTsKICAgICB9CiAKKyAgICBicmVha3BvaW50Rm9yU291 cmNlQ29kZUxvY2F0aW9uKHNvdXJjZUNvZGVMb2NhdGlvbikKKyAgICB7CisgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHNvdXJjZUNvZGVMb2NhdGlvbiBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Tb3Vy Y2VDb2RlTG9jYXRpb24pOworCisgICAgICAgIGZvciAobGV0IGJyZWFrcG9pbnQgb2YgdGhpcy5i cmVha3BvaW50c0ZvclNvdXJjZUNvZGUoc291cmNlQ29kZUxvY2F0aW9uLnNvdXJjZUNvZGUpKSB7 CisgICAgICAgICAgICBpZiAoYnJlYWtwb2ludC5zb3VyY2VDb2RlTG9jYXRpb24uaXNFcXVhbChz b3VyY2VDb2RlTG9jYXRpb24pKQorICAgICAgICAgICAgICAgIHJldHVybiBicmVha3BvaW50Owor ICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorCiAgICAgaXNCcmVha3Bv aW50UmVtb3ZhYmxlKGJyZWFrcG9pbnQpCiAgICAgewogICAgICAgICByZXR1cm4gYnJlYWtwb2lu dCAhPT0gdGhpcy5fYWxsRXhjZXB0aW9uc0JyZWFrcG9pbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGV4dE1lbnVV dGlsaXRpZXMuanMKaW5kZXggNDBiNDg5Yjg3M2Y3Yzc2ODViZjFmMzI3MmRmNDRhN2U3MWI0Mjgw Yi4uMGMxNzcwYWU0MzJlMmFkZmE3OTQwNjk3YmUxZjc0MzhiMmQzZTI4ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGV4dE1lbnVVdGls aXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q29udGV4dE1lbnVVdGlsaXRpZXMuanMKQEAgLTIzLDEyICsyMywxOSBAQAogICogVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5hcHBlbmRDb250ZXh0 TWVudUl0ZW1zRm9yU291cmNlQ29kZSA9IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBzb3VyY2VDb2Rl KQorV2ViSW5zcGVjdG9yLmFwcGVuZENvbnRleHRNZW51SXRlbXNGb3JTb3VyY2VDb2RlID0gZnVu Y3Rpb24oY29udGV4dE1lbnUsIHNvdXJjZUNvZGVPckxvY2F0aW9uKQogewogICAgIGNvbnNvbGUu YXNzZXJ0KGNvbnRleHRNZW51IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KTsK ICAgICBpZiAoIShjb250ZXh0TWVudSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Db250ZXh0TWVu dSkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGxldCBzb3VyY2VDb2RlID0gc291cmNlQ29kZU9y TG9jYXRpb247CisgICAgbGV0IGxvY2F0aW9uID0gbnVsbDsKKyAgICBpZiAoc291cmNlQ29kZU9y TG9jYXRpb24gaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU291cmNlQ29kZUxvY2F0aW9uKSB7Cisg ICAgICAgIHNvdXJjZUNvZGUgPSBzb3VyY2VDb2RlT3JMb2NhdGlvbi5zb3VyY2VDb2RlOworICAg ICAgICBsb2NhdGlvbiA9IHNvdXJjZUNvZGVPckxvY2F0aW9uOworICAgIH0KKwogICAgIGNvbnNv bGUuYXNzZXJ0KHNvdXJjZUNvZGUgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU291cmNlQ29kZSk7 CiAgICAgaWYgKCEoc291cmNlQ29kZSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2Rl KSkKICAgICAgICAgcmV0dXJuOwpAQCAtNDEsNiArNDgsMTYgQEAgV2ViSW5zcGVjdG9yLmFwcGVu ZENvbnRleHRNZW51SXRlbXNGb3JTb3VyY2VDb2RlID0gZnVuY3Rpb24oY29udGV4dE1lbnUsIHNv dXJjZUMKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5vcGVuVVJMKHNvdXJjZUNvZGUudXJsLCBm cmFtZSwge2Fsd2F5c09wZW5FeHRlcm5hbGx5OiB0cnVlfSk7CiAgICAgICAgIH0pOwogCisgICAg ICAgIGlmIChXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIucmVzb3VyY2VGb3JVUkwo c291cmNlQ29kZS51cmwpICYmICFXZWJJbnNwZWN0b3IuaXNTaG93aW5nUmVzb3VyY2VzVGFiKCkp IHsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJSZXZlYWwgaW4gUmVzb3VyY2VzIFRhYiIpLCAoKSA9PiB7CisgICAgICAgICAgICAgICAg Y29uc3Qgb3B0aW9ucyA9IHtpZ25vcmVOZXR3b3JrVGFiOiB0cnVlfTsKKyAgICAgICAgICAgICAg ICBpZiAobG9jYXRpb24pCisgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93U291 cmNlQ29kZUxvY2F0aW9uKGxvY2F0aW9uLCBvcHRpb25zKTsKKyAgICAgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93U291cmNlQ29kZShzb3VyY2VD b2RlLCBvcHRpb25zKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CisKICAgICAgICAgY29u dGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvcHkgTGluayBBZGRy ZXNzIiksICgpID0+IHsKICAgICAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5jb3B5VGV4 dChzb3VyY2VDb2RlLnVybCk7CiAgICAgICAgIH0pOwpAQCAtNjIsNCArNzksMjEgQEAgV2ViSW5z cGVjdG9yLmFwcGVuZENvbnRleHRNZW51SXRlbXNGb3JTb3VyY2VDb2RlID0gZnVuY3Rpb24oY29u dGV4dE1lbnUsIHNvdXJjZUMKICAgICAgICAgICAgIH0pOwogICAgICAgICB9KTsKICAgICB9KTsK KworICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOworCisgICAgaWYgKGxvY2F0aW9u ICYmIChzb3VyY2VDb2RlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlwdCB8fCAoc291cmNl Q29kZSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJjZSAmJiBzb3VyY2VDb2RlLnR5cGUg PT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlNjcmlwdCkpKSB7CisgICAgICAgIGxldCBl eGlzdGluZ0JyZWFrcG9pbnQgPSBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLmJyZWFrcG9p bnRGb3JTb3VyY2VDb2RlTG9jYXRpb24obG9jYXRpb24pOworICAgICAgICBpZiAoZXhpc3RpbmdC cmVha3BvaW50KSB7CisgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiRGVsZXRlIEJyZWFrcG9pbnQiKSwgKCkgPT4geworICAgICAgICAgICAg ICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1hbmFnZXIucmVtb3ZlQnJlYWtwb2ludChleGlzdGlu Z0JyZWFrcG9pbnQpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAg ICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQWRkIEJy ZWFrcG9pbnQiKSwgKCkgPT4geworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dl ck1hbmFnZXIuYWRkQnJlYWtwb2ludChuZXcgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQobG9jYXRp b24pKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CisKKyAgICAgICAgY29udGV4dE1lbnUu YXBwZW5kU2VwYXJhdG9yKCk7CisgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RldGFpbHNTZWN0aW9uLmNzcwppbmRl eCA5OTQ0MzBhOTIzOTdlYjI0YTcxMjY4ODdmNmE2NTg3YTdlMWNiOWRlLi5mM2U0NTQzNjdkY2Iw OGVlY2MyM2E3NTllNzVjNzgxZjczZTU2MDU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZXRhaWxzU2VjdGlvbi5jc3MKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGV0YWlsc1NlY3Rpb24uY3NzCkBA IC0zMSw3ICszMSw3IEBACiAgICAgLS1kZXRhaWxzLXNlY3Rpb24taGVhZGVyLXBhZGRpbmctZW5k OiA1cHg7CiAgICAgLS1kZXRhaWxzLXNlY3Rpb24taGVhZGVyLWxhYmVsLWNoZWNrYm94LW1hcmdp bi1zdGFydDogNXB4OwogICAgIC0tZGV0YWlscy1zZWN0aW9uLWhlYWRlci1nby10by1tYXJnaW4t c3RhcnQ6IC0zcHg7Ci0gICAgLS1kZXRhaWxzLXNlY3Rpb24tY29udGVudC1yb3ctc2ltcGxlLXBh ZGRpbmctc3RhcnQ6IDZweDsKKyAgICAtLWRldGFpbHMtc2VjdGlvbi1jb250ZW50LWdyb3VwLXJv dy1zaW1wbGUtcGFkZGluZy1zdGFydDogNnB4OwogICAgIC0tZGV0YWlscy1zZWN0aW9uLWNvbnRl bnQtZ3JvdXAtcm93LXNpbXBsZS12YWx1ZS1nby10by1tYXJnaW4tc3RhcnQ6IDVweDsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWFp bi5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NYWluLmNz cwppbmRleCA4NGFhYTU4YjQ1ZTBkMDAxNjI0MGM2YzdiYTg3YTU4NDdjZjlkNDgyLi40MzViNzJl NjZhMTMyYzI1NjI5ZWYyOTkzZTk0NzE0OWJmMzJlODRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NYWluLmNzcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NYWluLmNzcwpAQCAtMjY1LDYgKzI2NSw3 IEBAIGJvZHkuZG9ja2VkOm1hdGNoZXMoLnJpZ2h0LCAubGVmdCkgI25hdmlnYXRpb24tc2lkZWJh ci5jb2xsYXBzZWQgPiAucmVzaXplciB7CiAgICAgY29sb3I6IGhzbCgwLCAwJSwgMzMlKTsKICAg ICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsKICAgICBjdXJzb3I6IHBvaW50ZXI7CisgICAg LXdlYmtpdC11c2VyLXNlbGVjdDogbm9uZTsKIH0KIAogLmdvLXRvLWxpbms6bm90KC5kb250LWZs b2F0KSB7Cg== 303877 2017-03-08 17:52:10 -0800 2017-03-08 18:13:34 -0800 Patch 47442.diff text/plain 7140 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI4MzYxMmJhLi4xNTNiMDkyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxNy0wMy0wOCAgRGV2aW4gUm91c3Nv ICA8ZGNyb3Vzc28rd2Via2l0QGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBh ZGQgYSAiY3JlYXRlIGJyZWFrcG9pbnQiIGNvbnRleHQgbWVudSBpdGVtIGZvciBsaW5raWZpZWQg c291cmNlIGxvY2F0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDc0NDIKKworICAgICAgICBSZXZpZXdlZCBieSBCcmlhbiBCdXJnLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu aXNTaG93aW5nUmVzb3VyY2VzVGFiKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IubGlu a2lmeUVsZW1lbnQpOgorICAgICAgICBOb3cgY2FsbHMgV2ViSW5zcGVjdG9yLmFwcGVuZENvbnRl eHRNZW51SXRlbXNGb3JTb3VyY2VDb2RlIG9uICJjb250ZXh0bWVudSIgZXZlbnRzIGZvciB0aGUK KyAgICAgICAgY3JlYXRlZCBlbGVtZW50LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdn ZXJNYW5hZ2VyLnByb3RvdHlwZS5icmVha3BvaW50Rm9yU291cmNlQ29kZUxvY2F0aW9uKToKKyAg ICAgICAgUmV0dXJucyB0aGUgZmlyc3QgYnJlYWtwb2ludCAoc2luY2UgdGhlcmUgc2hvdWxkIG9u bHkgYmUgb25lKSB0aGF0IG1hdGNoZXMgdGhlIGdpdmVuIGxvY2F0aW9uLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5hcHBlbmRDb250ZXh0TWVudUl0ZW1zRm9yU291cmNlQ29kZSk6CisgICAgICAg IFJld29yayBwYXJhbWV0ZXJzIHRvIGFsc28gYWNjZXB0IGEgV2ViSW5zcGVjdG9yLlNvdXJjZUNv ZGVMb2NhdGlvbiwgdGhlcmVieSBhbGxvd2luZyB0aGUKKyAgICAgICAgc2V0dGluZyBvZiBicmVh a3BvaW50cyBzbyBsb25nIGFzIHRoZSBhc3NvY2lhdGVkIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2Rl IGlzIGEgc2NyaXB0LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9NYWluLmNzczoK KyAgICAgICAgKC5yZXNvdXJjZS1saW5rLCAuZ28tdG8tbGluayk6CisgICAgICAgIFByZXZlbnQg bGluayBmcm9tIGJlaW5nIHNlbGVjdGVkLgorCiAyMDE3LTAzLTA4ICBNYXR0IEJha2VyICA8bWF0 dGJha2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjEyOTk4KTogV2ViIElu c3BlY3RvcjogRGV0YWlsc1NlY3Rpb25zIHdpdGggb3B0aW9ucyBoYXZlIGJyb2tlbiBsYXlvdXQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFp bi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpp bmRleCAwYTdkN2U0Li4wMTQyZWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC0xMDI3LDYgKzEwMjcsMTEgQEAgV2ViSW5zcGVj dG9yLnNob3dSZXNvdXJjZXNUYWIgPSBmdW5jdGlvbigpCiAgICAgdGhpcy50YWJCcm93c2VyLnNo b3dUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50Vmlldyk7CiB9OwogCitXZWJJbnNwZWN0b3Iu aXNTaG93aW5nUmVzb3VyY2VzVGFiID0gZnVuY3Rpb24oKQoreworICAgIHJldHVybiB0aGlzLnRh YkJyb3dzZXIuc2VsZWN0ZWRUYWJDb250ZW50VmlldyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5S ZXNvdXJjZXNUYWJDb250ZW50VmlldzsKK307CisKIFdlYkluc3BlY3Rvci5zaG93U3RvcmFnZVRh YiA9IGZ1bmN0aW9uKCkKIHsKICAgICB2YXIgdGFiQ29udGVudFZpZXcgPSB0aGlzLnRhYkJyb3dz ZXIuYmVzdFRhYkNvbnRlbnRWaWV3Rm9yQ2xhc3MoV2ViSW5zcGVjdG9yLlN0b3JhZ2VUYWJDb250 ZW50Vmlldyk7CkBAIC0yMzUzLDYgKzIzNTgsMTAgQEAgV2ViSW5zcGVjdG9yLmxpbmtpZnlFbGVt ZW50ID0gZnVuY3Rpb24obGlua0VsZW1lbnQsIHNvdXJjZUNvZGVMb2NhdGlvbikgewogICAgIH0K IAogICAgIGxpbmtFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgc2hvd1NvdXJjZUNv ZGVMb2NhdGlvbi5iaW5kKHRoaXMpKTsKKyAgICBsaW5rRWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJjb250ZXh0bWVudSIsIChldmVudCkgPT4geworICAgICAgICBsZXQgY29udGV4dE1lbnUgPSBX ZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUuY3JlYXRlRnJvbUV2ZW50KGV2ZW50KTsKKyAgICAgICAg V2ViSW5zcGVjdG9yLmFwcGVuZENvbnRleHRNZW51SXRlbXNGb3JTb3VyY2VDb2RlKGNvbnRleHRN ZW51LCBzb3VyY2VDb2RlTG9jYXRpb24pOworICAgIH0pOwogfTsKIAogV2ViSW5zcGVjdG9yLnNv dXJjZUNvZGVGb3JVUkwgPSBmdW5jdGlvbih1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1h bmFnZXIuanMKaW5kZXggODI3MjYzYS4uNmM5YmVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVn Z2VyTWFuYWdlci5qcwpAQCAtMjA0LDYgKzIwNCwxOCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJN YW5hZ2VyID0gY2xhc3MgRGVidWdnZXJNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVj dAogICAgICAgICByZXR1cm4gW107CiAgICAgfQogCisgICAgYnJlYWtwb2ludEZvclNvdXJjZUNv ZGVMb2NhdGlvbihzb3VyY2VDb2RlTG9jYXRpb24pCisgICAgeworICAgICAgICBjb25zb2xlLmFz c2VydChzb3VyY2VDb2RlTG9jYXRpb24gaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU291cmNlQ29k ZUxvY2F0aW9uKTsKKworICAgICAgICBmb3IgKGxldCBicmVha3BvaW50IG9mIHRoaXMuYnJlYWtw b2ludHNGb3JTb3VyY2VDb2RlKHNvdXJjZUNvZGVMb2NhdGlvbi5zb3VyY2VDb2RlKSkgeworICAg ICAgICAgICAgaWYgKGJyZWFrcG9pbnQuc291cmNlQ29kZUxvY2F0aW9uLmlzRXF1YWwoc291cmNl Q29kZUxvY2F0aW9uKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gYnJlYWtwb2ludDsKKyAgICAg ICAgfQorCisgICAgICAgIHJldHVybiBudWxsOworICAgIH0KKwogICAgIGlzQnJlYWtwb2ludFJl bW92YWJsZShicmVha3BvaW50KQogICAgIHsKICAgICAgICAgcmV0dXJuIGJyZWFrcG9pbnQgIT09 IHRoaXMuX2FsbEV4Y2VwdGlvbnNCcmVha3BvaW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZXh0TWVudVV0aWxpdGllcy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0 aWVzLmpzCmluZGV4IDQwYjQ4OWIuLjBjMTc3MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRpbGl0aWVzLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRleHRNZW51VXRp bGl0aWVzLmpzCkBAIC0yMywxMiArMjMsMTkgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3IuYXBwZW5kQ29udGV4dE1lbnVJdGVtc0ZvclNv dXJjZUNvZGUgPSBmdW5jdGlvbihjb250ZXh0TWVudSwgc291cmNlQ29kZSkKK1dlYkluc3BlY3Rv ci5hcHBlbmRDb250ZXh0TWVudUl0ZW1zRm9yU291cmNlQ29kZSA9IGZ1bmN0aW9uKGNvbnRleHRN ZW51LCBzb3VyY2VDb2RlT3JMb2NhdGlvbikKIHsKICAgICBjb25zb2xlLmFzc2VydChjb250ZXh0 TWVudSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSk7CiAgICAgaWYgKCEoY29u dGV4dE1lbnUgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUpKQogICAgICAgICBy ZXR1cm47CiAKKyAgICBsZXQgc291cmNlQ29kZSA9IHNvdXJjZUNvZGVPckxvY2F0aW9uOworICAg IGxldCBsb2NhdGlvbiA9IG51bGw7CisgICAgaWYgKHNvdXJjZUNvZGVPckxvY2F0aW9uIGluc3Rh bmNlb2YgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVMb2NhdGlvbikgeworICAgICAgICBzb3VyY2VD b2RlID0gc291cmNlQ29kZU9yTG9jYXRpb24uc291cmNlQ29kZTsKKyAgICAgICAgbG9jYXRpb24g PSBzb3VyY2VDb2RlT3JMb2NhdGlvbjsKKyAgICB9CisKICAgICBjb25zb2xlLmFzc2VydChzb3Vy Y2VDb2RlIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGUpOwogICAgIGlmICghKHNv dXJjZUNvZGUgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuU291cmNlQ29kZSkpCiAgICAgICAgIHJl dHVybjsKQEAgLTQxLDYgKzQ4LDE2IEBAIFdlYkluc3BlY3Rvci5hcHBlbmRDb250ZXh0TWVudUl0 ZW1zRm9yU291cmNlQ29kZSA9IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBzb3VyY2VDCiAgICAgICAg ICAgICBXZWJJbnNwZWN0b3Iub3BlblVSTChzb3VyY2VDb2RlLnVybCwgZnJhbWUsIHthbHdheXNP cGVuRXh0ZXJuYWxseTogdHJ1ZX0pOwogICAgICAgICB9KTsKIAorICAgICAgICBpZiAoV2ViSW5z cGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLnJlc291cmNlRm9yVVJMKHNvdXJjZUNvZGUudXJs KSAmJiAhV2ViSW5zcGVjdG9yLmlzU2hvd2luZ1Jlc291cmNlc1RhYigpKSB7CisgICAgICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmV2ZWFsIGlu IFJlc291cmNlcyBUYWIiKSwgKCkgPT4geworICAgICAgICAgICAgICAgIGNvbnN0IG9wdGlvbnMg PSB7aWdub3JlTmV0d29ya1RhYjogdHJ1ZX07CisgICAgICAgICAgICAgICAgaWYgKGxvY2F0aW9u KQorICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGVMb2NhdGlv bihsb2NhdGlvbiwgb3B0aW9ucyk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGUoc291cmNlQ29kZSwgb3B0aW9ucyk7 CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQorCiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb3B5IExpbmsgQWRkcmVzcyIpLCAoKSA9PiB7 CiAgICAgICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY29weVRleHQoc291cmNlQ29kZS51 cmwpOwogICAgICAgICB9KTsKQEAgLTYyLDQgKzc5LDIxIEBAIFdlYkluc3BlY3Rvci5hcHBlbmRD b250ZXh0TWVudUl0ZW1zRm9yU291cmNlQ29kZSA9IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBzb3Vy Y2VDCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSk7CiAgICAgfSk7CisKKyAgICBjb250ZXh0 TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKKworICAgIGlmIChsb2NhdGlvbiAmJiAoc291cmNlQ29k ZSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TY3JpcHQgfHwgKHNvdXJjZUNvZGUgaW5zdGFuY2Vv ZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2UgJiYgc291cmNlQ29kZS50eXBlID09PSBXZWJJbnNwZWN0 b3IuUmVzb3VyY2UuVHlwZS5TY3JpcHQpKSkgeworICAgICAgICBsZXQgZXhpc3RpbmdCcmVha3Bv aW50ID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTWFuYWdlci5icmVha3BvaW50Rm9yU291cmNlQ29k ZUxvY2F0aW9uKGxvY2F0aW9uKTsKKyAgICAgICAgaWYgKGV4aXN0aW5nQnJlYWtwb2ludCkgewor ICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkRlbGV0ZSBCcmVha3BvaW50IiksICgpID0+IHsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0 b3IuZGVidWdnZXJNYW5hZ2VyLnJlbW92ZUJyZWFrcG9pbnQoZXhpc3RpbmdCcmVha3BvaW50KTsK KyAgICAgICAgICAgIH0pOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgY29udGV4dE1l bnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFkZCBCcmVha3BvaW50IiksICgp ID0+IHsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNYW5hZ2VyLmFkZEJy ZWFrcG9pbnQobmV3IFdlYkluc3BlY3Rvci5CcmVha3BvaW50KGxvY2F0aW9uKSk7CisgICAgICAg ICAgICB9KTsKKyAgICAgICAgfQorCisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRv cigpOworICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9NYWluLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL01haW4uY3NzCmluZGV4IDg0YWFhNTguLjQzNWI3MmUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01haW4uY3NzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01haW4uY3NzCkBAIC0yNjUs NiArMjY1LDcgQEAgYm9keS5kb2NrZWQ6bWF0Y2hlcygucmlnaHQsIC5sZWZ0KSAjbmF2aWdhdGlv bi1zaWRlYmFyLmNvbGxhcHNlZCA+IC5yZXNpemVyIHsKICAgICBjb2xvcjogaHNsKDAsIDAlLCAz MyUpOwogICAgIHRleHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lOwogICAgIGN1cnNvcjogcG9pbnRl cjsKKyAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOwogfQogCiAuZ28tdG8tbGluazpub3Qo LmRvbnQtZmxvYXQpIHsK