28801 2009-08-28 02:40:59 -0700 Remove dependency of SummaryBar on WebInspector.resourceCategories 2009-08-28 06:23:46 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 mnaganov webkit-unassigned pfeldman timothy oldest_to_newest 143331 0 mnaganov 2009-08-28 02:40:59 -0700 When extracting the SummaryBar, I missed the direct dependency of drawing code on WebInspector.resourceCategories to extract categories titles. This needs to be fixed. 143332 1 38724 mnaganov 2009-08-28 02:45:08 -0700 Created attachment 38724 Proposed patch 143344 2 pfeldman 2009-08-28 06:23:46 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/ResourcesPanel.js M WebCore/inspector/front-end/SummaryBar.js Committed r47861 38724 2009-08-28 02:45:08 -0700 2009-08-28 06:19:22 -0700 Proposed patch summary-bar-titles-patch text/plain 4891 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZThkMTY4Yy4uNzNiN2EwZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wOC0yOCAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBkZXBlbmRlbmN5IG9mIFN1bW1hcnlCYXIgb24g V2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg4MDEKKworICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VzUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlw ZS50b29sYmFySXRlbUNsYXNzLmdldCBjYXRlZ29yaWVzKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1N1bW1hcnlCYXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3VtbWFyeUJh cik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3VtbWFyeUJhci5wcm90b3R5cGUudXBkYXRlKToK KwogMjAwOS0wOC0yOCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBOb3QgcmV2aWV3ZWQgKHBhdGNoaW5nIGluIGwxOG4gY2hhbmdlIHRoYXQgd2FzIG1p c3NpbmcgZHVlIHRvCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFu ZWwuanMKaW5kZXggMDcxNzRiNC4uNmU0ZTZkMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtNjAsNyArNjAsNyBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5jb250YWluZXJDb250ZW50RWxl bWVudC5pZCA9ICJyZXNvdXJjZXMtY29udGFpbmVyLWNvbnRlbnQiOwogICAgIHRoaXMuY29udGFp bmVyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRhaW5lckNvbnRlbnRFbGVtZW50KTsKIAot ICAgIHRoaXMuc3VtbWFyeUJhciA9IG5ldyBXZWJJbnNwZWN0b3IuU3VtbWFyeUJhcih0aGlzLmNh dGVnb3J5Q29sb3JzLCB0aGlzLmNhdGVnb3J5T3JkZXIpOworICAgIHRoaXMuc3VtbWFyeUJhciA9 IG5ldyBXZWJJbnNwZWN0b3IuU3VtbWFyeUJhcih0aGlzLmNhdGVnb3JpZXMpOwogICAgIHRoaXMu c3VtbWFyeUJhci5lbGVtZW50LmlkID0gInJlc291cmNlcy1zdW1tYXJ5IjsKICAgICB0aGlzLmNv bnRhaW5lckNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc3VtbWFyeUJhci5lbGVtZW50 KTsKIApAQCAtMTU1LDggKzE1NSw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbCA9IGZ1 bmN0aW9uKCkKIAogICAgIHZhciBhbGxFbGVtZW50ID0gY3JlYXRlRmlsdGVyRWxlbWVudC5jYWxs KHRoaXMsICJhbGwiKTsKICAgICB0aGlzLmZpbHRlcihhbGxFbGVtZW50LmNhdGVnb3J5KTsKLSAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuY2F0ZWdvcnlPcmRlci5sZW5ndGg7IGkrKykKLSAg ICAgICAgY3JlYXRlRmlsdGVyRWxlbWVudC5jYWxsKHRoaXMsIHRoaXMuY2F0ZWdvcnlPcmRlcltp XSk7CisgICAgZm9yICh2YXIgY2F0ZWdvcnkgaW4gdGhpcy5jYXRlZ29yaWVzKQorICAgICAgICBj cmVhdGVGaWx0ZXJFbGVtZW50LmNhbGwodGhpcywgY2F0ZWdvcnkpOwogCiAgICAgdGhpcy5yZXNl dCgpOwogCkBAIC0xNjYsOSArMTY2LDE2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbCA9 IGZ1bmN0aW9uKCkKIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgdG9vbGJhckl0ZW1DbGFzczogInJlc291cmNlcyIsCiAKLSAgICBjYXRlZ29yeUNvbG9yczog e2RvY3VtZW50czoge3I6IDQ3LCBnOiAxMDIsIGI6IDIzNn0sIHN0eWxlc2hlZXRzOiB7cjogMTU3 LCBnOiAyMzEsIGI6IDExOX0sIGltYWdlczoge3I6IDE2NCwgZzogNjAsIGI6IDI1NX0sIHNjcmlw dHM6IHtyOiAyNTUsIGc6IDEyMSwgYjogMH0sIHhocjoge3I6IDIzMSwgZzogMjMxLCBiOiAxMH0s IGZvbnRzOiB7cjogMjU1LCBnOiA4MiwgYjogNjJ9LCBvdGhlcjoge3I6IDE4NiwgZzogMTg2LCBi OiAxODZ9fSwKLQotICAgIGNhdGVnb3J5T3JkZXI6IFsiZG9jdW1lbnRzIiwgInN0eWxlc2hlZXRz IiwgImltYWdlcyIsICJzY3JpcHRzIiwgInhociIsICJmb250cyIsICJvdGhlciJdLAorICAgIGdl dCBjYXRlZ29yaWVzKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fY2F0ZWdvcmllcykgewor ICAgICAgICAgICAgdGhpcy5fY2F0ZWdvcmllcyA9IHtkb2N1bWVudHM6IHtjb2xvcjoge3I6IDQ3 LCBnOiAxMDIsIGI6IDIzNn19LCBzdHlsZXNoZWV0czoge2NvbG9yOiB7cjogMTU3LCBnOiAyMzEs IGI6IDExOX19LCBpbWFnZXM6IHtjb2xvcjoge3I6IDE2NCwgZzogNjAsIGI6IDI1NX19LCBzY3Jp cHRzOiB7Y29sb3I6IHtyOiAyNTUsIGc6IDEyMSwgYjogMH19LCB4aHI6IHtjb2xvcjoge3I6IDIz MSwgZzogMjMxLCBiOiAxMH19LCBmb250czoge2NvbG9yOiB7cjogMjU1LCBnOiA4MiwgYjogNjJ9 fSwgb3RoZXI6IHtjb2xvcjoge3I6IDE4NiwgZzogMTg2LCBiOiAxODZ9fX07CisgICAgICAgICAg ICBmb3IgKHZhciBjYXRlZ29yeSBpbiB0aGlzLl9jYXRlZ29yaWVzKSB7CisgICAgICAgICAgICAg ICAgdGhpcy5fY2F0ZWdvcmllc1tjYXRlZ29yeV0udGl0bGUgPSBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VDYXRlZ29yaWVzW2NhdGVnb3J5XS50aXRsZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQor ICAgICAgICByZXR1cm4gdGhpcy5fY2F0ZWdvcmllczsgCisgICAgfSwKIAogICAgIGZpbHRlcjog ZnVuY3Rpb24gKGNhdGVnb3J5KSB7CiAgICAgICAgIGlmICh0aGlzLl9maWx0ZXJDYXRlZ29yeSAm JiB0aGlzLl9maWx0ZXJDYXRlZ29yeSA9PT0gY2F0ZWdvcnkpCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU3VtbWFyeUJhci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TdW1tYXJ5QmFyLmpzCmluZGV4IDEzMjhjZWEuLmJiZjJiMWEgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdW1tYXJ5QmFyLmpzCisrKyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TdW1tYXJ5QmFyLmpzCkBAIC0yNywxMCArMjcsOSBAQAogICog VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3IuU3VtbWFyeUJhciA9IGZ1bmN0aW9uKGNhdGVn b3J5Q29sb3JzLCBjYXRlZ29yeU9yZGVyKQorV2ViSW5zcGVjdG9yLlN1bW1hcnlCYXIgPSBmdW5j dGlvbihjYXRlZ29yaWVzKQogewotICAgIHRoaXMuY2F0ZWdvcnlDb2xvcnMgPSBjYXRlZ29yeUNv bG9yczsKLSAgICB0aGlzLmNhdGVnb3J5T3JkZXIgPSBjYXRlZ29yeU9yZGVyOworICAgIHRoaXMu Y2F0ZWdvcmllcyA9IGNhdGVnb3JpZXM7CiAKICAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInN1bW1h cnktYmFyIjsKQEAgLTcwLDE5ICs2OSwxOCBAQCBXZWJJbnNwZWN0b3IuU3VtbWFyeUJhci5wcm90 b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5sZWdlbmRFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7 CiAKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLmNhdGVnb3J5T3JkZXIubGVuZ3Ro OyArK2kpIHsKLSAgICAgICAgICAgIHZhciBjYXRlZ29yeSA9IHRoaXMuY2F0ZWdvcnlPcmRlcltp XTsKKyAgICAgICAgZm9yICh2YXIgY2F0ZWdvcnkgaW4gdGhpcy5jYXRlZ29yaWVzKSB7CiAgICAg ICAgICAgICB2YXIgc2l6ZSA9IGdyYXBoSW5mby5jYXRlZ29yeVZhbHVlc1tjYXRlZ29yeV07CiAg ICAgICAgICAgICBpZiAoIXNpemUpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAg ICAgICAgIHZhciBjb2xvciA9IHRoaXMuY2F0ZWdvcnlDb2xvcnNbY2F0ZWdvcnldOworICAgICAg ICAgICAgdmFyIGNvbG9yID0gdGhpcy5jYXRlZ29yaWVzW2NhdGVnb3J5XS5jb2xvcjsKICAgICAg ICAgICAgIHZhciBjb2xvclN0cmluZyA9ICJyZ2IoIiArIGNvbG9yLnIgKyAiLCAiICsgY29sb3Iu ZyArICIsICIgKyBjb2xvci5iICsgIikiOwogCiAgICAgICAgICAgICB2YXIgZmlsbFNlZ21lbnQg PSB7Y29sb3I6IGNvbG9yU3RyaW5nLCB2YWx1ZTogc2l6ZX07CiAgICAgICAgICAgICBmaWxsU2Vn bWVudHMucHVzaChmaWxsU2VnbWVudCk7CiAKLSAgICAgICAgICAgIHZhciBsZWdlbmRMYWJlbCA9 IHRoaXMuX21ha2VMZWdlbmRFbGVtZW50KFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3JpZXNb Y2F0ZWdvcnldLnRpdGxlLCB0aGlzLmNhbGN1bGF0b3IuZm9ybWF0VmFsdWUoc2l6ZSksIGNvbG9y U3RyaW5nKTsKKyAgICAgICAgICAgIHZhciBsZWdlbmRMYWJlbCA9IHRoaXMuX21ha2VMZWdlbmRF bGVtZW50KHRoaXMuY2F0ZWdvcmllc1tjYXRlZ29yeV0udGl0bGUsIHRoaXMuY2FsY3VsYXRvci5m b3JtYXRWYWx1ZShzaXplKSwgY29sb3JTdHJpbmcpOwogICAgICAgICAgICAgdGhpcy5sZWdlbmRF bGVtZW50LmFwcGVuZENoaWxkKGxlZ2VuZExhYmVsKTsKICAgICAgICAgfQogCg==