145548 2015-06-01 21:37:16 -0700 Web Inspector: Better handle keyboard events in the quick console prompt 2015-06-01 22:46:50 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck aestes commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1098724 0 joepeck 2015-06-01 21:37:16 -0700 * SUMMARY Better handle keyboard events in the quick console prompt. * NOTES - Cmd+F in the quick console doesn't behave as expected if the LogContentView is not showing - Cmd+S in the quick console doesn't trigger save dialog even if in the Console Tab We should better handle the different situations you have keyboard shortcuts while in the quick console prompt. 1098725 1 254049 joepeck 2015-06-01 21:42:15 -0700 Created attachment 254049 [PATCH] Proposed Fix Note, LogContentView currently always makes this.prompt === WebInspector.quickConsole.prompt. If that changes, we wouldn't want to just blatantly check if WebInspector.isSplitConsole. 1098737 2 254049 commit-queue 2015-06-01 22:46:47 -0700 Comment on attachment 254049 [PATCH] Proposed Fix Clearing flags on attachment: 254049 Committed r185104: <http://trac.webkit.org/changeset/185104> 1098738 3 commit-queue 2015-06-01 22:46:50 -0700 All reviewed patches have been landed. Closing bug. 254049 2015-06-01 21:42:15 -0700 2015-06-01 22:46:47 -0700 [PATCH] Proposed Fix better-console-shortcuts.patch text/plain 7574 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRmMmY3ODkuLmEyZmExNGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE1LTA2LTAxICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQmV0dGVy IGhhbmRsZSBrZXlib2FyZCBldmVudHMgaW4gdGhlIHF1aWNrIGNvbnNvbGUgcHJvbXB0CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU1NDgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNhdmVEYXRhVG9GaWxlKToK KyAgICAgICAgTW92ZSBnZW5lcmljIEluc3BlY3RvckZyb250ZW5kSG9zdCBjb2RlIGhlcmUuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLnByb3RvdHlwZS5fc2F2ZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLl9zYXZlQXMpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLnByb3RvdHlwZS5fc2F2ZURhdGFUb0ZpbGUp OiBEZWxldGVkLgorICAgICAgICBVc2UgdGhlIGdlbmVyaWMgc2F2ZSBjb2RlLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIucHJvdG90 eXBlLl9zYXZlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRy b2xsZXIucHJvdG90eXBlLl9zYXZlQXMpOgorICAgICAgICBIYW5kbGUgc2F2ZSBrZXlib2FyZCBz aG9ydGN1dHMgd2hpbGUgdGhlIHByb21wdCBpcyBmb2N1c2VkLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5M b2dDb250ZW50Vmlldy5wcm90b3R5cGUuZm9jdXNTZWFyY2hCYXIpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5zYXZlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUuc2F2ZUFzKToKKyAgICAgICAgQmV0dGVyIGhh bmRsZSBrZXlib2FyZCBzaG9ydGN1dCBjYXNlcyBpbiB0aGUgY29uc29sZSBwcm9tcHQgZm9yIGNh c2VzCisgICAgICAgIGxpa2UgYSBjb2xsYXBzZWQgb3Igc3BsaXQgY29uc29sZSB2aWV3LgorCisy MDE1LTA2LTAxICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAg ICAgV2ViIEluc3BlY3Rvcjog4oyYRiBubyBsb25nZXIgYnJpbmdzIHVwIHRoZSBmaW5kLWluLXBh Z2UgYmFyIGFmdGVyIHR5cGluZyBpbiB0aGUgcXVpY2sgY29uc29sZQogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1NTQ2CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCA5Mjk0NjQwLi44 MWJlYTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzCkBAIC02NTUsNiArNjU1LDI1IEBAIFdlYkluc3BlY3Rvci5jbG9zZSA9IGZ1bmN0 aW9uKCkKICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY2xvc2VXaW5kb3coKTsKIH07CiAKK1dl Ykluc3BlY3Rvci5zYXZlRGF0YVRvRmlsZSA9IGZ1bmN0aW9uKHNhdmVEYXRhLCBmb3JjZVNhdmVB cykKK3sKKyAgICBjb25zb2xlLmFzc2VydChzYXZlRGF0YSk7CisgICAgaWYgKCFzYXZlRGF0YSkK KyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKHR5cGVvZiBzYXZlRGF0YS5jdXN0b21TYXZlSGFu ZGxlciA9PT0gImZ1bmN0aW9uIikgeworICAgICAgICBzYXZlRGF0YS5jdXN0b21TYXZlSGFuZGxl cihmb3JjZVNhdmVBcyk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBjb25zb2xlLmFz c2VydChzYXZlRGF0YS51cmwpOworICAgIGNvbnNvbGUuYXNzZXJ0KHR5cGVvZiBzYXZlRGF0YS5j b250ZW50ID09PSAic3RyaW5nIik7CisgICAgaWYgKCFzYXZlRGF0YS51cmwgfHwgdHlwZW9mIHNh dmVEYXRhLmNvbnRlbnQgIT09ICJzdHJpbmciKQorICAgICAgICByZXR1cm47CisKKyAgICBJbnNw ZWN0b3JGcm9udGVuZEhvc3Quc2F2ZShzYXZlRGF0YS51cmwsIHNhdmVEYXRhLmNvbnRlbnQsIGZh bHNlLCBmb3JjZVNhdmVBcyB8fCBzYXZlRGF0YS5mb3JjZVNhdmVBcyk7Cit9OworCiBXZWJJbnNw ZWN0b3IuaXNDb25zb2xlRm9jdXNlZCA9IGZ1bmN0aW9uKCkKIHsKICAgICByZXR1cm4gdGhpcy5x dWlja0NvbnNvbGUucHJvbXB0LmZvY3VzZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xs ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9K YXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMKaW5kZXggMTVjYmQ3ZC4uN2M1MmEyMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv SmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5q cwpAQCAtNjAsNiArNjAsOCBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9s bGVyID0gY2xhc3MgSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyIGV4dAogICAgICAgICB0aGlz Ll9wcm9tcHRGaW5kS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JD b250cm9sLCAiRiIsIHRoaXMuX2hhbmRsZUZpbmRTaG9ydGN1dC5iaW5kKHRoaXMpLCB0aGlzLl9w cm9tcHQuZWxlbWVudCk7CiAgICAgICAgIHRoaXMuX3Byb21wdEZpbmROZXh0S2V5Ym9hcmRTaG9y dGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5 Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiRyIsIHRoaXMuX2hhbmRs ZUZpbmROZXh0U2hvcnRjdXQuYmluZCh0aGlzKSwgdGhpcy5fcHJvbXB0LmVsZW1lbnQpOwogICAg ICAgICB0aGlzLl9wcm9tcHRGaW5kUHJldmlvdXNLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1v ZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5N b2RpZmllci5TaGlmdCwgIkciLCB0aGlzLl9oYW5kbGVGaW5kUHJldmlvdXNTaG9ydGN1dC5iaW5k KHRoaXMpLCB0aGlzLl9wcm9tcHQuZWxlbWVudCk7CisgICAgICAgIHRoaXMuX3Byb21wdFNhdmVL ZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJTIiwg dGhpcy5fc2F2ZS5iaW5kKHRoaXMpLCB0aGlzLl9wcm9tcHQuZWxlbWVudCk7CisgICAgICAgIHRo aXMuX3Byb21wdFNhdmVBc0tleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQg fCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9s LCAiUyIsIHRoaXMuX3NhdmVBcy5iaW5kKHRoaXMpLCB0aGlzLl9wcm9tcHQuZWxlbWVudCk7CiAK ICAgICAgICAgdGhpcy5zdGFydE5ld1Nlc3Npb24oKTsKICAgICB9CkBAIC0yNjAsNiArMjYyLDE2 IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgPSBjbGFzcyBKYXZh U2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgZXh0CiAgICAgICAgIHRoaXMuZGVsZWdhdGUuaGlnaGxp Z2h0UHJldmlvdXNTZWFyY2hNYXRjaCgpOwogICAgIH0KIAorICAgIF9zYXZlKCkKKyAgICB7Cisg ICAgICAgIHRoaXMuZGVsZWdhdGUuc2F2ZSgpOworICAgIH0KKworICAgIF9zYXZlQXMoKQorICAg IHsKKyAgICAgICAgdGhpcy5kZWxlZ2F0ZS5zYXZlQXMoKTsKKyAgICB9CisKICAgICBfYXBwZW5k Q29uc29sZU1lc3NhZ2VWaWV3KG1lc3NhZ2VWaWV3LCByZXBlYXRDb3VudFdhc0ludGVycnVwdGVk KQogICAgIHsKICAgICAgICAgdmFyIHdhc1Njcm9sbGVkVG9Cb3R0b20gPSB0aGlzLmlzU2Nyb2xs ZWRUb0JvdHRvbSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCAxZTlhMGY3Li41ZTEwN2Mz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D b250ZW50QnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpAQCAtMzE3LDMyICszMTcsMTMgQEAgV2ViSW5zcGVj dG9yLkNvbnRlbnRCcm93c2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5nb0ZvcndhcmQo KTsKICAgICB9LAogCi0gICAgX3NhdmVEYXRhVG9GaWxlOiBmdW5jdGlvbihzYXZlRGF0YSwgZm9y Y2VTYXZlQXMpCi0gICAgewotICAgICAgICBjb25zb2xlLmFzc2VydChzYXZlRGF0YSk7Ci0gICAg ICAgIGlmICghc2F2ZURhdGEpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYgKHR5 cGVvZiBzYXZlRGF0YS5jdXN0b21TYXZlSGFuZGxlciA9PT0gImZ1bmN0aW9uIikgewotICAgICAg ICAgICAgc2F2ZURhdGEuY3VzdG9tU2F2ZUhhbmRsZXIoZm9yY2VTYXZlQXMpOwotICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgY29uc29sZS5hc3NlcnQoc2F2ZURhdGEu dXJsKTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQodHlwZW9mIHNhdmVEYXRhLmNvbnRlbnQgPT09 ICJzdHJpbmciKTsKLSAgICAgICAgaWYgKCFzYXZlRGF0YS51cmwgfHwgdHlwZW9mIHNhdmVEYXRh LmNvbnRlbnQgIT09ICJzdHJpbmciKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIElu c3BlY3RvckZyb250ZW5kSG9zdC5zYXZlKHNhdmVEYXRhLnVybCwgc2F2ZURhdGEuY29udGVudCwg ZmFsc2UsIGZvcmNlU2F2ZUFzIHx8IHNhdmVEYXRhLmZvcmNlU2F2ZUFzKTsKLSAgICB9LAotCiAg ICAgX3NhdmU6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIGN1cnJlbnRDb250 ZW50VmlldyA9IHRoaXMuY3VycmVudENvbnRlbnRWaWV3OwogICAgICAgICBpZiAoIWN1cnJlbnRD b250ZW50VmlldyB8fCAhY3VycmVudENvbnRlbnRWaWV3LnN1cHBvcnRzU2F2ZSkKICAgICAgICAg ICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLl9zYXZlRGF0YVRvRmlsZShjdXJyZW50Q29udGVu dFZpZXcuc2F2ZURhdGEpOworICAgICAgICBXZWJJbnNwZWN0b3Iuc2F2ZURhdGFUb0ZpbGUoY3Vy cmVudENvbnRlbnRWaWV3LnNhdmVEYXRhKTsKICAgICB9LAogCiAgICAgX3NhdmVBczogZnVuY3Rp b24oZXZlbnQpCkBAIC0zNTEsNyArMzMyLDcgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2Vy LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFjdXJyZW50Q29udGVudFZpZXcgfHwgIWN1cnJl bnRDb250ZW50Vmlldy5zdXBwb3J0c1NhdmUpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAg ICAgdGhpcy5fc2F2ZURhdGFUb0ZpbGUoY3VycmVudENvbnRlbnRWaWV3LnNhdmVEYXRhLCB0cnVl KTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnNhdmVEYXRhVG9GaWxlKGN1cnJlbnRDb250ZW50Vmll dy5zYXZlRGF0YSwgdHJ1ZSk7CiAgICAgfSwKIAogICAgIF9zaG93RmluZEJhbm5lcjogZnVuY3Rp b24oZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDZhNTVkOWMuLjcxY2U3ZmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0Nv bnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC0yMjksOSArMjI5LDM0IEBAIFdlYkluc3BlY3Rvci5M b2dDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBmb2N1c1NlYXJjaEJhcjogZnVuY3Rp b24oKQogICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLnZpc2libGUpCisgICAgICAgICAgICByZXR1 cm47CisKICAgICAgICAgdGhpcy5fc2VhcmNoQmFyLmZvY3VzKCk7CiAgICAgfSwKIAorICAgIHNh dmU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy52aXNpYmxlKQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuaXNTaG93aW5nU3BsaXRD b25zb2xlKCkpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgV2ViSW5zcGVjdG9yLnNh dmVEYXRhVG9GaWxlKHRoaXMuc2F2ZURhdGEpOworICAgIH0sCisKKyAgICBzYXZlQXM6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy52aXNpYmxlKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuaXNTaG93aW5nU3BsaXRDb25zb2xlKCkp CisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgV2ViSW5zcGVjdG9yLnNhdmVEYXRhVG9G aWxlKHRoaXMuc2F2ZURhdGEsIHRydWUpOworICAgIH0sCisKICAgICBoaWdobGlnaHRQcmV2aW91 c1NlYXJjaE1hdGNoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuc2VhcmNo SW5Qcm9ncmVzcyB8fCBpc0VtcHR5T2JqZWN0KHRoaXMuX3NlYXJjaE1hdGNoZXMpKQo=