68144 2011-09-15 00:32:41 -0700 Web Inspector: skip overlapping scripts when displaying concatenated content. 2011-09-23 06:46:31 -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 467686 0 podivilov 2011-09-15 00:32:41 -0700 Web Inspector: skip overlapping scripts when displaying concatenated content. 467689 1 107471 podivilov 2011-09-15 00:37:22 -0700 Created attachment 107471 Patch 469265 2 107471 pfeldman 2011-09-19 00:37:28 -0700 Comment on attachment 107471 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107471&action=review > Source/WebCore/inspector/front-end/SourceFile.js:274 > + if (lineNumber > scripts[i].lineOffset || (lineNumber === scripts[i].lineOffset && columnNumber > scripts[i].columnOffset - scriptOpenTag.length)) Could you also investigate when this happens? I.e. can we process scripts added via appendChild differently? 472206 3 podivilov 2011-09-23 06:46:31 -0700 Committed r95797: <http://trac.webkit.org/changeset/95797> 107471 2011-09-15 00:37:22 -0700 2011-09-19 00:37:28 -0700 Patch bug-68144-20110915113720.patch text/plain 5673 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTUwODYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwYzAzNTU5NGIwOWUwOTNmZmZlODBi ODVlMjhmYmQ4NWQ4OTU4YmNlLi42YTgyYTYyMzM4MmM4YTgxMWZiM2IyODA5MjNkZmE4MzViODU1 Njk3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDktMTUgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogc2tpcCBv dmVybGFwcGluZyBzY3JpcHRzIHdoZW4gZGlzcGxheWluZyBjb25jYXRlbmF0ZWQgY29udGVudC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MTQ0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZGVidWdnZXIvY29udGVudC1wcm92aWRlcnMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGlu c3BlY3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3ZpZGVycy5odG1sOgorCiAyMDExLTA5LTE0ICBL ZW50YXJvIEhhcmEgIDxoYXJha2VuQGdvb2dsZS5jb20+CiAKICAgICAgICAgcGFnZS10cmFuc2l0 aW9uLWV2ZW50LWNvbnN0cnVjdG9yLWV4cGVjdGVkLnR4dCBpcyBtaXNzaW5nCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY29udGVudC1wcm92aWRlcnMtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2NvbnRlbnQtcHJvdmlkZXJz LWV4cGVjdGVkLnR4dAppbmRleCAzZWM3MTAzOTgwMzEzMzc1OTQyM2EyMWJiZDBhYTRiZWU2MDkw M2E0Li4zYzIxMDBmMGY1ZWUyYmZiZjhmZDA1ZmRlNmRkZGI3MzhiMjU5ZDg5IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY29udGVudC1wcm92aWRlcnMtZXhwZWN0 ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3Zp ZGVycy1leHBlY3RlZC50eHQKQEAgLTIsMTQgKzIsMTAgQEAgVGVzdHMgQ29udGVudFByb3ZpZGVy IGltcGxlbWVudGF0aW9ucy4KIAogCiBSdW5uaW5nOiB0ZXN0U2NyaXB0Q29udGVudFByb3ZpZGVy Ci1SZXF1ZXN0IGZvby5qcyBzb3VyY2UuCiAKIFJ1bm5pbmc6IHRlc3RDb25jYXRlbmF0ZWRTY3Jp cHRzQ29udGVudFByb3ZpZGVyCi1SZXF1ZXN0IGZvby5qcyBzb3VyY2UuCi1SZXF1ZXN0IGJhci5q cyBzb3VyY2UuCi1SZXF1ZXN0IGJhei5qcyBzb3VyY2UuCi0KLSAgPHNjcmlwdD5mdW5jdGlvbiBm b28oKSB7IHJldHVybiAwOyB9PC9zY3JpcHQ+ICAgICAgICAgICAgICAgPHNjcmlwdD5mdW5jdGlv biBiYXIoKSB7IHJldHVybiAwOyB9PC9zY3JpcHQ+CisgIDxzY3JpcHQ+ZnVuY3Rpb24gZm9vKCkg eyByZXR1cm4gMDsgfTwvc2NyaXB0PgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c2NyaXB0PmZ1bmN0aW9uIGJhcigpIHsgcmV0 dXJuIDA7IH08L3NjcmlwdD4KIAogICAgICAgICAgICAgPHNjcmlwdD4KIGZ1bmN0aW9uIGJheigp CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvY29udGVudC1wcm92 aWRlcnMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3Zp ZGVycy5odG1sCmluZGV4IGFhNTE0NmRjNjEwMDIyNjA2NmFlY2M2NGYzMmEzYTRlMmFiMmQ5NTcu LjJmMTVmMzQ5MDY1MDA4NTYzMDY0ZjA1MDRkNmVkMmVhZjIxN2JkZGMgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3ZpZGVycy5odG1sCisrKyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb250ZW50LXByb3ZpZGVycy5odG1sCkBA IC0xMiw3ICsxMiw2IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICByZXR1cm4gewogICAgICAg ICAgICAgcmVxdWVzdFNvdXJjZTogZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgICAgICAgICB7Ci0g ICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlJlcXVlc3QgIiArIGlkICsg IiBzb3VyY2UuIik7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soc291cmNlKTsKICAgICAgICAg ICAgIH0sCiAgICAgICAgICAgICBnZXQgbGluZU9mZnNldCgpIHsgcmV0dXJuIHJhbmdlWzBdOyB9 LApAQCAtMzgsOSArMzcsMTAgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIGZ1bmN0aW9uIHRl c3RDb25jYXRlbmF0ZWRTY3JpcHRzQ29udGVudFByb3ZpZGVyKG5leHQpCiAgICAgICAgIHsKICAg ICAgICAgICAgIHZhciBzY3JpcHRzID0gW107Ci0gICAgICAgICAgICBzY3JpcHRzLnB1c2goY3Jl YXRlTW9ja1NjcmlwdCgiYmF6LmpzIiwgIlxuZnVuY3Rpb24gYmF6KClcbntcbiAgcmV0dXJuIDA7 XG59XG4iLCBbMywgMjBdKSk7Ci0gICAgICAgICAgICBzY3JpcHRzLnB1c2goY3JlYXRlTW9ja1Nj cmlwdCgiZm9vLmpzIiwgImZ1bmN0aW9uIGZvbygpIHsgcmV0dXJuIDA7IH0iLCBbMSwgMTBdKSk7 Ci0gICAgICAgICAgICBzY3JpcHRzLnB1c2goY3JlYXRlTW9ja1NjcmlwdCgiYmFyLmpzIiwgImZ1 bmN0aW9uIGJhcigpIHsgcmV0dXJuIDA7IH0iLCBbMSwgNzBdKSk7CisgICAgICAgICAgICBzY3Jp cHRzLnB1c2goY3JlYXRlTW9ja1NjcmlwdCgiMSIsICJcbmZ1bmN0aW9uIGJheigpXG57XG4gIHJl dHVybiAwO1xufVxuIiwgWzMsIDIwXSkpOworICAgICAgICAgICAgc2NyaXB0cy5wdXNoKGNyZWF0 ZU1vY2tTY3JpcHQoIjIiLCAiZnVuY3Rpb24gZm9vKCkgeyByZXR1cm4gMDsgfSIsIFswLCAxMF0p KTsKKyAgICAgICAgICAgIHNjcmlwdHMucHVzaChjcmVhdGVNb2NrU2NyaXB0KCIzIiwgImZ1bmN0 aW9uIGJhcigpIHsgcmV0dXJuIDA7IH0iLCBbMSwgNzBdKSk7CisgICAgICAgICAgICBzY3JpcHRz LnB1c2goY3JlYXRlTW9ja1NjcmlwdCgiNCIsICJ0aGlzIHNob3VsZCBub3QgYXBwZWFyIGluIGRp c3BsYXllZCBjb250ZW50IiwgWzAsIDIwXSkpOwogICAgICAgICAgICAgdmFyIGNvbnRlbnRQcm92 aWRlciA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uY2F0ZW5hdGVkU2NyaXB0c0NvbnRlbnRQcm92aWRl cihzY3JpcHRzKTsKICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFJlcXVlc3RDb250ZW50KG1pbWVU eXBlLCBjb250ZW50KQogICAgICAgICAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGZkZjY3OTQ5NDYwMjYw MDg0MTk1NWFhYjM2OTc5ODlkODRiOTYyYTYuLjhiNzAxYjRiN2FlN2MzNDk5YTZiMzQ0M2QwYzZh ZDFlZjYzMzRmZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wOS0xNSAgUGF2 ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBza2lwIG92ZXJsYXBwaW5nIHNjcmlwdHMgd2hlbiBkaXNwbGF5aW5nIGNvbmNhdGVu YXRlZCBjb250ZW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjgxNDQKKworICAgICAgICBEeW5hbWljYWxseSBhcHBlbmRlZCBzY3JpcHQgdGFncyBo YXZlIHdyb25nIG9mZnNldHMgYW5kIGNhdXNlIHRyb3VibGVzIGJ1aWxkaW5nIGNvbmNhdGVuYXRl ZCBjb250ZW50LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNvbmNhdGVuYXRlZFNjcmlwdHNDb250ZW50UHJvdmlkZXIucHJvdG90eXBlLl9jb25j YXRlbmF0ZVNjcmlwdHNDb250ZW50LmFwcGVuZENodW5rKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Db25jYXRlbmF0ZWRTY3JpcHRzQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZS5fY29uY2F0ZW5h dGVTY3JpcHRzQ29udGVudCk6CisKIDIwMTEtMDktMTQgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJl dmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI5 NTA4MC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291 cmNlRmlsZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmls ZS5qcwppbmRleCBjODEyMGY2MjEzMjQ5ZGM4ZjQ3MDU5YzQ0MDQ2NDVhOGE1MDM2NTRiLi5hODc5 MDdjZGQyYjZiNzE2MjlmNDZkN2M0NjQ5NDIwMTUzZDg5ZjkyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZpbGUuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCkBAIC0yNTcsNyArMjU3LDYg QEAgV2ViSW5zcGVjdG9yLkNvbmNhdGVuYXRlZFNjcmlwdHNDb250ZW50UHJvdmlkZXIucHJvdG90 eXBlID0gewogCiAgICAgICAgZnVuY3Rpb24gYXBwZW5kQ2h1bmsoY2h1bmspCiAgICAgICAgewot ICAgICAgICAgICB2YXIgc3RhcnQgPSB7IGxpbmVOdW1iZXI6IGxpbmVOdW1iZXIsIGNvbHVtbk51 bWJlcjogY29sdW1uTnVtYmVyIH07CiAgICAgICAgICAgIGNvbnRlbnQgKz0gY2h1bms7CiAgICAg ICAgICAgIHZhciBsaW5lRW5kaW5ncyA9IGNodW5rLmxpbmVFbmRpbmdzKCk7CiAgICAgICAgICAg IHZhciBsaW5lQ291bnQgPSBsaW5lRW5kaW5ncy5sZW5ndGg7CkBAIC0yNjcsMTIgKzI2NiwxNCBA QCBXZWJJbnNwZWN0b3IuQ29uY2F0ZW5hdGVkU2NyaXB0c0NvbnRlbnRQcm92aWRlci5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICAgICBsaW5lTnVtYmVyICs9IGxpbmVDb3VudCAtIDE7CiAgICAg ICAgICAgICAgICBjb2x1bW5OdW1iZXIgPSBsaW5lRW5kaW5nc1tsaW5lQ291bnQgLSAxXSAtIGxp bmVFbmRpbmdzW2xpbmVDb3VudCAtIDJdIC0gMTsKICAgICAgICAgICAgfQotICAgICAgICAgICB2 YXIgZW5kID0geyBsaW5lTnVtYmVyOiBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IGNvbHVtbk51 bWJlciB9OwogICAgICAgIH0KIAogICAgICAgIHZhciBzY3JpcHRPcGVuVGFnID0gIjxzY3JpcHQ+ IjsKICAgICAgICB2YXIgc2NyaXB0Q2xvc2VUYWcgPSAiPC9zY3JpcHQ+IjsKICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHNjcmlwdHMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgaWYgKGxp bmVOdW1iZXIgPiBzY3JpcHRzW2ldLmxpbmVPZmZzZXQgfHwgKGxpbmVOdW1iZXIgPT09IHNjcmlw dHNbaV0ubGluZU9mZnNldCAmJiBjb2x1bW5OdW1iZXIgPiBzY3JpcHRzW2ldLmNvbHVtbk9mZnNl dCAtIHNjcmlwdE9wZW5UYWcubGVuZ3RoKSkKKyAgICAgICAgICAgICAgIGNvbnRpbnVlOworCiAg ICAgICAgICAgIC8vIEZpbGwgdGhlIGdhcCB3aXRoIHdoaXRlc3BhY2UgY2hhcmFjdGVycy4KICAg ICAgICAgICAgd2hpbGUgKGxpbmVOdW1iZXIgPCBzY3JpcHRzW2ldLmxpbmVPZmZzZXQpCiAgICAg ICAgICAgICAgICBhcHBlbmRDaHVuaygiXG4iKTsK