55821 2011-03-05 04:17:31 -0800 Web Inspector: move breakpoint column adjustment to debugger model 2011-03-23 03:25:37 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 362932 0 podivilov 2011-03-05 04:17:31 -0800 Web Inspector: move breakpoint column adjustment to debugger model 362933 1 84859 podivilov 2011-03-05 04:18:51 -0800 Created attachment 84859 Patch. 363100 2 84859 pfeldman 2011-03-06 11:07:11 -0800 Comment on attachment 84859 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=84859&action=review > Source/WebCore/inspector/front-end/DebuggerModel.js:83 > + var script = this._scripts[id]; So you rely upon the fact that _scripts are sorted in the compilation order, right? This is right, but a bit fragile. Could you mention it in the comments and provide a test? Clearing r? while waiting for test. > Source/WebCore/inspector/front-end/DebuggerModel.js:100 > + } Please revert this change. 364406 3 85151 podivilov 2011-03-09 03:43:17 -0800 Created attachment 85151 Patch. 364408 4 podivilov 2011-03-09 03:45:07 -0800 (In reply to comment #2) > (From update of attachment 84859 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=84859&action=review > > > Source/WebCore/inspector/front-end/DebuggerModel.js:83 > > + var script = this._scripts[id]; > > So you rely upon the fact that _scripts are sorted in the compilation order, right? > This is right, but a bit fragile. Could you mention it in the comments and provide a test? Clearing r? while waiting for test. Replaced with less fragile code that searches for the leftmost script on the line. This code is tested by debug-inlined-scripts.html. > > > Source/WebCore/inspector/front-end/DebuggerModel.js:100 > > + } > > Please revert this change. Done. 372053 5 podivilov 2011-03-23 03:25:37 -0700 Commited in r80702. 84859 2011-03-05 04:18:51 -0800 2011-03-09 03:43:17 -0800 Patch. patch text/plain 3535 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjNjMzMzNlLi44MmI3OThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDMtMDUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogbW92ZSBicmVha3BvaW50IGNvbHVtbiBhZGp1c3RtZW50IHRvIGRlYnVnZ2VyIG1v ZGVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU4 MjEKKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvZGVidWdnZXIvZGVidWctaW5saW5lZC1zY3Jp cHRzLmh0bWwKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5zZXRCcmVh a3BvaW50LmRpZFNldEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy TW9kZWwucHJvdG90eXBlLnNldEJyZWFrcG9pbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlRnJhbWVDb250ZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lQ29udGVudC5wcm90b3R5cGUuc291cmNlRnJhbWVMaW5lTnVtYmVyVG9BY3R1YWxMb2Nh dGlvbik6CisKIDIwMTEtMDMtMDQgIEpvaG4gQmF1bWFuICA8amJhdW1hbkBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNzZWxsLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCmluZGV4IGQzMWZm MjQuLmY4MTQ1MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RlYnVnZ2VyTW9kZWwuanMKQEAgLTc4LDYgKzc4LDE1IEBAIFdlYkluc3BlY3Rvci5EZWJ1 Z2dlck1vZGVsLnByb3RvdHlwZSA9IHsKIAogICAgIHNldEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKHVy bCwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpCiAgICAgewor ICAgICAgICAvLyBBZGp1c3QgY29sdW1uIGlmIG5lZWRlZC4KKyAgICAgICAgZm9yICh2YXIgaWQg aW4gdGhpcy5fc2NyaXB0cykgeworICAgICAgICAgICAgdmFyIHNjcmlwdCA9IHRoaXMuX3Njcmlw dHNbaWRdOworICAgICAgICAgICAgaWYgKHVybCA9PT0gc2NyaXB0LnNvdXJjZVVSTCAmJiBsaW5l TnVtYmVyID09PSBzY3JpcHQubGluZU9mZnNldCkgeworICAgICAgICAgICAgICAgIGNvbHVtbk51 bWJlciA9IE1hdGgubWF4KGNvbHVtbk51bWJlciwgc2NyaXB0LmNvbHVtbk9mZnNldCk7CisgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKwogICAgICAgICBm dW5jdGlvbiBkaWRTZXRCcmVha3BvaW50KGJyZWFrcG9pbnRzUHVzaGVkVG9CYWNrZW5kLCBicmVh a3BvaW50SWQsIGxvY2F0aW9ucykKICAgICAgICAgewogICAgICAgICAgICAgaWYgKCFicmVha3Bv aW50SWQpCkBAIC04OCw3ICs5Nyw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIGlmIChicmVha3BvaW50c1B1c2hlZFRvQmFja2VuZCkKICAg ICAgICAgICAgICAgICB0aGlzLl9zYXZlQnJlYWtwb2ludHMoKTsKICAgICAgICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLkV2ZW50 cy5CcmVha3BvaW50QWRkZWQsIGJyZWFrcG9pbnQpOwotICAgICAgICB9CisgICAgICAgIH0gICAg ICAgIAogICAgICAgICBEZWJ1Z2dlckFnZW50LnNldEphdmFTY3JpcHRCcmVha3BvaW50KHVybCwg bGluZU51bWJlciwgY29sdW1uTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQsIGRpZFNldEJyZWFr cG9pbnQuYmluZCh0aGlzLCB0aGlzLl9icmVha3BvaW50c1B1c2hlZFRvQmFja2VuZCkpOwogICAg IH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291 cmNlRnJhbWVDb250ZW50LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T b3VyY2VGcmFtZUNvbnRlbnQuanMKaW5kZXggOTFiMzk3Yi4uM2YzYThlOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZUNvbnRlbnQuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZUNvbnRl bnQuanMKQEAgLTQ4LDE4ICs0OCw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZUNvbnRlbnQu cHJvdG90eXBlID0gewogCiAgICAgc291cmNlRnJhbWVMaW5lTnVtYmVyVG9BY3R1YWxMb2NhdGlv bjogZnVuY3Rpb24obGluZU51bWJlcikKICAgICB7Ci0gICAgICAgIC8vIFNjcmlwdCBjb250ZW50 IG1heSBzdGFydCByaWdodCBhZnRlciA8c2NyaXB0PiB0YWcgd2l0aG91dCBuZXcgbGluZSAoZS5n LiAiPHNjcmlwdD5mdW5jdGlvbiBmKCkuLi4iKS4KLSAgICAgICAgLy8gSW4gdGhhdCBjYXNlLCBj b2x1bW4gbnVtYmVyIHNob3VsZCBiZSBlcXVhbCB0byBzY3JpcHQgY29sdW1uIG9mZnNldC4KLSAg ICAgICAgdmFyIGNvbHVtbk51bWJlciA9IDA7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg dGhpcy5fc2NyaXB0UmFuZ2VzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgc2NyaXB0 UmFuZ2UgPSB0aGlzLl9zY3JpcHRSYW5nZXNbaV07Ci0gICAgICAgICAgICBpZiAoc2NyaXB0UmFu Z2Uuc3RhcnQubGluZU51bWJlciA8IGxpbmVOdW1iZXIpCi0gICAgICAgICAgICAgICAgY29udGlu dWU7Ci0gICAgICAgICAgICBpZiAoc2NyaXB0UmFuZ2Uuc3RhcnQubGluZU51bWJlciA9PT0gbGlu ZU51bWJlcikKLSAgICAgICAgICAgICAgICBjb2x1bW5OdW1iZXIgPSBzY3JpcHRSYW5nZS5zdGFy dC5jb2x1bW5OdW1iZXI7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotICAgICAgICB2 YXIgbG9jYXRpb24gPSB0aGlzLl9tYXBwaW5nLnNvdXJjZUxvY2F0aW9uVG9BY3R1YWxMb2NhdGlv bihsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOworICAgICAgICB2YXIgbG9jYXRpb24gPSB0aGlz Ll9tYXBwaW5nLnNvdXJjZUxvY2F0aW9uVG9BY3R1YWxMb2NhdGlvbihsaW5lTnVtYmVyLCAwKTsK ICAgICAgICAgbG9jYXRpb24uc291cmNlSUQgPSB0aGlzLl9zb3VyY2VJREZvclNvdXJjZUZyYW1l TGluZU51bWJlcihsaW5lTnVtYmVyKTsKICAgICAgICAgcmV0dXJuIGxvY2F0aW9uOwogICAgIH0s Cg== 85151 2011-03-09 03:43:17 -0800 2011-03-09 04:42:56 -0800 Patch. patch text/plain 3179 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMzViOTNkLi5mYzY4NDc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDMtMDUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogbW92ZSBicmVha3BvaW50IGNvbHVtbiBhZGp1c3RtZW50IHRvIGRlYnVnZ2VyIG1v ZGVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU4 MjEKKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvZGVidWdnZXIvZGVidWctaW5saW5lZC1zY3Jp cHRzLmh0bWwKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5zZXRCcmVh a3BvaW50LmRpZFNldEJyZWFrcG9pbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2Vy TW9kZWwucHJvdG90eXBlLnNldEJyZWFrcG9pbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlRnJhbWVDb250ZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lQ29udGVudC5wcm90b3R5cGUuc291cmNlRnJhbWVMaW5lTnVtYmVyVG9BY3R1YWxMb2Nh dGlvbik6CisKIDIwMTEtMDMtMDggIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwppbmRleCBkMzFmZjI0Li44 MmFkOGY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWJ1Z2dlck1vZGVsLmpzCkBAIC03OCw2ICs3OCwxNSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJN b2RlbC5wcm90b3R5cGUgPSB7CiAKICAgICBzZXRCcmVha3BvaW50OiBmdW5jdGlvbih1cmwsIGxp bmVOdW1iZXIsIGNvbHVtbk51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKQogICAgIHsKKyAgICAg ICAgLy8gQWRqdXN0IGNvbHVtbiBpZiBuZWVkZWQuCisgICAgICAgIHZhciBtaW5Db2x1bW5OdW1i ZXIgPSAwOworICAgICAgICBmb3IgKHZhciBpZCBpbiB0aGlzLl9zY3JpcHRzKSB7CisgICAgICAg ICAgICB2YXIgc2NyaXB0ID0gdGhpcy5fc2NyaXB0c1tpZF07CisgICAgICAgICAgICBpZiAodXJs ID09PSBzY3JpcHQuc291cmNlVVJMICYmIGxpbmVOdW1iZXIgPT09IHNjcmlwdC5saW5lT2Zmc2V0 KQorICAgICAgICAgICAgICAgIG1pbkNvbHVtbk51bWJlciA9IG1pbkNvbHVtbk51bWJlciA/IE1h dGgubWluKG1pbkNvbHVtbk51bWJlciwgc2NyaXB0LmNvbHVtbk9mZnNldCkgOiBzY3JpcHQuY29s dW1uT2Zmc2V0OworICAgICAgICB9CisgICAgICAgIGNvbHVtbk51bWJlciA9IE1hdGgubWF4KGNv bHVtbk51bWJlciwgbWluQ29sdW1uTnVtYmVyKTsKKwogICAgICAgICBmdW5jdGlvbiBkaWRTZXRC cmVha3BvaW50KGJyZWFrcG9pbnRzUHVzaGVkVG9CYWNrZW5kLCBicmVha3BvaW50SWQsIGxvY2F0 aW9ucykKICAgICAgICAgewogICAgICAgICAgICAgaWYgKCFicmVha3BvaW50SWQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lQ29udGVu dC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWVDb250 ZW50LmpzCmluZGV4IDkxYjM5N2IuLjNmM2E4ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWVDb250ZW50LmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWVDb250ZW50LmpzCkBAIC00OCwx OCArNDgsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVDb250ZW50LnByb3RvdHlwZSA9IHsK IAogICAgIHNvdXJjZUZyYW1lTGluZU51bWJlclRvQWN0dWFsTG9jYXRpb246IGZ1bmN0aW9uKGxp bmVOdW1iZXIpCiAgICAgewotICAgICAgICAvLyBTY3JpcHQgY29udGVudCBtYXkgc3RhcnQgcmln aHQgYWZ0ZXIgPHNjcmlwdD4gdGFnIHdpdGhvdXQgbmV3IGxpbmUgKGUuZy4gIjxzY3JpcHQ+ZnVu Y3Rpb24gZigpLi4uIikuCi0gICAgICAgIC8vIEluIHRoYXQgY2FzZSwgY29sdW1uIG51bWJlciBz aG91bGQgYmUgZXF1YWwgdG8gc2NyaXB0IGNvbHVtbiBvZmZzZXQuCi0gICAgICAgIHZhciBjb2x1 bW5OdW1iZXIgPSAwOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3NjcmlwdFJh bmdlcy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgdmFyIHNjcmlwdFJhbmdlID0gdGhpcy5f c2NyaXB0UmFuZ2VzW2ldOwotICAgICAgICAgICAgaWYgKHNjcmlwdFJhbmdlLnN0YXJ0LmxpbmVO dW1iZXIgPCBsaW5lTnVtYmVyKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAg ICAgaWYgKHNjcmlwdFJhbmdlLnN0YXJ0LmxpbmVOdW1iZXIgPT09IGxpbmVOdW1iZXIpCi0gICAg ICAgICAgICAgICAgY29sdW1uTnVtYmVyID0gc2NyaXB0UmFuZ2Uuc3RhcnQuY29sdW1uTnVtYmVy OwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgICAgdmFyIGxvY2F0aW9uID0g dGhpcy5fbWFwcGluZy5zb3VyY2VMb2NhdGlvblRvQWN0dWFsTG9jYXRpb24obGluZU51bWJlciwg Y29sdW1uTnVtYmVyKTsKKyAgICAgICAgdmFyIGxvY2F0aW9uID0gdGhpcy5fbWFwcGluZy5zb3Vy Y2VMb2NhdGlvblRvQWN0dWFsTG9jYXRpb24obGluZU51bWJlciwgMCk7CiAgICAgICAgIGxvY2F0 aW9uLnNvdXJjZUlEID0gdGhpcy5fc291cmNlSURGb3JTb3VyY2VGcmFtZUxpbmVOdW1iZXIobGlu ZU51bWJlcik7CiAgICAgICAgIHJldHVybiBsb2NhdGlvbjsKICAgICB9LAo=