132201 2014-04-25 12:33:17 -0700 Refactor debugging code to use BreakpointActions instead of Vector<ScriptBreakpointAction> 2014-04-25 12:46:26 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam joepeck timothy oldest_to_newest 1004159 0 mark.lam 2014-04-25 12:33:17 -0700 BreakpointActions is Vector<ScriptBreakpointAction>. Let's just consistently use BreakpointActions everywhere. 1004160 1 230190 mark.lam 2014-04-25 12:38:12 -0700 Created attachment 230190 the patch. 1004163 2 230190 joepeck 2014-04-25 12:41:54 -0700 Comment on attachment 230190 the patch. r=me 1004168 3 mark.lam 2014-04-25 12:46:26 -0700 Thanks. Landed in r167816: <http://trac.webkit.org/r167816>. 230190 2014-04-25 12:38:12 -0700 2014-04-25 12:41:54 -0700 the patch. bug-132201.patch text/plain 7803 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY3ODEzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBA CisyMDE0LTA0LTI1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZWZhY3RvciBkZWJ1Z2dpbmcgY29kZSB0byB1c2UgQnJlYWtwb2ludEFjdGlvbnMgaW5zdGVhZCBv ZiBWZWN0b3I8U2NyaXB0QnJlYWtwb2ludEFjdGlvbj4uCisgICAgICAgIDxodHRwczovL3dlYmtp dC5vcmcvYi8xMzIyMDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQnJlYWtwb2ludEFjdGlvbnMgaXMgVmVjdG9yPFNjcmlwdEJyZWFrcG9pbnRBY3Rp b24+LiAgTGV0J3MganVzdCBjb25zaXN0ZW50bHkgdXNlCisgICAgICAgIEJyZWFrcG9pbnRBY3Rp b25zIGV2ZXJ5d2hlcmUuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvU2NyaXB0QnJlYWtwb2ludC5o OgorICAgICAgICAoSW5zcGVjdG9yOjpTY3JpcHRCcmVha3BvaW50OjpTY3JpcHRCcmVha3BvaW50 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwOgorICAgICAgICAo SW5zcGVjdG9yOjpTY3JpcHREZWJ1Z1NlcnZlcjo6c2V0QnJlYWtwb2ludCk6CisgICAgICAgIChJ bnNwZWN0b3I6OlNjcmlwdERlYnVnU2VydmVyOjpnZXRBY3Rpb25zRm9yQnJlYWtwb2ludCk6Cisg ICAgICAgICogaW5zcGVjdG9yL1NjcmlwdERlYnVnU2VydmVyLmg6CisgICAgICAgICogaW5zcGVj dG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcDoKKyAgICAgICAgKEluc3BlY3Rv cjo6SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6YnJlYWtwb2ludEFjdGlvbnNGcm9tUHJvdG9jb2wp OgorICAgICAgICAoSW5zcGVjdG9yOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRCcmVha3Bv aW50QnlVcmwpOgorICAgICAgICAoSW5zcGVjdG9yOjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50Ojpz ZXRCcmVha3BvaW50KToKKyAgICAgICAgKEluc3BlY3Rvcjo6SW5zcGVjdG9yRGVidWdnZXJBZ2Vu dDo6cmVtb3ZlQnJlYWtwb2ludCk6CisgICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0 b3JEZWJ1Z2dlckFnZW50Lmg6CisKIDIwMTQtMDQtMjUgIE9saXZlciBIdW50ICA8b2xpdmVyQGFw cGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW51c2VkIHBhcmFtZXRlciBmcm9tIGNvZGVibG9j ayBsaW5raW5nIGZ1bmN0aW9uCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L1NjcmlwdEJyZWFrcG9pbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL1NjcmlwdEJyZWFrcG9pbnQuaAkocmV2aXNpb24gMTY3ODEyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9TY3JpcHRCcmVha3BvaW50LmgJKHdvcmtpbmcgY29w eSkKQEAgLTU1LDYgKzU1LDggQEAgc3RydWN0IFNjcmlwdEJyZWFrcG9pbnRBY3Rpb24gewogICAg IFN0cmluZyBkYXRhOwogfTsKIAordHlwZWRlZiBWZWN0b3I8U2NyaXB0QnJlYWtwb2ludEFjdGlv bj4gQnJlYWtwb2ludEFjdGlvbnM7CisKIHN0cnVjdCBTY3JpcHRCcmVha3BvaW50IHsKICAgICBT Y3JpcHRCcmVha3BvaW50KCkKICAgICB7CkBAIC02OCw3ICs3MCw3IEBAIHN0cnVjdCBTY3JpcHRC cmVha3BvaW50IHsKICAgICB7CiAgICAgfQogCi0gICAgU2NyaXB0QnJlYWtwb2ludChpbnQgbGlu ZU51bWJlciwgaW50IGNvbHVtbk51bWJlciwgY29uc3QgU3RyaW5nJiBjb25kaXRpb24sIFZlY3Rv cjxTY3JpcHRCcmVha3BvaW50QWN0aW9uPiYgYWN0aW9ucywgYm9vbCBhdXRvQ29udGludWUpCisg ICAgU2NyaXB0QnJlYWtwb2ludChpbnQgbGluZU51bWJlciwgaW50IGNvbHVtbk51bWJlciwgY29u c3QgU3RyaW5nJiBjb25kaXRpb24sIEJyZWFrcG9pbnRBY3Rpb25zJiBhY3Rpb25zLCBib29sIGF1 dG9Db250aW51ZSkKICAgICAgICAgOiBsaW5lTnVtYmVyKGxpbmVOdW1iZXIpCiAgICAgICAgICwg Y29sdW1uTnVtYmVyKGNvbHVtbk51bWJlcikKICAgICAgICAgLCBjb25kaXRpb24oY29uZGl0aW9u KQpAQCAtODAsNyArODIsNyBAQCBzdHJ1Y3QgU2NyaXB0QnJlYWtwb2ludCB7CiAgICAgaW50IGxp bmVOdW1iZXI7CiAgICAgaW50IGNvbHVtbk51bWJlcjsKICAgICBTdHJpbmcgY29uZGl0aW9uOwot ICAgIFZlY3RvcjxTY3JpcHRCcmVha3BvaW50QWN0aW9uPiBhY3Rpb25zOworICAgIEJyZWFrcG9p bnRBY3Rpb25zIGFjdGlvbnM7CiAgICAgYm9vbCBhdXRvQ29udGludWU7CiB9OwogCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnU2VydmVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnU2Vy dmVyLmNwcAkocmV2aXNpb24gMTY3ODEyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9TY3JpcHREZWJ1Z1NlcnZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcwLDcgKzcwLDcg QEAgSlNDOjpCcmVha3BvaW50SUQgU2NyaXB0RGVidWdTZXJ2ZXI6OnNldAogICAgICAgICBCcmVh a3BvaW50SURUb0FjdGlvbnNNYXA6Oml0ZXJhdG9yIGl0ID0gbV9icmVha3BvaW50SURUb0FjdGlv bnMuZmluZChpZCk7CiAgICAgICAgIEFTU0VSVChpdCA9PSBtX2JyZWFrcG9pbnRJRFRvQWN0aW9u cy5lbmQoKSk7CiAjZW5kaWYKLSAgICAgICAgY29uc3QgVmVjdG9yPFNjcmlwdEJyZWFrcG9pbnRB Y3Rpb24+ICZhY3Rpb25zID0gc2NyaXB0QnJlYWtwb2ludC5hY3Rpb25zOworICAgICAgICBjb25z dCBCcmVha3BvaW50QWN0aW9ucyYgYWN0aW9ucyA9IHNjcmlwdEJyZWFrcG9pbnQuYWN0aW9uczsK ICAgICAgICAgbV9icmVha3BvaW50SURUb0FjdGlvbnMuc2V0KGlkLCBhY3Rpb25zKTsKICAgICB9 CiAgICAgcmV0dXJuIGlkOwpAQCAtMzI0LDE0ICszMjQsMTQgQEAgdm9pZCBTY3JpcHREZWJ1Z1Nl cnZlcjo6aGFuZGxlUGF1c2UoRGVidQogICAgIGRpc3BhdGNoRnVuY3Rpb25Ub0xpc3RlbmVycygm U2NyaXB0RGVidWdTZXJ2ZXI6OmRpc3BhdGNoRGlkQ29udGludWUsIHZtRW50cnlHbG9iYWxPYmpl Y3QpOwogfQogCi1jb25zdCBWZWN0b3I8U2NyaXB0QnJlYWtwb2ludEFjdGlvbj4mIFNjcmlwdERl YnVnU2VydmVyOjpnZXRBY3Rpb25zRm9yQnJlYWtwb2ludChKU0M6OkJyZWFrcG9pbnRJRCBicmVh a3BvaW50SUQpCitjb25zdCBCcmVha3BvaW50QWN0aW9ucyYgU2NyaXB0RGVidWdTZXJ2ZXI6Omdl dEFjdGlvbnNGb3JCcmVha3BvaW50KEpTQzo6QnJlYWtwb2ludElEIGJyZWFrcG9pbnRJRCkKIHsK ICAgICBBU1NFUlQoYnJlYWtwb2ludElEICE9IEpTQzo6bm9CcmVha3BvaW50SUQpOwogCiAgICAg aWYgKG1fYnJlYWtwb2ludElEVG9BY3Rpb25zLmNvbnRhaW5zKGJyZWFrcG9pbnRJRCkpCiAgICAg ICAgIHJldHVybiBtX2JyZWFrcG9pbnRJRFRvQWN0aW9ucy5maW5kKGJyZWFrcG9pbnRJRCktPnZh bHVlOwogICAgIAotICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxWZWN0b3I8U2NyaXB0QnJlYWtw b2ludEFjdGlvbj4+IGVtcHR5QWN0aW9uVmVjdG9yID0gVmVjdG9yPFNjcmlwdEJyZWFrcG9pbnRB Y3Rpb24+KCk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEJyZWFrcG9pbnRBY3Rpb25zPiBl bXB0eUFjdGlvblZlY3RvciA9IEJyZWFrcG9pbnRBY3Rpb25zKCk7CiAgICAgcmV0dXJuIGVtcHR5 QWN0aW9uVmVjdG9yOwogfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9y L1NjcmlwdERlYnVnU2VydmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9TY3JpcHREZWJ1Z1NlcnZlci5oCShyZXZpc2lvbiAxNjc4MTIpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnU2VydmVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTU4LDcgKzU4LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIHJlY29t cGlsZUFsbEpTRnVuY3Rpb25zKCkgPSAwOwogCi0gICAgY29uc3QgVmVjdG9yPFNjcmlwdEJyZWFr cG9pbnRBY3Rpb24+JiBnZXRBY3Rpb25zRm9yQnJlYWtwb2ludChKU0M6OkJyZWFrcG9pbnRJRCk7 CisgICAgY29uc3QgQnJlYWtwb2ludEFjdGlvbnMmIGdldEFjdGlvbnNGb3JCcmVha3BvaW50KEpT Qzo6QnJlYWtwb2ludElEKTsKIAogICAgIGNsYXNzIFRhc2sgewogICAgICAgICBXVEZfTUFLRV9G QVNUX0FMTE9DQVRFRDsKQEAgLTk2LDcgKzk2LDYgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wgbV9k b25lUHJvY2Vzc2luZ0RlYnVnZ2VyRXZlbnRzOwogCiBwcml2YXRlOgotICAgIHR5cGVkZWYgVmVj dG9yPFNjcmlwdEJyZWFrcG9pbnRBY3Rpb24+IEJyZWFrcG9pbnRBY3Rpb25zOwogICAgIHR5cGVk ZWYgSGFzaE1hcDxKU0M6OkJyZWFrcG9pbnRJRCwgQnJlYWtwb2ludEFjdGlvbnM+IEJyZWFrcG9p bnRJRFRvQWN0aW9uc01hcDsKIAogICAgIHZpcnR1YWwgdm9pZCBzb3VyY2VQYXJzZWQoSlNDOjpF eGVjU3RhdGUqLCBKU0M6OlNvdXJjZVByb3ZpZGVyKiwgaW50IGVycm9yTGluZSwgY29uc3QgU3Ry aW5nJiBlcnJvck1zZykgb3ZlcnJpZGUgZmluYWw7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1 Z2dlckFnZW50LmNwcAkocmV2aXNpb24gMTY3ODEyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE5NSw3ICsxOTUsNyBAQCBzdGF0aWMgYm9vbCBicmVha3BvaW50QWN0aW9uVHlwZUZv clN0cmluCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIEluc3BlY3RvckRlYnVnZ2VyQWdl bnQ6OmJyZWFrcG9pbnRBY3Rpb25zRnJvbVByb3RvY29sKEVycm9yU3RyaW5nKiBlcnJvclN0cmlu ZywgUmVmUHRyPEluc3BlY3RvckFycmF5PiYgYWN0aW9ucywgVmVjdG9yPFNjcmlwdEJyZWFrcG9p bnRBY3Rpb24+KiByZXN1bHQpCitib29sIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6OmJyZWFrcG9p bnRBY3Rpb25zRnJvbVByb3RvY29sKEVycm9yU3RyaW5nKiBlcnJvclN0cmluZywgUmVmUHRyPElu c3BlY3RvckFycmF5PiYgYWN0aW9ucywgQnJlYWtwb2ludEFjdGlvbnMqIHJlc3VsdCkKIHsKICAg ICBpZiAoIWFjdGlvbnMpCiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMjY2LDcgKzI2Niw3IEBA IHZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6c2V0QnJlYWtwb2kKICAgICAgICAgYWN0aW9u cyA9ICgqb3B0aW9ucyktPmdldEFycmF5KEFTQ0lJTGl0ZXJhbCgiYWN0aW9ucyIpKTsKICAgICB9 CiAKLSAgICBWZWN0b3I8U2NyaXB0QnJlYWtwb2ludEFjdGlvbj4gYnJlYWtwb2ludEFjdGlvbnM7 CisgICAgQnJlYWtwb2ludEFjdGlvbnMgYnJlYWtwb2ludEFjdGlvbnM7CiAgICAgaWYgKCFicmVh a3BvaW50QWN0aW9uc0Zyb21Qcm90b2NvbChlcnJvclN0cmluZywgYWN0aW9ucywgJmJyZWFrcG9p bnRBY3Rpb25zKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0zMTcsNyArMzE3LDcgQEAgdm9pZCBJ bnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpzZXRCcmVha3BvaQogICAgICAgICBhY3Rpb25zID0gKCpv cHRpb25zKS0+Z2V0QXJyYXkoQVNDSUlMaXRlcmFsKCJhY3Rpb25zIikpOwogICAgIH0KIAotICAg IFZlY3RvcjxTY3JpcHRCcmVha3BvaW50QWN0aW9uPiBicmVha3BvaW50QWN0aW9uczsKKyAgICBC cmVha3BvaW50QWN0aW9ucyBicmVha3BvaW50QWN0aW9uczsKICAgICBpZiAoIWJyZWFrcG9pbnRB Y3Rpb25zRnJvbVByb3RvY29sKGVycm9yU3RyaW5nLCBhY3Rpb25zLCAmYnJlYWtwb2ludEFjdGlv bnMpKQogICAgICAgICByZXR1cm47CiAKQEAgLTM0Miw3ICszNDIsNyBAQCB2b2lkIEluc3BlY3Rv ckRlYnVnZ2VyQWdlbnQ6OnJlbW92ZUJyZWFrCiAgICAgbV9qYXZhU2NyaXB0QnJlYWtwb2ludHMu cmVtb3ZlKGJyZWFrcG9pbnRJZGVudGlmaWVyKTsKIAogICAgIGZvciAoSlNDOjpCcmVha3BvaW50 SUQgYnJlYWtwb2ludElEIDogbV9icmVha3BvaW50SWRlbnRpZmllclRvRGVidWdTZXJ2ZXJCcmVh a3BvaW50SURzLnRha2UoYnJlYWtwb2ludElkZW50aWZpZXIpKSB7Ci0gICAgICAgIGNvbnN0IFZl Y3RvcjxTY3JpcHRCcmVha3BvaW50QWN0aW9uPiYgYnJlYWtwb2ludEFjdGlvbnMgPSBzY3JpcHRE ZWJ1Z1NlcnZlcigpLmdldEFjdGlvbnNGb3JCcmVha3BvaW50KGJyZWFrcG9pbnRJRCk7CisgICAg ICAgIGNvbnN0IEJyZWFrcG9pbnRBY3Rpb25zJiBicmVha3BvaW50QWN0aW9ucyA9IHNjcmlwdERl YnVnU2VydmVyKCkuZ2V0QWN0aW9uc0ZvckJyZWFrcG9pbnQoYnJlYWtwb2ludElEKTsKICAgICAg ICAgZm9yIChhdXRvJiBhY3Rpb24gOiBicmVha3BvaW50QWN0aW9ucykKICAgICAgICAgICAgIG1f aW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5yZWxlYXNlT2JqZWN0R3JvdXAob2JqZWN0R3JvdXBGb3JC cmVha3BvaW50QWN0aW9uKGFjdGlvbikpOwogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yRGVidWdnZXJB Z2VudC5oCShyZXZpc2lvbiAxNjc4MTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL2FnZW50cy9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTE0 Myw3ICsxNDMsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgY2xlYXJJbnNwZWN0b3JCcmVha3BvaW50 U3RhdGUoKTsKICAgICB2b2lkIGNsZWFyQnJlYWtEZXRhaWxzKCk7CiAKLSAgICBib29sIGJyZWFr cG9pbnRBY3Rpb25zRnJvbVByb3RvY29sKEVycm9yU3RyaW5nKiwgUmVmUHRyPEluc3BlY3RvckFy cmF5PiYgYWN0aW9ucywgVmVjdG9yPFNjcmlwdEJyZWFrcG9pbnRBY3Rpb24+KiByZXN1bHQpOwor ICAgIGJvb2wgYnJlYWtwb2ludEFjdGlvbnNGcm9tUHJvdG9jb2woRXJyb3JTdHJpbmcqLCBSZWZQ dHI8SW5zcGVjdG9yQXJyYXk+JiBhY3Rpb25zLCBCcmVha3BvaW50QWN0aW9ucyogcmVzdWx0KTsK IAogICAgIHR5cGVkZWYgSGFzaE1hcDxKU0M6OlNvdXJjZUlELCBTY3JpcHQ+IFNjcmlwdHNNYXA7 CiAgICAgdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgVmVjdG9yPEpTQzo6QnJlYWtwb2ludElEPj4g QnJlYWtwb2ludElkZW50aWZpZXJUb0RlYnVnU2VydmVyQnJlYWtwb2ludElEc01hcDsK