59108 2011-04-21 09:35:03 -0700 Web Inspector: group content scripts in the scripts panel drop down. 2011-04-22 06:18:29 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 390086 0 pfeldman 2011-04-21 09:35:03 -0700 Patch to follow. 390089 1 90547 pfeldman 2011-04-21 09:40:02 -0700 Created attachment 90547 Patch 390730 2 90547 yurys 2011-04-22 05:37:39 -0700 Comment on attachment 90547 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90547&action=review > Source/WebCore/inspector/front-end/ScriptsPanel.js:292 > + if (a.isContentScript && !b.isContentScript) you could use difference between two boolean values instead of these two statements: var d = !!a.isContentScript - !!b.isContentScript; if (!d) return d; 390744 3 pfeldman 2011-04-22 06:18:29 -0700 Committed r84623: <http://trac.webkit.org/changeset/84623> 90547 2011-04-21 09:40:02 -0700 2011-04-22 05:37:39 -0700 Patch bug-59108-20110421204000.patch text/plain 3745 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODQ0OTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzOWVkNjE2YjVhY2EwYWI2 YjAyNTBiZjUyMGU5ZDE4YWZhMzRkNTY4Li42MWMzODIwMjQ5ZWZiNTZkYzM3NDZjNzdhMzY2N2E0 MzA4MDE5NzViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTEtMDQtMjEgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGdyb3VwIGNvbnRlbnQgc2Ny aXB0cyBpbiB0aGUgc2NyaXB0cyBwYW5lbCBkcm9wIGRvd24uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTEwOAorCisgICAgICAgICogRW5nbGlzaC5s cHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90 b3R5cGUuX2FkZE9wdGlvblRvRmlsZXNTZWxlY3Qub3B0aW9uQ29tcGFyZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fYWRkT3B0aW9uVG9GaWxlc1NlbGVj dCk6CisKKzIwMTEtMDQtMjEgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgor CiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogQ29va2llcyBzZWN0aW9uIGluIGVtcHR5IG9uIHBhZ2UgcmUtbGF1bmNoLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz IGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4 IDU0NjA2YTE0ZDY5NGY4YmJlOThiZTQ5NGE3NDdiMzY3NmQ5MWE2ZmMuLmNlNjAxNDY4N2NmNWYx YzE1ZTU2MTJkZGUxOWI0NmFjZWM3MTUyNDggMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEg NzgKemNtY2J6bkVBdks8XyVYYVBRSnllR1RBfG9XJTJfcDdTVTlPSmNiZW0xJV9nVldRSFAhT29q cD11WHU4end4fUZkCk44M3JXPVlYJllMMU9WdCo2ZnBuKgoKZGVsdGEgOQpSY21YQEhnISMmMTxf JVhhMHN0OFQxd1F9KQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggYzgxYmJhOTY4ZjI2MGI2NDdhMDU1MzM2MzVjNWM4YzYy ZDI3NDU1YS4uM2E5MDQ0NzlkNGI1MGI0ODAxNzVjMmQyNTkzYTNhNTZlNThhZDVkZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK QEAgLTI3OSwyMCArMjc5LDM4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICB2YXIgc2VsZWN0ID0gdGhpcy5fZmlsZXNTZWxlY3RFbGVtZW50OwogICAg ICAgICB2YXIgb3B0aW9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib3B0aW9uIik7CiAgICAg ICAgIG9wdGlvbi50ZXh0ID0gc291cmNlRmlsZS51cmwgPyBXZWJJbnNwZWN0b3IuZGlzcGxheU5h bWVGb3JVUkwoc291cmNlRmlsZS51cmwpIDogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIocHJvZ3Jh bSkiKTsKKyAgICAgICAgb3B0aW9uLmlzQ29udGVudFNjcmlwdCA9IHNvdXJjZUZpbGUuaXNDb250 ZW50U2NyaXB0OwogICAgICAgICBpZiAoc291cmNlRmlsZS5pc0NvbnRlbnRTY3JpcHQpCiAgICAg ICAgICAgICBvcHRpb24uYWRkU3R5bGVDbGFzcygiZXh0ZW5zaW9uLXNjcmlwdCIpOwogICAgICAg ICBmdW5jdGlvbiBvcHRpb25Db21wYXJlKGEsIGIpCiAgICAgICAgIHsKKyAgICAgICAgICAgIGlm IChhID09PSBzZWxlY3QuY29udGVudFNjcmlwdFNlY3Rpb24pCisgICAgICAgICAgICAgICAgcmV0 dXJuIGIuaXNDb250ZW50U2NyaXB0ID8gLTEgOiAxOworICAgICAgICAgICAgaWYgKGIgPT09IHNl bGVjdC5jb250ZW50U2NyaXB0U2VjdGlvbikKKyAgICAgICAgICAgICAgICByZXR1cm4gYS5pc0Nv bnRlbnRTY3JpcHQgPyAxIDogLTE7CisKKyAgICAgICAgICAgIGlmIChhLmlzQ29udGVudFNjcmlw dCAmJiAhYi5pc0NvbnRlbnRTY3JpcHQpCisgICAgICAgICAgICAgICAgcmV0dXJuIDE7IAorICAg ICAgICAgICAgaWYgKCFhLmlzQ29udGVudFNjcmlwdCAmJiBiLmlzQ29udGVudFNjcmlwdCkKKyAg ICAgICAgICAgICAgICByZXR1cm4gLTE7IAorCiAgICAgICAgICAgICBpZiAoYS50ZXh0ID09PSBi LnRleHQpCiAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAgICByZXR1cm4gYS50 ZXh0IDwgYi50ZXh0ID8gLTEgOiAxOwogICAgICAgICB9CisKICAgICAgICAgdmFyIGluc2VydGlv bkluZGV4ID0gaW5zZXJ0aW9uSW5kZXhGb3JPYmplY3RJbkxpc3RTb3J0ZWRCeUZ1bmN0aW9uKG9w dGlvbiwgc2VsZWN0LmNoaWxkTm9kZXMsIG9wdGlvbkNvbXBhcmUpOwotICAgICAgICBpZiAoaW5z ZXJ0aW9uSW5kZXggPCAwKQotICAgICAgICAgICAgc2VsZWN0LmFwcGVuZENoaWxkKG9wdGlvbik7 Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHNlbGVjdC5pbnNlcnRCZWZvcmUob3B0aW9uLCBz ZWxlY3QuY2hpbGROb2Rlcy5pdGVtKGluc2VydGlvbkluZGV4KSk7CisgICAgICAgIHNlbGVjdC5p bnNlcnRCZWZvcmUob3B0aW9uLCBpbnNlcnRpb25JbmRleCA8IDAgPyBudWxsIDogc2VsZWN0LmNo aWxkTm9kZXMuaXRlbShpbnNlcnRpb25JbmRleCkpOworCisgICAgICAgIGlmIChzb3VyY2VGaWxl LmlzQ29udGVudFNjcmlwdCAmJiAhc2VsZWN0LmNvbnRlbnRTY3JpcHRTZWN0aW9uKSB7CisgICAg ICAgICAgICB2YXIgY29udGVudFNjcmlwdFNlY3Rpb24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJvcHRpb24iKTsKKyAgICAgICAgICAgIGNvbnRlbnRTY3JpcHRTZWN0aW9uLnRleHQgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkNvbnRlbnQgc2NyaXB0cyIpOworICAgICAgICAgICAgY29udGVu dFNjcmlwdFNlY3Rpb24uZGlzYWJsZWQgPSB0cnVlOworICAgICAgICAgICAgc2VsZWN0LmNvbnRl bnRTY3JpcHRTZWN0aW9uID0gY29udGVudFNjcmlwdFNlY3Rpb247CiAKKyAgICAgICAgICAgIHZh ciBpbnNlcnRpb25JbmRleCA9IGluc2VydGlvbkluZGV4Rm9yT2JqZWN0SW5MaXN0U29ydGVkQnlG dW5jdGlvbihjb250ZW50U2NyaXB0U2VjdGlvbiwgc2VsZWN0LmNoaWxkTm9kZXMsIG9wdGlvbkNv bXBhcmUpOworICAgICAgICAgICAgc2VsZWN0Lmluc2VydEJlZm9yZShjb250ZW50U2NyaXB0U2Vj dGlvbiwgaW5zZXJ0aW9uSW5kZXggPCAwID8gbnVsbCA6IHNlbGVjdC5jaGlsZE5vZGVzLml0ZW0o aW5zZXJ0aW9uSW5kZXgpKTsKKyAgICAgICAgfQogICAgICAgICBvcHRpb24uX3NvdXJjZUZpbGVJ ZCA9IHNvdXJjZUZpbGVJZDsKICAgICAgICAgdGhpcy5fc291cmNlRmlsZUlkVG9GaWxlc1NlbGVj dE9wdGlvbltzb3VyY2VGaWxlSWRdID0gb3B0aW9uOwogICAgIH0sCg==