71773 2011-11-07 23:42:53 -0800 Web Inspector: refactor shortcuts and settings screens 2011-11-08 00:56:24 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 497783 0 yurys 2011-11-07 23:42:53 -0800 The way we show and hide shortcuts and settings screens makes it hard adding other HelpScreen descendants to the code as we would have to manually hide all possible screens. Instead we should keep a pointer to the visible instance and hide it automatically when new screen is about to be displayed. 497785 1 114001 yurys 2011-11-07 23:44:57 -0800 Created attachment 114001 Patch 497824 2 yurys 2011-11-08 00:56:24 -0800 Committed r99533: <http://trac.webkit.org/changeset/99533> 114001 2011-11-07 23:44:57 -0800 2011-11-08 00:53:34 -0800 Patch bug-71773-20111108114455.patch text/plain 6246 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogOTk0MTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNzc0OWYxNDUyZDc5MjNh ZmM4NTBjMWIwMjIzNTM0ZjExZTI1N2IyLi40OTJjNzdiZTYwNWI3Y2IxNGYxOTUyZWIwYWQ5OTNm NjU2MmU0Y2I0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUgQEAKIDIwMTEtMTEtMDcgIFl1cnkg U2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogcmVmYWN0b3Igc2hvcnRjdXRzIGFuZCBzZXR0aW5ncyBzY3JlZW5zCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTc3MworCisgICAgICAgIEtlZXAg cG9pbnRlciB0byB0aGUgdmlzaWJsZSBzY3JlZW4gYW5kIGhpZGUgaXQgYXV0b21hdGljYWxseSB3 aGVuIG5ldyBvbmUgaXMgZ29pbmcKKyAgICAgICAgdG8gYmUgZGlzcGxheWVkLgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9IZWxwU2NyZWVuLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW4ucHJv dG90eXBlLnNob3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW4ucHJvdG90eXBl LmhpZGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2hvcnRjdXRzU2NyZWVuLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNob3J0Y3V0c1NjcmVlbik6IFNob3J0Y3V0c1NjcmVl biBpcyBub3cgYSBkZXNjZW5kYW50IG9mIEhlbHBTY3JlZW4uCisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2hvcnRjdXRzU2NyZWVuLnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5faGlkZVNldHRp bmdzU2NyZWVuKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5kb2N1bWVudEtleURvd24pOgorCisy MDExLTExLTA3ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCiAgICAg ICAgIFtDaHJvbWl1bV0gV2ViIEluc3BlY3RvcjogdXNlIG5hdGl2ZSB3b3JrZXIgaW5zcGVjdG9y IGluc3RlYWQgb2YgZmFrZSB3b3JrZXJzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03MTY3MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0hlbHBTY3JlZW4uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0hlbHBTY3JlZW4uanMKaW5kZXggNzFhZDIyMTE3ZWU2MDA3YjdkY2M2NGYwMmU3 YmEyNzdjNDkxZjY1NC4uYzM0OTNjODkyYjc1ZTIwYmUyMGEwMzJiZjljZDdlYTJlMDFjNDU5ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWxwU2NyZWVu LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVscFNjcmVlbi5q cwpAQCAtNTQsMTIgKzU0LDE4IEBAIFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuID0gZnVuY3Rpb24o dGl0bGUpCiAgICAgXTsKIH0KIAorV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW4udmlzaWJsZVNjcmVl bl8gPSBudWxsOworCiBXZWJJbnNwZWN0b3IuSGVscFNjcmVlbi5wcm90b3R5cGUgPSB7CiAgICAg c2hvdzogZnVuY3Rpb24ob25IaWRlKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2lzU2hvd24p CiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5IZWxwU2Ny ZWVuLnZpc2libGVTY3JlZW5fKQorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW4u dmlzaWJsZVNjcmVlbl8uaGlkZSgpOworICAgICAgICBXZWJJbnNwZWN0b3IuSGVscFNjcmVlbi52 aXNpYmxlU2NyZWVuXyA9IHRoaXM7CisKICAgICAgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGls ZCh0aGlzLl9lbGVtZW50KTsKICAgICAgICAgdGhpcy5faXNTaG93biA9IHRydWU7CiAgICAgICAg IHRoaXMuX29uSGlkZSA9IG9uSGlkZTsKQEAgLTc1LDYgKzgxLDcgQEAgV2ViSW5zcGVjdG9yLkhl bHBTY3JlZW4ucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9pc1Nob3duID0gZmFsc2U7CiAg ICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQodGhpcy5fZWxlbWVudCk7CiAgICAgICAg IFdlYkluc3BlY3Rvci5zZXRDdXJyZW50Rm9jdXNFbGVtZW50KHRoaXMuX3ByZXZpb3VzRm9jdXNF bGVtZW50KTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW4udmlzaWJsZVNjcmVlbl8g PSBudWxsOwogICAgICAgICBpZiAodGhpcy5fb25IaWRlKSB7CiAgICAgICAgICAgICB0aGlzLl9v bkhpZGUoKTsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9vbkhpZGU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nob3J0Y3V0c1NjcmVlbi5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2hvcnRjdXRzU2NyZWVuLmpzCmluZGV4 IGZmMzA3ODY3MTAyNWNhYWI2NjNhZjU1ODc4NmQyYjA2NDljOWE2OWYuLjU0MzkxN2I3MWYyZjNk ODliMTExMjM0NGQ5Y2FiYTg3YWVkODM1MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2hvcnRjdXRzU2NyZWVuLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2hvcnRjdXRzU2NyZWVuLmpzCkBAIC0zMyw3ICszMyw5IEBA CiAgKi8KIFdlYkluc3BlY3Rvci5TaG9ydGN1dHNTY3JlZW4gPSBmdW5jdGlvbigpCiB7CisgICAg V2ViSW5zcGVjdG9yLkhlbHBTY3JlZW4uY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IktleWJvYXJkIFNob3J0Y3V0cyIpKTsKICAgICB0aGlzLl9zZWN0aW9ucyA9IHt9OworICAgIHRo aXMuX3RhYmxlUmVhZHkgPSBmYWxzZTsKIH0KIAogV2ViSW5zcGVjdG9yLlNob3J0Y3V0c1NjcmVl bi5wcm90b3R5cGUgPSB7CkBAIC00NSwyMyArNDcsMTggQEAgV2ViSW5zcGVjdG9yLlNob3J0Y3V0 c1NjcmVlbi5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBzZWN0aW9uOwogICAgIH0sCiAK LSAgICBzaG93OiBmdW5jdGlvbigpCisgICAgc2hvdzogZnVuY3Rpb24ob25IaWRlKQogICAgIHsK LSAgICAgICAgaWYgKCF0aGlzLl9oZWxwU2NyZWVuKSB7Ci0gICAgICAgICAgICB0aGlzLl9oZWxw U2NyZWVuID0gbmV3IFdlYkluc3BlY3Rvci5IZWxwU2NyZWVuKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiS2V5Ym9hcmQgU2hvcnRjdXRzIikpOwotICAgICAgICAgICAgdGhpcy5fYnVpbGRUYWJsZSh0 aGlzLl9oZWxwU2NyZWVuLmNvbnRlbnRFbGVtZW50LCAyKTsKLSAgICAgICAgfQotICAgICAgICB0 aGlzLl9oZWxwU2NyZWVuLnNob3coKTsKLSAgICB9LAotCi0gICAgaGlkZTogZnVuY3Rpb24oKQot ICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2hlbHBTY3JlZW4pCi0gICAgICAgICAgICB0aGlzLl9o ZWxwU2NyZWVuLmhpZGUoKTsKKyAgICAgICAgdGhpcy5fYnVpbGRUYWJsZSh0aGlzLmNvbnRlbnRF bGVtZW50LCAyKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW4ucHJvdG90eXBlLnNo b3cuY2FsbCh0aGlzLCBvbkhpZGUpOwogICAgIH0sCiAKICAgICBfYnVpbGRUYWJsZTogZnVuY3Rp b24ocGFyZW50LCBuQ29sdW1ucykKICAgICB7CisgICAgICAgIGlmICh0aGlzLl90YWJsZVJlYWR5 KQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB0aGlzLl90YWJsZVJlYWR5ID0gdHJ1ZTsK KwogICAgICAgICB2YXIgaGVpZ2h0ID0gMDsKICAgICAgICAgdmFyIG9yZGVyZWRTZWN0aW9ucyA9 IFtdOwogICAgICAgICBmb3IgKHZhciBzZWN0aW9uIGluIHRoaXMuX3NlY3Rpb25zKSB7CkBAIC05 NSw3ICs5MiwxMyBAQCBXZWJJbnNwZWN0b3IuU2hvcnRjdXRzU2NyZWVuLnByb3RvdHlwZSA9IHsK ICAgICB9CiB9CiAKLVdlYkluc3BlY3Rvci5zaG9ydGN1dHNTY3JlZW4gPSBuZXcgV2ViSW5zcGVj dG9yLlNob3J0Y3V0c1NjcmVlbigpOworV2ViSW5zcGVjdG9yLlNob3J0Y3V0c1NjcmVlbi5wcm90 b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkhlbHBTY3JlZW4ucHJvdG90eXBlOworCisv KioKKyAqIFdlIGNhbm5vdCBpbml0aWFsaXplIGl0IGhlcmUgYXMgbG9jYWxpemVkIHN0cmluZ3Mg YXJlIG5vdCBsb2FkZWQgeWV0LgorICogQHR5cGUgez9XZWJJbnNwZWN0b3IuU2hvcnRjdXRzU2Ny ZWVufQorICovCitXZWJJbnNwZWN0b3Iuc2hvcnRjdXRzU2NyZWVuID0gbnVsbDsKIAogLyoqCiAg KiBAY29uc3RydWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKaW5kZXggMWUyMGRkNGJhOTViY2E3OGNlZjk3ZDQyOWM3MTA2NTA5MTAwMTg5 MC4uYmZmZGY3MGE1YzdmM2FkZDMwODg3NTVlNTIxYzkyNWE4YzJlNjVmYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTE1MCwyMCAr MTUwLDggQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICAgICAgICAgIHRoaXMuX2hpZGVTZXR0 aW5nc1NjcmVlbigpOwogICAgIH0sCiAKLSAgICBfc2hvd1Nob3J0Y3V0c1NjcmVlbjogZnVuY3Rp b24oKQotICAgIHsKLSAgICAgICAgdGhpcy5faGlkZVNldHRpbmdzU2NyZWVuKCk7Ci0gICAgICAg IFdlYkluc3BlY3Rvci5zaG9ydGN1dHNTY3JlZW4uc2hvdygpOwotICAgIH0sCi0KLSAgICBfaGlk ZVNob3J0Y3V0c1NjcmVlbjogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9y LnNob3J0Y3V0c1NjcmVlbi5oaWRlKCk7Ci0gICAgfSwKLQogICAgIF9zaG93U2V0dGluZ3NTY3Jl ZW46IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2hpZGVTaG9ydGN1dHNTY3JlZW4o KTsKICAgICAgICAgZnVuY3Rpb24gb25oaWRlKCkKICAgICAgICAgewogICAgICAgICAgICAgdGhp cy5fc2V0dGluZ3NCdXR0b24udG9nZ2xlZCA9IGZhbHNlOwpAQCAtMTc4LDExICsxNjYsOCBAQCB2 YXIgV2ViSW5zcGVjdG9yID0gewogCiAgICAgX2hpZGVTZXR0aW5nc1NjcmVlbjogZnVuY3Rpb24o KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3NldHRpbmdzU2NyZWVuKSB7CisgICAgICAgIGlm ICh0aGlzLl9zZXR0aW5nc1NjcmVlbikKICAgICAgICAgICAgIHRoaXMuX3NldHRpbmdzU2NyZWVu LmhpZGUoKTsKLSAgICAgICAgICAgIHRoaXMuX3NldHRpbmdzQnV0dG9uLnRvZ2dsZWQgPSBmYWxz ZTsKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9zZXR0aW5nc1NjcmVlbjsKLSAgICAgICAgfQog ICAgIH0sCiAKICAgICBnZXQgYXR0YWNoZWQoKQpAQCAtMzM1LDYgKzMyMCw3IEBAIFdlYkluc3Bl Y3Rvci5kb0xvYWRlZERvbmUgPSBmdW5jdGlvbigpCiAgICAgaWYgKFdlYkluc3BlY3Rvci5zb2Nr ZXQpCiAgICAgICAgIGRvY3VtZW50LmJvZHkuYWRkU3R5bGVDbGFzcygicmVtb3RlIik7CiAKKyAg ICBXZWJJbnNwZWN0b3Iuc2hvcnRjdXRzU2NyZWVuID0gbmV3IFdlYkluc3BlY3Rvci5TaG9ydGN1 dHNTY3JlZW4oKTsKICAgICB0aGlzLl9yZWdpc3RlclNob3J0Y3V0cygpOwogCiAgICAgLy8gc2V0 IG9yZGVyIG9mIHNvbWUgc2VjdGlvbnMgZXhwbGljaXRseQpAQCAtNTc3LDcgKzU2Myw3IEBAIFdl Ykluc3BlY3Rvci5kb2N1bWVudEtleURvd24gPSBmdW5jdGlvbihldmVudCkKIAogICAgIGlmIChl dmVudC5rZXlJZGVudGlmaWVyID09PSAiRjEiIHx8CiAgICAgICAgIChldmVudC5rZXlJZGVudGlm aWVyID09PSBoZWxwS2V5ICYmIGV2ZW50LnNoaWZ0S2V5ICYmICghaXNJbkVkaXRNb2RlICYmICFp c0lucHV0RWxlbWVudCB8fCBldmVudC5tZXRhS2V5KSkpIHsKLSAgICAgICAgdGhpcy5fc2hvd1No b3J0Y3V0c1NjcmVlbigpOworICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvcnRjdXRzU2NyZWVuLnNo b3coKTsKICAgICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CiAgICAgICAgIGV2ZW50LnBy ZXZlbnREZWZhdWx0KCk7CiAgICAgICAgIHJldHVybjsK