204811 2019-12-03 13:09:33 -0800 Web Inspector: prefer non-blackboxed scripts when showing a source code location link 2019-12-03 19:32:21 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1595140 0 hi 2019-12-03 13:09:33 -0800 # STEPS TO REPRODUCE: 1. inspect <http://bogojoker.com/shell/> 2. set a breakpoint inside `$.fn.easySlider` 3. edit the breakpoint from step #2 and add an Evaluate JavaScript action for `console.trace()` 4. reload the page => a trace should be logged to the Console with an 'easySlider.min.js:4' link 5. blackbox easySlider.min.js => the trace shown after step #4 still shows 'easySlider.min.js:4' when it really should show 'shell:28' 1595150 1 384744 hi 2019-12-03 13:19:11 -0800 Created attachment 384744 Patch 1595340 2 384744 commit-queue 2019-12-03 19:31:40 -0800 Comment on attachment 384744 Patch Clearing flags on attachment: 384744 Committed r253087: <https://trac.webkit.org/changeset/253087> 1595341 3 commit-queue 2019-12-03 19:31:41 -0800 All reviewed patches have been landed. Closing bug. 1595342 4 webkit-bug-importer 2019-12-03 19:32:21 -0800 <rdar://problem/57612318> 384744 2019-12-03 13:19:11 -0800 2019-12-03 19:31:40 -0800 Patch bug-204811-20191203131911.patch text/plain 12191 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDVlMWRhMzRhN2ZmNDY0OTQ1MzA0MzhjZTVjNzAz YmM2MWY3ZTdhNjQuLjQwMGFhZDliMjNmNWIwNTBhZjE5NDIzMjA4M2YzMWNlMDExMzAyYjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTEyLTAzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBw cmVmZXIgbm9uLWJsYWNrYm94ZWQgc2NyaXB0cyB3aGVuIHNob3dpbmcgYSBzb3VyY2UgY29kZSBs b2NhdGlvbiBsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDQ4MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1N0YWNrVHJhY2UuanM6CisgICAgICAgIChXSS5T dGFja1RyYWNlLnByb3RvdHlwZS5nZXQgZmlyc3ROb25OYXRpdmVOb25Bbm9ueW1vdXNOb3RCbGFj a2JveGVkQ2FsbEZyYW1lKTogQWRkZWQuCisgICAgICAgIChXSS5TdGFja1RyYWNlLnByb3RvdHlw ZS5nZXQgZmlyc3ROb25OYXRpdmVDYWxsRnJhbWUpOiBEZWxldGVkLgorICAgICAgICAoV0kuU3Rh Y2tUcmFjZS5wcm90b3R5cGUuZ2V0IGZpcnN0Tm9uTmF0aXZlTm9uQW5vbnltb3VzQ2FsbEZyYW1l KTogRGVsZXRlZC4KKyAgICAgICAgSW5jbHVkZSBsb2dpYyB0byBza2lwIGNhbGwgZnJhbWVzIHRo YXQgYXJlIGJsYWNrYm94ZWQsIHVubGVzcyB0aGVyZSBhcmUgbm8gbm9uLWJsYWNrYm94ZWQKKyAg ICAgICAgY2FsbCBmcmFtZXMsIGluIHdoaWNoIGNhc2UgZmFsbCBiYWNrIHRvIHRoZSBmaXJzdCBu b24tbmF0aXZlIG5vbi1hbm9ueW1vdXMgY2FsbCBmcmFtZS4KKyAgICAgICAgRHJpdmUtYnk6IHJl bW92ZSB1bnVzZWQgZnVuY3Rpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Nv bnNvbGVNZXNzYWdlVmlldy5qczoKKyAgICAgICAgKFdJLkNvbnNvbGVNZXNzYWdlVmlldy5wcm90 b3R5cGUucmVuZGVyKToKKyAgICAgICAgKFdJLkNvbnNvbGVNZXNzYWdlVmlldy5wcm90b3R5cGUu Y2xlYXJTZXNzaW9uU3RhdGUpOiBBZGRlZC4KKyAgICAgICAgKFdJLkNvbnNvbGVNZXNzYWdlVmll dy5wcm90b3R5cGUuX2FwcGVuZExvY2F0aW9uTGluayk6CisgICAgICAgIChXSS5Db25zb2xlTWVz c2FnZVZpZXcucHJvdG90eXBlLl9oYW5kbGVEZWJ1Z2dlckJsYWNrYm94Q2hhbmdlZCk6IEFkZGVk LgorICAgICAgICAoV0kuQ29uc29sZU1lc3NhZ2VWaWV3LnByb3RvdHlwZS5jbGVhclNhdmVkVmFy aWFibGVTdGF0ZSk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Mb2dD b250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fc2Vz c2lvblN0YXJ0ZWQpOgorICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLl9sb2dD bGVhcmVkKToKKyAgICAgICAgTGlzdGVuIGZvciBjaGFuZ2VzIHRvIHRoZSBkZWJ1Z2dlciBibGFj a2JveCB0byByZS1yZW5kZXIgdGhlIGxvY2F0aW9uIGxpbmsuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1N0YWNrVHJhY2VWaWV3LmpzOgorICAgICAgICAoV0kuU3RhY2tUcmFjZVZp ZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FsbEZyYW1lVmlldy5qczoKKyAg ICAgICAgKFdJLkNhbGxGcmFtZVZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv Q2FsbEZyYW1lVmlldy5jc3M6CisgICAgICAgICguY2FsbC1mcmFtZS5ibGFja2JveGVkID4gLnRp dGxlLCAuY2FsbC1mcmFtZS5ibGFja2JveGVkOm5vdCg6aG92ZXIsIDpmb2N1cykgPiAuc3VidGl0 bGUpOiBBZGRlZC4KKyAgICAgICAgQWRkIGEgY29uc3RydWN0b3Igb3B0aW9uIHRvIGNvbnRyb2wg d2hldGhlciBibGFja2JveGVkIGZyYW1lcyBhcmUgaW5kaWNhdGVkIHZpc3VhbGx5LgorCiAyMDE5 LTEyLTAyICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IFByb3ZpZGUgVUkgdG8gY29udmVydCBiZXR3ZWVuIHNSR0IgYW5kIHAz IGNvbG9yIHNwYWNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL1N0YWNrVHJhY2UuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvU3RhY2tUcmFjZS5qcwppbmRleCA1YjBmNGZlMjVjODI0ZTViNDQ3YmZk YTA0ZGIxY2ZmZjY0ZDE0OTgwLi5iYjYxZjMxMGE3YmIyMzk4YTZlZjk5YjlkYzc1N2QxM2I0MTIz MTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2Rl bHMvU3RhY2tUcmFjZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvU3RhY2tUcmFjZS5qcwpAQCAtMTQwLDM4ICsxNDAsMzUgQEAgV0kuU3RhY2tUcmFj ZSA9IGNsYXNzIFN0YWNrVHJhY2UKIAogICAgIC8vIFB1YmxpYwogCi0gICAgZ2V0IGNhbGxGcmFt ZXMoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2NhbGxGcmFtZXM7Ci0gICAgfQorICAg IGdldCBjYWxsRnJhbWVzKCkgeyByZXR1cm4gdGhpcy5fY2FsbEZyYW1lczsgfQorICAgIGdldCB0 b3BDYWxsRnJhbWVJc0JvdW5kYXJ5KCkgeyByZXR1cm4gdGhpcy5fdG9wQ2FsbEZyYW1lSXNCb3Vu ZGFyeTsgfQorICAgIGdldCB0cnVuY2F0ZWQoKSB7IHJldHVybiB0aGlzLl90cnVuY2F0ZWQ7IH0K KyAgICBnZXQgcGFyZW50U3RhY2tUcmFjZSgpIHsgcmV0dXJuIHRoaXMuX3BhcmVudFN0YWNrVHJh Y2U7IH0KIAotICAgIGdldCBmaXJzdE5vbk5hdGl2ZUNhbGxGcmFtZSgpCisgICAgZ2V0IGZpcnN0 Tm9uTmF0aXZlTm9uQW5vbnltb3VzTm90QmxhY2tib3hlZENhbGxGcmFtZSgpCiAgICAgewotICAg ICAgICBmb3IgKGxldCBmcmFtZSBvZiB0aGlzLl9jYWxsRnJhbWVzKSB7Ci0gICAgICAgICAgICBp ZiAoIWZyYW1lLm5hdGl2ZUNvZGUpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGZyYW1lOwotICAg ICAgICB9CisgICAgICAgIGxldCBmaXJzdE5vbk5hdGl2ZU5vbkFub255bW91c0NhbGxGcmFtZSA9 IG51bGw7CiAKLSAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgfQotCi0gICAgZ2V0IGZpcnN0Tm9u TmF0aXZlTm9uQW5vbnltb3VzQ2FsbEZyYW1lKCkKLSAgICB7CiAgICAgICAgIGZvciAobGV0IGZy YW1lIG9mIHRoaXMuX2NhbGxGcmFtZXMpIHsKICAgICAgICAgICAgIGlmIChmcmFtZS5uYXRpdmVD b2RlKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCiAgICAgICAgICAgICBpZiAoZnJhbWUu c291cmNlQ29kZUxvY2F0aW9uKSB7CiAgICAgICAgICAgICAgICAgbGV0IHNvdXJjZUNvZGUgPSBm cmFtZS5zb3VyY2VDb2RlTG9jYXRpb24uc291cmNlQ29kZTsKICAgICAgICAgICAgICAgICBpZiAo c291cmNlQ29kZSBpbnN0YW5jZW9mIFdJLlNjcmlwdCAmJiBzb3VyY2VDb2RlLmFub255bW91cykK ICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgICAgICAvLyBTYXZl IHRoZSBmaXJzdCBub24tbmF0aXZlIG5vbi1hbm9ueW1vdXMgY2FsbCBmcmFtZSBzbyBpdCBjYW4g YmUgdXNlZCBhcyBhCisgICAgICAgICAgICAgICAgLy8gZmFsbGJhY2sgaWYgYWxsIHJlbWFpbmlu ZyBjYWxsIGZyYW1lcyBhcmUgYmxhY2tib3hlZC4KKyAgICAgICAgICAgICAgICBmaXJzdE5vbk5h dGl2ZU5vbkFub255bW91c0NhbGxGcmFtZSA9IGZyYW1lOworCisgICAgICAgICAgICAgICAgaWYg KFdJLmRlYnVnZ2VyTWFuYWdlci5ibGFja2JveERhdGFGb3JTb3VyY2VDb2RlKHNvdXJjZUNvZGUp KQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KKwogICAgICAg ICAgICAgcmV0dXJuIGZyYW1lOwogICAgICAgICB9CiAKLSAgICAgICAgcmV0dXJuIG51bGw7Cisg ICAgICAgIHJldHVybiBmaXJzdE5vbk5hdGl2ZU5vbkFub255bW91c0NhbGxGcmFtZTsKICAgICB9 Ci0KLSAgICBnZXQgdG9wQ2FsbEZyYW1lSXNCb3VuZGFyeSgpIHsgcmV0dXJuIHRoaXMuX3RvcENh bGxGcmFtZUlzQm91bmRhcnk7IH0KLSAgICBnZXQgdHJ1bmNhdGVkKCkgeyByZXR1cm4gdGhpcy5f dHJ1bmNhdGVkOyB9Ci0gICAgZ2V0IHBhcmVudFN0YWNrVHJhY2UoKSB7IHJldHVybiB0aGlzLl9w YXJlbnRTdGFja1RyYWNlOyB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FsbEZyYW1lVmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYWxsRnJhbWVWaWV3LmNzcwppbmRleCAzNTQyNmZm NDNkNDQ4N2MyMTA3OTIxZTgwZjRhYzg3MmUwMGM2NTdjLi5mZWI3OGVlYmFlYmMwNTUzZmIxYmZk MjkzNjNkZDIxZDk4ZWFmNWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9DYWxsRnJhbWVWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYWxsRnJhbWVWaWV3LmNzcwpAQCAtMzAsNiArMzAs MTEgQEAKICAgICBjdXJzb3I6IHBvaW50ZXI7CiB9CiAKKy5jYWxsLWZyYW1lLmJsYWNrYm94ZWQg PiAudGl0bGUsCisuY2FsbC1mcmFtZS5ibGFja2JveGVkOm5vdCg6aG92ZXIsIDpmb2N1cykgPiAu c3VidGl0bGUgeworICAgIG9wYWNpdHk6IDAuNTsKK30KKwogLmNhbGwtZnJhbWUgLmljb24gewog ICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FsbEZy YW1lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nh bGxGcmFtZVZpZXcuanMKaW5kZXggZWRhNWNmYzkwYzVlN2Q1NGU0MDAyZTA4OWRjNjhiNzk4OGU1 MzYzMy4uZGM5YjkwYzM4OGEzMDZkZjBiMDZiMTJmNDc5MDA3ZjM0NDA5NTVkOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FsbEZyYW1lVmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYWxs RnJhbWVWaWV3LmpzCkBAIC0yNSw3ICsyNSw3IEBACiAKIFdJLkNhbGxGcmFtZVZpZXcgPSBjbGFz cyBDYWxsRnJhbWVWaWV3IGV4dGVuZHMgV0kuT2JqZWN0CiB7Ci0gICAgY29uc3RydWN0b3IoY2Fs bEZyYW1lLCBzaG93RnVuY3Rpb25OYW1lKQorICAgIGNvbnN0cnVjdG9yKGNhbGxGcmFtZSwge3No b3dGdW5jdGlvbk5hbWUsIGluZGljYXRlSWZCbGFja2JveGVkfSA9IHt9KQogICAgIHsKICAgICAg ICAgY29uc29sZS5hc3NlcnQoY2FsbEZyYW1lIGluc3RhbmNlb2YgV0kuQ2FsbEZyYW1lKTsKIApA QCAtMzcsNiArMzcsOSBAQCBXSS5DYWxsRnJhbWVWaWV3ID0gY2xhc3MgQ2FsbEZyYW1lVmlldyBl eHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAgIHZhciBzb3VyY2VDb2RlTG9jYXRpb24gPSBjYWxs RnJhbWUuc291cmNlQ29kZUxvY2F0aW9uOwogICAgICAgICBpZiAoc291cmNlQ29kZUxvY2F0aW9u KSB7CisgICAgICAgICAgICBpZiAoaW5kaWNhdGVJZkJsYWNrYm94ZWQpCisgICAgICAgICAgICAg ICAgY2FsbEZyYW1lRWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKCJibGFja2JveGVkIiwgV0kuZGVi dWdnZXJNYW5hZ2VyLmJsYWNrYm94RGF0YUZvclNvdXJjZUNvZGUoY2FsbEZyYW1lLnNvdXJjZUNv ZGVMb2NhdGlvbi5zb3VyY2VDb2RlKSk7CisKICAgICAgICAgICAgIFdJLmxpbmtpZnlFbGVtZW50 KGNhbGxGcmFtZUVsZW1lbnQsIHNvdXJjZUNvZGVMb2NhdGlvbiwgewogICAgICAgICAgICAgICAg IGlnbm9yZU5ldHdvcmtUYWI6IHRydWUsCiAgICAgICAgICAgICAgICAgaWdub3JlU2VhcmNoVGFi OiB0cnVlLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ29uc29sZU1lc3NhZ2VWaWV3LmpzCmluZGV4IDlmNzE0MzM1YWEyZjYx NTY4Njg3MzM2OTJjZGQ2YTYyNTM0MThhYTcuLmEzMzhkM2Q4NWQzNjgyN2JmNjIzZDY4OTExNzgz ZDQ0YzU5NjRjNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvbnNvbGVNZXNzYWdlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlTWVzc2FnZVZpZXcuanMKQEAgLTQ5LDYgKzQ5 LDcgQEAgV0kuQ29uc29sZU1lc3NhZ2VWaWV3ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VWaWV3IGV4 dGVuZHMgV0kuT2JqZWN0CiAKICAgICByZW5kZXIoKQogICAgIHsKKyAgICAgICAgY29uc29sZS5h c3NlcnQoIXRoaXMuX2VsZW1lbnQpOwogICAgICAgICB0aGlzLl9lbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFk ZCgiY29uc29sZS1tZXNzYWdlIik7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuZGlyID0gImx0ciI7 CkBAIC0xMDUsNiArMTA2LDggQEAgV0kuQ29uc29sZU1lc3NhZ2VWaWV3ID0gY2xhc3MgQ29uc29s ZU1lc3NhZ2VWaWV3IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50 LmNsYXNzTGlzdC5hZGQoImNvbnNvbGUtaW1hZ2UiKTsKICAgICAgICAgICAgIHRoaXMuX2VsZW1l bnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9oYW5kbGVDb250ZXh0TWVu dS5iaW5kKHRoaXMpKTsKICAgICAgICAgfQorCisgICAgICAgIFdJLmRlYnVnZ2VyTWFuYWdlci5h ZGRFdmVudExpc3RlbmVyKFdJLkRlYnVnZ2VyTWFuYWdlci5FdmVudC5CbGFja2JveENoYW5nZWQs IHRoaXMuX2hhbmRsZURlYnVnZ2VyQmxhY2tib3hDaGFuZ2VkLCB0aGlzKTsKICAgICB9CiAKICAg ICBnZXQgZWxlbWVudCgpCkBAIC0yNDMsNyArMjQ2LDcgQEAgV0kuQ29uc29sZU1lc3NhZ2VWaWV3 ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VWaWV3IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHJl dHVybiBjbGlwYm9hcmRTdHJpbmc7CiAgICAgfQogCi0gICAgY2xlYXJTYXZlZFZhcmlhYmxlU3Rh dGUoKQorICAgIGNsZWFyU2Vzc2lvblN0YXRlKCkKICAgICB7CiAgICAgICAgIGZvciAobGV0IG5v ZGUgb2YgdGhpcy5fbWVzc2FnZUJvZHlFbGVtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoIi5jb25zb2xl LXNhdmVkLXZhcmlhYmxlIikpCiAgICAgICAgICAgICBub2RlLnJlbW92ZSgpOwpAQCAtMjUzLDYg KzI1Niw4IEBAIFdJLkNvbnNvbGVNZXNzYWdlVmlldyA9IGNsYXNzIENvbnNvbGVNZXNzYWdlVmll dyBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQu b3JnL2IvMTk2OTU2PiBXZWIgSW5zcGVjdG9yOiB1c2Ugd2VhayBjb2xsZWN0aW9ucyBmb3IgaG9s ZGluZyBldmVudCBsaXN0ZW5lcnMKICAgICAgICAgV0kuc2V0dGluZ3MuY29uc29sZVNhdmVkUmVz dWx0QWxpYXMucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKKworICAgICAg ICBXSS5kZWJ1Z2dlck1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5EZWJ1Z2dlck1hbmFn ZXIuRXZlbnQuQmxhY2tib3hDaGFuZ2VkLCB0aGlzLl9oYW5kbGVEZWJ1Z2dlckJsYWNrYm94Q2hh bmdlZCwgdGhpcyk7CiAgICAgfQogCiAgICAgLy8gUHJpdmF0ZQpAQCAtNDE4LDEyICs0MjMsMTEg QEAgV0kuQ29uc29sZU1lc3NhZ2VWaWV3ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VWaWV3IGV4dGVu ZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICB2 YXIgZmlyc3ROb25OYXRpdmVOb25Bbm9ueW1vdXNDYWxsRnJhbWUgPSB0aGlzLl9tZXNzYWdlLnN0 YWNrVHJhY2UuZmlyc3ROb25OYXRpdmVOb25Bbm9ueW1vdXNDYWxsRnJhbWU7Ci0KICAgICAgICAg dmFyIGNhbGxGcmFtZTsKLSAgICAgICAgaWYgKGZpcnN0Tm9uTmF0aXZlTm9uQW5vbnltb3VzQ2Fs bEZyYW1lKSB7CisgICAgICAgIGxldCBmaXJzdE5vbk5hdGl2ZU5vbkFub255bW91c05vdEJsYWNr Ym94ZWRDYWxsRnJhbWUgPSB0aGlzLl9tZXNzYWdlLnN0YWNrVHJhY2UuZmlyc3ROb25OYXRpdmVO b25Bbm9ueW1vdXNOb3RCbGFja2JveGVkQ2FsbEZyYW1lOworICAgICAgICBpZiAoZmlyc3ROb25O YXRpdmVOb25Bbm9ueW1vdXNOb3RCbGFja2JveGVkQ2FsbEZyYW1lKSB7CiAgICAgICAgICAgICAv LyBKYXZhU2NyaXB0IGVycm9ycyBhbmQgY29uc29sZS4qIG1ldGhvZHMuCi0gICAgICAgICAgICBj YWxsRnJhbWUgPSBmaXJzdE5vbk5hdGl2ZU5vbkFub255bW91c0NhbGxGcmFtZTsKKyAgICAgICAg ICAgIGNhbGxGcmFtZSA9IGZpcnN0Tm9uTmF0aXZlTm9uQW5vbnltb3VzTm90QmxhY2tib3hlZENh bGxGcmFtZTsKICAgICAgICAgfSBlbHNlIGlmICh0aGlzLl9tZXNzYWdlLnVybCAmJiAhdGhpcy5f c2hvdWxkSGlkZVVSTCh0aGlzLl9tZXNzYWdlLnVybCkpIHsKICAgICAgICAgICAgIC8vIENTUyB3 YXJuaW5ncyBoYXZlIG5vIHN0YWNrIHRyYWNlcy4KICAgICAgICAgICAgIGNhbGxGcmFtZSA9IFdJ LkNhbGxGcmFtZS5mcm9tUGF5bG9hZCh0aGlzLl9tZXNzYWdlLnRhcmdldCwgewpAQCAtNDM1LDEw ICs0MzksMTUgQEAgV0kuQ29uc29sZU1lc3NhZ2VWaWV3ID0gY2xhc3MgQ29uc29sZU1lc3NhZ2VW aWV3IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoY2FsbEZyYW1l ICYmICghY2FsbEZyYW1lLmlzQ29uc29sZUV2YWx1YXRpb24gfHwgKFdJLmlzRGVidWdVSUVuYWJs ZWQoKSAmJiBXSS5zZXR0aW5ncy5kZWJ1Z1Nob3dDb25zb2xlRXZhbHVhdGlvbnMudmFsdWUpKSkg ewotICAgICAgICAgICAgY29uc3Qgc2hvd0Z1bmN0aW9uTmFtZSA9ICEhY2FsbEZyYW1lLmZ1bmN0 aW9uTmFtZTsKLSAgICAgICAgICAgIHZhciBsb2NhdGlvbkVsZW1lbnQgPSBuZXcgV0kuQ2FsbEZy YW1lVmlldyhjYWxsRnJhbWUsIHNob3dGdW5jdGlvbk5hbWUpOwotICAgICAgICAgICAgbG9jYXRp b25FbGVtZW50LmNsYXNzTGlzdC5hZGQoImNvbnNvbGUtbWVzc2FnZS1sb2NhdGlvbiIpOwotICAg ICAgICAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZChsb2NhdGlvbkVsZW1lbnQpOworICAg ICAgICAgICAgbGV0IGV4aXN0aW5nQ2FsbEZyYW1lVmlldyA9IHRoaXMuX2NhbGxGcmFtZVZpZXc7 CisKKyAgICAgICAgICAgIHRoaXMuX2NhbGxGcmFtZVZpZXcgPSBuZXcgV0kuQ2FsbEZyYW1lVmll dyhjYWxsRnJhbWUsIHtzaG93RnVuY3Rpb25OYW1lOiAhIWNhbGxGcmFtZS5mdW5jdGlvbk5hbWV9 KTsKKyAgICAgICAgICAgIHRoaXMuX2NhbGxGcmFtZVZpZXcuY2xhc3NMaXN0LmFkZCgiY29uc29s ZS1tZXNzYWdlLWxvY2F0aW9uIik7CisKKyAgICAgICAgICAgIGlmIChleGlzdGluZ0NhbGxGcmFt ZVZpZXcpCisgICAgICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5yZXBsYWNlQ2hpbGQodGhpcy5f Y2FsbEZyYW1lVmlldywgZXhpc3RpbmdDYWxsRnJhbWVWaWV3KTsKKyAgICAgICAgICAgIGVsc2UK KyAgICAgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2NhbGxGcmFt ZVZpZXcpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTEwMzgsNCArMTA0 NywxMCBAQCBXSS5Db25zb2xlTWVzc2FnZVZpZXcgPSBjbGFzcyBDb25zb2xlTWVzc2FnZVZpZXcg ZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3Io KTsKICAgICB9CisKKyAgICBfaGFuZGxlRGVidWdnZXJCbGFja2JveENoYW5nZWQoZXZlbnQpCisg ICAgeworICAgICAgICBpZiAodGhpcy5fY2FsbEZyYW1lVmlldykKKyAgICAgICAgICAgIHRoaXMu X2FwcGVuZExvY2F0aW9uTGluaygpOworICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCmlu ZGV4IDYyODU4YTRiNTQ1ODhjN2NmZDRiYTZhMDZhMzI5ZDA3NWE3MzZjZmUuLmFhOTlmOGVjYWU2 ZTAzZDg0M2M1MmVhMTA4ZTEyZWM4ZjA3ZmM5NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCkBA IC0zOTgsNyArMzk4LDcgQEAgV0kuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBMb2dDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAKICAgICAgICAgZm9yIChsZXQgbWVzc2FnZUVsZW1l bnQgb2YgdGhpcy5fYWxsTWVzc2FnZUVsZW1lbnRzKCkpIHsKICAgICAgICAgICAgIGlmIChtZXNz YWdlRWxlbWVudC5fX21lc3NhZ2VWaWV3KQotICAgICAgICAgICAgICAgIG1lc3NhZ2VFbGVtZW50 Ll9fbWVzc2FnZVZpZXcuY2xlYXJTYXZlZFZhcmlhYmxlU3RhdGUoKTsKKyAgICAgICAgICAgICAg ICBtZXNzYWdlRWxlbWVudC5fX21lc3NhZ2VWaWV3LmNsZWFyU2Vzc2lvblN0YXRlKCk7CiAgICAg ICAgIH0KIAogICAgICAgICBjb25zdCBpc0ZpcnN0U2Vzc2lvbiA9IGZhbHNlOwpAQCAtODM2LDcg KzgzNiw3IEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5k cyBXSS5Db250ZW50VmlldwogCiAgICAgICAgIGZvciAobGV0IG1lc3NhZ2VFbGVtZW50IG9mIHRo aXMuX2FsbE1lc3NhZ2VFbGVtZW50cygpKSB7CiAgICAgICAgICAgICBpZiAobWVzc2FnZUVsZW1l bnQuX19tZXNzYWdlVmlldykKLSAgICAgICAgICAgICAgICBtZXNzYWdlRWxlbWVudC5fX21lc3Nh Z2VWaWV3LmNsZWFyU2F2ZWRWYXJpYWJsZVN0YXRlKCk7CisgICAgICAgICAgICAgICAgbWVzc2Fn ZUVsZW1lbnQuX19tZXNzYWdlVmlldy5jbGVhclNlc3Npb25TdGF0ZSgpOwogICAgICAgICB9CiAK ICAgICAgICAgdGhpcy5fbG9nVmlld0NvbnRyb2xsZXIuY2xlYXIoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1N0YWNrVHJhY2VWaWV3Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3RhY2tUcmFjZVZp ZXcuanMKaW5kZXggYjUzZjY2MzZlNWZjN2ExMTg0YWZjYjgwOGFjMTI1NmVmNmNiNjNmNC4uMmU0 MzZkZTZjZjI5MTlmZDk2NjNlNzQzZDQ3NGM5YjlhNzA5MTc4YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3RhY2tUcmFjZVZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3RhY2tUcmFjZVZp ZXcuanMKQEAgLTM4LDcgKzM4LDcgQEAgV0kuU3RhY2tUcmFjZVZpZXcgPSBjbGFzcyBTdGFja1Ry YWNlVmlldyBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgaWYgKGNhbGxGcmFtZS5pc0Nv bnNvbGVFdmFsdWF0aW9uICYmICghV0kuaXNEZWJ1Z1VJRW5hYmxlZCgpIHx8ICFXSS5zZXR0aW5n cy5kZWJ1Z1Nob3dDb25zb2xlRXZhbHVhdGlvbnMudmFsdWUpKQogICAgICAgICAgICAgICAgIGNv bnRpbnVlOwogCi0gICAgICAgICAgICB2YXIgY2FsbEZyYW1lRWxlbWVudCA9IG5ldyBXSS5DYWxs RnJhbWVWaWV3KGNhbGxGcmFtZSwgdHJ1ZSk7CisgICAgICAgICAgICBsZXQgY2FsbEZyYW1lRWxl bWVudCA9IG5ldyBXSS5DYWxsRnJhbWVWaWV3KGNhbGxGcmFtZSwge3Nob3dGdW5jdGlvbk5hbWU6 IHRydWUsIGluZGljYXRlSWZCbGFja2JveGVkOiB0cnVlfSk7CiAgICAgICAgICAgICBlbGVtZW50 LmFwcGVuZENoaWxkKGNhbGxGcmFtZUVsZW1lbnQpOwogICAgICAgICB9CiAgICAgfQo=