107102 2013-01-17 00:40:07 -0800 Web Inspector: add createOption method to WebInspector.StatusBarComboBox 2013-01-17 01:08:34 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 aandrey aandrey apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 809152 0 aandrey 2013-01-17 00:40:07 -0800 Patch to follow. 809156 1 183137 aandrey 2013-01-17 00:46:58 -0800 Created attachment 183137 Patch 809165 2 183137 vsevik 2013-01-17 01:01:30 -0800 Comment on attachment 183137 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183137&action=review > Source/WebCore/inspector/front-end/ConsoleView.js:203 > this._contextSelector.addOption(option); remove this line > Source/WebCore/inspector/front-end/StatusBarButton.js:142 > + this.element.removeStyleClass("toggled-" + this._state); Previously this was only done inside if clause. Why is it correct to take it out? > Source/WebCore/inspector/front-end/StatusBarButton.js:311 > + if (value !== "undefined") typeof value !== ... 809167 3 183137 aandrey 2013-01-17 01:05:08 -0800 Comment on attachment 183137 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183137&action=review >> Source/WebCore/inspector/front-end/ConsoleView.js:203 >> this._contextSelector.addOption(option); > > remove this line done. good catch! >> Source/WebCore/inspector/front-end/StatusBarButton.js:142 >> + this.element.removeStyleClass("toggled-" + this._state); > > Previously this was only done inside if clause. Why is it correct to take it out? This was done inside *both* if- and else- clauses, thus I took it out. >> Source/WebCore/inspector/front-end/StatusBarButton.js:311 >> + if (value !== "undefined") > > typeof value !== ... done. 809170 4 aandrey 2013-01-17 01:08:34 -0800 Committed r139972: <http://trac.webkit.org/changeset/139972> 183137 2013-01-17 00:46:58 -0800 2013-01-17 01:05:07 -0800 Patch bug-107102-20130117124358.patch text/plain 6750 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmRmZGMyODkzOWQwMDFm ZDk3NzcyZTBlMmNhYmJkYjBlYzk0ZDk4NS4uNWE4MjNjYjI5OTAwMmZiMzE0Y2VkMjIwMTQ2Y2Qy ZGZjMDI1NzA0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAxLTE3ICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFkZCBjcmVhdGVPcHRpb24gbWV0aG9kIHRvIFdlYkluc3BlY3Rvci5TdGF0dXNCYXJDb21i b0JveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3 MTAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0NQVVByb2ZpbGVWaWV3LmpzOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29s ZVZpZXcucHJvdG90eXBlLl9hZGRGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29s ZVZpZXcucHJvdG90eXBlLl9hcHBlbmRDb250ZXh0T3B0aW9uKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1N0YXR1c0JhckJ1dHRvbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T dGF0dXNCYXJCdXR0b24ucHJvdG90eXBlLnNldCBzdGF0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU3RhdHVzQmFyQnV0dG9uLnByb3RvdHlwZS5zZXQgdmlzaWJsZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU3RhdHVzQmFyQ29tYm9Cb3gucHJvdG90eXBlLmNyZWF0ZU9wdGlvbik6CisKIDIw MTMtMDEtMTYgIFJpayBDYWJhbmllciAgPGNhYmFuaWVyQGFkb2JlLmNvbT4KIAogICAgICAgICBV cGRhdGUgR3JhcGhpY3NDb250ZXh0IHRvIHN1cHBvcnQgd2luZGluZyBydWxlIGluIGNsaXAgb3Bl cmF0b3IgZm9yIENvcmUgR3JhcGhpY3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ1BVUHJvZmlsZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0NQVVByb2ZpbGVWaWV3LmpzCmluZGV4IGRjY2Q4ZWVmYWU3NDZhYWNlYmQw ZmZmODczZmM5NTE5ZThkNjVkNzguLjQ0MjQ3ZjdhM2Y5Y2MxMGQ5Njk3ZmIzM2FiMzYyYmM1NWY5 ZDMyODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1BV UHJvZmlsZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D UFVQcm9maWxlVmlldy5qcwpAQCAtNTYsMTUgKzU2LDggQEAgV2ViSW5zcGVjdG9yLkNQVVByb2Zp bGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKIAogICAgIHRoaXMudmlld1NlbGVjdENvbWJvQm94 ID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJDb21ib0JveCh0aGlzLl9jaGFuZ2VWaWV3LmJp bmQodGhpcykpOwogCi0gICAgdmFyIGhlYXZ5Vmlld09wdGlvbiA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoIm9wdGlvbiIpOwotICAgIGhlYXZ5Vmlld09wdGlvbi5sYWJlbCA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiSGVhdnkgKEJvdHRvbSBVcCkiKTsKLSAgICBoZWF2eVZpZXdPcHRpb24udmFs dWUgPSBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVZpZXcuX1R5cGVIZWF2eTsKLSAgICB2YXIgdHJl ZVZpZXdPcHRpb24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvcHRpb24iKTsKLSAgICB0cmVl Vmlld09wdGlvbi5sYWJlbCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVHJlZSAoVG9wIERvd24p Iik7Ci0gICAgdHJlZVZpZXdPcHRpb24udmFsdWUgPSBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVZp ZXcuX1R5cGVUcmVlOwotCi0gICAgdGhpcy52aWV3U2VsZWN0Q29tYm9Cb3guYWRkT3B0aW9uKGhl YXZ5Vmlld09wdGlvbik7Ci0gICAgdGhpcy52aWV3U2VsZWN0Q29tYm9Cb3guYWRkT3B0aW9uKHRy ZWVWaWV3T3B0aW9uKTsKKyAgICB2YXIgaGVhdnlWaWV3T3B0aW9uID0gdGhpcy52aWV3U2VsZWN0 Q29tYm9Cb3guY3JlYXRlT3B0aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiSGVhdnkgKEJvdHRv bSBVcCkiKSwgIiIsIFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVmlldy5fVHlwZUhlYXZ5KTsKKyAg ICB2YXIgdHJlZVZpZXdPcHRpb24gPSB0aGlzLnZpZXdTZWxlY3RDb21ib0JveC5jcmVhdGVPcHRp b24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUcmVlIChUb3AgRG93bikiKSwgIiIsIFdlYkluc3Bl Y3Rvci5DUFVQcm9maWxlVmlldy5fVHlwZVRyZWUpOwogICAgIHRoaXMudmlld1NlbGVjdENvbWJv Qm94LnNlbGVjdCh0aGlzLl92aWV3VHlwZS5nZXQoKSA9PT0gV2ViSW5zcGVjdG9yLkNQVVByb2Zp bGVWaWV3Ll9UeXBlSGVhdnkgPyBoZWF2eVZpZXdPcHRpb24gOiB0cmVlVmlld09wdGlvbik7CiAK ICAgICB0aGlzLnBlcmNlbnRCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRv bigiIiwgInBlcmNlbnQtdGltZS1zdGF0dXMtYmFyLWl0ZW0iKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCmluZGV4IGFhNmEyMTZkMjk2 OGE3NTI4OWJiZGMwZjY3NTExMTMyZWIzODRmMzAuLmM1Yjc2MjlmMGU1ZGJmOTgxMTZlYTMzY2U4 ODM5NWQ4YzIyNDZlMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMTUwLDEyICsxNTAsOSBAQCBXZWJJbnNwZWN0b3IuQ29u c29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAqLwogICAgIF9hZGRGcmFtZTogZnVuY3Rpb24o Y29udGV4dExpc3QpCiAgICAgewotICAgICAgICB2YXIgb3B0aW9uID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgib3B0aW9uIik7Ci0gICAgICAgIG9wdGlvbi50ZXh0ID0gY29udGV4dExpc3QuZGlz cGxheU5hbWU7Ci0gICAgICAgIG9wdGlvbi50aXRsZSA9IGNvbnRleHRMaXN0LnVybDsKKyAgICAg ICAgdmFyIG9wdGlvbiA9IHRoaXMuX2ZyYW1lU2VsZWN0b3IuY3JlYXRlT3B0aW9uKGNvbnRleHRM aXN0LmRpc3BsYXlOYW1lLCBjb250ZXh0TGlzdC51cmwpOwogICAgICAgICBvcHRpb24uX2NvbnRl eHRMaXN0ID0gY29udGV4dExpc3Q7CiAgICAgICAgIGNvbnRleHRMaXN0Ll9jb25zb2xlT3B0aW9u ID0gb3B0aW9uOwotICAgICAgICB0aGlzLl9mcmFtZVNlbGVjdG9yLmFkZE9wdGlvbihvcHRpb24p OwogICAgICAgICBjb250ZXh0TGlzdC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5GcmFt ZUV4ZWN1dGlvbkNvbnRleHRMaXN0LkV2ZW50VHlwZXMuQ29udGV4dHNVcGRhdGVkLCB0aGlzLl9m cmFtZVVwZGF0ZWQsIHRoaXMpOwogICAgICAgICBjb250ZXh0TGlzdC5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5GcmFtZUV4ZWN1dGlvbkNvbnRleHRMaXN0LkV2ZW50VHlwZXMuQ29udGV4 dEFkZGVkLCB0aGlzLl9jb250ZXh0QWRkZWQsIHRoaXMpOwogICAgICAgICB0aGlzLl9mcmFtZUNo YW5nZWQoKTsKQEAgLTIwMSw5ICsxOTgsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IucnVudGltZU1vZGVs LmN1cnJlbnRFeGVjdXRpb25Db250ZXh0KCkpCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucnVu dGltZU1vZGVsLnNldEN1cnJlbnRFeGVjdXRpb25Db250ZXh0KGV4ZWN1dGlvbkNvbnRleHQpOwot ICAgICAgICB2YXIgb3B0aW9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib3B0aW9uIik7Ci0g ICAgICAgIG9wdGlvbi50ZXh0ID0gZXhlY3V0aW9uQ29udGV4dC5uYW1lOwotICAgICAgICBvcHRp b24udGl0bGUgPSBleGVjdXRpb25Db250ZXh0LmlkOworICAgICAgICB2YXIgb3B0aW9uID0gdGhp cy5fY29udGV4dFNlbGVjdG9yLmNyZWF0ZU9wdGlvbihleGVjdXRpb25Db250ZXh0Lm5hbWUsIGV4 ZWN1dGlvbkNvbnRleHQuaWQpOwogICAgICAgICBvcHRpb24uX2V4ZWN1dGlvbkNvbnRleHQgPSBl eGVjdXRpb25Db250ZXh0OwogICAgICAgICB0aGlzLl9jb250ZXh0U2VsZWN0b3IuYWRkT3B0aW9u KG9wdGlvbik7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3RhdHVzQmFyQnV0dG9uLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TdGF0dXNCYXJCdXR0b24uanMKaW5kZXggY2Y3ODllODU3OGY4YmU5YmViMDhiZWUx OTZlNjUyNzdlMzQ0ZGRiMC4uMzAwNzllMzNjYWQ2YTNiN2Y1OWNmMzgxZDY3MzI4MGU1ZjliZmI1 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0dXNC YXJCdXR0b24uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0 dXNCYXJCdXR0b24uanMKQEAgLTY1LDYgKzY1LDggQEAgV2ViSW5zcGVjdG9yLlN0YXR1c0Jhckl0 ZW0ucHJvdG90eXBlID0gewogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqIEBleHRlbmRzIHtXZWJJ bnNwZWN0b3IuU3RhdHVzQmFySXRlbX0KKyAqIEBwYXJhbSB7c3RyaW5nfSB0aXRsZQorICogQHBh cmFtIHtzdHJpbmd9IGNsYXNzTmFtZQogICogQHBhcmFtIHtudW1iZXI9fSBzdGF0ZXMKICAqLwog V2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1dHRvbiA9IGZ1bmN0aW9uKHRpdGxlLCBjbGFzc05hbWUs IHN0YXRlcykKQEAgLTEzNCwxNyArMTM2LDEyIEBAIFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0 b24ucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5fc3RhdGUgPT09IHgpCiAgICAgICAg ICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKHRoaXMuc3RhdGVzID09PSAyKSB7Ci0gICAgICAg ICAgICBpZiAoeCkKLSAgICAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygi dG9nZ2xlZC1vbiIpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHRoaXMuZWxl bWVudC5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLW9uIik7Ci0gICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICBpZiAoeCAhPT0gMCkgewotICAgICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5y ZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLSIgKyB0aGlzLl9zdGF0ZSk7CisgICAgICAgIGlmICh0 aGlzLnN0YXRlcyA9PT0gMikKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5lbmFibGVTdHlsZUNs YXNzKCJ0b2dnbGVkLW9uIiwgeCk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgdGhpcy5l bGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtIiArIHRoaXMuX3N0YXRlKTsKKyAgICAg ICAgICAgIGlmICh4ICE9PSAwKQogICAgICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRTdHls ZUNsYXNzKCJ0b2dnbGVkLSIgKyB4KTsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAg ICAgIHRoaXMuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJ0b2dnbGVkLSIgKyB0aGlzLl9zdGF0 ZSk7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fc3RhdGUgPSB4OwogICAgIH0sCkBAIC0xNzMs MTAgKzE3MCw3IEBAIFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24ucHJvdG90eXBlID0gewog ICAgICAgICBpZiAodGhpcy5fdmlzaWJsZSA9PT0geCkKICAgICAgICAgICAgIHJldHVybjsKIAot ICAgICAgICBpZiAoeCkKLSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNz KCJoaWRkZW4iKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFkZFN0 eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICB0aGlzLmVsZW1lbnQuZW5hYmxlU3R5bGVDbGFz cygiaGlkZGVuIiwgIXgpOwogICAgICAgICB0aGlzLl92aXNpYmxlID0geDsKICAgICB9LAogCkBA IC0zMDMsNiArMjk3LDIzIEBAIFdlYkluc3BlY3Rvci5TdGF0dXNCYXJDb21ib0JveC5wcm90b3R5 cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBsYWJlbAor ICAgICAqIEBwYXJhbSB7c3RyaW5nPX0gdGl0bGUKKyAgICAgKiBAcGFyYW0ge3N0cmluZz19IHZh bHVlCisgICAgICogQHJldHVybiB7IUVsZW1lbnR9CisgICAgICovCisgICAgY3JlYXRlT3B0aW9u OiBmdW5jdGlvbihsYWJlbCwgdGl0bGUsIHZhbHVlKQorICAgIHsKKyAgICAgICAgdmFyIG9wdGlv biA9IHRoaXMuX3NlbGVjdEVsZW1lbnQuY3JlYXRlQ2hpbGQoIm9wdGlvbiIpOworICAgICAgICBv cHRpb24udGV4dCA9IGxhYmVsOworICAgICAgICBpZiAodGl0bGUpCisgICAgICAgICAgICBvcHRp b24udGl0bGUgPSB0aXRsZTsKKyAgICAgICAgaWYgKHZhbHVlICE9PSAidW5kZWZpbmVkIikKKyAg ICAgICAgICAgIG9wdGlvbi52YWx1ZSA9IHZhbHVlOworICAgICAgICByZXR1cm4gb3B0aW9uOwor ICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAb3ZlcnJpZGUKICAgICAgKi8KICAgICBfYXBwbHlF bmFibGVkU3RhdGU6IGZ1bmN0aW9uKCkK