32678 2009-12-17 12:33:52 -0800 Web Inspector: Do not lose original request for non-main resource redirects. 2009-12-22 08:21:30 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy webkit.review.bot oldest_to_newest 172912 0 pfeldman 2009-12-17 12:33:52 -0800 If an image source has redirects, information about these redirects' requests is currently being overwritten. 172916 1 45101 pfeldman 2009-12-17 12:49:21 -0800 Created attachment 45101 [PATCH] Proposed fix. 172920 2 webkit.review.bot 2009-12-17 12:51:07 -0800 style-queue ran check-webkit-style on attachment 45101 without any errors. 172945 3 45101 pfeldman 2009-12-17 14:03:18 -0800 Comment on attachment 45101 [PATCH] Proposed fix. I'll land this manually. 174274 4 pfeldman 2009-12-22 08:21:30 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorResource.cpp M WebCore/inspector/front-end/Resource.js M WebCore/inspector/front-end/inspector.js Committed r52487 45101 2009-12-17 12:49:21 -0800 2009-12-17 14:03:18 -0800 [PATCH] Proposed fix. redirect_resource text/plain 5436 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzhiOThkZi4uNDRiMGJiMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0xMi0xNyAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBEbyBub3QgbG9zZSBvcmlnaW5hbCBy ZXF1ZXN0IGZvciBub24tbWFpbiByZXNvdXJjZSByZWRpcmVjdHMuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyNjc4CisKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y UmVzb3VyY2U6OmFwcGVuZFJlZGlyZWN0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci51cGRhdGVSZXNvdXJjZSk6CisKIDIwMDktMTItMTcgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFy b25Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0 aWFuc2VuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2Uu Y3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2UuY3BwCmluZGV4IDFlNGZj OTIuLjE5MWQyNzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291 cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5jcHAKQEAg LTc5LDYgKzc5LDggQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JSZXNvdXJjZT4gSW5zcGVjdG9yUmVz b3VyY2U6OmFwcGVuZFJlZGlyZWN0KHVuc2lnbmVkIGxvbmcgaWQKICAgICByZWRpcmVjdC0+bV9j aGFuZ2VzLnNldChSZWRpcmVjdHNDaGFuZ2UpOwogCiAgICAgbV9pZGVudGlmaWVyID0gaWRlbnRp ZmllcjsKKyAgICAvLyBSZS1zZW5kIHJlcXVlc3QgaW5mbyB3aXRoIG5ldyBpZC4KKyAgICBtX2No YW5nZXMuc2V0KFJlcXVlc3RDaGFuZ2UpOwogICAgIG1fcmVkaXJlY3RzLmNsZWFyKCk7CiAgICAg cmV0dXJuIHJlZGlyZWN0OwogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpz CmluZGV4IGNlMWVmOTUuLmQyOTJlMTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2UuanMKQEAgLTI2LDI3ICsyNiwxNyBAQAogICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1XZWJJbnNw ZWN0b3IuUmVzb3VyY2UgPSBmdW5jdGlvbihyZXF1ZXN0SGVhZGVycywgdXJsLCBkb2N1bWVudFVS TCwgZG9tYWluLCBwYXRoLCBsYXN0UGF0aENvbXBvbmVudCwgaWRlbnRpZmllciwgbWFpblJlc291 cmNlLCBjYWNoZWQsIHJlcXVlc3RNZXRob2QsIHJlcXVlc3RGb3JtRGF0YSkKK1dlYkluc3BlY3Rv ci5SZXNvdXJjZSA9IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHVybCkKIHsKICAgICB0aGlzLmlkZW50 aWZpZXIgPSBpZGVudGlmaWVyOwotCi0gICAgdGhpcy5zdGFydFRpbWUgPSAtMTsKLSAgICB0aGlz LmVuZFRpbWUgPSAtMTsKLSAgICB0aGlzLm1haW5SZXNvdXJjZSA9IG1haW5SZXNvdXJjZTsKLSAg ICB0aGlzLnJlcXVlc3RIZWFkZXJzID0gcmVxdWVzdEhlYWRlcnM7Ci0gICAgdGhpcy51cmwgPSB1 cmw7Ci0gICAgdGhpcy5kb2N1bWVudFVSTCA9IGRvY3VtZW50VVJMOwotICAgIHRoaXMuZG9tYWlu ID0gZG9tYWluOwotICAgIHRoaXMucGF0aCA9IHBhdGg7Ci0gICAgdGhpcy5sYXN0UGF0aENvbXBv bmVudCA9IGxhc3RQYXRoQ29tcG9uZW50OwotICAgIHRoaXMuY2FjaGVkID0gY2FjaGVkOwotICAg IHRoaXMucmVxdWVzdE1ldGhvZCA9IHJlcXVlc3RNZXRob2QgfHwgIiI7Ci0gICAgdGhpcy5yZXF1 ZXN0Rm9ybURhdGEgPSByZXF1ZXN0Rm9ybURhdGEgfHwgIiI7Ci0KLSAgICB0aGlzLmNhdGVnb3J5 ID0gV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0ZWdvcmllcy5vdGhlcjsKKyAgICB0aGlzLl91cmwg PSB1cmw7CisgICAgdGhpcy5fc3RhcnRUaW1lID0gLTE7CisgICAgdGhpcy5fZW5kVGltZSA9IC0x OworICAgIHRoaXMuX3JlcXVlc3RNZXRob2QgPSAiIjsKKyAgICB0aGlzLl9yZXF1ZXN0Rm9ybURh dGEgPSAiIjsKKyAgICB0aGlzLl9jYXRlZ29yeSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVn b3JpZXMub3RoZXI7CiB9CiAKLQogV2ViSW5zcGVjdG9yLlJlc291cmNlLlN0YXR1c1RleHQgPSB7 CiAgICAgMTAwOiAiQ29udGludWUiLAogICAgIDEwMTogIlN3aXRjaGluZyBQcm90b2NvbHMiLApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggMmMwNGVkNi4uMjk5 MzAyOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q cworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBAIC05NjIs MzYgKzk2Miw2IEBAIFdlYkluc3BlY3Rvci5zaG93Q29uc29sZVBhbmVsID0gZnVuY3Rpb24oKQog ICAgIHRoaXMuY3VycmVudFBhbmVsID0gdGhpcy5wYW5lbHMuY29uc29sZTsKIH0KIAotV2ViSW5z cGVjdG9yLl9hZGRSZXNvdXJjZSA9IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHBheWxvYWQpCi17Ci0g ICAgdmFyIHJlc291cmNlID0gbmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZSgKLSAgICAgICAgcGF5 bG9hZC5yZXF1ZXN0SGVhZGVycywKLSAgICAgICAgcGF5bG9hZC51cmwsCi0gICAgICAgIHBheWxv YWQuZG9jdW1lbnRVUkwsCi0gICAgICAgIHBheWxvYWQuaG9zdCwKLSAgICAgICAgcGF5bG9hZC5w YXRoLAotICAgICAgICBwYXlsb2FkLmxhc3RQYXRoQ29tcG9uZW50LAotICAgICAgICBpZGVudGlm aWVyLAotICAgICAgICBwYXlsb2FkLm1haW5SZXNvdXJjZSwKLSAgICAgICAgcGF5bG9hZC5jYWNo ZWQsCi0gICAgICAgIHBheWxvYWQucmVxdWVzdE1ldGhvZCwKLSAgICAgICAgcGF5bG9hZC5yZXF1 ZXN0Rm9ybURhdGEpOwotICAgIHRoaXMucmVzb3VyY2VzW2lkZW50aWZpZXJdID0gcmVzb3VyY2U7 Ci0gICAgdGhpcy5yZXNvdXJjZVVSTE1hcFtyZXNvdXJjZS51cmxdID0gcmVzb3VyY2U7Ci0KLSAg ICBpZiAocmVzb3VyY2UubWFpblJlc291cmNlKQotICAgICAgICB0aGlzLm1haW5SZXNvdXJjZSA9 IHJlc291cmNlOwotCi0gICAgaWYgKHRoaXMucGFuZWxzLnJlc291cmNlcykKLSAgICAgICAgdGhp cy5wYW5lbHMucmVzb3VyY2VzLmFkZFJlc291cmNlKHJlc291cmNlKTsKLQotICAgIHZhciBtYXRj aCA9IHBheWxvYWQuZG9jdW1lbnRVUkwubWF0Y2goL14oaHR0cFtzXT98ZmlsZSk6XC9cLyhbXC9d KlteXC9dKykvaSk7Ci0gICAgaWYgKG1hdGNoKQotICAgICAgICB0aGlzLmFkZENvb2tpZURvbWFp bihtYXRjaFsxXS50b0xvd2VyQ2FzZSgpID09PSAiZmlsZSIgPyAiIiA6IG1hdGNoWzJdKTsKLQot ICAgIHJldHVybiByZXNvdXJjZTsKLX0KLQogV2ViSW5zcGVjdG9yLmNsZWFyQ29uc29sZU1lc3Nh Z2VzID0gZnVuY3Rpb24oKQogewogICAgIFdlYkluc3BlY3Rvci5jb25zb2xlLmNsZWFyTWVzc2Fn ZXMoZmFsc2UpOwpAQCAtMTAxMywxMyArOTgzLDE0IEBAIFdlYkluc3BlY3Rvci51cGRhdGVSZXNv dXJjZSA9IGZ1bmN0aW9uKGlkZW50aWZpZXIsIHBheWxvYWQpCiB7CiAgICAgdmFyIHJlc291cmNl ID0gdGhpcy5yZXNvdXJjZXNbaWRlbnRpZmllcl07CiAgICAgaWYgKCFyZXNvdXJjZSkgewotICAg ICAgICByZXNvdXJjZSA9IHRoaXMuX2FkZFJlc291cmNlKGlkZW50aWZpZXIsIHBheWxvYWQpOwot ICAgICAgICAvLyBSZXF1ZXN0IGluZm8gaXMgYWxyZWFkeSBwb3B1bGF0ZWQgaW4gY29uc3RydWN0 b3IuCi0gICAgICAgIHBheWxvYWQuZGlkUmVxdWVzdENoYW5nZSA9IGZhbHNlOworICAgICAgICBy ZXNvdXJjZSA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2UoaWRlbnRpZmllciwgcGF5bG9hZC51 cmwpOworICAgICAgICB0aGlzLnJlc291cmNlc1tpZGVudGlmaWVyXSA9IHJlc291cmNlOworICAg ICAgICB0aGlzLnJlc291cmNlVVJMTWFwW3Jlc291cmNlLnVybF0gPSByZXNvdXJjZTsKKyAgICAg ICAgaWYgKHRoaXMucGFuZWxzLnJlc291cmNlcykKKyAgICAgICAgICAgIHRoaXMucGFuZWxzLnJl c291cmNlcy5hZGRSZXNvdXJjZShyZXNvdXJjZSk7CiAgICAgfQogCiAgICAgaWYgKHBheWxvYWQu ZGlkUmVxdWVzdENoYW5nZSkgewotICAgICAgICByZXNvdXJjZS51cmwgPSBwYXlsb2FkLnVybDsK ICAgICAgICAgcmVzb3VyY2UuaG9zdCA9IHBheWxvYWQuZG9tYWluOwogICAgICAgICByZXNvdXJj ZS5wYXRoID0gcGF5bG9hZC5wYXRoOwogICAgICAgICByZXNvdXJjZS5sYXN0UGF0aENvbXBvbmVu dCA9IHBheWxvYWQubGFzdFBhdGhDb21wb25lbnQ7CkBAIC0xMDI3LDYgKzk5OCwxNSBAQCBXZWJJ bnNwZWN0b3IudXBkYXRlUmVzb3VyY2UgPSBmdW5jdGlvbihpZGVudGlmaWVyLCBwYXlsb2FkKQog ICAgICAgICByZXNvdXJjZS5tYWluUmVzb3VyY2UgPSBwYXlsb2FkLm1haW5SZXNvdXJjZTsKICAg ICAgICAgcmVzb3VyY2UucmVxdWVzdE1ldGhvZCA9IHBheWxvYWQucmVxdWVzdE1ldGhvZDsKICAg ICAgICAgcmVzb3VyY2UucmVxdWVzdEZvcm1EYXRhID0gcGF5bG9hZC5yZXF1ZXN0Rm9ybURhdGE7 CisgICAgICAgIHJlc291cmNlLmNhY2hlZCA9IHBheWxvYWQuY2FjaGVkOworICAgICAgICByZXNv dXJjZS5kb2N1bWVudFVSTCA9IHBheWxvYWQuZG9jdW1lbnRVUkw7CisKKyAgICAgICAgaWYgKHJl c291cmNlLm1haW5SZXNvdXJjZSkKKyAgICAgICAgICAgIHRoaXMubWFpblJlc291cmNlID0gcmVz b3VyY2U7CisKKyAgICAgICAgdmFyIG1hdGNoID0gcGF5bG9hZC5kb2N1bWVudFVSTC5tYXRjaCgv XihodHRwW3NdP3xmaWxlKTpcL1wvKFtcL10qW15cL10rKS9pKTsKKyAgICAgICAgaWYgKG1hdGNo KQorICAgICAgICAgICAgdGhpcy5hZGRDb29raWVEb21haW4obWF0Y2hbMV0udG9Mb3dlckNhc2Uo KSA9PT0gImZpbGUiID8gIiIgOiBtYXRjaFsyXSk7CiAgICAgfQogCiAgICAgaWYgKHBheWxvYWQu ZGlkUmVzcG9uc2VDaGFuZ2UpIHsK