39923 2010-05-29 11:14:00 -0700 Web Inspector: [REGRESSION] caller locations are not shown on Timeline Panel. 2010-05-29 16:34:50 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman commit-queue jaimeyap joepeck loislo timothy yurys oldest_to_newest 232128 0 pfeldman 2010-05-29 11:14:00 -0700 A nasty regression that kills source locations for all records on timeline. I am reverting frontend changes made in http://trac.webkit.org/changeset/60083#file14 to fix it. 232132 1 57413 pfeldman 2010-05-29 11:25:13 -0700 Created attachment 57413 [PATCH] Proposed fix. 232134 2 jaimeyap 2010-05-29 13:14:24 -0700 WebCore/inspector/front-end/TimelinePanel.js:  + contentHelper._appendLinkRow(WebInspector.UIString("Caller"), this.callerScriptName, callSite.lineNumber); This would seem to be the bug right here. this.callerScriptName is null. I believe it should instead be callsite.scriptName. This may have been an issue with hand merging this file. @Pavel: I recall when you were landing it you said that timelinepanel.js had a conflict with another change that went in while https://bugs.webkit.org/show_bug.cgi?id=37502 was sitting in the commit queue. I believe that the merge had a small mistake. Notice in https://bugs.webkit.org/attachment.cgi?id=56398&action=review the patch has the correct piece of code. I recommend in stead of reverting, just try changing that one line and testing to see if the bug is resolved. 232149 3 57413 commit-queue 2010-05-29 15:17:04 -0700 Comment on attachment 57413 [PATCH] Proposed fix. Clearing flags on attachment: 57413 Committed r60412: <http://trac.webkit.org/changeset/60412> 232150 4 commit-queue 2010-05-29 15:17:15 -0700 All reviewed patches have been landed. Closing bug. 232155 5 pfeldman 2010-05-29 16:34:50 -0700 > Notice in https://bugs.webkit.org/attachment.cgi?id=56398&action=review the patch has the correct piece of code. > > I recommend in stead of reverting, just try changing that one line and testing to see if the bug is resolved. Yes. Sorry for this to sound like Jaime regressed it. Now it is clear to me that it was a poor merge on my side. Having said that, Jaime did have a small bug that was dropping callers for rendering events. Not from all of them though :P. I reverted the change since I guess simply getting callserScriptName and line in the first line of formatting, was guaranteeing that old code was still functioning. So it is the shortest distance to the working code after the stack refactoring. The code still works and it works right, delta from the pre-stack state is just 4 lines! 57413 2010-05-29 11:25:13 -0700 2010-05-29 15:17:04 -0700 [PATCH] Proposed fix. timeline_regression text/plain 4188 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDkwZTEzMy4uZjVjYzYzNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wNS0yOSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbUkVHUkVTU0lPTl0gY2FsbGVyIGxv Y2F0aW9ucyBhcmUgbm90IHNob3duIG9uIFRpbWVsaW5lIFBhbmVsLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zOTkyMworCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lUGFuZWwuRm9ybWF0dGVkUmVjb3JkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUuX2dlbmVyYXRlUG9wdXBDb250 ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29y ZC5wcm90b3R5cGUuX2dldFJlY29yZERldGFpbHMpOgorCiAyMDEwLTA1LTI4ICBOYXRoYW4gTGF3 cmVuY2UgIDxubGF3cmVuY2VAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2Zm cmV5IEdhcmVuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVs aW5lUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5q cwppbmRleCBiYjE5YjM2Li5mZDA1MGQ5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVQYW5lbC5qcwpAQCAtODQ0LDcgKzg0NCwxMCBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQgPSBmdW5jdGlvbihyZWNvcmQsIHBhcmVudFJlY29y ZCwgcGFuZQogICAgIHRoaXMuX3NlbGZUaW1lID0gdGhpcy5lbmRUaW1lIC0gdGhpcy5zdGFydFRp bWU7CiAgICAgdGhpcy5fbGFzdENoaWxkRW5kVGltZSA9IHRoaXMuZW5kVGltZTsKICAgICB0aGlz Lm9yaWdpbmFsUmVjb3JkRm9yVGVzdHMgPSByZWNvcmQ7Ci0gICAgdGhpcy5zdGFja1RyYWNlID0g cmVjb3JkLnN0YWNrVHJhY2U7CisgICAgaWYgKHJlY29yZC5zdGFja1RyYWNlICYmIHJlY29yZC5z dGFja1RyYWNlLmxlbmd0aCkgeworICAgICAgICB0aGlzLmNhbGxlclNjcmlwdE5hbWUgPSByZWNv cmQuc3RhY2tUcmFjZVswXS5zY3JpcHROYW1lOworICAgICAgICB0aGlzLmNhbGxlclNjcmlwdExp bmUgPSByZWNvcmQuc3RhY2tUcmFjZVswXS5saW5lTnVtYmVyOworICAgIH0KICAgICB0aGlzLnRv dGFsSGVhcFNpemUgPSByZWNvcmQudG90YWxIZWFwU2l6ZTsKICAgICB0aGlzLnVzZWRIZWFwU2l6 ZSA9IHJlY29yZC51c2VkSGVhcFNpemU7CiAKQEAgLTg3NywxMSArODgwLDggQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lUGFuZWwuRm9ybWF0dGVkUmVjb3JkID0gZnVuY3Rpb24ocmVjb3JkLCBwYXJl bnRSZWNvcmQsIHBhbmUKICAgICB9IGVsc2UgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBl cy5UaW1lckZpcmUpIHsKICAgICAgICAgdmFyIHRpbWVySW5zdGFsbGVkUmVjb3JkID0gcGFuZWwu X3RpbWVyUmVjb3Jkc1tyZWNvcmQuZGF0YS50aW1lcklkXTsKICAgICAgICAgaWYgKHRpbWVySW5z dGFsbGVkUmVjb3JkKSB7Ci0gICAgICAgICAgICBpZiAodGltZXJJbnN0YWxsZWRSZWNvcmQuc3Rh Y2tUcmFjZSkgewotICAgICAgICAgICAgICAgIHZhciBjYWxsU2l0ZSA9IHRpbWVySW5zdGFsbGVk UmVjb3JkLnN0YWNrVHJhY2VbMF07ICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgdGhpcy5j YWxsU2l0ZVNjcmlwdE5hbWUgPSBjYWxsU2l0ZS5zY3JpcHROYW1lOwotICAgICAgICAgICAgICAg IHRoaXMuY2FsbFNpdGVTY3JpcHRMaW5lID0gY2FsbFNpdGUubGluZU51bWJlcjsKLSAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIHRoaXMuY2FsbFNpdGVTY3JpcHROYW1lID0gdGltZXJJbnN0YWxs ZWRSZWNvcmQuY2FsbGVyU2NyaXB0TmFtZTsKKyAgICAgICAgICAgIHRoaXMuY2FsbFNpdGVTY3Jp cHRMaW5lID0gdGltZXJJbnN0YWxsZWRSZWNvcmQuY2FsbGVyU2NyaXB0TGluZTsKICAgICAgICAg ICAgIHRoaXMudGltZW91dCA9IHRpbWVySW5zdGFsbGVkUmVjb3JkLnRpbWVvdXQ7CiAgICAgICAg ICAgICB0aGlzLnNpbmdsZVNob3QgPSB0aW1lckluc3RhbGxlZFJlY29yZC5zaW5nbGVTaG90Owog ICAgICAgICB9CkBAIC05ODUsMTEgKzk4NSw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVs LkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLmNhbGxlclNj cmlwdE5hbWUgJiYgdGhpcy50eXBlICE9PSByZWNvcmRUeXBlcy5HQ0V2ZW50KQogICAgICAgICAg ICAgY29udGVudEhlbHBlci5fYXBwZW5kTGlua1JvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNh bGxlciIpLCB0aGlzLmNhbGxlclNjcmlwdE5hbWUsIHRoaXMuY2FsbGVyU2NyaXB0TGluZSk7CiAK LSAgICAgICAgaWYgKHRoaXMuc3RhY2tUcmFjZSAmJiB0aGlzLnR5cGUgIT09IHJlY29yZFR5cGVz LkdDRXZlbnQpIHsKLSAgICAgICAgICAgIHZhciBjYWxsU2l0ZSA9IHRoaXMuc3RhY2tUcmFjZVsw XTsKLSAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVuZExpbmtSb3coV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJDYWxsZXIiKSwgdGhpcy5jYWxsZXJTY3JpcHROYW1lLCBjYWxsU2l0ZS5saW5l TnVtYmVyKTsKLSAgICAgICAgfQotCiAgICAgICAgIGlmICh0aGlzLnVzZWRIZWFwU2l6ZSkKICAg ICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVuZFRleHRSb3coV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJVc2VkIEhlYXAgU2l6ZSIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVzIG9mICVzIiwg TnVtYmVyLmJ5dGVzVG9TdHJpbmcodGhpcy51c2VkSGVhcFNpemUsIFdlYkluc3BlY3Rvci5VSVN0 cmluZyksIE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMudG90YWxIZWFwU2l6ZSwgV2ViSW5zcGVj dG9yLlVJU3RyaW5nKSkpOwogCkBAIC0xMDExLDggKzEwMDYsNyBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAg IHJldHVybiByZWNvcmQuZGF0YS53aWR0aCArICJcdTIwMDlcdTAwZDdcdTIwMDkiICsgcmVjb3Jk LmRhdGEuaGVpZ2h0OwogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2Vu dC5SZWNvcmRUeXBlLlRpbWVySW5zdGFsbDoKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9y LlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5UaW1lclJlbW92ZToKLSAgICAgICAgICAgICAgICB2 YXIgY2FsbFNpdGUgPSB0aGlzLnN0YWNrVHJhY2U7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIGNh bGxTaXRlID8gV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNvdXJjZUFzTm9kZShjYWxsU2l0ZS5zY3Jp cHROYW1lLCAic2NyaXB0cyIsIGNhbGxTaXRlLmxpbmVOdW1iZXIsICIiLCAiIikgOiByZWNvcmQu ZGF0YS50aW1lcklkOworICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLmNhbGxlclNjcmlwdE5h bWUgPyBXZWJJbnNwZWN0b3IubGlua2lmeVJlc291cmNlQXNOb2RlKHRoaXMuY2FsbGVyU2NyaXB0 TmFtZSwgInNjcmlwdHMiLCB0aGlzLmNhbGxlclNjcmlwdExpbmUsICIiLCAiIikgOiByZWNvcmQu ZGF0YS50aW1lcklkOwogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2Vu dC5SZWNvcmRUeXBlLlBhcnNlSFRNTDoKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRp bWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5SZWNhbGN1bGF0ZVN0eWxlczoKICAgICAgICAgICAgICAg ICByZXR1cm4gdGhpcy5jYWxsZXJTY3JpcHROYW1lID8gV2ViSW5zcGVjdG9yLmxpbmtpZnlSZXNv dXJjZUFzTm9kZSh0aGlzLmNhbGxlclNjcmlwdE5hbWUsICJzY3JpcHRzIiwgdGhpcy5jYWxsZXJT Y3JpcHRMaW5lLCAiIiwgIiIpIDogbnVsbDsK