36188 2010-03-16 13:44:14 -0700 Web Inspector: Capture main resource load events in timeline panel. 2010-03-17 02:57:37 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman loislo timothy oldest_to_newest 200405 0 pfeldman 2010-03-16 13:44:14 -0700 Currently didCommitLoad resets timeline and sent request / receive response events are wiped out. This patch fixes it. Also has a drive-by fix for send request friendly url shortcut. 200407 1 50829 pfeldman 2010-03-16 13:46:42 -0700 Created attachment 50829 [PATCH] Proposed fix. 200633 2 pfeldman 2010-03-17 02:57:37 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/TimelinePanel.js Committed r56103 50829 2010-03-16 13:46:42 -0700 2010-03-16 13:47:29 -0700 [PATCH] Proposed fix. main_resource_load text/plain 3774 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmFmMzJjNi4uNmJmNmY5OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wMy0xNiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDYXB0dXJlIG1haW4gcmVzb3VyY2Ug bG9hZCBldmVudHMgaW4gdGltZWxpbmUgcGFuZWwuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MTg4CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbC5wcm90b3R5cGUuX2NyZWF0ZVN0YXR1c2JhckJ1dHRvbnMpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl90b2dnbGVUaW1lbGluZUJ1dHRvbkNsaWNr ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLnRpbWVs aW5lV2FzU3RvcHBlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90 b3R5cGUuYWRkUmVjb3JkVG9UaW1lbGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVQYW5lbC5wcm90b3R5cGUuX2NsZWFyUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRp bWVsaW5lUGFuZWwuRm9ybWF0dGVkUmVjb3JkKToKKwogMjAxMC0wMy0xNiAgSmFrdWIgV2llY3pv cmVrICA8andpZWN6b3Jla0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMg U2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5l UGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwpp bmRleCBkZGRkYmQ1Li5lY2Q5YTBjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VGltZWxpbmVQYW5lbC5qcwpAQCAtMTUxLDE1ICsxNTEsMTcgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnRvZ2dsZVRpbWVsaW5lQnV0dG9u LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fdG9nZ2xlVGltZWxpbmVCdXR0b25DbGlj a2VkLmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgICAgICB0aGlzLmNsZWFyQnV0dG9uID0gbmV3 IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oIiIsICJ0aW1lbGluZS1jbGVhci1zdGF0dXMt YmFyLWl0ZW0iKTsKLSAgICAgICAgdGhpcy5jbGVhckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsIHRoaXMucmVzZXQuYmluZCh0aGlzKSwgZmFsc2UpOworICAgICAgICB0aGlzLmNsZWFy QnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fY2xlYXJQYW5lbC5iaW5kKHRo aXMpLCBmYWxzZSk7CiAgICAgfSwKIAogICAgIF90b2dnbGVUaW1lbGluZUJ1dHRvbkNsaWNrZWQ6 IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICh0aGlzLnRvZ2dsZVRpbWVsaW5lQnV0dG9u LnRvZ2dsZWQpCiAgICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnN0b3BUaW1lbGluZVByb2Zp bGVyKCk7Ci0gICAgICAgIGVsc2UKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICB0aGlzLl9j bGVhclBhbmVsKCk7CiAgICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnN0YXJ0VGltZWxpbmVQ cm9maWxlcigpOworICAgICAgICB9CiAgICAgfSwKIAogICAgIHRpbWVsaW5lV2FzU3RhcnRlZDog ZnVuY3Rpb24oKQpAQCAtMTc0LDYgKzE3NiwxNSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5l bC5wcm90b3R5cGUgPSB7CiAKICAgICBhZGRSZWNvcmRUb1RpbWVsaW5lOiBmdW5jdGlvbihyZWNv cmQpCiAgICAgeworICAgICAgICBpZiAocmVjb3JkLnR5cGUgPT0gV2ViSW5zcGVjdG9yLlRpbWVs aW5lQWdlbnQuUmVjb3JkVHlwZS5SZXNvdXJjZVNlbmRSZXF1ZXN0ICYmIHJlY29yZC5kYXRhLmlz TWFpblJlc291cmNlKSB7CisgICAgICAgICAgICBpZiAodGhpcy5fbWFpblJlc291cmNlSWRlbnRp ZmllciAhPSByZWNvcmQuZGF0YS5pZGVudGlmaWVyKSB7CisgICAgICAgICAgICAgICAgLy8gV2Ug YXJlIGxvYWRpbmcgbmV3IG1haW4gcmVzb3VyY2UgLT4gY2xlYXIgdGhlIHBhbmVsLiBDaGVjayBh Ym92ZSBpcyBuZWNlc3Nhcnkgc2luY2UKKyAgICAgICAgICAgICAgICAvLyB0aGVyZSBtYXkgYmUg c2V2ZXJhbCByZXNvdXJjZSBsb2FkcyB3aXRoIG1haW4gcmVzb3VyY2UgbWFya2VyIHVwb24gcmVk aXJlY3RzLCByZWRpcmVjdHMgYXJlIHJlcG9ydGVkIHdpdGgKKyAgICAgICAgICAgICAgICAvLyB0 aGUgb3JpZ2luYWwgaWRlbnRpZmllci4KKyAgICAgICAgICAgICAgICB0aGlzLl9tYWluUmVzb3Vy Y2VJZGVudGlmaWVyID0gcmVjb3JkLmRhdGEuaWRlbnRpZmllcjsKKyAgICAgICAgICAgICAgICB0 aGlzLl9jbGVhclBhbmVsKCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICAgICAgdGhp cy5faW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZCwgdGhpcy5fcmVjb3Jkcyk7CiAgICAg ICAgIHRoaXMuX3NjaGVkdWxlUmVmcmVzaCgpOwogICAgIH0sCkBAIC0yMjQsNyArMjM1LDcgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9z Y2hlZHVsZVJlZnJlc2goKTsKICAgICB9LAogCi0gICAgcmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICBf Y2xlYXJQYW5lbDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fbGFzdFJlY29yZCA9 IG51bGw7CiAgICAgICAgIHRoaXMuX3NlbmRSZXF1ZXN0UmVjb3JkcyA9IHt9OwpAQCAtNjM5LDcg KzY1MCw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZCA9IGZ1 bmN0aW9uKHJlY29yZCwgcmVjb3JkU3R5bGVzLCBzZW5kCiAgICAgICAgICAgICBzZW5kUmVxdWVz dFJlY29yZC5fcmVzcG9uc2VSZWNlaXZlZEZvcm1hdHRlZFRpbWUgPSB0aGlzLnN0YXJ0VGltZTsK ICAgICAgICAgICAgIHJlY29yZC5kYXRhLnVybCA9IHNlbmRSZXF1ZXN0UmVjb3JkLmRhdGEudXJs OwogICAgICAgICAgICAgdGhpcy5zdGFydFRpbWUgPSBzZW5kUmVxdWVzdFJlY29yZC5zdGFydFRp bWU7Ci0gICAgICAgICAgICB0aGlzLmRldGFpbHMgPSB0aGlzLl9nZXRSZWNvcmREZXRhaWxzKHNl bmRSZXF1ZXN0UmVjb3JkLCBzZW5kUmVxdWVzdFJlY29yZHMpOworICAgICAgICAgICAgLy8gTm93 IHRoYXQgd2UgaGF2ZSByZXNvdXJjZSBpbiB0aGUgY29sbGVjdGlvbiwgcmVjYWxjdWxhdGUgZGV0 YWlscyBpbiBvcmRlciB0byBkaXNwbGF5IHNob3J0IHVybC4KKyAgICAgICAgICAgIHNlbmRSZXF1 ZXN0UmVjb3JkLmRldGFpbHMgPSB0aGlzLl9nZXRSZWNvcmREZXRhaWxzKHNlbmRSZXF1ZXN0UmVj b3JkLCBzZW5kUmVxdWVzdFJlY29yZHMpOwogICAgICAgICAgICAgdGhpcy5jYWxsZXJTY3JpcHRO YW1lID0gc2VuZFJlcXVlc3RSZWNvcmQuY2FsbGVyU2NyaXB0TmFtZTsKICAgICAgICAgICAgIHRo aXMuY2FsbGVyU2NyaXB0TGluZSA9IHNlbmRSZXF1ZXN0UmVjb3JkLmNhbGxlclNjcmlwdExpbmU7 CiAgICAgICAgIH0K