33794 2010-01-18 05:15:24 -0800 Web Inspector: Speed-up Timeline panel scrolling (second iteration). 2010-01-18 10:31:42 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 loislo webkit-unassigned commit-queue pfeldman oldest_to_newest 181835 0 loislo 2010-01-18 05:15:24 -0800 Timeline's panel scrolling speed can be 2 times faster. 181848 1 46814 loislo 2010-01-18 06:12:25 -0800 Created attachment 46814 The fixes for Timeline panel scrolling speed 181858 2 46814 pfeldman 2010-01-18 06:31:17 -0800 Comment on attachment 46814 The fixes for Timeline panel scrolling speed > + this._graphRows = document.createElement("div"); We typically call elements someElement. Maybe kill it? > - var start = (record.startTime - this.minimumBoundary) / this.boundarySpan * 100; > - var end = (record.endTime - this.minimumBoundary) / this.boundarySpan * 100; > + var start = (record.startTime - this._context.minB) / this._context.bSpan * 100; this._context.minimumBoundary. Btw, this calculator is supposed to cache min and max boundaries, so it is not clear why you are gaining some win out of it. Maybe cache is broken? Or typeof ... === "number" works slowly? Should we try using -1 as an uninitialized value then? 181877 3 46824 loislo 2010-01-18 07:45:59 -0800 Created attachment 46824 Next iteration. Calculator object was a bit redesigned. 181921 4 46824 commit-queue 2010-01-18 10:31:30 -0800 Comment on attachment 46824 Next iteration. Calculator object was a bit redesigned. Clearing flags on attachment: 46824 Committed r53413: <http://trac.webkit.org/changeset/53413> 181922 5 commit-queue 2010-01-18 10:31:42 -0800 All reviewed patches have been landed. Closing bug. 46814 2010-01-18 06:12:25 -0800 2010-01-18 07:45:59 -0800 The fixes for Timeline panel scrolling speed patch text/plain 6241 loislo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzQwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEtMTggIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hy b21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRpbWVsaW5lIHNjcm9sbGluZyBzcGVlZCBjYW4gYmUgMiB0aW1lcyBmYXN0ZXIuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzc5NAorCisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwucHJvdG90eXBlLl9zY2hlZHVsZVJlZnJlc2guX3JlZnJlc2hSZWNvcmRzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5XZWJJbnNwZWN0b3IuVGlt ZWxpbmVDYWxjdWxhdG9yLnByb3RvdHlwZS5jb21wdXRlQmFyR3JhcGhQZXJjZW50YWdlc0luQ29u dGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuV2Vi SW5zcGVjdG9yLlRpbWVsaW5lQ2FsY3VsYXRvci5wcm90b3R5cGUuY2FsY3VsYXRlQ29udGV4dCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuV2ViSW5zcGVj dG9yLlRpbWVsaW5lUmVjb3JkR3JhcGhSb3cucHJvdG90eXBlLnVwZGF0ZSk6CisKIDIwMTAtMDEt MTggIERhbmllbCBCYXRlcyAgPGRiYXRlc0ByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgU2VpZGVsLgpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5l UGFuZWwuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVs aW5lUGFuZWwuanMJKHJldmlzaW9uIDUzNDAxKQorKysgV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RpbWVsaW5lUGFuZWwuanMJKHdvcmtpbmcgY29weSkKQEAgLTY5LDcgKzY5LDkgQEAKICAg ICB0aGlzLl9pdGVtc0dyYXBoc0VsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fdG9wR2FwRWxlbWVu dCk7CiAKICAgICB0aGlzLl9ncmFwaFJvd3NFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7Ci0gICAgdGhpcy5faXRlbXNHcmFwaHNFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu X2dyYXBoUm93c0VsZW1lbnQpOworICAgIHRoaXMuX2dyYXBoUm93cyA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMuX2dyYXBoUm93cy5hcHBlbmRDaGlsZCh0aGlzLl9n cmFwaFJvd3NFbGVtZW50KTsKKyAgICB0aGlzLl9pdGVtc0dyYXBoc0VsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5fZ3JhcGhSb3dzKTsKIAogICAgIHRoaXMuX2JvdHRvbUdhcEVsZW1lbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLl9ib3R0b21HYXBFbGVtZW50LmNs YXNzTmFtZSA9ICJ0aW1lbGluZS1nYXAiOwpAQCAtMzA0LDggKzMwNiwxMiBAQAogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB0aGlzLl9uZWVkc1JlZnJlc2ggPSB0cnVlOwogCi0gICAgICAg IGlmICh0aGlzLnZpc2libGUgJiYgISgiX3JlZnJlc2hUaW1lb3V0IiBpbiB0aGlzKSkKLSAgICAg ICAgICAgIHRoaXMuX3JlZnJlc2hUaW1lb3V0ID0gc2V0VGltZW91dCh0aGlzLl9yZWZyZXNoLmJp bmQodGhpcyksIHByZXNlcnZlQm91bmRhcmllcyA/IDAgOiAxMDApOworICAgICAgICBpZiAodGhp cy52aXNpYmxlICYmICEoIl9yZWZyZXNoVGltZW91dCIgaW4gdGhpcykpIHsKKyAgICAgICAgICAg IGlmIChwcmVzZXJ2ZUJvdW5kYXJpZXMpCisgICAgICAgICAgICAgICAgdGhpcy5fcmVmcmVzaCgp OworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHRoaXMuX3JlZnJlc2hUaW1lb3V0 ID0gc2V0VGltZW91dCh0aGlzLl9yZWZyZXNoLmJpbmQodGhpcyksIDEwMCk7CisgICAgICAgIH0K ICAgICB9LAogCiAgICAgX3JlZnJlc2g6IGZ1bmN0aW9uKCkKQEAgLTMzMywxMCArMzM5LDEyIEBA CiAgICAgICAgICAgICAgICAgdGhpcy5fY2FsY3VsYXRvci51cGRhdGVCb3VuZGFyaWVzKHRoaXMu X3JlY29yZHNbaV0pOwogICAgICAgICB9CiAKKyAgICAgICAgdGhpcy5fY2FsY3VsYXRvci5jYWxj dWxhdGVDb250ZXh0KCk7CisKICAgICAgICAgdmFyIHJlY29yZHNJbldpbmRvdyA9IFtdOwogICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3JlY29yZHMubGVuZ3RoOyArK2kpIHsKICAg ICAgICAgICAgIHZhciByZWNvcmQgPSB0aGlzLl9yZWNvcmRzW2ldOwotICAgICAgICAgICAgdmFy IHBlcmNlbnRhZ2VzID0gdGhpcy5fY2FsY3VsYXRvci5jb21wdXRlQmFyR3JhcGhQZXJjZW50YWdl cyhyZWNvcmQpOworICAgICAgICAgICAgdmFyIHBlcmNlbnRhZ2VzID0gdGhpcy5fY2FsY3VsYXRv ci5jb21wdXRlQmFyR3JhcGhQZXJjZW50YWdlc0luQ29udGV4dChyZWNvcmQpOwogICAgICAgICAg ICAgaWYgKHBlcmNlbnRhZ2VzLnN0YXJ0IDwgMTAwICYmIHBlcmNlbnRhZ2VzLmVuZCA+PSAwICYm ICFyZWNvcmQuY2F0ZWdvcnkuaGlkZGVuKQogICAgICAgICAgICAgICAgIHRoaXMuX2FkZFRvUmVj b3Jkc1dpbmRvdyhyZWNvcmQsIHJlY29yZHNJbldpbmRvdyk7CiAgICAgICAgIH0KQEAgLTM2Niw4 ICszNzQsOSBAQAogCiAgICAgICAgIC8vIFVwZGF0ZSB2aXNpYmxlIHJvd3MuCiAgICAgICAgIHZh ciBsaXN0Um93RWxlbWVudCA9IHRoaXMuX3NpZGViYXJMaXN0RWxlbWVudC5maXJzdENoaWxkOwor ICAgICAgICB2YXIgd2lkdGggPSB0aGlzLl9ncmFwaFJvd3NFbGVtZW50Lm9mZnNldFdpZHRoOwor ICAgICAgICB0aGlzLl9ncmFwaFJvd3MucmVtb3ZlQ2hpbGQodGhpcy5fZ3JhcGhSb3dzRWxlbWVu dCk7CiAgICAgICAgIHZhciBncmFwaFJvd0VsZW1lbnQgPSB0aGlzLl9ncmFwaFJvd3NFbGVtZW50 LmZpcnN0Q2hpbGQ7Ci0gICAgICAgIHZhciB3aWR0aCA9IHRoaXMuX2dyYXBoUm93c0VsZW1lbnQu b2Zmc2V0V2lkdGg7CiAgICAgICAgIHZhciBzY2hlZHVsZVJlZnJlc2hDYWxsYmFjayA9IHRoaXMu X3NjaGVkdWxlUmVmcmVzaC5iaW5kKHRoaXMsIHRydWUpOwogICAgICAgICBmb3IgKHZhciBpID0g c3RhcnRJbmRleDsgaSA8IGVuZEluZGV4OyArK2kpIHsKICAgICAgICAgICAgIHZhciByZWNvcmQg PSByZWNvcmRzSW5XaW5kb3dbaV07CkBAIC0zODMsNyArMzkyLDcgQEAKICAgICAgICAgICAgIH0K IAogICAgICAgICAgICAgbGlzdFJvd0VsZW1lbnQubGlzdFJvdy51cGRhdGUocmVjb3JkLCBpc0V2 ZW4pOwotICAgICAgICAgICAgZ3JhcGhSb3dFbGVtZW50LmdyYXBoUm93LnVwZGF0ZShyZWNvcmQs IGlzRXZlbiwgdGhpcy5fY2FsY3VsYXRvciwgd2lkdGgsIGV4cGFuZE9mZnNldCk7CisgICAgICAg ICAgICBncmFwaFJvd0VsZW1lbnQuZ3JhcGhSb3cudXBkYXRlKHJlY29yZCwgaXNFdmVuLCB0aGlz Ll9jYWxjdWxhdG9yLCB3aWR0aCwgZXhwYW5kT2Zmc2V0LCBpKTsKIAogICAgICAgICAgICAgbGlz dFJvd0VsZW1lbnQgPSBsaXN0Um93RWxlbWVudC5uZXh0U2libGluZzsKICAgICAgICAgICAgIGdy YXBoUm93RWxlbWVudCA9IGdyYXBoUm93RWxlbWVudC5uZXh0U2libGluZzsKQEAgLTQwMSw2ICs0 MTAsNyBAQAogICAgICAgICAgICAgZ3JhcGhSb3dFbGVtZW50ID0gbmV4dEVsZW1lbnQ7CiAgICAg ICAgIH0KIAorICAgICAgICB0aGlzLl9ncmFwaFJvd3MuYXBwZW5kQ2hpbGQodGhpcy5fZ3JhcGhS b3dzRWxlbWVudCk7CiAgICAgICAgIC8vIFJlc2VydmUgc29tZSByb29tIGZvciBleHBhbmQgLyBj b2xsYXBzZSBjb250cm9scyB0byB0aGUgbGVmdCBmb3IgcmVjb3JkcyB0aGF0IHN0YXJ0IGF0IDBt cy4KICAgICAgICAgdmFyIHRpbWVsaW5lUGFkZGluZ0xlZnQgPSB0aGlzLl9jYWxjdWxhdG9yLndp bmRvd0xlZnQgPT09IDAgPyBleHBhbmRPZmZzZXQgOiAwOwogICAgICAgICBpZiAodXBkYXRlQm91 bmRhcmllcykKQEAgLTQ0NiwxMyArNDU2LDE4IEBACiB9CiAKIFdlYkluc3BlY3Rvci5UaW1lbGlu ZUNhbGN1bGF0b3IucHJvdG90eXBlID0gewotICAgIGNvbXB1dGVCYXJHcmFwaFBlcmNlbnRhZ2Vz OiBmdW5jdGlvbihyZWNvcmQpCisgICAgY29tcHV0ZUJhckdyYXBoUGVyY2VudGFnZXNJbkNvbnRl eHQ6IGZ1bmN0aW9uKHJlY29yZCkKICAgICB7Ci0gICAgICAgIHZhciBzdGFydCA9IChyZWNvcmQu c3RhcnRUaW1lIC0gdGhpcy5taW5pbXVtQm91bmRhcnkpIC8gdGhpcy5ib3VuZGFyeVNwYW4gKiAx MDA7Ci0gICAgICAgIHZhciBlbmQgPSAocmVjb3JkLmVuZFRpbWUgLSB0aGlzLm1pbmltdW1Cb3Vu ZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3BhbiAqIDEwMDsKKyAgICAgICAgdmFyIHN0YXJ0ID0gKHJl Y29yZC5zdGFydFRpbWUgLSB0aGlzLl9jb250ZXh0Lm1pbkIpIC8gdGhpcy5fY29udGV4dC5iU3Bh biAqIDEwMDsKKyAgICAgICAgdmFyIGVuZCA9IChyZWNvcmQuZW5kVGltZSAtIHRoaXMuX2NvbnRl eHQubWluQikgLyB0aGlzLl9jb250ZXh0LmJTcGFuICogMTAwOwogICAgICAgICByZXR1cm4ge3N0 YXJ0OiBzdGFydCwgZW5kOiBlbmR9OwogICAgIH0sCiAKKyAgICBjYWxjdWxhdGVDb250ZXh0OiBm dW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9jb250ZXh0ID0ge21pbkI6IHRoaXMubWlu aW11bUJvdW5kYXJ5LCBiU3BhbjogdGhpcy5ib3VuZGFyeVNwYW59OworICAgIH0sCisKICAgICBn ZXQgbWluaW11bUJvdW5kYXJ5KCkKICAgICB7CiAgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fbWlu aW11bUJvdW5kYXJ5ID09PSAibnVtYmVyIikKQEAgLTYwMCwxOCArNjE1LDE4IEBACiB9CiAKIFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZEdyYXBoUm93LnByb3RvdHlwZSA9IHsKLSAgICB1cGRh dGU6IGZ1bmN0aW9uKHJlY29yZCwgaXNFdmVuLCBjYWxjdWxhdG9yLCBjbGllbnRXaWR0aCwgZXhw YW5kT2Zmc2V0KQorICAgIHVwZGF0ZTogZnVuY3Rpb24ocmVjb3JkLCBpc0V2ZW4sIGNhbGN1bGF0 b3IsIGNsaWVudFdpZHRoLCBleHBhbmRPZmZzZXQsIGluZGV4KQogICAgIHsKICAgICAgICAgdGhp cy5fcmVjb3JkID0gcmVjb3JkOwogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInRp bWVsaW5lLWdyYXBoLXNpZGUgdGltZWxpbmUtY2F0ZWdvcnktIiArIHJlY29yZC5jYXRlZ29yeS5u YW1lICsgKGlzRXZlbiA/ICIgZXZlbiIgOiAiIik7Ci0gICAgICAgIHZhciBwZXJjZW50YWdlcyA9 IGNhbGN1bGF0b3IuY29tcHV0ZUJhckdyYXBoUGVyY2VudGFnZXMocmVjb3JkKTsKKyAgICAgICAg dmFyIHBlcmNlbnRhZ2VzID0gY2FsY3VsYXRvci5jb21wdXRlQmFyR3JhcGhQZXJjZW50YWdlc0lu Q29udGV4dChyZWNvcmQpOwogICAgICAgICB2YXIgbGVmdCA9IHBlcmNlbnRhZ2VzLnN0YXJ0IC8g MTAwICogY2xpZW50V2lkdGg7CiAgICAgICAgIHZhciB3aWR0aCA9IChwZXJjZW50YWdlcy5lbmQg LSBwZXJjZW50YWdlcy5zdGFydCkgLyAxMDAgKiBjbGllbnRXaWR0aDsKICAgICAgICAgdGhpcy5f YmFyRWxlbWVudC5zdHlsZS5sZWZ0ID0gKGxlZnQgKyBleHBhbmRPZmZzZXQpICsgInB4IjsKICAg ICAgICAgdGhpcy5fYmFyRWxlbWVudC5zdHlsZS53aWR0aCA9IHdpZHRoICsgInB4IjsKIAogICAg ICAgICBpZiAocmVjb3JkLnZpc2libGVDaGlsZHJlbkNvdW50KSB7Ci0gICAgICAgICAgICB0aGlz Ll9leHBhbmRFbGVtZW50LnN0eWxlLnRvcCA9IHRoaXMuZWxlbWVudC5vZmZzZXRUb3AgKyAicHgi OworICAgICAgICAgICAgdGhpcy5fZXhwYW5kRWxlbWVudC5zdHlsZS50b3AgPSBpbmRleCAqIHRo aXMuX3Jvd0hlaWdodCArICJweCI7CiAgICAgICAgICAgICB0aGlzLl9leHBhbmRFbGVtZW50LnN0 eWxlLmxlZnQgPSBsZWZ0ICsgInB4IjsKICAgICAgICAgICAgIHRoaXMuX2V4cGFuZEVsZW1lbnQu c3R5bGUud2lkdGggPSBNYXRoLm1heCgxMiwgd2lkdGggKyAyNSkgKyAicHgiOwogICAgICAgICAg ICAgaWYgKCFyZWNvcmQuY29sbGFwc2VkKSB7Cg== 46824 2010-01-18 07:45:59 -0800 2010-01-18 10:31:29 -0800 Next iteration. Calculator object was a bit redesigned. patch text/plain 7684 loislo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzQwOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDEtMTggIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hy b21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdlYkluc3BlY3RvcjogVGltZWxpbmUgcGFuZWwgc2Nyb2xsaW5nIHNwZWVkIGNhbiBiZSAy IHRpbWVzIGZhc3Rlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTMzNzk0CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFu ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX3Nj aGVkdWxlUmVmcmVzaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90 b3R5cGUuX3JlZnJlc2hSZWNvcmRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNh bGN1bGF0b3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2FsY3VsYXRvci5wcm90 b3R5cGUuY2FsY3VsYXRlV2luZG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNh bGN1bGF0b3IucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGlu ZUNhbGN1bGF0b3IucHJvdG90eXBlLnVwZGF0ZUJvdW5kYXJpZXMpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkR3JhcGhSb3cucHJvdG90eXBlLnVwZGF0ZSk6CisKIDIwMTAt MDEtMTggIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpJbmRleDogV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMJKHJldmlzaW9uIDUzNDAxKQorKysgV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMJKHdvcmtpbmcgY29weSkK QEAgLTMwNCw4ICszMDQsMTIgQEAKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5f bmVlZHNSZWZyZXNoID0gdHJ1ZTsKIAotICAgICAgICBpZiAodGhpcy52aXNpYmxlICYmICEoIl9y ZWZyZXNoVGltZW91dCIgaW4gdGhpcykpCi0gICAgICAgICAgICB0aGlzLl9yZWZyZXNoVGltZW91 dCA9IHNldFRpbWVvdXQodGhpcy5fcmVmcmVzaC5iaW5kKHRoaXMpLCBwcmVzZXJ2ZUJvdW5kYXJp ZXMgPyAwIDogMTAwKTsKKyAgICAgICAgaWYgKHRoaXMudmlzaWJsZSAmJiAhKCJfcmVmcmVzaFRp bWVvdXQiIGluIHRoaXMpKSB7CisgICAgICAgICAgICBpZiAocHJlc2VydmVCb3VuZGFyaWVzKQor ICAgICAgICAgICAgICAgIHRoaXMuX3JlZnJlc2goKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICB0aGlzLl9yZWZyZXNoVGltZW91dCA9IHNldFRpbWVvdXQodGhpcy5fcmVmcmVz aC5iaW5kKHRoaXMpLCAxMDApOworICAgICAgICB9CiAgICAgfSwKIAogICAgIF9yZWZyZXNoOiBm dW5jdGlvbigpCkBAIC0zMjUsMTIgKzMyOSwxNCBAQAogICAgIF9yZWZyZXNoUmVjb3JkczogZnVu Y3Rpb24odXBkYXRlQm91bmRhcmllcykKICAgICB7CiAgICAgICAgIGlmICh1cGRhdGVCb3VuZGFy aWVzKSB7CisgICAgICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLnJlc2V0KCk7CiAgICAgICAgICAg ICB0aGlzLl9jYWxjdWxhdG9yLndpbmRvd0xlZnQgPSB0aGlzLl9vdmVydmlld1BhbmUud2luZG93 TGVmdDsKICAgICAgICAgICAgIHRoaXMuX2NhbGN1bGF0b3Iud2luZG93UmlnaHQgPSB0aGlzLl9v dmVydmlld1BhbmUud2luZG93UmlnaHQ7Ci0gICAgICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLnJl c2V0KCk7CiAKICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fcmVjb3Jkcy5s ZW5ndGg7ICsraSkKICAgICAgICAgICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLnVwZGF0ZUJvdW5k YXJpZXModGhpcy5fcmVjb3Jkc1tpXSk7CisKKyAgICAgICAgICAgIHRoaXMuX2NhbGN1bGF0b3Iu Y2FsY3VsYXRlV2luZG93KCk7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgcmVjb3Jkc0luV2lu ZG93ID0gW107CkBAIC0zNjYsOCArMzcyLDkgQEAKIAogICAgICAgICAvLyBVcGRhdGUgdmlzaWJs ZSByb3dzLgogICAgICAgICB2YXIgbGlzdFJvd0VsZW1lbnQgPSB0aGlzLl9zaWRlYmFyTGlzdEVs ZW1lbnQuZmlyc3RDaGlsZDsKLSAgICAgICAgdmFyIGdyYXBoUm93RWxlbWVudCA9IHRoaXMuX2dy YXBoUm93c0VsZW1lbnQuZmlyc3RDaGlsZDsKICAgICAgICAgdmFyIHdpZHRoID0gdGhpcy5fZ3Jh cGhSb3dzRWxlbWVudC5vZmZzZXRXaWR0aDsKKyAgICAgICAgdGhpcy5faXRlbXNHcmFwaHNFbGVt ZW50LnJlbW92ZUNoaWxkKHRoaXMuX2dyYXBoUm93c0VsZW1lbnQpOworICAgICAgICB2YXIgZ3Jh cGhSb3dFbGVtZW50ID0gdGhpcy5fZ3JhcGhSb3dzRWxlbWVudC5maXJzdENoaWxkOwogICAgICAg ICB2YXIgc2NoZWR1bGVSZWZyZXNoQ2FsbGJhY2sgPSB0aGlzLl9zY2hlZHVsZVJlZnJlc2guYmlu ZCh0aGlzLCB0cnVlKTsKICAgICAgICAgZm9yICh2YXIgaSA9IHN0YXJ0SW5kZXg7IGkgPCBlbmRJ bmRleDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgcmVjb3JkID0gcmVjb3Jkc0luV2luZG93W2ld OwpAQCAtMzgzLDcgKzM5MCw3IEBACiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGxpc3RS b3dFbGVtZW50Lmxpc3RSb3cudXBkYXRlKHJlY29yZCwgaXNFdmVuKTsKLSAgICAgICAgICAgIGdy YXBoUm93RWxlbWVudC5ncmFwaFJvdy51cGRhdGUocmVjb3JkLCBpc0V2ZW4sIHRoaXMuX2NhbGN1 bGF0b3IsIHdpZHRoLCBleHBhbmRPZmZzZXQpOworICAgICAgICAgICAgZ3JhcGhSb3dFbGVtZW50 LmdyYXBoUm93LnVwZGF0ZShyZWNvcmQsIGlzRXZlbiwgdGhpcy5fY2FsY3VsYXRvciwgd2lkdGgs IGV4cGFuZE9mZnNldCwgaSk7CiAKICAgICAgICAgICAgIGxpc3RSb3dFbGVtZW50ID0gbGlzdFJv d0VsZW1lbnQubmV4dFNpYmxpbmc7CiAgICAgICAgICAgICBncmFwaFJvd0VsZW1lbnQgPSBncmFw aFJvd0VsZW1lbnQubmV4dFNpYmxpbmc7CkBAIC00MDEsNiArNDA4LDcgQEAKICAgICAgICAgICAg IGdyYXBoUm93RWxlbWVudCA9IG5leHRFbGVtZW50OwogICAgICAgICB9CiAKKyAgICAgICAgdGhp cy5faXRlbXNHcmFwaHNFbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLl9ncmFwaFJvd3NFbGVtZW50 LCB0aGlzLl9ib3R0b21HYXBFbGVtZW50KTsKICAgICAgICAgLy8gUmVzZXJ2ZSBzb21lIHJvb20g Zm9yIGV4cGFuZCAvIGNvbGxhcHNlIGNvbnRyb2xzIHRvIHRoZSBsZWZ0IGZvciByZWNvcmRzIHRo YXQgc3RhcnQgYXQgMG1zLgogICAgICAgICB2YXIgdGltZWxpbmVQYWRkaW5nTGVmdCA9IHRoaXMu X2NhbGN1bGF0b3Iud2luZG93TGVmdCA9PT0gMCA/IGV4cGFuZE9mZnNldCA6IDA7CiAgICAgICAg IGlmICh1cGRhdGVCb3VuZGFyaWVzKQpAQCAtNDQwLDYgKzQ0OCw3IEBACiAKIFdlYkluc3BlY3Rv ci5UaW1lbGluZUNhbGN1bGF0b3IgPSBmdW5jdGlvbigpCiB7CisgICAgdGhpcy5yZXNldCgpOwog ICAgIHRoaXMud2luZG93TGVmdCA9IDAuMDsKICAgICB0aGlzLndpbmRvd1JpZ2h0ID0gMS4wOwog ICAgIHRoaXMuX3VpU3RyaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nLmJpbmQoV2ViSW5zcGVj dG9yKTsKQEAgLTQ1Myw2NSArNDYyLDMwIEBACiAgICAgICAgIHJldHVybiB7c3RhcnQ6IHN0YXJ0 LCBlbmQ6IGVuZH07CiAgICAgfSwKIAotICAgIGdldCBtaW5pbXVtQm91bmRhcnkoKQorICAgIGNh bGN1bGF0ZVdpbmRvdzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHR5cGVvZiB0aGlz Ll9taW5pbXVtQm91bmRhcnkgPT09ICJudW1iZXIiKQotICAgICAgICAgICAgcmV0dXJuIHRoaXMu X21pbmltdW1Cb3VuZGFyeTsKLQotICAgICAgICBpZiAodHlwZW9mIHRoaXMud2luZG93TGVmdCA9 PT0gIm51bWJlciIpCi0gICAgICAgICAgICB0aGlzLl9taW5pbXVtQm91bmRhcnkgPSB0aGlzLl9h YnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSArIHRoaXMud2luZG93TGVmdCAqICh0aGlzLl9hYnNvbHV0 ZU1heGltdW1Cb3VuZGFyeSAtIHRoaXMuX2Fic29sdXRlTWluaW11bUJvdW5kYXJ5KTsKLSAgICAg ICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fbWluaW11bUJvdW5kYXJ5ID0gdGhpcy5fYWJzb2x1 dGVNaW5pbXVtQm91bmRhcnk7Ci0gICAgICAgIHJldHVybiB0aGlzLl9taW5pbXVtQm91bmRhcnk7 CisgICAgICAgIHRoaXMubWluaW11bUJvdW5kYXJ5ID0gdGhpcy5fYWJzb2x1dGVNaW5pbXVtQm91 bmRhcnkgKyB0aGlzLndpbmRvd0xlZnQgKiAodGhpcy5fYWJzb2x1dGVNYXhpbXVtQm91bmRhcnkg LSB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSk7CisgICAgICAgIHRoaXMubWF4aW11bUJv dW5kYXJ5ID0gdGhpcy5fYWJzb2x1dGVNaW5pbXVtQm91bmRhcnkgKyB0aGlzLndpbmRvd1JpZ2h0 ICogKHRoaXMuX2Fic29sdXRlTWF4aW11bUJvdW5kYXJ5IC0gdGhpcy5fYWJzb2x1dGVNaW5pbXVt Qm91bmRhcnkpOworICAgICAgICB0aGlzLmJvdW5kYXJ5U3BhbiA9IHRoaXMubWF4aW11bUJvdW5k YXJ5IC0gdGhpcy5taW5pbXVtQm91bmRhcnk7CiAgICAgfSwKIAotICAgIGdldCBtYXhpbXVtQm91 bmRhcnkoKQotICAgIHsKLSAgICAgICAgaWYgKHR5cGVvZiB0aGlzLl9tYXhpbXVtQm91bmRhcnkg PT09ICJudW1iZXIiKQotICAgICAgICAgICAgcmV0dXJuIHRoaXMuX21heGltdW1Cb3VuZGFyeTsK LQotICAgICAgICBpZiAodHlwZW9mIHRoaXMud2luZG93TGVmdCA9PT0gIm51bWJlciIpCi0gICAg ICAgICAgICB0aGlzLl9tYXhpbXVtQm91bmRhcnkgPSB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3Vu ZGFyeSArIHRoaXMud2luZG93UmlnaHQgKiAodGhpcy5fYWJzb2x1dGVNYXhpbXVtQm91bmRhcnkg LSB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIHRoaXMuX21heGltdW1Cb3VuZGFyeSA9IHRoaXMuX2Fic29sdXRlTWF4aW11bUJvdW5kYXJ5 OwotICAgICAgICByZXR1cm4gdGhpcy5fbWF4aW11bUJvdW5kYXJ5OwotICAgIH0sCi0KICAgICBy ZXNldDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgZGVsZXRlIHRoaXMuX2Fic29sdXRlTWlu aW11bUJvdW5kYXJ5OwotICAgICAgICBkZWxldGUgdGhpcy5fYWJzb2x1dGVNYXhpbXVtQm91bmRh cnk7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9taW5pbXVtQm91bmRhcnk7Ci0gICAgICAgIGRlbGV0 ZSB0aGlzLl9tYXhpbXVtQm91bmRhcnk7CisgICAgICAgIHRoaXMuX2Fic29sdXRlTWluaW11bUJv dW5kYXJ5ID0gLTE7CisgICAgICAgIHRoaXMuX2Fic29sdXRlTWF4aW11bUJvdW5kYXJ5ID0gLTE7 CiAgICAgfSwKIAogICAgIHVwZGF0ZUJvdW5kYXJpZXM6IGZ1bmN0aW9uKHJlY29yZCkKICAgICB7 Ci0gICAgICAgIHZhciBkaWRDaGFuZ2UgPSBmYWxzZTsKLQogICAgICAgICB2YXIgbG93ZXJCb3Vu ZCA9IHJlY29yZC5zdGFydFRpbWU7Ci0KLSAgICAgICAgaWYgKHR5cGVvZiB0aGlzLl9hYnNvbHV0 ZU1pbmltdW1Cb3VuZGFyeSA9PT0gInVuZGVmaW5lZCIgfHwgbG93ZXJCb3VuZCA8IHRoaXMuX2Fi c29sdXRlTWluaW11bUJvdW5kYXJ5KSB7CisgICAgICAgIGlmICh0aGlzLl9hYnNvbHV0ZU1pbmlt dW1Cb3VuZGFyeSA9PT0gLTEgfHwgbG93ZXJCb3VuZCA8IHRoaXMuX2Fic29sdXRlTWluaW11bUJv dW5kYXJ5KQogICAgICAgICAgICAgdGhpcy5fYWJzb2x1dGVNaW5pbXVtQm91bmRhcnkgPSBsb3dl ckJvdW5kOwotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX21pbmltdW1Cb3VuZGFyeTsKLSAgICAg ICAgICAgIGRpZENoYW5nZSA9IHRydWU7Ci0gICAgICAgIH0KIAogICAgICAgICB2YXIgdXBwZXJC b3VuZCA9IHJlY29yZC5lbmRUaW1lOwotICAgICAgICBpZiAodHlwZW9mIHRoaXMuX2Fic29sdXRl TWF4aW11bUJvdW5kYXJ5ID09PSAidW5kZWZpbmVkIiB8fCB1cHBlckJvdW5kID4gdGhpcy5fYWJz b2x1dGVNYXhpbXVtQm91bmRhcnkpIHsKKyAgICAgICAgaWYgKHRoaXMuX2Fic29sdXRlTWF4aW11 bUJvdW5kYXJ5ID09PSAtMSB8fCB1cHBlckJvdW5kID4gdGhpcy5fYWJzb2x1dGVNYXhpbXVtQm91 bmRhcnkpCiAgICAgICAgICAgICB0aGlzLl9hYnNvbHV0ZU1heGltdW1Cb3VuZGFyeSA9IHVwcGVy Qm91bmQ7Ci0gICAgICAgICAgICBkZWxldGUgdGhpcy5fbWF4aW11bUJvdW5kYXJ5OwotICAgICAg ICAgICAgZGlkQ2hhbmdlID0gdHJ1ZTsKLSAgICAgICAgfQotCi0gICAgICAgIHJldHVybiBkaWRD aGFuZ2U7CiAgICAgfSwKIAotICAgIGdldCBib3VuZGFyeVNwYW4oKQotICAgIHsKLSAgICAgICAg cmV0dXJuIHRoaXMubWF4aW11bUJvdW5kYXJ5IC0gdGhpcy5taW5pbXVtQm91bmRhcnk7Ci0gICAg fSwKLQogICAgIGZvcm1hdFZhbHVlOiBmdW5jdGlvbih2YWx1ZSkKICAgICB7CiAgICAgICAgIHJl dHVybiBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHZhbHVlICsgdGhpcy5taW5pbXVtQm91bmRhcnkg LSB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSwgdGhpcy5fdWlTdHJpbmcpOwpAQCAtNjAw LDcgKzU3NCw3IEBACiB9CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZEdyYXBoUm93LnBy b3RvdHlwZSA9IHsKLSAgICB1cGRhdGU6IGZ1bmN0aW9uKHJlY29yZCwgaXNFdmVuLCBjYWxjdWxh dG9yLCBjbGllbnRXaWR0aCwgZXhwYW5kT2Zmc2V0KQorICAgIHVwZGF0ZTogZnVuY3Rpb24ocmVj b3JkLCBpc0V2ZW4sIGNhbGN1bGF0b3IsIGNsaWVudFdpZHRoLCBleHBhbmRPZmZzZXQsIGluZGV4 KQogICAgIHsKICAgICAgICAgdGhpcy5fcmVjb3JkID0gcmVjb3JkOwogICAgICAgICB0aGlzLmVs ZW1lbnQuY2xhc3NOYW1lID0gInRpbWVsaW5lLWdyYXBoLXNpZGUgdGltZWxpbmUtY2F0ZWdvcnkt IiArIHJlY29yZC5jYXRlZ29yeS5uYW1lICsgKGlzRXZlbiA/ICIgZXZlbiIgOiAiIik7CkBAIC02 MTEsNyArNTg1LDcgQEAKICAgICAgICAgdGhpcy5fYmFyRWxlbWVudC5zdHlsZS53aWR0aCA9IHdp ZHRoICsgInB4IjsKIAogICAgICAgICBpZiAocmVjb3JkLnZpc2libGVDaGlsZHJlbkNvdW50KSB7 Ci0gICAgICAgICAgICB0aGlzLl9leHBhbmRFbGVtZW50LnN0eWxlLnRvcCA9IHRoaXMuZWxlbWVu dC5vZmZzZXRUb3AgKyAicHgiOworICAgICAgICAgICAgdGhpcy5fZXhwYW5kRWxlbWVudC5zdHls ZS50b3AgPSBpbmRleCAqIHRoaXMuX3Jvd0hlaWdodCArICJweCI7CiAgICAgICAgICAgICB0aGlz Ll9leHBhbmRFbGVtZW50LnN0eWxlLmxlZnQgPSBsZWZ0ICsgInB4IjsKICAgICAgICAgICAgIHRo aXMuX2V4cGFuZEVsZW1lbnQuc3R5bGUud2lkdGggPSBNYXRoLm1heCgxMiwgd2lkdGggKyAyNSkg KyAicHgiOwogICAgICAgICAgICAgaWYgKCFyZWNvcmQuY29sbGFwc2VkKSB7Cg==