65113 2011-07-25 08:49:54 -0700 Web Inspector: simplify Drawer.js 2011-09-21 05:06:10 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED WONTFIX P2 Normal --- 68155 1 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 441671 0 yurys 2011-07-25 08:49:54 -0700 Drawer can only contain ConsoleView but contains some logic assuming that it can contain other type of views. The code can be simplified. 441677 1 101875 yurys 2011-07-25 08:51:59 -0700 Created attachment 101875 Patch 442150 2 101875 pfeldman 2011-07-26 01:19:46 -0700 Comment on attachment 101875 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101875&action=review > Source/WebCore/inspector/front-end/Drawer.js:59 > + WebInspector.console.show(); Drawer class should not depend on console object unless they are merged into a single entity. 101875 2011-07-25 08:51:59 -0700 2011-07-26 01:19:46 -0700 Patch bug-65113-20110725195158.patch text/plain 5487 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogOTE2NjYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5YTNkOTRlZWM4MTM5Mzk4 MzE5YjJkNTY3ZGE3ZWViOWVmMWE2YzU2Li4xMmE5NzMyYWViMzNjNjNlYTMyNWYxZTM4ZDFjNGUw N2E5ZjEzYWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMTEtMDctMjUgIFl1cnkg U2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogc2ltcGxpZnkgRHJhd2VyLmpzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NTExMworCisgICAgICAgIERyYXdlciBhbHdheXMgY29udGFpbnMgQ29u c29sZVZpZXcuIFN1cHBvcnQgZm9yIGFuIGFyYml0cmFyeSBpbm5lciB2aWV3IGhhcyBiZWVuCisg ICAgICAgIHJlbW92ZWQgaW4gZmF2b3VyIG9mIHNpbXBsaWNpdHkuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlw ZS5fdG9nZ2xlQ29uc29sZUJ1dHRvbkNsaWNrZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvRHJhd2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRyYXdlci5wcm90b3R5cGUu c2hvdy5hbmltYXRpb25GaW5pc2hlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRHJhd2VyLnBy b3RvdHlwZS5zaG93KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5zaG93Q29uc29sZSk6CisKKzIwMTEtMDctMjUgIFl1 cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW0Nocm9taXVt XSBXZWIgSW5zcGVjdG9yOiBsaXZlIGVkaXQgZXJyb3Igc2hvdWxkIGJlIHJldmVhbGVkIGluIENv bnNvbGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1 MTA5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29u c29sZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVW aWV3LmpzCmluZGV4IDJhZWYxMzE1MTBlNGQxNGEzZjNkOTk0ODJhNjI2NTBlN2ExYWJmNmMuLmQw YzdjMWZhOGQzNTg4ZmU4OTNjZjZkZWMyZWMwMGMyNDljMjdhYmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMjM0LDE0ICsy MzQsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgX3Rv Z2dsZUNvbnNvbGVCdXR0b25DbGlja2VkOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlz LmRyYXdlci52aXNpYmxlVmlldyA9IHRoaXM7Ci0gICAgfSwKLQotICAgIGF0dGFjaDogZnVuY3Rp b24obWFpbkVsZW1lbnQsIHN0YXR1c0JhckVsZW1lbnQpCi0gICAgewotICAgICAgICBtYWluRWxl bWVudC5hcHBlbmRDaGlsZCh0aGlzLmVsZW1lbnQpOwotICAgICAgICBzdGF0dXNCYXJFbGVtZW50 LmFwcGVuZENoaWxkKHRoaXMuY2xlYXJCdXR0b24pOwotICAgICAgICBzdGF0dXNCYXJFbGVtZW50 LmFwcGVuZENoaWxkKHRoaXMuZmlsdGVyQmFyRWxlbWVudCk7CisgICAgICAgIHRoaXMuZHJhd2Vy LnZpc2libGUgPSB0cnVlOwogICAgIH0sCiAKICAgICBzaG93OiBmdW5jdGlvbigpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RyYXdlci5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRHJhd2VyLmpzCmluZGV4IDk4MTMyOTU0ZTBj Yzk3OGU4MjVhMjM1YjYzNTMxODBjYzNhM2M4ZjYuLjI5NDc4MDNmOTI5ZjY3NGFhODNhODNjYjQ1 ODI2MDI1YTM0ZDlkOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRHJhd2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RHJhd2VyLmpzCkBAIC00NSw1NCArNDUsMTggQEAgV2ViSW5zcGVjdG9yLkRyYXdlciA9IGZ1bmN0 aW9uKCkKIH0KIAogV2ViSW5zcGVjdG9yLkRyYXdlci5wcm90b3R5cGUgPSB7Ci0gICAgZ2V0IHZp c2libGVWaWV3KCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl92aXNpYmxlVmlldzsKLSAg ICB9LAotCi0gICAgc2V0IHZpc2libGVWaWV3KHgpCi0gICAgewotICAgICAgICBpZiAodGhpcy5f dmlzaWJsZVZpZXcgPT09IHgpIHsKLSAgICAgICAgICAgIGlmICh0aGlzLnZpc2libGUgJiYgdGhp cy5mdWxsUGFuZWwpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgdGhpcy52 aXNpYmxlID0gIXRoaXMudmlzaWJsZTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQot Ci0gICAgICAgIHZhciBmaXJzdFRpbWUgPSAhdGhpcy5fdmlzaWJsZVZpZXc7Ci0gICAgICAgIGlm ICh0aGlzLl92aXNpYmxlVmlldykKLSAgICAgICAgICAgIHRoaXMuX3Zpc2libGVWaWV3LmhpZGUo KTsKLQotICAgICAgICB0aGlzLl92aXNpYmxlVmlldyA9IHg7Ci0KLSAgICAgICAgaWYgKHggJiYg IWZpcnN0VGltZSkgewotICAgICAgICAgICAgdGhpcy5fc2FmZWx5UmVtb3ZlQ2hpbGRyZW4oKTsK LSAgICAgICAgICAgIHRoaXMuX3ZpZXdTdGF0dXNCYXIucmVtb3ZlQ2hpbGRyZW4oKTsgLy8gb3B0 aW1pemUgdGhpcz8gY2FsbCBvbGQuZGV0YWNoKCkKLSAgICAgICAgICAgIHguYXR0YWNoKHRoaXMu ZWxlbWVudCwgdGhpcy5fdmlld1N0YXR1c0Jhcik7Ci0gICAgICAgICAgICB4LnNob3coKTsKLSAg ICAgICAgICAgIHRoaXMudmlzaWJsZSA9IHRydWU7Ci0gICAgICAgIH0KLSAgICB9LAotCiAgICAg Z2V0IHNhdmVkSGVpZ2h0KCkKICAgICB7CiAgICAgICAgIHZhciBoZWlnaHQgPSB0aGlzLl9zYXZl ZEhlaWdodCB8fCB0aGlzLmVsZW1lbnQub2Zmc2V0SGVpZ2h0OwogICAgICAgICByZXR1cm4gTnVt YmVyLmNvbnN0cmFpbihoZWlnaHQsIFByZWZlcmVuY2VzLm1pbkNvbnNvbGVIZWlnaHQsIHdpbmRv dy5pbm5lckhlaWdodCAtIHRoaXMuX21haW5FbGVtZW50LnRvdGFsT2Zmc2V0VG9wIC0gUHJlZmVy ZW5jZXMubWluQ29uc29sZUhlaWdodCk7CiAgICAgfSwKIAotICAgIHNob3dWaWV3OiBmdW5jdGlv bih2aWV3KQotICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLnZpc2libGUgfHwgdGhpcy52aXNpYmxl VmlldyAhPT0gdmlldykKLSAgICAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcgPSB2aWV3OwotICAg IH0sCi0KICAgICBzaG93OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fYW5p bWF0aW5nIHx8IHRoaXMudmlzaWJsZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBp ZiAodGhpcy52aXNpYmxlVmlldykKLSAgICAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcuc2hvdygp OworICAgICAgICBXZWJJbnNwZWN0b3IuY29uc29sZS5zaG93KCk7CiAKICAgICAgICAgV2ViSW5z cGVjdG9yLlZpZXcucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzKTsKIApAQCAtMTI0LDggKzg4LDcg QEAgV2ViSW5zcGVjdG9yLkRyYXdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHsKICAgICAgICAg ICAgIGlmICgidXBkYXRlU3RhdHVzQmFySXRlbXMiIGluIFdlYkluc3BlY3Rvci5jdXJyZW50UGFu ZWwpCiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmN1cnJlbnRQYW5lbC51cGRhdGVTdGF0 dXNCYXJJdGVtcygpOwotICAgICAgICAgICAgaWYgKHRoaXMudmlzaWJsZVZpZXcuYWZ0ZXJTaG93 KQotICAgICAgICAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcuYWZ0ZXJTaG93KCk7CisgICAgICAg ICAgICBXZWJJbnNwZWN0b3IuY29uc29sZS5hZnRlclNob3coKTsKICAgICAgICAgICAgIGRlbGV0 ZSB0aGlzLl9hbmltYXRpbmc7CiAgICAgICAgICAgICBkZWxldGUgdGhpcy5fY3VycmVudEFuaW1h dGlvbjsKICAgICAgICAgICAgIHRoaXMuc3RhdGUgPSAodGhpcy5mdWxsUGFuZWwgPyBXZWJJbnNw ZWN0b3IuRHJhd2VyLlN0YXRlLkZ1bGwgOiBXZWJJbnNwZWN0b3IuRHJhd2VyLlN0YXRlLlZhcmlh YmxlKTsKQEAgLTE0Myw4ICsxMDYsNyBAQCBXZWJJbnNwZWN0b3IuRHJhd2VyLnByb3RvdHlwZSA9 IHsKIAogICAgICAgICBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGUuaGlkZS5jYWxsKHRoaXMp OwogCi0gICAgICAgIGlmICh0aGlzLnZpc2libGVWaWV3KQotICAgICAgICAgICAgdGhpcy52aXNp YmxlVmlldy5oaWRlKCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmhpZGUoKTsKIAog ICAgICAgICB0aGlzLl9hbmltYXRpbmcgPSB0cnVlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IGI4M2EwZTY5OTU0MzQ5ODliOWU4 MmJjOWI4MjMzYzViZjM0ZTdjNWYuLmE3YmE2YjA1MzU2ODFlN2Y2NTEwZjhmMTE3M2U0NTg4MTUy NDg0M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmpzCkBAIC00OTcsNyArNDk3LDYgQEAgV2ViSW5zcGVjdG9yLmRvTG9hZGVkRG9uZSA9IGZ1 bmN0aW9uKCkKIAogICAgIHRoaXMuZHJhd2VyID0gbmV3IFdlYkluc3BlY3Rvci5EcmF3ZXIoKTsK ICAgICB0aGlzLmNvbnNvbGUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3KHRoaXMuZHJh d2VyKTsKLSAgICB0aGlzLmRyYXdlci52aXNpYmxlVmlldyA9IHRoaXMuY29uc29sZTsKICAgICB0 aGlzLm5ldHdvcmtNYW5hZ2VyID0gbmV3IFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlcigpOwog ICAgIHRoaXMucmVzb3VyY2VUcmVlTW9kZWwgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJl ZU1vZGVsKCk7CiAgICAgdGhpcy5uZXR3b3JrTG9nID0gbmV3IFdlYkluc3BlY3Rvci5OZXR3b3Jr TG9nKCk7CkBAIC0xMDIzLDcgKzEwMjIsNyBAQCBXZWJJbnNwZWN0b3IudG9nZ2xlU2VhcmNoaW5n Rm9yTm9kZSA9IGZ1bmN0aW9uKCkKIAogV2ViSW5zcGVjdG9yLnNob3dDb25zb2xlID0gZnVuY3Rp b24oKQogewotICAgIHRoaXMuZHJhd2VyLnNob3dWaWV3KHRoaXMuY29uc29sZSk7CisgICAgdGhp cy5kcmF3ZXIudmlzaWJsZSA9IHRydWU7CiB9CiAKIFdlYkluc3BlY3Rvci5zaG93UGFuZWwgPSBm dW5jdGlvbihwYW5lbCkK