58133 2011-04-08 04:40:49 -0700 Web Inspector: distinguish breakpoints set on de-obfuscated sources from breakponts set on original sources. 2011-04-08 05:34:55 -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 382146 0 podivilov 2011-04-08 04:40:49 -0700 Web Inspector: distinguish breakpoints set on de-obfuscated sources from breakponts set on original sources. So they aren't messed up when source representation is changed. 382148 1 88799 podivilov 2011-04-08 04:41:29 -0700 Created attachment 88799 Patch. 382169 2 podivilov 2011-04-08 05:34:55 -0700 Committed r83289: <http://trac.webkit.org/changeset/83289> 88799 2011-04-08 04:41:29 -0700 2011-04-08 05:24:54 -0700 Patch. patch text/plain 5778 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkZmQ4Yjk0Li5hODY4YWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDQtMDggIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogZGlzdGluZ3Vpc2ggYnJlYWtwb2ludHMgc2V0IG9uIGRlLW9iZnVzY2F0ZWQgc291 cmNlcyBmcm9tIGJyZWFrcG9udHMgc2V0IG9uIG9yaWdpbmFsIHNvdXJjZXMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODEzMworCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLmNhbkVk aXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwucHJvdG90eXBlLnRvZ2dsZUZvcm1hdFNvdXJjZUZpbGVzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fZGVidWdnZXJQ YXVzZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwu cHJvdG90eXBlLl9zb3VyY2VGaWxlRm9yU2NyaXB0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fc2NyaXB0Rm9yU291cmNlRmlsZUlk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3Rv dHlwZS5fY3JlYXRlU291cmNlRmlsZUlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fcmVzZXQpOgorCiAyMDExLTA0LTA2ICBQYXZl bCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IDk0 N2QxNmIuLmY4Zjg1ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTkxLDcg KzkxLDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBl ID0gewogCiAgICAgX2FkZFNjcmlwdDogZnVuY3Rpb24oc2NyaXB0KQogICAgIHsKLSAgICAgICAg dmFyIHNvdXJjZUZpbGVJZCA9IHNjcmlwdC5zb3VyY2VVUkwgfHwgc2NyaXB0LnNvdXJjZUlEOwor ICAgICAgICB2YXIgc291cmNlRmlsZUlkID0gdGhpcy5fY3JlYXRlU291cmNlRmlsZUlkKHNjcmlw dC5zb3VyY2VVUkwsIHNjcmlwdC5zb3VyY2VJRCk7CiAgICAgICAgIHZhciBzb3VyY2VGaWxlID0g dGhpcy5fc291cmNlRmlsZXNbc291cmNlRmlsZUlkXTsKICAgICAgICAgaWYgKHNvdXJjZUZpbGUp IHsKICAgICAgICAgICAgIHNvdXJjZUZpbGUuYWRkU2NyaXB0KHNjcmlwdCk7CkBAIC0xMzMsNyAr MTMzLDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBl ID0gewogICAgICAgICBpZiAoIVByZWZlcmVuY2VzLmNhbkVkaXRTY3JpcHRTb3VyY2UpCiAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIHZhciBzY3JpcHQgPSB0aGlzLl9zY3JpcHRG b3JTb3VyY2VGaWxlSWQoc291cmNlRmlsZUlkKTsKLSAgICAgICAgcmV0dXJuICAhc2NyaXB0Lmxp bmVPZmZzZXQgJiYgIXNjcmlwdC5jb2x1bW5PZmZzZXQ7CisgICAgICAgIHJldHVybiAhc2NyaXB0 LmxpbmVPZmZzZXQgJiYgIXNjcmlwdC5jb2x1bW5PZmZzZXQ7CiAgICAgfSwKIAogICAgIGVkaXRT Y3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCwgbmV3U291cmNlLCBjYWxsYmFjaykK QEAgLTE5OCw5ICsxOTgsMTUgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5fZm9ybWF0U291cmNlRmlsZXMgJiYg IXRoaXMuX2Zvcm1hdHRlcikKICAgICAgICAgICAgIHRoaXMuX2Zvcm1hdHRlciA9IG5ldyBXZWJJ bnNwZWN0b3IuU2NyaXB0Rm9ybWF0dGVyKCk7CiAKKyAgICAgICAgZm9yICh2YXIgaWQgaW4gdGhp cy5fc291cmNlRmlsZXMpIHsKKyAgICAgICAgICAgIHZhciBzb3VyY2VGaWxlID0gdGhpcy5fc291 cmNlRmlsZXNbaWRdOworICAgICAgICAgICAgZm9yICh2YXIgbGluZSBpbiBzb3VyY2VGaWxlLmJy ZWFrcG9pbnRzKQorICAgICAgICAgICAgICAgIHRoaXMuX3JlbW92ZUJyZWFrcG9pbnRGcm9tRGVi dWdnZXIoc291cmNlRmlsZS5icmVha3BvaW50c1tsaW5lXSk7CisgICAgICAgIH0KKwogICAgICAg ICB2YXIgbWVzc2FnZXMgPSB0aGlzLl9tZXNzYWdlczsKICAgICAgICAgdGhpcy5fcmVzZXQoKTsK LSAgICAgIAorCiAgICAgICAgIHZhciBzY3JpcHRzID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9k ZWwuc2NyaXB0czsKICAgICAgICAgZm9yICh2YXIgaWQgaW4gc2NyaXB0cykKICAgICAgICAgICAg IHRoaXMuX2FkZFNjcmlwdChzY3JpcHRzW2lkXSk7CkBAIC0yMjEsNyArMjI3LDcgQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgIHsKICAg ICAgICAgdGhpcy5fbWVzc2FnZXMucHVzaChtZXNzYWdlKTsKIAotICAgICAgICB2YXIgc291cmNl RmlsZSA9IHRoaXMuX3NvdXJjZUZpbGVGb3JTY3JpcHRVUkwobWVzc2FnZS51cmwpOworICAgICAg ICB2YXIgc291cmNlRmlsZSA9IHRoaXMuX3NvdXJjZUZpbGVGb3JTY3JpcHQobWVzc2FnZS51cmwp OwogICAgICAgICBpZiAoIXNvdXJjZUZpbGUpCiAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTI2 OCw3ICsyNzQsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90 b3R5cGUgPSB7CiAgICAgc2V0QnJlYWtwb2ludDogZnVuY3Rpb24oc291cmNlRmlsZUlkLCBsaW5l TnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQsIGRvbnRTYXZlQnJlYWtwb2ludHMpCiAgICAgewog ICAgICAgICB2YXIgc291cmNlRmlsZSA9IHRoaXMuX3NvdXJjZUZpbGVzW3NvdXJjZUZpbGVJZF07 Ci0gICAgICAgIGlmICghc291cmNlRmlsZSkgCisgICAgICAgIGlmICghc291cmNlRmlsZSkKICAg ICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB2YXIgYnJlYWtwb2ludCA9IG5ldyBXZWJJbnNw ZWN0b3IuUHJlc2VudGF0aW9uQnJlYWtwb2ludChzb3VyY2VGaWxlLCBsaW5lTnVtYmVyLCBjb25k aXRpb24sIGVuYWJsZWQpOwpAQCAtNDk2LDcgKzUwMiw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dl clByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhciBzb3VyY2VG aWxlOwogICAgICAgICAgICAgdmFyIHNjcmlwdCA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVs LnNjcmlwdEZvclNvdXJjZUlEKGNhbGxGcmFtZS5zb3VyY2VJRCk7CiAgICAgICAgICAgICBpZiAo c2NyaXB0KQotICAgICAgICAgICAgICAgIHNvdXJjZUZpbGUgPSB0aGlzLl9zb3VyY2VGaWxlRm9y U2NyaXB0KHNjcmlwdCk7CisgICAgICAgICAgICAgICAgc291cmNlRmlsZSA9IHRoaXMuX3NvdXJj ZUZpbGVGb3JTY3JpcHQoc2NyaXB0LnNvdXJjZVVSTCwgc2NyaXB0LnNvdXJjZUlEKTsKICAgICAg ICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbkNhbGxGcmFtZXMucHVzaChuZXcgV2ViSW5zcGVjdG9y LlByZXNlbmF0aW9uQ2FsbEZyYW1lKGNhbGxGcmFtZSwgaSwgc291cmNlRmlsZSkpOwogICAgICAg ICB9CiAgICAgICAgIHZhciBkZXRhaWxzID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuZGVi dWdnZXJQYXVzZWREZXRhaWxzOwpAQCAtNTI0LDIzICs1MzAsMjQgQEAgV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhp cy5fcHJlc2VudGF0aW9uQ2FsbEZyYW1lc1t0aGlzLl9zZWxlY3RlZENhbGxGcmFtZUluZGV4XTsK ICAgICB9LAogCi0gICAgX3NvdXJjZUZpbGVGb3JTY3JpcHQ6IGZ1bmN0aW9uKHNjcmlwdCkKLSAg ICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VGaWxlc1tzY3JpcHQuc291cmNlVVJMIHx8 IHNjcmlwdC5zb3VyY2VJRF07Ci0gICAgfSwKLQotICAgIF9zb3VyY2VGaWxlRm9yU2NyaXB0VVJM OiBmdW5jdGlvbihzY3JpcHRVUkwpCisgICAgX3NvdXJjZUZpbGVGb3JTY3JpcHQ6IGZ1bmN0aW9u KHNvdXJjZVVSTCwgc291cmNlSUQpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fc291cmNl RmlsZXNbc2NyaXB0VVJMXTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NvdXJjZUZpbGVzW3RoaXMu X2NyZWF0ZVNvdXJjZUZpbGVJZChzb3VyY2VVUkwsIHNvdXJjZUlEKV07CiAgICAgfSwKIAogICAg IF9zY3JpcHRGb3JTb3VyY2VGaWxlSWQ6IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCkKICAgICB7CiAg ICAgICAgIGZ1bmN0aW9uIGZpbHRlcihzY3JpcHQpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHJl dHVybiAoc2NyaXB0LnNvdXJjZVVSTCB8fCBzY3JpcHQuc291cmNlSUQpID09PSBzb3VyY2VGaWxl SWQ7CisgICAgICAgICAgICByZXR1cm4gdGhpcy5fY3JlYXRlU291cmNlRmlsZUlkKHNjcmlwdC5z b3VyY2VVUkwsIHNjcmlwdC5zb3VyY2VJRCkgPT09IHNvdXJjZUZpbGVJZDsKICAgICAgICAgfQot ICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwucXVlcnlTY3JpcHRzKGZp bHRlcilbMF07CisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5xdWVy eVNjcmlwdHMoZmlsdGVyLmJpbmQodGhpcykpWzBdOworICAgIH0sCisKKyAgICBfY3JlYXRlU291 cmNlRmlsZUlkOiBmdW5jdGlvbihzb3VyY2VVUkwsIHNvdXJjZUlEKQorICAgIHsKKyAgICAgICAg dmFyIHByZWZpeCA9IHRoaXMuX2Zvcm1hdFNvdXJjZUZpbGVzID8gImRlb2JmdXNjYXRlZDoiIDog IiI7CisgICAgICAgIHJldHVybiBwcmVmaXggKyAoc291cmNlVVJMIHx8IHNvdXJjZUlEKTsKICAg ICB9LAogCiAgICAgX3Jlc2V0OiBmdW5jdGlvbigpCkBAIC01NTQsNyArNTYxLDcgQEAgV2ViSW5z cGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAg ICAgICAgICAgICB0aGlzLl9icmVha3BvaW50c1dpdGhvdXRTb3VyY2VGaWxlW3NvdXJjZUZpbGUu aWRdID0gYnJlYWtwb2ludHM7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGJy ZWFrcG9pbnRzLnB1c2goc291cmNlRmlsZS5icmVha3BvaW50c1tsaW5lXS5zZXJpYWxpemUoKSk7 Ci0gICAgICAgICAgICB9IAorICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAgdGhp cy5fc291cmNlRmlsZXMgPSB7fTsK