83896 2012-04-13 08:32:25 -0700 Web Inspector: do not attempt to load content from resource until request finished loading. 2012-04-13 08:41:55 -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 602098 0 pfeldman 2012-04-13 08:32:25 -0700 When we stop in the in the inline script on reload, we should only show concatenated script content. When we resume, we should replace UI source code with the actual HTML content. We should not attempt to fetch resource content until request finished loading. I regressed it in the Request extraction and now am bringing it back. 602105 1 137089 pfeldman 2012-04-13 08:34:03 -0700 Created attachment 137089 Patch 602112 2 137089 podivilov 2012-04-13 08:35:53 -0700 Comment on attachment 137089 Patch lgtm 602116 3 pfeldman 2012-04-13 08:41:55 -0700 Committed r114135: <http://trac.webkit.org/changeset/114135> 137089 2012-04-13 08:34:03 -0700 2012-04-13 08:39:32 -0700 Patch bug-83896-20120413193359.patch text/plain 5340 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRjNjNkZmQzOWM0OWJh YTc5MTc0M2EzNmM4NDgwNDAxMDcwM2QxNi4uODA3MTgzOGJkOWQzZTc2MTM3ZWM0NmQ1YjliYzI0 ZWQyNDM1NDc0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEyLTA0LTEzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGRvIG5vdCBhdHRlbXB0IHRvIGxvYWQgY29udGVudCBmcm9tIHJlc291cmNlIHVudGlsIHJl cXVlc3QgZmluaXNoZWQgbG9hZGluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTgzODk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2hlbiB3ZSBzdG9wIGluIHRoZSBpbiB0aGUgaW5saW5lIHNjcmlwdCBv biByZWxvYWQsIHdlIHNob3VsZCBvbmx5IHNob3cgY29uY2F0ZW5hdGVkIHNjcmlwdCBjb250ZW50 LgorICAgICAgICBXaGVuIHdlIHJlc3VtZSwgd2Ugc2hvdWxkIHJlcGxhY2UgVUkgc291cmNlIGNv ZGUgd2l0aCB0aGUgYWN0dWFsIEhUTUwgY29udGVudC4gV2Ugc2hvdWxkIG5vdCBhdHRlbXB0IHRv CisgICAgICAgIGZldGNoIHJlc291cmNlIGNvbnRlbnQgdW50aWwgcmVxdWVzdCBmaW5pc2hlZCBs b2FkaW5nLiBJIHJlZ3Jlc3NlZCBpdCBpbiB0aGUgUmVxdWVzdCBleHRyYWN0aW9uCisgICAgICAg IGFuZCBub3cgYW0gYnJpbmdpbmcgaXQgYmFjay4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvUmF3U291cmNlQ29kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VD b2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5fZmlu aXNoZWRMb2FkaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlU2Ny aXB0TWFwcGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdE1hcHBp bmcucHJvdG90eXBlLmFkZFNjcmlwdCk6CisKKzIwMTItMDQtMTMgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogZm9sbG93IHVw IHRvIHIxMTQxMTYgLSBmaXhpbmcgUVQgdGVzdAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM4OTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SYXdTb3VyY2VDb2RlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SYXdTb3VyY2VDb2RlLmpzCmluZGV4IDRiOTViMWM2OThkY2IxZTA4 YzExMzI5MDFlNDMzYjc0MjM4NDlhYTAuLmQ3NmU1MzZjZWExMjBmZTFkNTc2YTIwOTcyOGNhZDQz NjcwMGM0MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmF3U291cmNlQ29kZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Jhd1NvdXJjZUNvZGUuanMKQEAgLTU1LDcgKzU1LDcgQEAgV2ViSW5zcGVjdG9yLlJhd1NvdXJj ZUNvZGUgPSBmdW5jdGlvbihpZCwgc2NyaXB0LCByZXNvdXJjZSwgcmVxdWVzdCwgZm9ybWF0dGVy LAogICAgIHRoaXMuX2hhc05ld1NjcmlwdHMgPSB0cnVlOwogCiAgICAgaWYgKHRoaXMuX3BlbmRp bmdSZXF1ZXN0KQotICAgICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5SZXNv dXJjZUFkZGVkLCB0aGlzLl9yZXNvdXJjZUFkZGVkLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fcGVu ZGluZ1JlcXVlc3QuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3Qu RXZlbnRzLkZpbmlzaGVkTG9hZGluZywgdGhpcy5fZmluaXNoZWRMb2FkaW5nLCB0aGlzKTsKICAg ICBlbHNlCiAgICAgICAgIHRoaXMuX3VwZGF0ZVNvdXJjZU1hcHBpbmcoKTsKIH0KQEAgLTExOSwx MyArMTE5LDkgQEAgV2ViSW5zcGVjdG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLl91cGRhdGVTb3VyY2VNYXBwaW5nKCk7CiAgICAgfSwKIAotICAgIF9yZXNvdXJj ZUFkZGVkOiBmdW5jdGlvbihldmVudCkKKyAgICBfZmluaXNoZWRMb2FkaW5nOiBmdW5jdGlvbihl dmVudCkKICAgICB7Ci0gICAgICAgIHZhciByZXNvdXJjZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVj dG9yLlJlc291cmNlfSAqLyBldmVudC5kYXRhOwotICAgICAgICBpZiAocmVzb3VyY2UucmVxdWVz dCAhPT0gdGhpcy5fcGVuZGluZ1JlcXVlc3QpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAg ICAgdGhpcy5fcmVzb3VyY2UgPSByZXNvdXJjZTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2UgPSBX ZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwodGhpcy5fcGVuZGluZ1JlcXVlc3QudXJsKTsKICAg ICAgICAgZGVsZXRlIHRoaXMuX3BlbmRpbmdSZXF1ZXN0OwogICAgICAgICB0aGlzLl91cGRhdGVT b3VyY2VNYXBwaW5nKCk7CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VTY3JpcHRNYXBwaW5nLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKaW5kZXggZmZkNjQw MWU5OTE4ZWM0MzlkOTI0YzJmYWI4ODc5MzhjYjY0NjRhYS4uYmRmMzhlZmU5ZTI4YjZhNmZhMTM5 Nzc2ZWM2ZWNkZWRhZWM3Y2NiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMKQEAgLTkzLDYgKzkz LDkgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTChzY3JpcHQu c291cmNlVVJMKTsKICAgICAgICAgICAgIGlmIChyZXNvdXJjZSAmJiByZXNvdXJjZS50eXBlICE9 PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5Eb2N1bWVudCkKICAgICAgICAgICAgICAgICBy ZXNvdXJjZSA9IG51bGw7CisgICAgICAgICAgICAvLyBJZ25vcmUgcmVzb3VyY2UgaW4gY2FzZSBp dCBoYXMgbm90IHlldCBmaW5pc2hlZCBsb2FkaW5nLgorICAgICAgICAgICAgaWYgKHJlc291cmNl ICYmIHJlc291cmNlLnJlcXVlc3QgJiYgIXJlc291cmNlLnJlcXVlc3QuZmluaXNoZWQpCisgICAg ICAgICAgICAgICAgcmVzb3VyY2UgPSBudWxsOwogICAgICAgICAgICAgaWYgKCFyZXNvdXJjZSkg ewogICAgICAgICAgICAgICAgIC8vIFdoZW4gdGhlcmUgaXMgbm8gcmVzb3VyY2UsIGxvb2t1cCBp bi1mbGlnaHQgcmVxdWVzdHMgb2YgdHlwZSBEb2N1bWVudC4KICAgICAgICAgICAgICAgICByZXF1 ZXN0ID0gV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLmluZmxpZ2h0UmVxdWVzdEZvclVSTChz Y3JpcHQuc291cmNlVVJMKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlZTYwYjk5YmZlNWUxMTg0ZGZmNDVkYWIxYTc3M2Vi YzQ0YjU3YmE3Li4zOTNjNTI5NzQ4NTdmMmI0MmU3NDU3YTJhMDBiN2RiOGVlYjIyNGViIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDUgKzEsMTQgQEAKIDIwMTItMDQtMTMgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBj aHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZG8gbm90IGF0dGVtcHQgdG8g bG9hZCBjb250ZW50IGZyb20gcmVzb3VyY2UgdW50aWwgcmVxdWVzdCBmaW5pc2hlZCBsb2FkaW5n LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM4OTYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3Bl Y3Rvci9kZWJ1Z2dlci9yYXctc291cmNlLWNvZGUuaHRtbDoKKworMjAxMi0wNC0xMyAgUGF2ZWwg RmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9y OiBmb2xsb3cgdXAgdG8gcjExNDExNiAtIGZpeGluZyBRVCB0ZXN0CiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mzg5MgogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcmF3LXNvdXJjZS1jb2RlLmh0bWwgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcmF3LXNvdXJjZS1jb2RlLmh0bWwKaW5kZXggNmE1MGY0 ZThiNmRmYzY4OWI5ZDBmZWM1YjU0NTZkZGYyYTc0ODllMC4uNmI2ZjEzMjI0MDFiZTU4YTU5OTA4 NDNiOWE2MDNiNmE1NmRjOGNkNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL3Jhdy1zb3VyY2UtY29kZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9yYXctc291cmNlLWNvZGUuaHRtbApAQCAtMzcsNyArMzcsNyBAQCBmdW5jdGlvbiB0 ZXN0KCkKICAgICAgICAgcmV0dXJuIHJlcXVlc3Q7CiAgICAgfQogCi0gICAgZnVuY3Rpb24gZmlu aXNoUmVxdWVzdChyZXF1ZXN0KSB7IFdlYkluc3BlY3Rvci5uZXR3b3JrTWFuYWdlci5fZGlzcGF0 Y2hlci5fZmluaXNoTmV0d29ya1JlcXVlc3QocmVxdWVzdCk7IH0KKyAgICBmdW5jdGlvbiBmaW5p c2hSZXF1ZXN0KHJlcXVlc3QpIHsgV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLl9kaXNwYXRj aGVyLl91cGRhdGVOZXR3b3JrUmVxdWVzdChyZXF1ZXN0KTsgV2ViSW5zcGVjdG9yLm5ldHdvcmtN YW5hZ2VyLl9kaXNwYXRjaGVyLl9maW5pc2hOZXR3b3JrUmVxdWVzdChyZXF1ZXN0KTsgfQogICAg IGZ1bmN0aW9uIGNyZWF0ZVBlbmRpbmdSZXF1ZXN0TW9jayh0eXBlLCBjb250ZW50KSB7IHJldHVy biBjcmVhdGVSZXF1ZXN0TW9jayh0eXBlLCBmYWxzZSwgY29udGVudCk7IH0KICAgICBmdW5jdGlv biBjcmVhdGVGaW5pc2hlZFJlcXVlc3RNb2NrKHR5cGUsIGNvbnRlbnQpIHsgcmV0dXJuIGNyZWF0 ZVJlcXVlc3RNb2NrKHR5cGUsIHRydWUsIGNvbnRlbnQpOyB9CiAK