38132 2010-04-26 11:22:49 -0700 Web Inspector: [Chromium] breakpoints are not preserved after reload 2010-04-27 09:59:58 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Minor --- 0 caseq webkit-unassigned bweinstein joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 217205 0 caseq 2010-04-26 11:22:49 -0700 1. Load a page 2. Set a breakpoint 3. Reload EXPECTED: Breakpoint is displayed in Breakpoints sidebar pane ACTUAL: Breakpoint is hit, but it's not displayed in Breakpoints sidebar pane 217216 1 54321 caseq 2010-04-26 12:04:24 -0700 Created attachment 54321 Restore breakpoints associated with script's url once script is parsed 217238 2 54321 pfeldman 2010-04-26 13:17:06 -0700 Comment on attachment 54321 Restore breakpoints associated with script's url once script is parsed WebCore/inspector/front-end/Breakpoint.js:74 + return (this.url ? this.url : this.sourceID) + ":" + this.line; It is not clear to me why this change is necessary. We'd like breakpoints to point to exact scripts, while URL <-> sourceID mapping is external. WebKit/chromium/src/js/DebuggerAgent.js:1100 + if (line * 1 == line) if (parseInt(line) === line) WebKit/chromium/src/js/DebuggerAgent.js:1101 + WebInspector.restoredBreakpoint(sourceID, scriptUrl, devtools.DebuggerAgent.v8ToWwebkitLineNumber_(line * 1), true, breakpoints[line].condition()); line * 1 -> parseInt(line) I think you should call devtools.DebuggerAgent.prototype.addBreakpoint for disabled breakpoints as well and populate the maps with the appropriate BreakpointInfo. You would need to cut the control flow further so that disabled breakpoint does not get into the VM. 217635 3 54405 caseq 2010-04-27 03:13:32 -0700 Created attachment 54405 added support for "enabled" state when storing breakpoints 217636 4 54405 pfeldman 2010-04-27 03:18:03 -0700 Comment on attachment 54405 added support for "enabled" state when storing breakpoints Looks good except for bogus console.log. 217637 5 54405 pfeldman 2010-04-27 03:21:03 -0700 Comment on attachment 54405 added support for "enabled" state when storing breakpoints Looks good except for bogus console.log. 217638 6 54406 caseq 2010-04-27 03:23:43 -0700 Created attachment 54406 removed console.log 217737 7 pfeldman 2010-04-27 09:39:33 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKit/chromium/ChangeLog M WebKit/chromium/src/js/DebuggerAgent.js Committed r58312 54321 2010-04-26 12:04:24 -0700 2010-04-27 03:13:32 -0700 Restore breakpoints associated with script's url once script is parsed breakpoints.diff text/plain 5609 caseq SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1ODI2MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDQtMjYgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVc2Ugc2NyaXB0IFVSTCBpbnN0ZWFkIG9mIHNjcmlwdCBpZCBmb3IgYnJlYWtwb2ludCBpZCwK KyAgICAgICAgc28gdGhhdCB3ZSBvbmx5IGRpc3BsYXkgb25lIGJyZWFrcG9pbnQgZm9yIG11bHRp cGxlIGluc3RhbmNlcworICAgICAgICBvZiB0aGUgc2FtZSBzY3JpcHQuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODEzMgorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJy ZWFrcG9pbnQucHJvdG90eXBlLmdldCBpZCk6CisKIDIwMTAtMDQtMjYgIFJvbWFuIEdlcnNobWFu ICA8cm9tYW5nZUBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGgu CkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludC5qcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludC5qcwkocmV2aXNp b24gNTgyNjEpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludC5qcwko d29ya2luZyBjb3B5KQpAQCAtNzEsNyArNzEsNyBAQCBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludC5w cm90b3R5cGUgPSB7CiAKICAgICBnZXQgaWQoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMu c291cmNlSUQgKyAiOiIgKyB0aGlzLmxpbmU7CisgICAgICAgIHJldHVybiAodGhpcy51cmwgPyB0 aGlzLnVybCA6IHRoaXMuc291cmNlSUQpICsgIjoiICsgdGhpcy5saW5lOwogICAgIH0sCiAKICAg ICBnZXQgY29uZGl0aW9uKCkKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTgyNjEpCisrKyBX ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMDQtMjYgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXN0b3JlIGJyZWFr cG9pbnRzIGFzc29jaWF0ZWQgd2l0aCBzY3JpcHQncyBVUkwKKyAgICAgICAgdXBvbiBwYXJzaW5n IGEgc2NyaXB0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzgxMzIKKworICAgICAgICAqIHNyYy9qcy9EZWJ1Z2dlckFnZW50LmpzOgorICAgICAgICAo ZGV2dG9vbHMuRGVidWdnZXJBZ2VudC5wcm90b3R5cGUuaW5pdFVJKToKKyAgICAgICAgKGRldnRv b2xzLkRlYnVnZ2VyQWdlbnQucHJvdG90eXBlLmFkZEJyZWFrcG9pbnQpOgorICAgICAgICAoZGV2 dG9vbHMuRGVidWdnZXJBZ2VudC5wcm90b3R5cGUuYWRkU2NyaXB0SW5mb18pOgorICAgICAgICAo ZGV2dG9vbHMuRGVidWdnZXJBZ2VudC5wcm90b3R5cGUucmVzdG9yZUJyZWFrcG9pbnRzXyk6Cisg ICAgICAgIChkZXZ0b29scy5CcmVha3BvaW50SW5mbyk6CisgICAgICAgIChkZXZ0b29scy5CcmVh a3BvaW50SW5mby5wcm90b3R5cGUuY29uZGl0aW9uKToKKwogMjAxMC0wNC0yNiAgUm9tYW4gR2Vy c2htYW4gIDxyb21hbmdlQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBC YXJ0aC4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvanMvRGVidWdnZXJBZ2VudC5qcwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RlYnVnZ2VyQWdlbnQuanMJKHJldmlz aW9uIDU4MjYxKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZWJ1Z2dlckFnZW50LmpzCSh3 b3JraW5nIGNvcHkpCkBAIC0xODIsNiArMTgyLDcgQEAgZGV2dG9vbHMuRGVidWdnZXJBZ2VudC5w cm90b3R5cGUuaW5pdFVJIAogICAgICAgICBmb3IgKHZhciBzY3JpcHRJZCBpbiB0aGlzLnBhcnNl ZFNjcmlwdHNfKSB7CiAgICAgICAgICAgdmFyIHNjcmlwdCA9IHRoaXMucGFyc2VkU2NyaXB0c19b c2NyaXB0SWRdOwogICAgICAgICAgIFdlYkluc3BlY3Rvci5wYXJzZWRTY3JpcHRTb3VyY2Uoc2Ny aXB0SWQsIHNjcmlwdC5nZXRVcmwoKSwgdW5kZWZpbmVkIC8qIHNjcmlwdCBzb3VyY2UgKi8sIHNj cmlwdC5nZXRMaW5lT2Zmc2V0KCkgKyAxKTsKKyAgICAgICAgICB0aGlzLnJlc3RvcmVCcmVha3Bv aW50c18oc2NyaXB0SWQsIHNjcmlwdC5nZXRVcmwoKSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0 dXJuOwogICAgIH0KQEAgLTI2Myw3ICsyNjQsNyBAQCBkZXZ0b29scy5EZWJ1Z2dlckFnZW50LnBy b3RvdHlwZS5hZGRCcmVhCiAgICAgICAgICAgICB0aGlzLnVybFRvQnJlYWtwb2ludHNfW3Njcmlw dC5nZXRVcmwoKV0gPSBicmVha3BvaW50czsKICAgICAgICAgfQogCi0gICAgICAgIHZhciBicmVh a3BvaW50SW5mbyA9IG5ldyBkZXZ0b29scy5CcmVha3BvaW50SW5mbyhsaW5lKTsKKyAgICAgICAg dmFyIGJyZWFrcG9pbnRJbmZvID0gbmV3IGRldnRvb2xzLkJyZWFrcG9pbnRJbmZvKGxpbmUsIGNv bmRpdGlvbik7CiAgICAgICAgIGJyZWFrcG9pbnRzW2xpbmVdID0gYnJlYWtwb2ludEluZm87CiAK ICAgICAgICAgY29tbWFuZEFyZ3VtZW50cyA9IHsKQEAgLTI3OCw3ICsyNzksNyBAQCBkZXZ0b29s cy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5hZGRCcmVhCiAgICAgICAgIGlmIChicmVha3BvaW50 SW5mbykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBicmVha3BvaW50SW5mbyA9IG5l dyBkZXZ0b29scy5CcmVha3BvaW50SW5mbyhsaW5lKTsKKyAgICAgICAgYnJlYWtwb2ludEluZm8g PSBuZXcgZGV2dG9vbHMuQnJlYWtwb2ludEluZm8obGluZSwgY29uZGl0aW9uKTsKICAgICAgICAg c2NyaXB0LmFkZEJyZWFrcG9pbnRJbmZvKGJyZWFrcG9pbnRJbmZvKTsKIAogICAgICAgICBjb21t YW5kQXJndW1lbnRzID0gewpAQCAtOTYyLDYgKzk2Myw3IEBAIGRldnRvb2xzLkRlYnVnZ2VyQWdl bnQucHJvdG90eXBlLmFkZFNjcmkKICAgICBpZiAodGhpcy5zY3JpcHRzUGFuZWxJbml0aWFsaXpl ZF8pIHsKICAgICAgICAgLy8gT25seSByZXBvcnQgc2NyaXB0IGFzIHBhcnNlZCBhZnRlciBzY3Jp cHRzIHBhbmVsIGhhcyBiZWVuIHNob3duLgogICAgICAgICBXZWJJbnNwZWN0b3IucGFyc2VkU2Ny aXB0U291cmNlKHNjcmlwdC5pZCwgc2NyaXB0Lm5hbWUsIHNjcmlwdC5zb3VyY2UsIHNjcmlwdC5s aW5lT2Zmc2V0ICsgMSk7CisgICAgICAgIHRoaXMucmVzdG9yZUJyZWFrcG9pbnRzXyhzY3JpcHQu aWQsIHNjcmlwdC5uYW1lKTsKICAgICB9CiB9OwogCkBAIC0xMDg1LDYgKzEwODcsMjMgQEAgZGV2 dG9vbHMuRGVidWdnZXJBZ2VudC5wcm90b3R5cGUuZm9ybWF0QwogCiAKIC8qKgorICogUmVzdG9y ZXMgYnJlYWtwb2ludHMgYXNzb2NpYXRlZCB3aXRoIHRoZSBVUkwgb2YgYSBuZXdseSBwYXJzZWQg c2NyaXB0LgorICogQHBhcmFtIHtudW1iZXJ9IHNvdXJjZUlEIFRoZSBpZCBvZiB0aGUgc2NyaXB0 LgorICogQHBhcmFtIHtzdHJpbmd9IHNjcmlwdFVybCBVUkwgb2YgdGhlIHNjcmlwdAorICovCitk ZXZ0b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5yZXN0b3JlQnJlYWtwb2ludHNfID0gZnVu Y3Rpb24oc291cmNlSUQsIHNjcmlwdFVybCkKK3sKKyAgICB2YXIgYnJlYWtwb2ludHMgPSB0aGlz LnVybFRvQnJlYWtwb2ludHNfW3NjcmlwdFVybF07CisgICAgaWYgKCFicmVha3BvaW50cykKKyAg ICAgICAgcmV0dXJuOworICAgIGZvciAodmFyIGxpbmUgaW4gYnJlYWtwb2ludHMpIHsKKyAgICAg ICAgaWYgKGxpbmUgKiAxID09IGxpbmUpCisgICAgICAgICAgICBXZWJJbnNwZWN0b3IucmVzdG9y ZWRCcmVha3BvaW50KHNvdXJjZUlELCBzY3JpcHRVcmwsIGRldnRvb2xzLkRlYnVnZ2VyQWdlbnQu djhUb1d3ZWJraXRMaW5lTnVtYmVyXyhsaW5lICogMSksIHRydWUsIGJyZWFrcG9pbnRzW2xpbmVd LmNvbmRpdGlvbigpKTsKKyAgICB9Cit9OworCisKKy8qKgogICogQ29sbGVjdHMgcHJvcGVydGll cyBmb3IgYW4gb2JqZWN0IGZyb20gdGhlIGRlYnVnZ2VyIHJlc3BvbnNlLgogICogQHBhcmFtIHtP YmplY3R9IG9iamVjdCBBbiBvYmplY3QgZnJvbSB0aGUgZGVidWdnZXIgcHJvdG9jb2wgcmVzcG9u c2UuCiAgKiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlQcm94eT59 IHJlc3VsdCBBbiBhcnJheSB0byBwdXQgdGhlCkBAIC0xMjc5LDkgKzEyOTgsMTAgQEAgZGV2dG9v bHMuU2NyaXB0SW5mby5wcm90b3R5cGUucmVtb3ZlQnJlYQogICogQHBhcmFtIHtudW1iZXJ9IGxp bmUgQnJlYWtwb2ludCAwLWJhc2VkIGxpbmUgbnVtYmVyIGluIHRoZSBjb250YWluaW5nIHNjcmlw dC4KICAqIEBjb25zdHJ1Y3RvcgogICovCi1kZXZ0b29scy5CcmVha3BvaW50SW5mbyA9IGZ1bmN0 aW9uKGxpbmUpCitkZXZ0b29scy5CcmVha3BvaW50SW5mbyA9IGZ1bmN0aW9uKGxpbmUsIGNvbmRp dGlvbikKIHsKICAgICB0aGlzLmxpbmVfID0gbGluZTsKKyAgICB0aGlzLmNvbmRpdGlvbl8gPSBj b25kaXRpb247CiAgICAgdGhpcy52OGlkXyA9IC0xOwogICAgIHRoaXMucmVtb3ZlZF8gPSBmYWxz ZTsKIH07CkBAIC0xMzE2LDcgKzEzMzYsNyBAQCBkZXZ0b29scy5CcmVha3BvaW50SW5mby5wcm90 b3R5cGUuc2V0VjhJCiAKIAogLyoqCi0gKiBNYXJrcyB0aGlzIGJyZWFrcG9pbnQgYXMgcmVtb3Zl ZCBmcm9tIHRoZSAgZnJvbnQtZW5kLgorICogTWFya3MgdGhpcyBicmVha3BvaW50IGFzIHJlbW92 ZWQgZnJvbSB0aGUgZnJvbnQtZW5kLgogICovCiBkZXZ0b29scy5CcmVha3BvaW50SW5mby5wcm90 b3R5cGUubWFya0FzUmVtb3ZlZCA9IGZ1bmN0aW9uKCkKIHsKQEAgLTEzMzUsNiArMTM1NSwxNSBA QCBkZXZ0b29scy5CcmVha3BvaW50SW5mby5wcm90b3R5cGUuaXNSZW1vCiAKIAogLyoqCisgKiBA cmV0dXJuIHs/c3RyaW5nfSBCcmVha3BvaW50IGNvbmRpdGlvbgorICovCitkZXZ0b29scy5CcmVh a3BvaW50SW5mby5wcm90b3R5cGUuY29uZGl0aW9uID0gZnVuY3Rpb24oKQoreworICAgIHJldHVy biB0aGlzLmNvbmRpdGlvbl87Cit9OworCisKKy8qKgogICogQ2FsbCBzdGFjayBmcmFtZSBkYXRh LgogICogQHBhcmFtIHtzdHJpbmd9IGlkIENhbGxGcmFtZSBpZC4KICAqIEBwYXJhbSB7c3RyaW5n fSB0eXBlIENhbGxGcmFtZSB0eXBlLgo= 54405 2010-04-27 03:13:32 -0700 2010-04-27 03:23:43 -0700 added support for "enabled" state when storing breakpoints breakpoints.diff text/plain 5620 caseq SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTgzMDApCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDQtMjcgIEFuZHJl eSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXN0b3JlIGJyZWFrcG9pbnRzIGFzc29jaWF0ZWQg d2l0aCBzY3JpcHQncyBVUkwgb25jZQorICAgICAgICBzY3JpcHQgaXMgcGFyc2VkLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgxMzIKKworICAgICAg ICAqIHNyYy9qcy9EZWJ1Z2dlckFnZW50LmpzOgorICAgICAgICAoZGV2dG9vbHMuRGVidWdnZXJB Z2VudC5wcm90b3R5cGUuaW5pdFVJKToKKyAgICAgICAgKGRldnRvb2xzLkRlYnVnZ2VyQWdlbnQu cHJvdG90eXBlLmFkZEJyZWFrcG9pbnQpOgorICAgICAgICAoZGV2dG9vbHMuRGVidWdnZXJBZ2Vu dC5wcm90b3R5cGUuYWRkU2NyaXB0SW5mb18pOgorICAgICAgICAoZGV2dG9vbHMuRGVidWdnZXJB Z2VudC5wcm90b3R5cGUucmVzdG9yZUJyZWFrcG9pbnRzXyk6CisgICAgICAgIChkZXZ0b29scy5C cmVha3BvaW50SW5mbyk6CisgICAgICAgIChkZXZ0b29scy5CcmVha3BvaW50SW5mby5wcm90b3R5 cGUuZW5hYmxlZCk6CisgICAgICAgIChkZXZ0b29scy5CcmVha3BvaW50SW5mby5wcm90b3R5cGUu Y29uZGl0aW9uKToKKwogMjAxMC0wNC0yNiAgSm9obiBBYmQtRWwtTWFsZWsgIDxqYW1AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KSW5kZXg6IFdlYktp dC9jaHJvbWl1bS9zcmMvanMvRGVidWdnZXJBZ2VudC5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv Y2hyb21pdW0vc3JjL2pzL0RlYnVnZ2VyQWdlbnQuanMJKHJldmlzaW9uIDU4Mjk1KQorKysgV2Vi S2l0L2Nocm9taXVtL3NyYy9qcy9EZWJ1Z2dlckFnZW50LmpzCSh3b3JraW5nIGNvcHkpCkBAIC0x ODIsNiArMTgyLDcgQEAgZGV2dG9vbHMuRGVidWdnZXJBZ2VudC5wcm90b3R5cGUuaW5pdFVJIAog ICAgICAgICBmb3IgKHZhciBzY3JpcHRJZCBpbiB0aGlzLnBhcnNlZFNjcmlwdHNfKSB7CiAgICAg ICAgICAgdmFyIHNjcmlwdCA9IHRoaXMucGFyc2VkU2NyaXB0c19bc2NyaXB0SWRdOwogICAgICAg ICAgIFdlYkluc3BlY3Rvci5wYXJzZWRTY3JpcHRTb3VyY2Uoc2NyaXB0SWQsIHNjcmlwdC5nZXRV cmwoKSwgdW5kZWZpbmVkIC8qIHNjcmlwdCBzb3VyY2UgKi8sIHNjcmlwdC5nZXRMaW5lT2Zmc2V0 KCkgKyAxKTsKKyAgICAgICAgICB0aGlzLnJlc3RvcmVCcmVha3BvaW50c18oc2NyaXB0SWQsIHNj cmlwdC5nZXRVcmwoKSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTI0 NSw3ICsyNDYsNyBAQCBkZXZ0b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5wYXVzZUV4CiAg KiBAcGFyYW0ge251bWJlcn0gbGluZSBOdW1iZXIgb2YgdGhlIGxpbmUgZm9yIHRoZSBicmVha3Bv aW50LgogICogQHBhcmFtIHs/c3RyaW5nfSBjb25kaXRpb24gVGhlIGJyZWFrcG9pbnQgY29uZGl0 aW9uLgogICovCi1kZXZ0b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5hZGRCcmVha3BvaW50 ID0gZnVuY3Rpb24oc291cmNlSWQsIGxpbmUsIGNvbmRpdGlvbikKK2RldnRvb2xzLkRlYnVnZ2Vy QWdlbnQucHJvdG90eXBlLmFkZEJyZWFrcG9pbnQgPSBmdW5jdGlvbihzb3VyY2VJZCwgbGluZSwg ZW5hYmxlZCwgY29uZGl0aW9uKQogewogICAgIHZhciBzY3JpcHQgPSB0aGlzLnBhcnNlZFNjcmlw dHNfW3NvdXJjZUlkXTsKICAgICBpZiAoIXNjcmlwdCkKQEAgLTI2Myw3ICsyNjQsNyBAQCBkZXZ0 b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5hZGRCcmVhCiAgICAgICAgICAgICB0aGlzLnVy bFRvQnJlYWtwb2ludHNfW3NjcmlwdC5nZXRVcmwoKV0gPSBicmVha3BvaW50czsKICAgICAgICAg fQogCi0gICAgICAgIHZhciBicmVha3BvaW50SW5mbyA9IG5ldyBkZXZ0b29scy5CcmVha3BvaW50 SW5mbyhsaW5lKTsKKyAgICAgICAgdmFyIGJyZWFrcG9pbnRJbmZvID0gbmV3IGRldnRvb2xzLkJy ZWFrcG9pbnRJbmZvKGxpbmUsIGVuYWJsZWQsIGNvbmRpdGlvbik7CiAgICAgICAgIGJyZWFrcG9p bnRzW2xpbmVdID0gYnJlYWtwb2ludEluZm87CiAKICAgICAgICAgY29tbWFuZEFyZ3VtZW50cyA9 IHsKQEAgLTI3OCw3ICsyNzksNyBAQCBkZXZ0b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5h ZGRCcmVhCiAgICAgICAgIGlmIChicmVha3BvaW50SW5mbykKICAgICAgICAgICAgIHJldHVybjsK IAotICAgICAgICBicmVha3BvaW50SW5mbyA9IG5ldyBkZXZ0b29scy5CcmVha3BvaW50SW5mbyhs aW5lKTsKKyAgICAgICAgYnJlYWtwb2ludEluZm8gPSBuZXcgZGV2dG9vbHMuQnJlYWtwb2ludElu Zm8obGluZSwgZW5hYmxlZCwgY29uZGl0aW9uKTsKICAgICAgICAgc2NyaXB0LmFkZEJyZWFrcG9p bnRJbmZvKGJyZWFrcG9pbnRJbmZvKTsKIAogICAgICAgICBjb21tYW5kQXJndW1lbnRzID0gewpA QCAtMjkwLDYgKzI5MSw5IEBAIGRldnRvb2xzLkRlYnVnZ2VyQWdlbnQucHJvdG90eXBlLmFkZEJy ZWEKICAgICAgICAgfTsKICAgICB9CiAKKyAgICBpZiAoIWVuYWJsZWQpCisgICAgICAgIHJldHVy bjsKKwogICAgIHZhciBjbWQgPSBuZXcgZGV2dG9vbHMuRGVidWdDb21tYW5kKCJzZXRicmVha3Bv aW50IiwgY29tbWFuZEFyZ3VtZW50cyk7CiAKICAgICB0aGlzLnJlcXVlc3ROdW1iZXJUb0JyZWFr cG9pbnRJbmZvX1tjbWQuZ2V0U2VxdWVuY2VOdW1iZXIoKV0gPSBicmVha3BvaW50SW5mbzsKQEAg LTk2Miw2ICs5NjYsNyBAQCBkZXZ0b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5hZGRTY3Jp CiAgICAgaWYgKHRoaXMuc2NyaXB0c1BhbmVsSW5pdGlhbGl6ZWRfKSB7CiAgICAgICAgIC8vIE9u bHkgcmVwb3J0IHNjcmlwdCBhcyBwYXJzZWQgYWZ0ZXIgc2NyaXB0cyBwYW5lbCBoYXMgYmVlbiBz aG93bi4KICAgICAgICAgV2ViSW5zcGVjdG9yLnBhcnNlZFNjcmlwdFNvdXJjZShzY3JpcHQuaWQs IHNjcmlwdC5uYW1lLCBzY3JpcHQuc291cmNlLCBzY3JpcHQubGluZU9mZnNldCArIDEpOworICAg ICAgICB0aGlzLnJlc3RvcmVCcmVha3BvaW50c18oc2NyaXB0LmlkLCBzY3JpcHQubmFtZSk7CiAg ICAgfQogfTsKIApAQCAtMTA4NSw2ICsxMDkwLDI0IEBAIGRldnRvb2xzLkRlYnVnZ2VyQWdlbnQu cHJvdG90eXBlLmZvcm1hdEMKIAogCiAvKioKKyAqIFJlc3RvcmVzIGJyZWFrcG9pbnRzIGFzc29j aWF0ZWQgd2l0aCB0aGUgVVJMIG9mIGEgbmV3bHkgcGFyc2VkIHNjcmlwdC4KKyAqIEBwYXJhbSB7 bnVtYmVyfSBzb3VyY2VJRCBUaGUgaWQgb2YgdGhlIHNjcmlwdC4KKyAqIEBwYXJhbSB7c3RyaW5n fSBzY3JpcHRVcmwgVVJMIG9mIHRoZSBzY3JpcHQuCisgKi8KK2RldnRvb2xzLkRlYnVnZ2VyQWdl bnQucHJvdG90eXBlLnJlc3RvcmVCcmVha3BvaW50c18gPSBmdW5jdGlvbihzb3VyY2VJRCwgc2Ny aXB0VXJsKQoreworICAgIGNvbnNvbGUubG9nKCJyZXN0b3JlIGJyZWFrcG9pbnRzOiAiICsgc291 cmNlSUQgKyAiICIgKyBzY3JpcHRVcmwpOworICAgIHZhciBicmVha3BvaW50cyA9IHRoaXMudXJs VG9CcmVha3BvaW50c19bc2NyaXB0VXJsXTsKKyAgICBmb3IgKHZhciBsaW5lIGluIGJyZWFrcG9p bnRzKSB7CisgICAgICAgIGlmIChwYXJzZUludChsaW5lKSA9PSBsaW5lICYmIGJyZWFrcG9pbnRz W2xpbmVdIGluc3RhbmNlb2YgZGV2dG9vbHMuQnJlYWtwb2ludEluZm8pIHsKKyAgICAgICAgICAg IHZhciB2OExpbmUgPSBkZXZ0b29scy5EZWJ1Z2dlckFnZW50LnY4VG9Xd2Via2l0TGluZU51bWJl cl8ocGFyc2VJbnQobGluZSkpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJlc3RvcmVkQnJl YWtwb2ludChzb3VyY2VJRCwgc2NyaXB0VXJsLCB2OExpbmUsIGJyZWFrcG9pbnRzW2xpbmVdLmVu YWJsZWQoKSwgYnJlYWtwb2ludHNbbGluZV0uY29uZGl0aW9uKCkpOworICAgICAgICB9CisgICAg fQorfTsKKworCisvKioKICAqIENvbGxlY3RzIHByb3BlcnRpZXMgZm9yIGFuIG9iamVjdCBmcm9t IHRoZSBkZWJ1Z2dlciByZXNwb25zZS4KICAqIEBwYXJhbSB7T2JqZWN0fSBvYmplY3QgQW4gb2Jq ZWN0IGZyb20gdGhlIGRlYnVnZ2VyIHByb3RvY29sIHJlc3BvbnNlLgogICogQHBhcmFtIHtBcnJh eS48V2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnR5UHJveHk+fSByZXN1bHQgQW4gYXJyYXkgdG8g cHV0IHRoZQpAQCAtMTI3OSw5ICsxMzAyLDExIEBAIGRldnRvb2xzLlNjcmlwdEluZm8ucHJvdG90 eXBlLnJlbW92ZUJyZWEKICAqIEBwYXJhbSB7bnVtYmVyfSBsaW5lIEJyZWFrcG9pbnQgMC1iYXNl ZCBsaW5lIG51bWJlciBpbiB0aGUgY29udGFpbmluZyBzY3JpcHQuCiAgKiBAY29uc3RydWN0b3IK ICAqLwotZGV2dG9vbHMuQnJlYWtwb2ludEluZm8gPSBmdW5jdGlvbihsaW5lKQorZGV2dG9vbHMu QnJlYWtwb2ludEluZm8gPSBmdW5jdGlvbihsaW5lLCBlbmFibGVkLCBjb25kaXRpb24pCiB7CiAg ICAgdGhpcy5saW5lXyA9IGxpbmU7CisgICAgdGhpcy5lbmFibGVkXyA9IGVuYWJsZWQ7CisgICAg dGhpcy5jb25kaXRpb25fID0gY29uZGl0aW9uOwogICAgIHRoaXMudjhpZF8gPSAtMTsKICAgICB0 aGlzLnJlbW92ZWRfID0gZmFsc2U7CiB9OwpAQCAtMTMxNiw3ICsxMzQxLDcgQEAgZGV2dG9vbHMu QnJlYWtwb2ludEluZm8ucHJvdG90eXBlLnNldFY4SQogCiAKIC8qKgotICogTWFya3MgdGhpcyBi cmVha3BvaW50IGFzIHJlbW92ZWQgZnJvbSB0aGUgIGZyb250LWVuZC4KKyAqIE1hcmtzIHRoaXMg YnJlYWtwb2ludCBhcyByZW1vdmVkIGZyb20gdGhlIGZyb250LWVuZC4KICAqLwogZGV2dG9vbHMu QnJlYWtwb2ludEluZm8ucHJvdG90eXBlLm1hcmtBc1JlbW92ZWQgPSBmdW5jdGlvbigpCiB7CkBA IC0xMzM1LDYgKzEzNjAsMjQgQEAgZGV2dG9vbHMuQnJlYWtwb2ludEluZm8ucHJvdG90eXBlLmlz UmVtbwogCiAKIC8qKgorICogQHJldHVybiB7Ym9vbGVhbn0gV2hldGhlciB0aGlzIGJyZWFrcG9p bnQgaXMgZW5hYmxlZC4KKyAqLworZGV2dG9vbHMuQnJlYWtwb2ludEluZm8ucHJvdG90eXBlLmVu YWJsZWQgPSBmdW5jdGlvbigpCit7CisgICAgcmV0dXJuIHRoaXMuZW5hYmxlZF87Cit9OworCisK Ky8qKgorICogQHJldHVybiB7P3N0cmluZ30gQnJlYWtwb2ludCBjb25kaXRpb24uCisgKi8KK2Rl dnRvb2xzLkJyZWFrcG9pbnRJbmZvLnByb3RvdHlwZS5jb25kaXRpb24gPSBmdW5jdGlvbigpCit7 CisgICAgcmV0dXJuIHRoaXMuY29uZGl0aW9uXzsKK307CisKKworLyoqCiAgKiBDYWxsIHN0YWNr IGZyYW1lIGRhdGEuCiAgKiBAcGFyYW0ge3N0cmluZ30gaWQgQ2FsbEZyYW1lIGlkLgogICogQHBh cmFtIHtzdHJpbmd9IHR5cGUgQ2FsbEZyYW1lIHR5cGUuCg== 54406 2010-04-27 03:23:43 -0700 2010-04-27 09:59:58 -0700 removed console.log breakpoints.diff text/plain 5492 caseq SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTgzMDApCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDQtMjcgIEFuZHJl eSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXN0b3JlIGJyZWFrcG9pbnRzIGFzc29jaWF0ZWQg d2l0aCBzY3JpcHQncyBVUkwgb25jZQorICAgICAgICBzY3JpcHQgaXMgcGFyc2VkLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgxMzIKKworICAgICAg ICAqIHNyYy9qcy9EZWJ1Z2dlckFnZW50LmpzOgorICAgICAgICAoZGV2dG9vbHMuRGVidWdnZXJB Z2VudC5wcm90b3R5cGUuaW5pdFVJKToKKyAgICAgICAgKGRldnRvb2xzLkRlYnVnZ2VyQWdlbnQu cHJvdG90eXBlLmFkZEJyZWFrcG9pbnQpOgorICAgICAgICAoZGV2dG9vbHMuRGVidWdnZXJBZ2Vu dC5wcm90b3R5cGUuYWRkU2NyaXB0SW5mb18pOgorICAgICAgICAoZGV2dG9vbHMuRGVidWdnZXJB Z2VudC5wcm90b3R5cGUucmVzdG9yZUJyZWFrcG9pbnRzXyk6CisgICAgICAgIChkZXZ0b29scy5C cmVha3BvaW50SW5mbyk6CisgICAgICAgIChkZXZ0b29scy5CcmVha3BvaW50SW5mby5wcm90b3R5 cGUuZW5hYmxlZCk6CisgICAgICAgIChkZXZ0b29scy5CcmVha3BvaW50SW5mby5wcm90b3R5cGUu Y29uZGl0aW9uKToKKwogMjAxMC0wNC0yNiAgSm9obiBBYmQtRWwtTWFsZWsgIDxqYW1AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KSW5kZXg6IFdlYktp dC9jaHJvbWl1bS9zcmMvanMvRGVidWdnZXJBZ2VudC5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv Y2hyb21pdW0vc3JjL2pzL0RlYnVnZ2VyQWdlbnQuanMJKHJldmlzaW9uIDU4Mjk1KQorKysgV2Vi S2l0L2Nocm9taXVtL3NyYy9qcy9EZWJ1Z2dlckFnZW50LmpzCSh3b3JraW5nIGNvcHkpCkBAIC0x ODIsNiArMTgyLDcgQEAgZGV2dG9vbHMuRGVidWdnZXJBZ2VudC5wcm90b3R5cGUuaW5pdFVJIAog ICAgICAgICBmb3IgKHZhciBzY3JpcHRJZCBpbiB0aGlzLnBhcnNlZFNjcmlwdHNfKSB7CiAgICAg ICAgICAgdmFyIHNjcmlwdCA9IHRoaXMucGFyc2VkU2NyaXB0c19bc2NyaXB0SWRdOwogICAgICAg ICAgIFdlYkluc3BlY3Rvci5wYXJzZWRTY3JpcHRTb3VyY2Uoc2NyaXB0SWQsIHNjcmlwdC5nZXRV cmwoKSwgdW5kZWZpbmVkIC8qIHNjcmlwdCBzb3VyY2UgKi8sIHNjcmlwdC5nZXRMaW5lT2Zmc2V0 KCkgKyAxKTsKKyAgICAgICAgICB0aGlzLnJlc3RvcmVCcmVha3BvaW50c18oc2NyaXB0SWQsIHNj cmlwdC5nZXRVcmwoKSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTI0 NSw3ICsyNDYsNyBAQCBkZXZ0b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5wYXVzZUV4CiAg KiBAcGFyYW0ge251bWJlcn0gbGluZSBOdW1iZXIgb2YgdGhlIGxpbmUgZm9yIHRoZSBicmVha3Bv aW50LgogICogQHBhcmFtIHs/c3RyaW5nfSBjb25kaXRpb24gVGhlIGJyZWFrcG9pbnQgY29uZGl0 aW9uLgogICovCi1kZXZ0b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5hZGRCcmVha3BvaW50 ID0gZnVuY3Rpb24oc291cmNlSWQsIGxpbmUsIGNvbmRpdGlvbikKK2RldnRvb2xzLkRlYnVnZ2Vy QWdlbnQucHJvdG90eXBlLmFkZEJyZWFrcG9pbnQgPSBmdW5jdGlvbihzb3VyY2VJZCwgbGluZSwg ZW5hYmxlZCwgY29uZGl0aW9uKQogewogICAgIHZhciBzY3JpcHQgPSB0aGlzLnBhcnNlZFNjcmlw dHNfW3NvdXJjZUlkXTsKICAgICBpZiAoIXNjcmlwdCkKQEAgLTI2Myw3ICsyNjQsNyBAQCBkZXZ0 b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5hZGRCcmVhCiAgICAgICAgICAgICB0aGlzLnVy bFRvQnJlYWtwb2ludHNfW3NjcmlwdC5nZXRVcmwoKV0gPSBicmVha3BvaW50czsKICAgICAgICAg fQogCi0gICAgICAgIHZhciBicmVha3BvaW50SW5mbyA9IG5ldyBkZXZ0b29scy5CcmVha3BvaW50 SW5mbyhsaW5lKTsKKyAgICAgICAgdmFyIGJyZWFrcG9pbnRJbmZvID0gbmV3IGRldnRvb2xzLkJy ZWFrcG9pbnRJbmZvKGxpbmUsIGVuYWJsZWQsIGNvbmRpdGlvbik7CiAgICAgICAgIGJyZWFrcG9p bnRzW2xpbmVdID0gYnJlYWtwb2ludEluZm87CiAKICAgICAgICAgY29tbWFuZEFyZ3VtZW50cyA9 IHsKQEAgLTI3OCw3ICsyNzksNyBAQCBkZXZ0b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5h ZGRCcmVhCiAgICAgICAgIGlmIChicmVha3BvaW50SW5mbykKICAgICAgICAgICAgIHJldHVybjsK IAotICAgICAgICBicmVha3BvaW50SW5mbyA9IG5ldyBkZXZ0b29scy5CcmVha3BvaW50SW5mbyhs aW5lKTsKKyAgICAgICAgYnJlYWtwb2ludEluZm8gPSBuZXcgZGV2dG9vbHMuQnJlYWtwb2ludElu Zm8obGluZSwgZW5hYmxlZCwgY29uZGl0aW9uKTsKICAgICAgICAgc2NyaXB0LmFkZEJyZWFrcG9p bnRJbmZvKGJyZWFrcG9pbnRJbmZvKTsKIAogICAgICAgICBjb21tYW5kQXJndW1lbnRzID0gewpA QCAtMjkwLDYgKzI5MSw5IEBAIGRldnRvb2xzLkRlYnVnZ2VyQWdlbnQucHJvdG90eXBlLmFkZEJy ZWEKICAgICAgICAgfTsKICAgICB9CiAKKyAgICBpZiAoIWVuYWJsZWQpCisgICAgICAgIHJldHVy bjsKKwogICAgIHZhciBjbWQgPSBuZXcgZGV2dG9vbHMuRGVidWdDb21tYW5kKCJzZXRicmVha3Bv aW50IiwgY29tbWFuZEFyZ3VtZW50cyk7CiAKICAgICB0aGlzLnJlcXVlc3ROdW1iZXJUb0JyZWFr cG9pbnRJbmZvX1tjbWQuZ2V0U2VxdWVuY2VOdW1iZXIoKV0gPSBicmVha3BvaW50SW5mbzsKQEAg LTk2Miw2ICs5NjYsNyBAQCBkZXZ0b29scy5EZWJ1Z2dlckFnZW50LnByb3RvdHlwZS5hZGRTY3Jp CiAgICAgaWYgKHRoaXMuc2NyaXB0c1BhbmVsSW5pdGlhbGl6ZWRfKSB7CiAgICAgICAgIC8vIE9u bHkgcmVwb3J0IHNjcmlwdCBhcyBwYXJzZWQgYWZ0ZXIgc2NyaXB0cyBwYW5lbCBoYXMgYmVlbiBz aG93bi4KICAgICAgICAgV2ViSW5zcGVjdG9yLnBhcnNlZFNjcmlwdFNvdXJjZShzY3JpcHQuaWQs IHNjcmlwdC5uYW1lLCBzY3JpcHQuc291cmNlLCBzY3JpcHQubGluZU9mZnNldCArIDEpOworICAg ICAgICB0aGlzLnJlc3RvcmVCcmVha3BvaW50c18oc2NyaXB0LmlkLCBzY3JpcHQubmFtZSk7CiAg ICAgfQogfTsKIApAQCAtMTA4NSw2ICsxMDkwLDIzIEBAIGRldnRvb2xzLkRlYnVnZ2VyQWdlbnQu cHJvdG90eXBlLmZvcm1hdEMKIAogCiAvKioKKyAqIFJlc3RvcmVzIGJyZWFrcG9pbnRzIGFzc29j aWF0ZWQgd2l0aCB0aGUgVVJMIG9mIGEgbmV3bHkgcGFyc2VkIHNjcmlwdC4KKyAqIEBwYXJhbSB7 bnVtYmVyfSBzb3VyY2VJRCBUaGUgaWQgb2YgdGhlIHNjcmlwdC4KKyAqIEBwYXJhbSB7c3RyaW5n fSBzY3JpcHRVcmwgVVJMIG9mIHRoZSBzY3JpcHQuCisgKi8KK2RldnRvb2xzLkRlYnVnZ2VyQWdl bnQucHJvdG90eXBlLnJlc3RvcmVCcmVha3BvaW50c18gPSBmdW5jdGlvbihzb3VyY2VJRCwgc2Ny aXB0VXJsKQoreworICAgIHZhciBicmVha3BvaW50cyA9IHRoaXMudXJsVG9CcmVha3BvaW50c19b c2NyaXB0VXJsXTsKKyAgICBmb3IgKHZhciBsaW5lIGluIGJyZWFrcG9pbnRzKSB7CisgICAgICAg IGlmIChwYXJzZUludChsaW5lKSA9PSBsaW5lKSB7CisgICAgICAgICAgICB2YXIgdjhMaW5lID0g ZGV2dG9vbHMuRGVidWdnZXJBZ2VudC52OFRvV3dlYmtpdExpbmVOdW1iZXJfKHBhcnNlSW50KGxp bmUpKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5yZXN0b3JlZEJyZWFrcG9pbnQoc291cmNl SUQsIHNjcmlwdFVybCwgdjhMaW5lLCBicmVha3BvaW50c1tsaW5lXS5lbmFibGVkKCksIGJyZWFr cG9pbnRzW2xpbmVdLmNvbmRpdGlvbigpKTsKKyAgICAgICAgfQorICAgIH0KK307CisKKworLyoq CiAgKiBDb2xsZWN0cyBwcm9wZXJ0aWVzIGZvciBhbiBvYmplY3QgZnJvbSB0aGUgZGVidWdnZXIg cmVzcG9uc2UuCiAgKiBAcGFyYW0ge09iamVjdH0gb2JqZWN0IEFuIG9iamVjdCBmcm9tIHRoZSBk ZWJ1Z2dlciBwcm90b2NvbCByZXNwb25zZS4KICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rv ci5PYmplY3RQcm9wZXJ0eVByb3h5Pn0gcmVzdWx0IEFuIGFycmF5IHRvIHB1dCB0aGUKQEAgLTEy NzksOSArMTMwMSwxMSBAQCBkZXZ0b29scy5TY3JpcHRJbmZvLnByb3RvdHlwZS5yZW1vdmVCcmVh CiAgKiBAcGFyYW0ge251bWJlcn0gbGluZSBCcmVha3BvaW50IDAtYmFzZWQgbGluZSBudW1iZXIg aW4gdGhlIGNvbnRhaW5pbmcgc2NyaXB0LgogICogQGNvbnN0cnVjdG9yCiAgKi8KLWRldnRvb2xz LkJyZWFrcG9pbnRJbmZvID0gZnVuY3Rpb24obGluZSkKK2RldnRvb2xzLkJyZWFrcG9pbnRJbmZv ID0gZnVuY3Rpb24obGluZSwgZW5hYmxlZCwgY29uZGl0aW9uKQogewogICAgIHRoaXMubGluZV8g PSBsaW5lOworICAgIHRoaXMuZW5hYmxlZF8gPSBlbmFibGVkOworICAgIHRoaXMuY29uZGl0aW9u XyA9IGNvbmRpdGlvbjsKICAgICB0aGlzLnY4aWRfID0gLTE7CiAgICAgdGhpcy5yZW1vdmVkXyA9 IGZhbHNlOwogfTsKQEAgLTEzMTYsNyArMTM0MCw3IEBAIGRldnRvb2xzLkJyZWFrcG9pbnRJbmZv LnByb3RvdHlwZS5zZXRWOEkKIAogCiAvKioKLSAqIE1hcmtzIHRoaXMgYnJlYWtwb2ludCBhcyBy ZW1vdmVkIGZyb20gdGhlICBmcm9udC1lbmQuCisgKiBNYXJrcyB0aGlzIGJyZWFrcG9pbnQgYXMg cmVtb3ZlZCBmcm9tIHRoZSBmcm9udC1lbmQuCiAgKi8KIGRldnRvb2xzLkJyZWFrcG9pbnRJbmZv LnByb3RvdHlwZS5tYXJrQXNSZW1vdmVkID0gZnVuY3Rpb24oKQogewpAQCAtMTMzNSw2ICsxMzU5 LDI0IEBAIGRldnRvb2xzLkJyZWFrcG9pbnRJbmZvLnByb3RvdHlwZS5pc1JlbW8KIAogCiAvKioK KyAqIEByZXR1cm4ge2Jvb2xlYW59IFdoZXRoZXIgdGhpcyBicmVha3BvaW50IGlzIGVuYWJsZWQu CisgKi8KK2RldnRvb2xzLkJyZWFrcG9pbnRJbmZvLnByb3RvdHlwZS5lbmFibGVkID0gZnVuY3Rp b24oKQoreworICAgIHJldHVybiB0aGlzLmVuYWJsZWRfOworfTsKKworCisvKioKKyAqIEByZXR1 cm4gez9zdHJpbmd9IEJyZWFrcG9pbnQgY29uZGl0aW9uLgorICovCitkZXZ0b29scy5CcmVha3Bv aW50SW5mby5wcm90b3R5cGUuY29uZGl0aW9uID0gZnVuY3Rpb24oKQoreworICAgIHJldHVybiB0 aGlzLmNvbmRpdGlvbl87Cit9OworCisKKy8qKgogICogQ2FsbCBzdGFjayBmcmFtZSBkYXRhLgog ICogQHBhcmFtIHtzdHJpbmd9IGlkIENhbGxGcmFtZSBpZC4KICAqIEBwYXJhbSB7c3RyaW5nfSB0 eXBlIENhbGxGcmFtZSB0eXBlLgo=