134414 2014-06-27 15:04:38 -0700 Web Inspector: Add a setting for clearing the console on page reload 2015-02-20 11:35:47 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Enhancement --- 1 rjett webkit-unassigned commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1019111 0 rjett 2014-06-27 15:04:38 -0700 The Web Inspector should have a setting that will clear the console on reload. 1019112 1 webkit-bug-importer 2014-06-27 15:04:57 -0700 <rdar://problem/17490397> 1021682 2 234719 rjett 2014-07-10 12:39:54 -0700 Created attachment 234719 patch 1021691 3 234719 timothy 2014-07-10 13:16:58 -0700 Comment on attachment 234719 patch View in context: https://bugs.webkit.org/attachment.cgi?id=234719&action=review > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:113 > get navigationItems() > { > - return [this._searchBar, this._scopeBar, this._clearLogNavigationItem, this._toggleSplitNavigationItem]; > + return [this._searchBar, this._scopeBar, this._clearLogNavigationItem, this._clearLogOnReloadNavigationItem, this._toggleSplitNavigationItem]; I don't think a navigation bar item is the right UI for this at this time. (We would need a new icon that is not confusing with a general Reload.) Lets add it to the context menu. You can do that in _handleContextMenuEvent by using appendCheckboxItem. You should also do appendSeparator between the existing Clear Log item. > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:301 > + if (this._clearLogOnReloadSetting.value) { > + this._clearLog(); > + } WebKit style is to not use braces for single lines. 1070509 4 246915 rjett 2015-02-19 13:44:32 -0800 Created attachment 246915 patch 1070512 5 rjett 2015-02-19 13:47:12 -0800 I updated the code, taking in to account your feedback. Sorry it took so long. Let me know what you think. 1070546 6 246915 timothy 2015-02-19 16:07:50 -0800 Comment on attachment 246915 patch View in context: https://bugs.webkit.org/attachment.cgi?id=246915&action=review > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:75 > + this._clearLogOnReloadSetting = new WebInspector.Setting("clear-log-on-reload", false); We might want to default it to true. > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:343 > + var clearLogOnReloadUIString = WebInspector.UIString("Clear Log on Reload"); > + > + if (this._clearLogOnReloadSetting.value) > + clearLogOnReloadUIString = WebInspector.UIString("Keep Log on Reload"); Nit: Could be one line: this._clearLogOnReloadSetting.value ? WebInspector.UIString("Keep Log on Reload") : WebInspector.UIString("Clear Log on Reload"); 1070715 7 246975 rjett 2015-02-20 10:22:44 -0800 Created attachment 246975 patch 1070716 8 rjett 2015-02-20 10:23:49 -0800 Updated the if to be a ternary. Switching the setting to be true by default. Is there a WebKit JS style guide somewhere? 1070726 9 joepeck 2015-02-20 10:52:43 -0800 > Is there a WebKit JS style guide somewhere? This gets occasional updates: http://trac.webkit.org/wiki/WebInspectorCodingStyleGuide 1070748 10 246975 commit-queue 2015-02-20 11:35:41 -0800 Comment on attachment 246975 patch Clearing flags on attachment: 246975 Committed r180432: <http://trac.webkit.org/changeset/180432> 1070749 11 commit-queue 2015-02-20 11:35:47 -0800 All reviewed patches have been landed. Closing bug. 234719 2014-07-10 12:39:54 -0700 2015-02-19 13:44:29 -0800 patch bug-134414-20140710123936.patch text/plain 6047 rjett SW5kZXg6IFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkocmV2aXNpb24gMTcwNTU3KQorKysgU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE0LTA2LTI3ICBSb25hbGQgSmV0dCAgPHJqZXR0QGFwcGxlLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBBZGQgYSBzZXR0aW5nIGZvciBjbGVhcmluZyB0aGUgY29uc29sZSBvbiBw YWdlIHJlbG9hZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTM0NDE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQ3JlYXRlZCBhIG5ldyBzZXR0aW5nICJjbGVhci1sb2ctb24tcmVsb2FkIiwgd2hpY2ggZGVm YXVsdHMgdG8gZmFsc2UuIAorICAgICAgICBJIGV4cG9zZWQgdGhpcyBzZXR0aW5nIHdpdGggYW4g QWN0aXZhdGVCdXR0b25OYXZpZ2F0aW9uSXRlbSBpbiBMb2dDb250ZW50Vmlldy4gVGhlIGJ1dHRv biBpcyBjdXJyZW50bHksCisgICAgICAgIHJlcHJlc2VudGVkIHdpdGggdGhlIHJlbG9hZCBpY29u LiBJdCBjYW4gYmUgdG9nZ2xlZCBvbiB0byBlbmFibGUgY2xlYXJpbmcgdGhlIGNvbnNvbGUgbG9n IG9uIHJlbG9hZCBvcgorICAgICAgICB0b2dnbGVkIG9mZiB0byByZXZlcnQgYmFjayB0byB0aGUg ZGVmYXVsdCBXZWIgSW5zcGVjdG9yIGJlaGF2aW9yLgorCisgICAgICAgICogTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvTG9nQ29udGVudFZpZXcuanM6CisKIDIwMTQtMDYtMjYgIEpvbm8gV2VsbHMgIDxqb25v d2VsbHNAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IENvbW1hbmQtLyAoc2xh c2gpIG5vdyBhdXRvLWNvbW1lbnRzIGNvZGUgdmlhIENvZGVNaXJyb3IgNC4gU2hvdWxkIHJlbW92 ZSBhcyBjb21tYW5kIHRvIHBhdXNlCkluZGV4OiBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anMJKHJldmlzaW9uIDE3MDU0MykKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRp b25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMJKHdvcmtpbmcgY29weSkKQEAgLTEzMSw2 ICsxMzEsNyBAQAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEQAaQBzAGEA YgBsAGUAIABCAHIAZQBhAGsAcABvAGkAbgB0ACIAXQAgAD0AIAAiAEQAaQBzAGEAYgBsAGUAIABC AHIAZQBhAGsAcABvAGkAbgB0ACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4AZwBz AFsAIgBEAGkAcwBhAGIAbABlACAAQgByAGUAYQBrAHAAbwBpAG4AdABzACIAXQAgAD0AIAAiAEQA aQBzAGEAYgBsAGUAIABCAHIAZQBhAGsAcABvAGkAbgB0AHMAIgA7AAogAGwAbwBjAGEAbABpAHoA ZQBkAFMAdAByAGkAbgBnAHMAWwAiAEQAaQBzAGEAYgBsAGUAIABhAGwAbAAgAGIAcgBlAGEAawBw AG8AaQBuAHQAcwAiAF0AIAA9ACAAIgBEAGkAcwBhAGIAbABlACAAYQBsAGwAIABiAHIAZQBhAGsA cABvAGkAbgB0AHMAIgA7AAorAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEQA aQBzAGEAYgBsAGUAIABsAG8AZwAgAGMAbABlAGEAcgBpAG4AZwAgAG8AbgAgAHIAZQBsAG8AYQBk ACIAXQAgAD0AIAAiAEQAaQBzAGEAYgBsAGUAIABsAG8AZwAgAGMAbABlAGEAcgBpAG4AZwAgAG8A bgAgAHIAZQBsAG8AYQBkACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4AZwBzAFsA IgBEAGkAcwBhAGIAbABlACAAcABvAGkAbgB0ACAAdABvACAAaQBuAHMAcABlAGMAdAAgAG0AbwBk AGUAIAAoACUAcwApACIAXQAgAD0AIAAiAEQAaQBzAGEAYgBsAGUAIABwAG8AaQBuAHQAIAB0AG8A IABpAG4AcwBwAGUAYwB0ACAAbQBvAGQAZQAgACgAJQBzACkAIgA7AAogAGwAbwBjAGEAbABpAHoA ZQBkAFMAdAByAGkAbgBnAHMAWwAiAEQAaQBzAGEAYgBsAGUAZAAiAF0AIAA9ACAAIgBEAGkAcwBh AGIAbABlAGQAIgA7AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEQAbwBj AGsAIAB0AG8AIABiAG8AdAB0AG8AbQAgAG8AZgAgAHcAaQBuAGQAbwB3ACIAXQAgAD0AIAAiAEQA bwBjAGsAIAB0AG8AIABiAG8AdAB0AG8AbQAgAG8AZgAgAHcAaQBuAGQAbwB3ACIAOwAKQEAgLTE3 OCw2ICsxNzksNyBAQAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEUAbgBh AGIAbABlACAAQgByAGUAYQBrAHAAbwBpAG4AdAAiAF0AIAA9ACAAIgBFAG4AYQBiAGwAZQAgAEIA cgBlAGEAawBwAG8AaQBuAHQAIgA7AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMA WwAiAEUAbgBhAGIAbABlACAAQgByAGUAYQBrAHAAbwBpAG4AdABzACIAXQAgAD0AIAAiAEUAbgBh AGIAbABlACAAQgByAGUAYQBrAHAAbwBpAG4AdABzACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABT AHQAcgBpAG4AZwBzAFsAIgBFAG4AYQBiAGwAZQAgAGEAbABsACAAYgByAGUAYQBrAHAAbwBpAG4A dABzACIAXQAgAD0AIAAiAEUAbgBhAGIAbABlACAAYQBsAGwAIABiAHIAZQBhAGsAcABvAGkAbgB0 AHMAIgA7AAorAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEUAbgBhAGIAbABl ACAAbABvAGcAIABjAGwAZQBhAHIAaQBuAGcAIABvAG4AIAByAGUAbABvAGEAZAAiAF0AIAA9ACAA IgBFAG4AYQBiAGwAZQAgAGwAbwBnACAAYwBsAGUAYQByAGkAbgBnACAAbwBuACAAcgBlAGwAbwBh AGQAIgA7AAogAGwAbwBjAGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEUAbgBhAGIAbABl ACAAcABvAGkAbgB0ACAAdABvACAAaQBuAHMAcABlAGMAdAAgAG0AbwBkAGUAIAAoACUAcwApACIA XQAgAD0AIAAiAEUAbgBhAGIAbABlACAAcABvAGkAbgB0ACAAdABvACAAaQBuAHMAcABlAGMAdAAg AG0AbwBkAGUAIAAoACUAcwApACIAOwAKIABsAG8AYwBhAGwAaQB6AGUAZABTAHQAcgBpAG4AZwBz AFsAIgBFAG4AYwBvAGQAZQBkACIAXQAgAD0AIAAiAEUAbgBjAG8AZABlAGQAIgA7AAogAGwAbwBj AGEAbABpAHoAZQBkAFMAdAByAGkAbgBnAHMAWwAiAEUAbgBjAG8AZABpAG4AZwAiAF0AIAA9ACAA IgBFAG4AYwBvAGQAaQBuAGcAIgA7AApJbmRleDogU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMJKHJldmlz aW9uIDE3MDU0MykKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xvZ0NvbnRlbnRWaWV3LmpzCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw2ICs2NywxMSBAQCBXZWJJ bnNwZWN0b3IuTG9nQ29udGVudFZpZXcgPSBmdW5jdGlvbihyCiAgICAgdGhpcy5fY2xlYXJMb2dO YXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImNs ZWFyLWxvZyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgbG9nICglcyBvciAlcykiKS5m b3JtYXQodGhpcy5fbG9nVmlld0NvbnRyb2xsZXIubWVzc2FnZXNDbGVhcktleWJvYXJkU2hvcnRj dXQuZGlzcGxheU5hbWUsIHRoaXMuX2xvZ1ZpZXdDb250cm9sbGVyLm1lc3NhZ2VzQWx0ZXJuYXRl Q2xlYXJLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRl bVRyYXNoLnN2ZyIsIDE2LCAxNik7CiAgICAgdGhpcy5fY2xlYXJMb2dOYXZpZ2F0aW9uSXRlbS5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5D bGlja2VkLCB0aGlzLl9jbGVhckxvZywgdGhpcyk7CiAKKyAgICB0aGlzLl9jbGVhckxvZ09uUmVs b2FkU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZygiY2xlYXItbG9nLW9uLXJlbG9h ZCIsIGZhbHNlKTsKKyAgICB0aGlzLl9jbGVhckxvZ09uUmVsb2FkTmF2aWdhdGlvbkl0ZW0gPSBu ZXcgV2ViSW5zcGVjdG9yLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImNsZWFyLWxvZy1v bi1yZWxvYWQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkVuYWJsZSBsb2cgY2xlYXJpbmcgb24g cmVsb2FkIiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGlzYWJsZSBsb2cgY2xlYXJpbmcgb24g cmVsb2FkIiksICJJbWFnZXMvUmVsb2FkLnN2ZyIsIDE2LCAxNik7CisgICAgdGhpcy5fY2xlYXJM b2dPblJlbG9hZE5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJ1 dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX3RvZ2dsZUNsZWFyT25SZWxv YWRTZXR0aW5nLCB0aGlzKTsKKyAgICB0aGlzLl9jbGVhckxvZ09uUmVsb2FkTmF2aWdhdGlvbkl0 ZW0uYWN0aXZhdGVkID0gdGhpcy5fY2xlYXJMb2dPblJlbG9hZFNldHRpbmcudmFsdWU7CisKICAg ICB2YXIgdG9vbFRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyBzcGxpdCBjb25zb2xl Iik7CiAgICAgdmFyIGFsdFRvb2xUaXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgZnVs bC1oZWlnaHQgY29uc29sZSIpOwogCkBAIC0xMDUsNyArMTEwLDcgQEAgV2ViSW5zcGVjdG9yLkxv Z0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IAogCiAgICAgZ2V0IG5hdmlnYXRpb25JdGVtcygpCiAg ICAgewotICAgICAgICByZXR1cm4gW3RoaXMuX3NlYXJjaEJhciwgdGhpcy5fc2NvcGVCYXIsIHRo aXMuX2NsZWFyTG9nTmF2aWdhdGlvbkl0ZW0sIHRoaXMuX3RvZ2dsZVNwbGl0TmF2aWdhdGlvbkl0 ZW1dOworICAgICAgICByZXR1cm4gW3RoaXMuX3NlYXJjaEJhciwgdGhpcy5fc2NvcGVCYXIsIHRo aXMuX2NsZWFyTG9nTmF2aWdhdGlvbkl0ZW0sIHRoaXMuX2NsZWFyTG9nT25SZWxvYWROYXZpZ2F0 aW9uSXRlbSwgdGhpcy5fdG9nZ2xlU3BsaXROYXZpZ2F0aW9uSXRlbV07CiAgICAgfSwKIAogICAg IGdldCBzY29wZUJhcigpCkBAIC0yOTEsNiArMjk2LDkgQEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRl bnRWaWV3LnByb3RvdHlwZSA9IAogCiAgICAgX3Nlc3Npb25TdGFydGVkOiBmdW5jdGlvbihldmVu dCkKICAgICB7CisgICAgICAgIGlmICh0aGlzLl9jbGVhckxvZ09uUmVsb2FkU2V0dGluZy52YWx1 ZSkgeworICAgICAgICAgICAgdGhpcy5fY2xlYXJMb2coKTsKKyAgICAgICAgfQogICAgICAgICB0 aGlzLl9sb2dWaWV3Q29udHJvbGxlci5zdGFydE5ld1Nlc3Npb24oKTsKICAgICB9LAogCkBAIC02 MjAsNiArNjI4LDEzIEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUgPSAK ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93U3BsaXRDb25zb2xlKCk7CiAgICAgfSwKIAor ICAgIF90b2dnbGVDbGVhck9uUmVsb2FkU2V0dGluZzogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgdmFyIHRvZ2dsZWRWYWx1ZSA9ICF0aGlzLl9jbGVhckxvZ09uUmVsb2FkTmF2aWdhdGlvbkl0 ZW0uYWN0aXZhdGVkOworICAgICAgICB0aGlzLl9jbGVhckxvZ09uUmVsb2FkU2V0dGluZy52YWx1 ZSA9IHRvZ2dsZWRWYWx1ZTsKKyAgICAgICAgdGhpcy5fY2xlYXJMb2dPblJlbG9hZE5hdmlnYXRp b25JdGVtLmFjdGl2YXRlZCA9IHRvZ2dsZWRWYWx1ZTsKKyAgICB9LAorCiAgICAgX2NsZWFyTG9n OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl9sb2dWaWV3Q29udHJvbGxlci5jbGVh cigpOwo= 246915 2015-02-19 13:44:32 -0800 2015-02-20 10:22:39 -0800 patch bug-134414-20150219134424.patch text/plain 4177 rjett U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz MWFlNDRlN2JkZTY5NGZhZDk4Y2I0MTZjZTBmMzhlNTk5NTMzY2RjLi4wNmY0OTI2MTE0MTQ4NGEz OWQ1YTRiZjg2MTM0ZjU5ZTQzMmE1N2FlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNS0wMi0xOSAgUm9uYWxkIEpldHQgIDxyamV0dEBhcHBsZS5jb20+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGEgc2V0dGluZyBmb3IgY2xlYXJpbmcgdGhlIGNv bnNvbGUgb24gcGFnZSByZWxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNDQxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENyZWF0ZWQgYSBuZXcgc2V0dGluZyAiY2xlYXItbG9nLW9uLXJlbG9hZCIs IHdoaWNoIGRlZmF1bHRzIHRvIGZhbHNlLgorICAgICAgICBVc2VycyBjYW4gdG9nZ2xlIHRoaXMg c2V0dGluZyB3aXRoIGFuIGl0ZW0gYWRkZWQgdG8gdGhlIGNvbnNvbGUncyBjb250ZXh0IG1lbnUu IAorICAgICAgICBXaGVuIGVuYWJsZWQsIHRoZSBjb25zb2xlIHdpbGwgY2xlYXIgb24gcGFnZSBy ZWxvYWQuIFdoZW4gZGlzYWJsZWQsIHRoZSBjb25zb2xlCisgICAgICAgIGNvbnRlbnQgd2lsbCBy ZW1haW4gZHVyaW5nIHBhZ2UgcmVsb2FkcyBhcyBpdCBkb2VzIG5vdy4gCisKKyAgICAgICAgKiBM b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Mb2dDb250ZW50Vmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcu cHJvdG90eXBlLl9zZXNzaW9uU3RhcnRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9nQ29u dGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVDb250ZXh0TWVudUV2ZW50KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUuX3RvZ2dsZUNsZWFyTG9nT25SZWxv YWRTZXR0aW5nKToKKwogMjAxNS0wMi0xOSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IERPTVRyZWUgLyBOb2RlIERldGFpbHMg U2lkZWJhciBkbyBub3QgdXBkYXRlIGFzIDxpbnB1dD4gY29udGVudCBjaGFuZ2VzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHBy b2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAyZTg1M2Q4ZTg0MzkxMGFhZjlmOTYzMWYxNTQ5 ZGM1OGZkMTIzZjM5Li40NDY4YWMzNTNlN2M5YTVjM2UyNGI2ZDhlMGFmN2M3OTZkOGFiZTMzIDEw MDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDE1MQp6Y21YQE5oeHl6LTxfKjc5Q2h1MmE2SU5p elhVSm52VTxoSkpXeWtAdDZCJHdfRkg/fmgjMU5sc1Becjg1eX4+MTAKby0mQlNJcGF2aEg7JmRS NXBgQWdBQXI+ZlozJmN0Yy1hdXBWc3N8ZmVVM1dQaTA5TEZjeEJ2aEUKCmRlbHRhIDE5CmJjbVhA TmtOTW1sPF8qNzlIckp9UUx+Z0ZIS09ZWU9XXjQpbAoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKaW5k ZXggMTk1NTVjNmU1MzBiMjZjOTQzOTg2ODEwODU3MjdiM2M0YWI4ZGQ5ZS4uMzE4ZDJlMTQ5NTI3 ZGE1MGJhOWRiNzY5MDgxZGY3NzIzYmE4OWZhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKQEAg LTcyLDYgKzcyLDggQEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3ID0gZnVuY3Rpb24ocmVw cmVzZW50ZWRPYmplY3QpCiAgICAgdGhpcy5fY2xlYXJMb2dOYXZpZ2F0aW9uSXRlbSA9IG5ldyBX ZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImNsZWFyLWxvZyIsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiQ2xlYXIgbG9nICglcyBvciAlcykiKS5mb3JtYXQodGhpcy5fbG9nVmlld0Nv bnRyb2xsZXIubWVzc2FnZXNDbGVhcktleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUsIHRoaXMu X2xvZ1ZpZXdDb250cm9sbGVyLm1lc3NhZ2VzQWx0ZXJuYXRlQ2xlYXJLZXlib2FyZFNob3J0Y3V0 LmRpc3BsYXlOYW1lKSwgdHJhc2hJbWFnZS5zcmMsIHRyYXNoSW1hZ2Uud2lkdGgsIHRyYXNoSW1h Z2UuaGVpZ2h0KTsKICAgICB0aGlzLl9jbGVhckxvZ05hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRo aXMuX2NsZWFyTG9nLCB0aGlzKTsKIAorICAgIHRoaXMuX2NsZWFyTG9nT25SZWxvYWRTZXR0aW5n ID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nKCJjbGVhci1sb2ctb24tcmVsb2FkIiwgZmFsc2Up OworCiAgICAgdmFyIHRvb2xUaXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgc3BsaXQg Y29uc29sZSIpOwogICAgIHZhciBhbHRUb29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJT aG93IGZ1bGwtaGVpZ2h0IGNvbnNvbGUiKTsKIApAQCAtMzAxLDYgKzMwMyw5IEBAIFdlYkluc3Bl Y3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBfc2Vzc2lvblN0YXJ0ZWQ6 IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2NsZWFyTG9nT25SZWxv YWRTZXR0aW5nLnZhbHVlKSAKKyAgICAgICAgICAgIHRoaXMuX2NsZWFyTG9nKCk7CisKICAgICAg ICAgdGhpcy5fbG9nVmlld0NvbnRyb2xsZXIuc3RhcnROZXdTZXNzaW9uKCk7CiAgICAgfSwKIApA QCAtMzMwLDYgKzMzNSwxNSBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBl ID0gewogCiAgICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4 dE1lbnUoZXZlbnQpOwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiQ2xlYXIgTG9nIiksIHRoaXMuX2NsZWFyTG9nLmJpbmQodGhpcykpOworICAg ICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKKworICAgICAgICB2YXIgY2xlYXJM b2dPblJlbG9hZFVJU3RyaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVhciBMb2cgb24g UmVsb2FkIik7CisKKyAgICAgICAgaWYgKHRoaXMuX2NsZWFyTG9nT25SZWxvYWRTZXR0aW5nLnZh bHVlKSAKKyAgICAgICAgICAgIGNsZWFyTG9nT25SZWxvYWRVSVN0cmluZyA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiS2VlcCBMb2cgb24gUmVsb2FkIik7CisKKyAgICAgICAgY29udGV4dE1lbnUu YXBwZW5kSXRlbShjbGVhckxvZ09uUmVsb2FkVUlTdHJpbmcsIHRoaXMuX3RvZ2dsZUNsZWFyTG9n T25SZWxvYWRTZXR0aW5nLmJpbmQodGhpcykpOworCiAgICAgICAgIGNvbnRleHRNZW51LnNob3co KTsKICAgICB9LAogCkBAIC02MjAsNiArNjM0LDExIEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50 Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NwbGl0Q29u c29sZSgpOwogICAgIH0sCiAKKyAgICBfdG9nZ2xlQ2xlYXJMb2dPblJlbG9hZFNldHRpbmc6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2NsZWFyTG9nT25SZWxvYWRTZXR0aW5nLnZh bHVlID0gIXRoaXMuX2NsZWFyTG9nT25SZWxvYWRTZXR0aW5nLnZhbHVlOworICAgIH0sCisKICAg ICBfY2xlYXJMb2c6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX2xvZ1ZpZXdDb250 cm9sbGVyLmNsZWFyKCk7Cg== 246975 2015-02-20 10:22:44 -0800 2015-02-20 11:35:41 -0800 patch bug-134414-20150220102235.patch text/plain 4106 rjett U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz MWFlNDRlN2JkZTY5NGZhZDk4Y2I0MTZjZTBmMzhlNTk5NTMzY2RjLi45ZGIwYmJhMzJkMjA2ODU5 OGVjNTQxNGNmNDAwZjEyMzMzY2U0NmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNS0wMi0xOSAgUm9uYWxkIEpldHQgIDxyamV0dEBhcHBsZS5jb20+CisK KyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGEgc2V0dGluZyBmb3IgY2xlYXJpbmcgdGhlIGNv bnNvbGUgb24gcGFnZSByZWxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNDQxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENyZWF0ZWQgYSBuZXcgc2V0dGluZyAiY2xlYXItbG9nLW9uLXJlbG9hZCIs IHdoaWNoIGRlZmF1bHRzIHRvIHRydWUuCisgICAgICAgIFVzZXJzIGNhbiB0b2dnbGUgdGhpcyBz ZXR0aW5nIHdpdGggYW4gaXRlbSBhZGRlZCB0byB0aGUgY29uc29sZSdzIGNvbnRleHQgbWVudS4g CisgICAgICAgIFdoZW4gZW5hYmxlZCwgdGhlIGNvbnNvbGUgd2lsbCBjbGVhciBvbiBwYWdlIHJl bG9hZC4gV2hlbiBkaXNhYmxlZCwgdGhlIGNvbnNvbGUKKyAgICAgICAgY29udGVudCB3aWxsIHJl bWFpbiBkdXJpbmcgcGFnZSByZWxvYWRzLiAKKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4u bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0xvZ0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUuX3Nlc3Np b25TdGFydGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5 cGUuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0Nv bnRlbnRWaWV3LnByb3RvdHlwZS5fdG9nZ2xlQ2xlYXJMb2dPblJlbG9hZFNldHRpbmcpOgorCiAy MDE1LTAyLTE5ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogRE9NVHJlZSAvIE5vZGUgRGV0YWlscyBTaWRlYmFyIGRvIG5vdCB1 cGRhdGUgYXMgPGlucHV0PiBjb250ZW50IGNoYW5nZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJp bmdzLmpzCmluZGV4IDJlODUzZDhlODQzOTEwYWFmOWY5NjMxZjE1NDlkYzU4ZmQxMjNmMzkuLjQ0 NjhhYzM1M2U3YzlhNWMzZTI0YjZkOGUwYWY3Yzc5NmQ4YWJlMzMgMTAwNjQ0CkdJVCBiaW5hcnkg cGF0Y2gKZGVsdGEgMTUxCnpjbVhATmh4eXotPF8qNzlDaHUyYTZJTml6WFVKbnZVPGhKSld5a0B0 NkIkd19GSD9+aCMxTmxzUF5yODV5fj4xMApvLSZCU0lwYXZoSDsmZFI1cGBBZ0FBcj5mWjMmY3Rj LWF1cFZzc3xmZVUzV1BpMDlMRmN4QnZoRQoKZGVsdGEgMTkKYmNtWEBOa05NbWw8Xyo3OUhySn1R TH5nRkhLT1lZT1deNClsCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwppbmRleCAxOTU1NWM2ZTUzMGIy NmM5NDM5ODY4MTA4NTcyN2IzYzRhYjhkZDllLi4xZTNlNzhkZWZlOWFhY2E4YjEyYTgyMjMwZmVk OTk1OTlhOGYzYWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcwpAQCAtNzIsNiArNzIsOCBAQCBX ZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkK ICAgICB0aGlzLl9jbGVhckxvZ05hdmlnYXRpb25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5CdXR0 b25OYXZpZ2F0aW9uSXRlbSgiY2xlYXItbG9nIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVh ciBsb2cgKCVzIG9yICVzKSIpLmZvcm1hdCh0aGlzLl9sb2dWaWV3Q29udHJvbGxlci5tZXNzYWdl c0NsZWFyS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSwgdGhpcy5fbG9nVmlld0NvbnRyb2xs ZXIubWVzc2FnZXNBbHRlcm5hdGVDbGVhcktleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpLCB0 cmFzaEltYWdlLnNyYywgdHJhc2hJbWFnZS53aWR0aCwgdHJhc2hJbWFnZS5oZWlnaHQpOwogICAg IHRoaXMuX2NsZWFyTG9nTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fY2xlYXJMb2csIHRo aXMpOwogCisgICAgdGhpcy5fY2xlYXJMb2dPblJlbG9hZFNldHRpbmcgPSBuZXcgV2ViSW5zcGVj dG9yLlNldHRpbmcoImNsZWFyLWxvZy1vbi1yZWxvYWQiLCB0cnVlKTsKKwogICAgIHZhciB0b29s VGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IHNwbGl0IGNvbnNvbGUiKTsKICAgICB2 YXIgYWx0VG9vbFRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyBmdWxsLWhlaWdodCBj b25zb2xlIik7CiAKQEAgLTMwMSw2ICszMDMsOSBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZp ZXcucHJvdG90eXBlID0gewogCiAgICAgX3Nlc3Npb25TdGFydGVkOiBmdW5jdGlvbihldmVudCkK ICAgICB7CisgICAgICAgIGlmICh0aGlzLl9jbGVhckxvZ09uUmVsb2FkU2V0dGluZy52YWx1ZSkg CisgICAgICAgICAgICB0aGlzLl9jbGVhckxvZygpOworCiAgICAgICAgIHRoaXMuX2xvZ1ZpZXdD b250cm9sbGVyLnN0YXJ0TmV3U2Vzc2lvbigpOwogICAgIH0sCiAKQEAgLTMzMCw2ICszMzUsMTIg QEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2 YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50KTsKICAg ICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsZWFy IExvZyIpLCB0aGlzLl9jbGVhckxvZy5iaW5kKHRoaXMpKTsKKyAgICAgICAgY29udGV4dE1lbnUu YXBwZW5kU2VwYXJhdG9yKCk7CisKKyAgICAgICAgdmFyIGNsZWFyTG9nT25SZWxvYWRVSVN0cmlu ZyA9IHRoaXMuX2NsZWFyTG9nT25SZWxvYWRTZXR0aW5nLnZhbHVlID8gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJLZWVwIExvZyBvbiBSZWxvYWQiKSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xl YXIgTG9nIG9uIFJlbG9hZCIpOworCisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oY2xl YXJMb2dPblJlbG9hZFVJU3RyaW5nLCB0aGlzLl90b2dnbGVDbGVhckxvZ09uUmVsb2FkU2V0dGlu Zy5iaW5kKHRoaXMpKTsKKwogICAgICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgfSwKIApA QCAtNjIwLDYgKzYzMSwxMSBAQCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBl ID0gewogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dTcGxpdENvbnNvbGUoKTsKICAgICB9 LAogCisgICAgX3RvZ2dsZUNsZWFyTG9nT25SZWxvYWRTZXR0aW5nOiBmdW5jdGlvbigpCisgICAg eworICAgICAgICB0aGlzLl9jbGVhckxvZ09uUmVsb2FkU2V0dGluZy52YWx1ZSA9ICF0aGlzLl9j bGVhckxvZ09uUmVsb2FkU2V0dGluZy52YWx1ZTsKKyAgICB9LAorCiAgICAgX2NsZWFyTG9nOiBm dW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl9sb2dWaWV3Q29udHJvbGxlci5jbGVhcigp Owo=