205438 2019-12-18 23:00:34 -0800 Web Inspector: Console: the clear console button is hidden at smaller widths 2019-12-19 16:33:24 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1600168 0 hi 2019-12-18 23:00:34 -0800 Ever since r242604, we no longer "need" to show the text filter bar or message type scope bar since new messages will show a warning banner that there's an active filter. Instead, we should prefer showing the navigation items that control functionality that cannot be reached (visually) anywhere else, such as clearing the console or evaluating as a user gesture. 1600170 1 386074 hi 2019-12-18 23:03:03 -0800 Created attachment 386074 Patch 1600289 2 386074 bburg 2019-12-19 08:49:11 -0800 Comment on attachment 386074 Patch r=me 1600320 3 386074 commit-queue 2019-12-19 09:33:37 -0800 Comment on attachment 386074 Patch Rejecting attachment 386074 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', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 386074, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=386074&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=205438&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 386074 from bug 205438. Fetching: https://bugs.webkit.org/attachment.cgi?id=386074 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebInspectorUI/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/WebInspectorUI/ChangeLog' is out of date W: 277f3cd7e10c1507d743533d24e29fe44dd5399c and refs/remotes/origin/master differ, using rebase: :040000 040000 1236d47d9f6b2151c90cede622a58ba66deaf71b a9826ad16b45839d3a15accb7f58c156b14aed9d M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebInspectorUI/ChangeLog ERROR from SVN: Item is out of date: File '/trunk/Source/WebInspectorUI/ChangeLog' is out of date W: 277f3cd7e10c1507d743533d24e29fe44dd5399c and refs/remotes/origin/master differ, using rebase: :040000 040000 1236d47d9f6b2151c90cede622a58ba66deaf71b a9826ad16b45839d3a15accb7f58c156b14aed9d M Source Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From https://git.webkit.org/git/WebKit 7f55b0e8419..02850c19cb3 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 253754 = 7f55b0e8419b0f7f848024e2eda6c3e03f79004f r253755 = 28e53b982780dd170d821b2370d77e870f6a4d4f r253756 = 02850c19cb3d0fe9b02985390489b2c5f6b1187e Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/13293402 1600523 4 386151 hi 2019-12-19 15:01:36 -0800 Created attachment 386151 Patch 1600557 5 386151 commit-queue 2019-12-19 16:32:50 -0800 Comment on attachment 386151 Patch Clearing flags on attachment: 386151 Committed r253800: <https://trac.webkit.org/changeset/253800> 1600558 6 commit-queue 2019-12-19 16:32:52 -0800 All reviewed patches have been landed. Closing bug. 1600559 7 webkit-bug-importer 2019-12-19 16:33:24 -0800 <rdar://problem/58096134> 386074 2019-12-18 23:03:03 -0800 2019-12-19 15:01:35 -0800 Patch bug-205438-20191218230302.patch text/plain 5259 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU0YzM1MzY2OTlmMTQ2NGEyNjY2NjI0NzU2MTUz ZWYwZDkyYmE3ZmEuLjEyNzRlMGU0ZTU3ZGE2ZjMzOGRmZWJhNGNhMDc1NjRlMjVhMThkMWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTEyLTE4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD b25zb2xlOiB0aGUgY2xlYXIgY29uc29sZSBidXR0b24gaXMgaGlkZGVuIGF0IHNtYWxsZXIgd2lk dGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU0 MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFdmVy IHNpbmNlIHIyNDI2MDQsIHdlIG5vIGxvbmdlciAibmVlZCIgdG8gc2hvdyB0aGUgdGV4dCBmaWx0 ZXIgYmFyIG9yIG1lc3NhZ2UgdHlwZSBzY29wZQorICAgICAgICBiYXIgc2luY2UgbmV3IG1lc3Nh Z2VzIHdpbGwgc2hvdyBhIHdhcm5pbmcgYmFubmVyIHRoYXQgdGhlcmUncyBhbiBhY3RpdmUgZmls dGVyLiBJbnN0ZWFkLCB3ZQorICAgICAgICBzaG91bGQgcHJlZmVyIHNob3dpbmcgdGhlIG5hdmln YXRpb24gaXRlbXMgdGhhdCBjb250cm9sIGZ1bmN0aW9uYWxpdHkgdGhhdCBjYW5ub3QgYmUgcmVh Y2hlZAorICAgICAgICBhbnl3aGVyZSBlbHNlICh2aXN1YWxseSksIHN1Y2ggYXMgY2xlYXJpbmcg dGhlIGNvbnNvbGUgb3IgZXZhbHVhdGluZyBhcyBhIHVzZXIgZ2VzdHVyZS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5Mb2dD b250ZW50Vmlldyk6CisgICAgICAgIE1ha2UgdGhlIHRleHQgZmluZCBiYW5uZXIgYW5kIHR5cGUg c2NvcGUgYmFyIGJvdGggbG93IHByaW9yaXR5LCB0aGUgcHJlc2VydmUgbG9nIGFuZAorICAgICAg ICBldmFsdWF0ZSBhcyB1c2VyIGdlc3R1cmUgdG9nZ2xlcyBub3JtYWwgcHJpb3JpdHksIGFuZCB0 aGUgY2xlYXIgbG9nIGhpZ2ggcHJpb3JpdHkuCisKIDIwMTktMTItMTggIFl1cnkgU2VtaWtoYXRz a3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUnVudGlt ZS5lbmFibGUgcmVwb3J0cyBkdXBsaWNhdGVzIChub24gZXhpc3RlbnQpIGNvbnRleHRzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250 ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xv Z0NvbnRlbnRWaWV3LmpzCmluZGV4IGU0NmVkOTViOTI5NjNmOGM3YzY5NTUzYmM0YzgwYzdiMzQ3 N2JjZDcuLjk5NzJiMDU2NGFjMGFjNzJmMGQxYWQwMDNjMmM1NTNmMjE2YmE4OTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xv Z0NvbnRlbnRWaWV3LmpzCkBAIC02Miw3ICs2Miw3IEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0gY2xh c3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogCiAgICAgICAgIGNvbnN0 IGZpeGVkID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fZmluZEJhbm5lciA9IG5ldyBXSS5GaW5kQmFu bmVyKHRoaXMsICJjb25zb2xlLWZpbmQtYmFubmVyIiwgZml4ZWQpOwotICAgICAgICB0aGlzLl9m aW5kQmFubmVyLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxp dHlQcmlvcml0eS5IaWdoOworICAgICAgICB0aGlzLl9maW5kQmFubmVyLnZpc2liaWxpdHlQcmlv cml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CiAgICAgICAg IHRoaXMuX2ZpbmRCYW5uZXIudGFyZ2V0RWxlbWVudCA9IHRoaXMuZWxlbWVudDsKIAogICAgICAg ICB0aGlzLl9jdXJyZW50U2VhcmNoUXVlcnkgPSAiIjsKQEAgLTcxLDcgKzcxLDYgQEAgV0kuTG9n Q29udGVudFZpZXcgPSBjbGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3 CiAgICAgICAgIHRoaXMuX3NlbGVjdGVkU2VhcmNoTWF0Y2hJc1ZhbGlkID0gZmFsc2U7CiAKICAg ICAgICAgdGhpcy5fcHJlc2VydmVMb2dOYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5DaGVja2JveE5h dmlnYXRpb25JdGVtKCJwcmVzZXJ2ZS1sb2ciLCBXSS5VSVN0cmluZygiUHJlc2VydmUgTG9nIiks ICFXSS5zZXR0aW5ncy5jbGVhckxvZ09uTmF2aWdhdGUudmFsdWUpOwotICAgICAgICB0aGlzLl9w cmVzZXJ2ZUxvZ05hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRp b25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CiAgICAgICAgIHRoaXMuX3ByZXNlcnZlTG9n TmF2aWdhdGlvbkl0ZW0udG9vbHRpcCA9IFdJLlVJU3RyaW5nKCJEbyBub3QgY2xlYXIgdGhlIGNv bnNvbGUgb24gbmV3IHBhZ2UgbG9hZHMiKTsKICAgICAgICAgdGhpcy5fcHJlc2VydmVMb2dOYXZp Z2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkNoZWNrYm94TmF2aWdhdGlvbkl0ZW0uRXZl bnQuQ2hlY2tlZERpZENoYW5nZSwgKCkgPT4gewogICAgICAgICAgICAgV0kuc2V0dGluZ3MuY2xl YXJMb2dPbk5hdmlnYXRlLnZhbHVlID0gIVdJLnNldHRpbmdzLmNsZWFyTG9nT25OYXZpZ2F0ZS52 YWx1ZTsKQEAgLTc5LDcgKzc4LDYgQEAgV0kuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBMb2dDb250 ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIFdJLnNldHRpbmdzLmNsZWFy TG9nT25OYXZpZ2F0ZS5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQuQ2hhbmdlZCwg dGhpcy5faGFuZGxlQ2xlYXJMb2dPbk5hdmlnYXRlU2V0dGluZ0NoYW5nZWQsIHRoaXMpOwogCiAg ICAgICAgIHRoaXMuX2VtdWxhdGVJblVzZXJHZXN0dXJlTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0ku Q2hlY2tib3hOYXZpZ2F0aW9uSXRlbSgiZW11bGF0ZS1pbi11c2VyLWdlc3R1cmUiLCBXSS5VSVN0 cmluZygiRW11bGF0ZSBVc2VyIEdlc3R1cmUiKSwgV0kuc2V0dGluZ3MuZW11bGF0ZUluVXNlckdl c3R1cmUudmFsdWUpOwotICAgICAgICB0aGlzLl9lbXVsYXRlSW5Vc2VyR2VzdHVyZU5hdmlnYXRp b25JdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQ cmlvcml0eS5Mb3c7CiAgICAgICAgIHRoaXMuX2VtdWxhdGVJblVzZXJHZXN0dXJlTmF2aWdhdGlv bkl0ZW0udG9vbHRpcCA9IFdJLlVJU3RyaW5nKCJSdW4gY29uc29sZSBjb21tYW5kcyBhcyBpZiBp bnNpZGUgYSB1c2VyIGdlc3R1cmUiKTsKICAgICAgICAgdGhpcy5fZW11bGF0ZUluVXNlckdlc3R1 cmVOYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkNoZWNrYm94TmF2aWdhdGlvbkl0 ZW0uRXZlbnQuQ2hlY2tlZERpZENoYW5nZSwgKCkgPT4gewogICAgICAgICAgICAgV0kuc2V0dGlu Z3MuZW11bGF0ZUluVXNlckdlc3R1cmUudmFsdWUgPSAhV0kuc2V0dGluZ3MuZW11bGF0ZUluVXNl ckdlc3R1cmUudmFsdWU7CkBAIC05OCw3ICs5Niw3IEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0gY2xh c3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICAgICAgbmV3 IFdJLlNjb3BlQmFySXRlbShXSS5Mb2dDb250ZW50Vmlldy5TY29wZXMuRGVidWdzLCBXSS5VSVN0 cmluZygiRGVidWdzIiksIHtjbGFzc05hbWU6ICJkZWJ1Z3MiLCBoaWRkZW46IHRydWV9KSwKICAg ICAgICAgXTsKICAgICAgICAgdGhpcy5fc2NvcGVCYXIgPSBuZXcgV0kuU2NvcGVCYXIoImxvZy1z Y29wZS1iYXIiLCBzY29wZUJhckl0ZW1zLCBzY29wZUJhckl0ZW1zWzBdKTsKLSAgICAgICAgdGhp cy5fc2NvcGVCYXIudmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJp bGl0eVByaW9yaXR5LkhpZ2g7CisgICAgICAgIHRoaXMuX3Njb3BlQmFyLnZpc2liaWxpdHlQcmlv cml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CiAgICAgICAg IHRoaXMuX3Njb3BlQmFyLmFkZEV2ZW50TGlzdGVuZXIoV0kuU2NvcGVCYXIuRXZlbnQuU2VsZWN0 aW9uQ2hhbmdlZCwgdGhpcy5fc2NvcGVCYXJTZWxlY3Rpb25EaWRDaGFuZ2UsIHRoaXMpOwogCiAg ICAgICAgIHRoaXMuX2hhc05vbkRlZmF1bHRMb2dDaGFubmVsTWVzc2FnZSA9IGZhbHNlOwpAQCAt MTE4LDYgKzExNiw3IEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZpZXcg ZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLl9nYXJiYWdlQ29sbGVjdE5hdmln YXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQu Q2xpY2tlZCwgdGhpcy5fZ2FyYmFnZUNvbGxlY3QsIHRoaXMpOwogCiAgICAgICAgIHRoaXMuX2Ns ZWFyTG9nTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImNsZWFy LWxvZyIsIFdJLlVJU3RyaW5nKCJDbGVhciBsb2cgKCVzIG9yICVzKSIpLmZvcm1hdChXSS5jbGVh cktleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUsIHRoaXMuX2xvZ1ZpZXdDb250cm9sbGVyLm1l c3NhZ2VzQWx0ZXJuYXRlQ2xlYXJLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lKSwgIkltYWdl cy9OYXZpZ2F0aW9uSXRlbVRyYXNoLnN2ZyIsIDE1LCAxNSk7CisgICAgICAgIHRoaXMuX2NsZWFy TG9nTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0u VmlzaWJpbGl0eVByaW9yaXR5LkhpZ2g7CiAgICAgICAgIHRoaXMuX2NsZWFyTG9nTmF2aWdhdGlv bkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlj a2VkLCB0aGlzLl9jbGVhckxvZywgdGhpcyk7CiAKICAgICAgICAgdGhpcy5fc2hvd0NvbnNvbGVU YWJOYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbSgic2hvdy10YWIi LCBXSS5VSVN0cmluZygiU2hvdyBDb25zb2xlIHRhYiIpLCAiSW1hZ2VzL1NwbGl0VG9nZ2xlVXAu c3ZnIiwgMTYsIDE2KTsK 386151 2019-12-19 15:01:36 -0800 2019-12-19 16:32:50 -0800 Patch bug-205438-20191219150135.patch text/plain 5287 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGUyMDVjYTczMTU1M2NjMjg3Yzk2MDEzMTc3YTM2 ZmE3MWE2OWYyNTEuLjA4ZWVmMWNhYTc5MjNhYTQ4NjQ2ZmFhNmJlM2FhMGFiMTFjOGM3ZjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTEyLTE5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD b25zb2xlOiB0aGUgY2xlYXIgY29uc29sZSBidXR0b24gaXMgaGlkZGVuIGF0IHNtYWxsZXIgd2lk dGhzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU0 MzgKKworICAgICAgICBSZXZpZXdlZCBieSBCcmlhbiBCdXJnLgorCisgICAgICAgIEV2ZXIgc2lu Y2UgcjI0MjYwNCwgd2Ugbm8gbG9uZ2VyICJuZWVkIiB0byBzaG93IHRoZSB0ZXh0IGZpbHRlciBi YXIgb3IgbWVzc2FnZSB0eXBlIHNjb3BlCisgICAgICAgIGJhciBzaW5jZSBuZXcgbWVzc2FnZXMg d2lsbCBzaG93IGEgd2FybmluZyBiYW5uZXIgdGhhdCB0aGVyZSdzIGFuIGFjdGl2ZSBmaWx0ZXIu IEluc3RlYWQsIHdlCisgICAgICAgIHNob3VsZCBwcmVmZXIgc2hvd2luZyB0aGUgbmF2aWdhdGlv biBpdGVtcyB0aGF0IGNvbnRyb2wgZnVuY3Rpb25hbGl0eSB0aGF0IGNhbm5vdCBiZSByZWFjaGVk CisgICAgICAgIGFueXdoZXJlIGVsc2UgKHZpc3VhbGx5KSwgc3VjaCBhcyBjbGVhcmluZyB0aGUg Y29uc29sZSBvciBldmFsdWF0aW5nIGFzIGEgdXNlciBnZXN0dXJlLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkxvZ0NvbnRl bnRWaWV3KToKKyAgICAgICAgTWFrZSB0aGUgdGV4dCBmaW5kIGJhbm5lciBhbmQgdHlwZSBzY29w ZSBiYXIgYm90aCBsb3cgcHJpb3JpdHksIHRoZSBwcmVzZXJ2ZSBsb2cgYW5kCisgICAgICAgIGV2 YWx1YXRlIGFzIHVzZXIgZ2VzdHVyZSB0b2dnbGVzIG5vcm1hbCBwcmlvcml0eSwgYW5kIHRoZSBj bGVhciBsb2cgaGlnaCBwcmlvcml0eS4KKwogMjAxOS0xMi0xOSAgRGV2aW4gUm91c3NvICA8ZHJv dXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQXVkaXQ6IGV4aXRpbmcg ZWRpdCBtb2RlIHdpdGggdGhlIHNhbWUgc2VsZWN0aW9uIGFzIGJlZm9yZSBlbnRlcmluZyBlZGl0 IG1vZGUgZG9lc24ndCByZXNlbGVjdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwppbmRleCBlNDZlZDk1 YjkyOTYzZjhjN2M2OTU1M2JjNGM4MGM3YjM0NzdiY2Q3Li45OTcyYjA1NjRhYzBhYzcyZjBkMWFk MDAzYzJjNTUzZjIxNmJhODk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwpAQCAtNjIsNyArNjIs NyBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0ku Q29udGVudFZpZXcKIAogICAgICAgICBjb25zdCBmaXhlZCA9IHRydWU7CiAgICAgICAgIHRoaXMu X2ZpbmRCYW5uZXIgPSBuZXcgV0kuRmluZEJhbm5lcih0aGlzLCAiY29uc29sZS1maW5kLWJhbm5l ciIsIGZpeGVkKTsKLSAgICAgICAgdGhpcy5fZmluZEJhbm5lci52aXNpYmlsaXR5UHJpb3JpdHkg PSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuSGlnaDsKKyAgICAgICAgdGhp cy5fZmluZEJhbm5lci52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNp YmlsaXR5UHJpb3JpdHkuTG93OwogICAgICAgICB0aGlzLl9maW5kQmFubmVyLnRhcmdldEVsZW1l bnQgPSB0aGlzLmVsZW1lbnQ7CiAKICAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFF1ZXJ5ID0g IiI7CkBAIC03MSw3ICs3MSw2IEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVu dFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLl9zZWxlY3RlZFNlYXJj aE1hdGNoSXNWYWxpZCA9IGZhbHNlOwogCiAgICAgICAgIHRoaXMuX3ByZXNlcnZlTG9nTmF2aWdh dGlvbkl0ZW0gPSBuZXcgV0kuQ2hlY2tib3hOYXZpZ2F0aW9uSXRlbSgicHJlc2VydmUtbG9nIiwg V0kuVUlTdHJpbmcoIlByZXNlcnZlIExvZyIpLCAhV0kuc2V0dGluZ3MuY2xlYXJMb2dPbk5hdmln YXRlLnZhbHVlKTsKLSAgICAgICAgdGhpcy5fcHJlc2VydmVMb2dOYXZpZ2F0aW9uSXRlbS52aXNp YmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93 OwogICAgICAgICB0aGlzLl9wcmVzZXJ2ZUxvZ05hdmlnYXRpb25JdGVtLnRvb2x0aXAgPSBXSS5V SVN0cmluZygiRG8gbm90IGNsZWFyIHRoZSBjb25zb2xlIG9uIG5ldyBwYWdlIGxvYWRzIik7CiAg ICAgICAgIHRoaXMuX3ByZXNlcnZlTG9nTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihX SS5DaGVja2JveE5hdmlnYXRpb25JdGVtLkV2ZW50LkNoZWNrZWREaWRDaGFuZ2UsICgpID0+IHsK ICAgICAgICAgICAgIFdJLnNldHRpbmdzLmNsZWFyTG9nT25OYXZpZ2F0ZS52YWx1ZSA9ICFXSS5z ZXR0aW5ncy5jbGVhckxvZ09uTmF2aWdhdGUudmFsdWU7CkBAIC03OSw3ICs3OCw2IEBAIFdJLkxv Z0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50Vmll dwogICAgICAgICBXSS5zZXR0aW5ncy5jbGVhckxvZ09uTmF2aWdhdGUuYWRkRXZlbnRMaXN0ZW5l cihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX2hhbmRsZUNsZWFyTG9nT25OYXZpZ2F0 ZVNldHRpbmdDaGFuZ2VkLCB0aGlzKTsKIAogICAgICAgICB0aGlzLl9lbXVsYXRlSW5Vc2VyR2Vz dHVyZU5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkNoZWNrYm94TmF2aWdhdGlvbkl0ZW0oImVtdWxh dGUtaW4tdXNlci1nZXN0dXJlIiwgV0kuVUlTdHJpbmcoIkVtdWxhdGUgVXNlciBHZXN0dXJlIiks IFdJLnNldHRpbmdzLmVtdWxhdGVJblVzZXJHZXN0dXJlLnZhbHVlKTsKLSAgICAgICAgdGhpcy5f ZW11bGF0ZUluVXNlckdlc3R1cmVOYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBX SS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OwogICAgICAgICB0aGlzLl9l bXVsYXRlSW5Vc2VyR2VzdHVyZU5hdmlnYXRpb25JdGVtLnRvb2x0aXAgPSBXSS5VSVN0cmluZygi UnVuIGNvbnNvbGUgY29tbWFuZHMgYXMgaWYgaW5zaWRlIGEgdXNlciBnZXN0dXJlIik7CiAgICAg ICAgIHRoaXMuX2VtdWxhdGVJblVzZXJHZXN0dXJlTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0 ZW5lcihXSS5DaGVja2JveE5hdmlnYXRpb25JdGVtLkV2ZW50LkNoZWNrZWREaWRDaGFuZ2UsICgp ID0+IHsKICAgICAgICAgICAgIFdJLnNldHRpbmdzLmVtdWxhdGVJblVzZXJHZXN0dXJlLnZhbHVl ID0gIVdJLnNldHRpbmdzLmVtdWxhdGVJblVzZXJHZXN0dXJlLnZhbHVlOwpAQCAtOTgsNyArOTYs NyBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0ku Q29udGVudFZpZXcKICAgICAgICAgICAgIG5ldyBXSS5TY29wZUJhckl0ZW0oV0kuTG9nQ29udGVu dFZpZXcuU2NvcGVzLkRlYnVncywgV0kuVUlTdHJpbmcoIkRlYnVncyIpLCB7Y2xhc3NOYW1lOiAi ZGVidWdzIiwgaGlkZGVuOiB0cnVlfSksCiAgICAgICAgIF07CiAgICAgICAgIHRoaXMuX3Njb3Bl QmFyID0gbmV3IFdJLlNjb3BlQmFyKCJsb2ctc2NvcGUtYmFyIiwgc2NvcGVCYXJJdGVtcywgc2Nv cGVCYXJJdGVtc1swXSk7Ci0gICAgICAgIHRoaXMuX3Njb3BlQmFyLnZpc2liaWxpdHlQcmlvcml0 eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5IaWdoOworICAgICAgICB0 aGlzLl9zY29wZUJhci52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNp YmlsaXR5UHJpb3JpdHkuTG93OwogICAgICAgICB0aGlzLl9zY29wZUJhci5hZGRFdmVudExpc3Rl bmVyKFdJLlNjb3BlQmFyLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQsIHRoaXMuX3Njb3BlQmFyU2Vs ZWN0aW9uRGlkQ2hhbmdlLCB0aGlzKTsKIAogICAgICAgICB0aGlzLl9oYXNOb25EZWZhdWx0TG9n Q2hhbm5lbE1lc3NhZ2UgPSBmYWxzZTsKQEAgLTExOCw2ICsxMTYsNyBAQCBXSS5Mb2dDb250ZW50 VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICAg ICAgdGhpcy5fZ2FyYmFnZUNvbGxlY3ROYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJ LkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2dhcmJhZ2VDb2xsZWN0 LCB0aGlzKTsKIAogICAgICAgICB0aGlzLl9jbGVhckxvZ05hdmlnYXRpb25JdGVtID0gbmV3IFdJ LkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJjbGVhci1sb2ciLCBXSS5VSVN0cmluZygiQ2xlYXIgbG9n ICglcyBvciAlcykiKS5mb3JtYXQoV0kuY2xlYXJLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1l LCB0aGlzLl9sb2dWaWV3Q29udHJvbGxlci5tZXNzYWdlc0FsdGVybmF0ZUNsZWFyS2V5Ym9hcmRT aG9ydGN1dC5kaXNwbGF5TmFtZSksICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1UcmFzaC5zdmciLCAx NSwgMTUpOworICAgICAgICB0aGlzLl9jbGVhckxvZ05hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQ cmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5IaWdoOwogICAg ICAgICB0aGlzLl9jbGVhckxvZ05hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0 dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fY2xlYXJMb2csIHRoaXMpOwog CiAgICAgICAgIHRoaXMuX3Nob3dDb25zb2xlVGFiTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQnV0 dG9uTmF2aWdhdGlvbkl0ZW0oInNob3ctdGFiIiwgV0kuVUlTdHJpbmcoIlNob3cgQ29uc29sZSB0 YWIiKSwgIkltYWdlcy9TcGxpdFRvZ2dsZVVwLnN2ZyIsIDE2LCAxNik7Cg==