84447 2012-04-20 06:52:14 -0700 Web Inspector: follow up to r114729: more @return annotations added. 2012-04-20 09:28:23 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 606553 0 pfeldman 2012-04-20 06:52:14 -0700 Patch to follow. 606555 1 138087 pfeldman 2012-04-20 06:54:20 -0700 Created attachment 138087 Patch 606626 2 138087 yurys 2012-04-20 09:17:44 -0700 Comment on attachment 138087 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138087&action=review > Source/WebCore/inspector/front-end/Resource.js:54 > + /** @type {?string} */ this._content; Type annotation should go above the field and the field should be initialized here. > Source/WebCore/inspector/front-end/ResourceUtils.js:113 > + var parsedURL = new WebInspector.ParsedURL(this.toString()); Why do you need to call toString()? Would @this {string} annotation help? 606635 3 pfeldman 2012-04-20 09:28:23 -0700 Committed r114754: <http://trac.webkit.org/changeset/114754> 138087 2012-04-20 06:54:20 -0700 2012-04-20 09:17:44 -0700 Patch bug-84447-20120420175418.patch text/plain 7451 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTQ0MTBlM2QwN2QzM2M5 YmEwNzYwYjczOWI1MmU5ODEwM2ZmOGI2Yi4uYzM4YWZkZjg2OTJhNDFmYTk2YzJhZTg5ZmMzNjFl MGNkOTY3NTRiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDEyLTA0LTIwICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGZvbGxvdyB1cCB0byByMTE0NzI5OiBtb3JlIEByZXR1cm4gYW5ub3RhdGlvbnMgYWRkZWQu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQ0Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJj ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lvbi5wcm90b3R5cGUuZ2V0 IGNvbnRlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9k ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRnJhbWUucHJvdG90eXBl Ll9hZGRSZXF1ZXN0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRp bHMuanM6CisgICAgICAgIChTdHJpbmcucHJvdG90eXBlLmFzUGFyc2VkVVJMKToKKworMjAxMi0w NC0yMCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBleHRyYWN0IE5hdmlnYXRvclZpZXcgYW5kIE5hdmlnYXRvck92ZXJsYXlD b250cm9sbGVyIGZyb20gU2NyaXB0c05hdmlnYXRvci4KICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NDQxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4IDE3YTQ5OWU5YzJmZWRmYjRmNTMzZjI5 MzNmZTBmYTUzOTM5ODdlNDguLjA1NmNhZGFkYzIwMmIwZjM4NzNlZDk0ZDEyMjk1NGE1YjJlZDIy ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5q cwpAQCAtMzUsOCArMzUsOCBAQAogICogQHBhcmFtIHtzdHJpbmd9IGRvY3VtZW50VVJMCiAgKiBA cGFyYW0ge05ldHdvcmtBZ2VudC5GcmFtZUlkfSBmcmFtZUlkCiAgKiBAcGFyYW0ge05ldHdvcmtB Z2VudC5Mb2FkZXJJZH0gbG9hZGVySWQKLSAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlJlc291cmNl VHlwZT19IHR5cGUKLSAqIEBwYXJhbSB7c3RyaW5nPX0gbWltZVR5cGUKKyAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLlJlc291cmNlVHlwZX0gdHlwZQorICogQHBhcmFtIHtzdHJpbmd9IG1pbWVUeXBl CiAgKi8KIFdlYkluc3BlY3Rvci5SZXNvdXJjZSA9IGZ1bmN0aW9uKHJlcXVlc3QsIHVybCwgZG9j dW1lbnRVUkwsIGZyYW1lSWQsIGxvYWRlcklkLCB0eXBlLCBtaW1lVHlwZSkKIHsKQEAgLTUxLDgg KzUxLDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlID0gZnVuY3Rpb24ocmVxdWVzdCwgdXJsLCBk b2N1bWVudFVSTCwgZnJhbWVJZCwgbG9hZGVySWQsIHQKICAgICB0aGlzLl9taW1lVHlwZSA9IG1p bWVUeXBlOwogICAgIHRoaXMuaGlzdG9yeSA9IFtdOwogCi0gICAgdGhpcy5fY29udGVudCA9IHVu ZGVmaW5lZDsKLSAgICB0aGlzLl9jb250ZW50RW5jb2RlZCA9IHVuZGVmaW5lZDsKKyAgICAvKiog QHR5cGUgez9zdHJpbmd9ICovIHRoaXMuX2NvbnRlbnQ7CisgICAgLyoqIEB0eXBlIHtib29sZWFu fSAqLyB0aGlzLl9jb250ZW50RW5jb2RlZDsKICAgICB0aGlzLl9wZW5kaW5nQ29udGVudENhbGxi YWNrcyA9IFtdOwogfQogCkBAIC0xNTQsNyArMTU0LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl LkV2ZW50cyA9IHsKIAogV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAv KioKLSAgICAgKiBAdHlwZSB7P1dlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdH0KKyAgICAgKiBA cmV0dXJuIHs/V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0fQogICAgICAqLwogICAgIGdldCBy ZXF1ZXN0KCkKICAgICB7CkBAIC0xNjIsNyArMTYyLDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHR5cGUge3N0cmluZ30K KyAgICAgKiBAcmV0dXJuIHtzdHJpbmd9CiAgICAgICovCiAgICAgZ2V0IHVybCgpCiAgICAgewpA QCAtMTgxLDcgKzE4MSw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAg ICAgfSwKIAogICAgIC8qKgotICAgICAqIEB0eXBlIHtzdHJpbmd9CisgICAgICogQHJldHVybiB7 c3RyaW5nfQogICAgICAqLwogICAgIGdldCBkb2N1bWVudFVSTCgpCiAgICAgewpAQCAtMTg5LDcg KzE4OSw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAog ICAgIC8qKgotICAgICAqIEB0eXBlIHtOZXR3b3JrQWdlbnQuRnJhbWVJZH0KKyAgICAgKiBAcmV0 dXJuIHtOZXR3b3JrQWdlbnQuRnJhbWVJZH0KICAgICAgKi8KICAgICBnZXQgZnJhbWVJZCgpCiAg ICAgewpAQCAtMTk3LDcgKzE5Nyw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUg PSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEB0eXBlIHtOZXR3b3JrQWdlbnQuTG9hZGVy SWR9CisgICAgICogQHJldHVybiB7TmV0d29ya0FnZW50LkxvYWRlcklkfQogICAgICAqLwogICAg IGdldCBsb2FkZXJJZCgpCiAgICAgewpAQCAtMjA1LDcgKzIwNSw3IEBAIFdlYkluc3BlY3Rvci5S ZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEB0eXBlIHtz dHJpbmd9CisgICAgICogQHJldHVybiB7c3RyaW5nfQogICAgICAqLwogICAgIGdldCBkaXNwbGF5 TmFtZSgpCiAgICAgewpAQCAtMjEzLDcgKzIxMyw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5w cm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEB0eXBlIHtXZWJJbnNwZWN0 b3IuUmVzb3VyY2VUeXBlfQorICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5SZXNvdXJjZVR5 cGV9CiAgICAgICovCiAgICAgZ2V0IHR5cGUoKQogICAgIHsKQEAgLTIyMSw3ICsyMjEsNyBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAg ICAgKiBAdHlwZSB7c3RyaW5nfQorICAgICAqIEByZXR1cm4ge3N0cmluZ30KICAgICAgKi8KICAg ICBnZXQgbWltZVR5cGUoKQogICAgIHsKQEAgLTIyOSw3ICsyMjksNyBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAdHlwZSB7 QXJyYXkuPFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZT59CisgICAgICogQHJldHVybiB7QXJy YXkuPFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZT59CiAgICAgICovCiAgICAgZ2V0IG1lc3Nh Z2VzKCkKICAgICB7CkBAIC0yNTEsNyArMjUxLDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnBy b3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHR5cGUge251bWJlcn0KKyAg ICAgKiBAcmV0dXJuIHtudW1iZXJ9CiAgICAgICovCiAgICAgZ2V0IGVycm9ycygpCiAgICAgewpA QCAtMjY0LDcgKzI2NCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAg ICAgfSwKIAogICAgIC8qKgotICAgICAqIEB0eXBlIHtudW1iZXJ9CisgICAgICogQHJldHVybiB7 bnVtYmVyfQogICAgICAqLwogICAgIGdldCB3YXJuaW5ncygpCiAgICAgewpAQCAtMjg1LDcgKzI4 NSw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAg IC8qKgotICAgICAqIEB0eXBlIHtzdHJpbmd9CisgICAgICogQHJldHVybiB7P3N0cmluZ30KICAg ICAgKi8KICAgICBnZXQgY29udGVudCgpCiAgICAgewpAQCAtMjkzLDcgKzI5Myw3IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAq IEB0eXBlIHtzdHJpbmd9CisgICAgICogQHJldHVybiB7Ym9vbGVhbn0KICAgICAgKi8KICAgICBn ZXQgY29udGVudEVuY29kZWQoKQogICAgIHsKQEAgLTMwMSw3ICszMDEsNyBAQCBXZWJJbnNwZWN0 b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAdHlw ZSB7bnVtYmVyfQorICAgICAqIEByZXR1cm4ge251bWJlcn0KICAgICAgKi8KICAgICBnZXQgY29u dGVudFRpbWVzdGFtcCgpCiAgICAgewpAQCAtNDYyLDcgKzQ2Miw3IEBAIFdlYkluc3BlY3Rvci5S ZXNvdXJjZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5 cGU7CiAgKiBAY29uc3RydWN0b3IKICAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuQ29udGVu dFByb3ZpZGVyfQogICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2V9IHJlc291cmNlCi0g KiBAcGFyYW0ge3N0cmluZ3x1bmRlZmluZWR9IGNvbnRlbnQKKyAqIEBwYXJhbSB7P3N0cmluZ3x1 bmRlZmluZWR9IGNvbnRlbnQKICAqIEBwYXJhbSB7bnVtYmVyfSB0aW1lc3RhbXAKICAqLwogV2Vi SW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb24gPSBmdW5jdGlvbihyZXNvdXJjZSwgY29udGVudCwg dGltZXN0YW1wKQpAQCAtNDc0LDcgKzQ3NCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVJldmlz aW9uID0gZnVuY3Rpb24ocmVzb3VyY2UsIGNvbnRlbnQsIHRpbWVzdGFtcCkKIAogV2ViSW5zcGVj dG9yLlJlc291cmNlUmV2aXNpb24ucHJvdG90eXBlID0gewogICAgIC8qKgotICAgICAqIEB0eXBl IHtXZWJJbnNwZWN0b3IuUmVzb3VyY2V9CisgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlJl c291cmNlfQogICAgICAqLwogICAgIGdldCByZXNvdXJjZSgpCiAgICAgewpAQCAtNDgyLDcgKzQ4 Miw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVJldmlzaW9uLnByb3RvdHlwZSA9IHsKICAgICB9 LAogCiAgICAgLyoqCi0gICAgICogQHR5cGUge251bWJlcn0KKyAgICAgKiBAcmV0dXJuIHtudW1i ZXJ9CiAgICAgICovCiAgICAgZ2V0IHRpbWVzdGFtcCgpCiAgICAgewpAQCAtNDkwLDExICs0OTAs MTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb24ucHJvdG90eXBlID0gewogICAgIH0s CiAKICAgICAvKioKLSAgICAgKiBAdHlwZSB7c3RyaW5nfQorICAgICAqIEByZXR1cm4gez9zdHJp bmd9CiAgICAgICovCiAgICAgZ2V0IGNvbnRlbnQoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRo aXMuX2NvbnRlbnQ7CisgICAgICAgIHJldHVybiB0aGlzLl9jb250ZW50IHx8IG51bGw7CiAgICAg fSwKIAogICAgIHJldmVydFRvVGhpczogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKaW5kZXggOTY1 YTBiNDc4NGU1MGE2MmQ5MmIxNjIwYjIxZjkyZDAwM2FhYzNmMi4uYTIyNGE0Zjk5ZjM0YjQyMzk0 MGNlZjI4NGM3YzhlNTY1ZTBmMzdjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCkBAIC01NDIsNyArNTQyLDcg QEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIC8vIEFscmVhZHkgaW4gdGhlIHRyZWUsIHdlIGp1c3QgZ290IGFuIGV4dHJhIHVwZGF0ZS4K ICAgICAgICAgICAgIHJldHVybiByZXNvdXJjZTsKICAgICAgICAgfQotICAgICAgICByZXNvdXJj ZSA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2UocmVxdWVzdCwgcmVxdWVzdC51cmwsIHJlcXVl c3QuZG9jdW1lbnRVUkwsIHJlcXVlc3QuZnJhbWVJZCwgcmVxdWVzdC5sb2FkZXJJZCk7CisgICAg ICAgIHJlc291cmNlID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZShyZXF1ZXN0LCByZXF1ZXN0 LnVybCwgcmVxdWVzdC5kb2N1bWVudFVSTCwgcmVxdWVzdC5mcmFtZUlkLCByZXF1ZXN0LmxvYWRl cklkLCByZXF1ZXN0LnR5cGUsIHJlcXVlc3QubWltZVR5cGUpOwogICAgICAgICB0aGlzLl9yZXNv dXJjZXNNYXBbcmVzb3VyY2UudXJsXSA9IHJlc291cmNlOwogICAgICAgICB0aGlzLl9tb2RlbC5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2 ZW50VHlwZXMuUmVzb3VyY2VBZGRlZCwgcmVzb3VyY2UpOwogICAgICAgICByZXR1cm4gcmVzb3Vy Y2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlVXRpbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl VXRpbHMuanMKaW5kZXggMWRmNTViYzliOThhZTkwNzgyMGU0NmNmOWFiZjMzOGY5M2E0YmQ4Ni4u MjVkYzA0ZjQwNDlkYjkwZGZmYTJjMGJmZmQ2N2ZiMjI5YzE3ZjBmYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VVdGlscy5qcwpAQCAtMzAs NyArMzAsNyBAQAogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgotICogQHBhcmFtIHtTdHJpbmd8c3Ry aW5nfSB1cmwKKyAqIEBwYXJhbSB7c3RyaW5nfSB1cmwKICAqLwogV2ViSW5zcGVjdG9yLlBhcnNl ZFVSTCA9IGZ1bmN0aW9uKHVybCkKIHsKQEAgLTExMCw3ICsxMTAsNyBAQCBXZWJJbnNwZWN0b3Iu UGFyc2VkVVJMLnByb3RvdHlwZSA9IHsKICAqLwogU3RyaW5nLnByb3RvdHlwZS5hc1BhcnNlZFVS TCA9IGZ1bmN0aW9uKCkKIHsKLSAgICB2YXIgcGFyc2VkVVJMID0gbmV3IFdlYkluc3BlY3Rvci5Q YXJzZWRVUkwodGhpcyk7CisgICAgdmFyIHBhcnNlZFVSTCA9IG5ldyBXZWJJbnNwZWN0b3IuUGFy c2VkVVJMKHRoaXMudG9TdHJpbmcoKSk7CiAgICAgaWYgKHBhcnNlZFVSTC5pc1ZhbGlkKQogICAg ICAgICByZXR1cm4gcGFyc2VkVVJMOwogICAgIHJldHVybiBudWxsOwo=