89548 2012-06-19 22:13:49 -0700 Web Inspector: reduce timeline refresh rate 2012-06-20 17:54:09 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo nduca pfeldman pmuellr rik timothy yurys oldest_to_newest 653193 0 caseq 2012-06-19 22:13:49 -0700 Timeline appears to slow down the inspected page refresh rate due to resource contention (particularly observed in Chromium on Mac, see crbug.com/133651). Reduced refresh rate and lazier update logic should help to mitigate that effect (though real fix should probably be in the platform itself). - reduce refresh for both overview and main panes to 300ms - automatically limit window size to approximately one pageful of events in the lower pane - do not refresh lower pane for events that are outside of the window 653206 1 148505 caseq 2012-06-19 22:33:20 -0700 Created attachment 148505 Patch 653236 2 148505 buildbot 2012-06-19 23:13:49 -0700 Comment on attachment 148505 Patch Attachment 148505 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13007119 654070 3 caseq 2012-06-20 17:54:09 -0700 Committed r120891: <http://trac.webkit.org/changeset/120891> 148505 2012-06-19 22:33:20 -0700 2012-06-20 09:48:08 -0700 Patch bug-89548-20120619223320.patch text/plain 10006 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmVlYzZlNTI0MjAwN2Uz OWY3MTFmZDIwOGUzZjI1MjhiNjE4NTlkMS4uMTdiYzBjZDhkYzZmZDBhMWE1NjI5YWE5ZTY2OGJk MDY3YmRkMWUwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA2LTE5ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogcmVkdWNlIHRpbWVsaW5lIHJlZnJlc2ggcmF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk1NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNaW5pbWl6ZSByZXNvdXJjZSBjb250ZW50aW9uIHdpdGgg dGhlIGluc3BlY3RlZCBwYWdlIGR1cmluZyByZWZyZXNoOgorCisgICAgICAgIC0gcmVkdWNlIHJl ZnJlc2ggZm9yIGJvdGggb3ZlcnZpZXcgYW5kIG1haW4gcGFuZXMgdG8gMzAwbXMKKyAgICAgICAg LSBhdXRvbWF0aWNhbGx5IGxpbWl0IHdpbmRvdyBzaXplIHRvIGFwcHJveGltYXRlbHkgb25lIHBh Z2VmdWwgb2YgZXZlbnRzIGluIHRoZSBsb3dlciBwYW5lCisgICAgICAgIC0gZG8gbm90IHJlZnJl c2ggbG93ZXIgcGFuZSBmb3IgZXZlbnRzIHRoYXQgYXJlIG91dHNpZGUgb2YgdGhlIHdpbmRvdwor CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuX3Vw ZGF0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90 eXBlLl9vbldpbmRvd0NoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3Zl cnZpZXdQYW5lLnByb3RvdHlwZS5zZXRXaW5kb3dUaW1lcyk6IFNldCBvdmVydmlldyB3aW5kb3cg YnkgdGltZXMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJv dG90eXBlLl91cGRhdGVXaW5kb3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3Zl cnZpZXdQYW5lLnByb3RvdHlwZS5fc2NoZWR1bGVSZWZyZXNoKTogUmVmcmVzaCBvbmNlIGluIDMw MG1zIChpbnN0ZWQgb2Ygb25jZSBpbiAxMDBtcykuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlld1dpbmRvdy5wcm90b3R5cGUuX3NldFdpbmRvdyk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9vblRpbWVsaW5lRXZlbnRSZWNvcmRlZCk6IERvIG5v dCByZWZyZXNoIGlmIHRoZSBuZXcgcmVjb3JkIGlzIG91dHNpZGUgb2Ygd2luZG93LgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9pbm5lckFkZFJlY29yZFRv VGltZWxpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBl Ll9yZXNldFBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3Rv dHlwZS5fc2NoZWR1bGVSZWZyZXNoKTogUmVmcmVzaCByYXRlOiAxMDBtcyAtPiAzMDBtcy4KKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaFJlY29y ZHMpOiBBdXRvbWF0aWNhbGx5IHNldCBvdmVydmlldyB3aW5kb3cuCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmpzOiBFeHBvc2UgZmlsdGVy UmVjb3JkcworICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwu cHJvdG90eXBlLmZpbHRlcmVkUmVjb3Jkcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuZmlsdGVyUmVjb3Jkcyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX2lubmVyRmls dGVyUmVjb3Jkcyk6CisKIDIwMTItMDYtMTUgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIEZpbGVSZWFkZXIgaXMgZHlzZnVuY3Rpb25hbCBpbiBkb2N1bWVudHMgd2l0 aCAibnVsbCIgb3JpZ2luIHN0cmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKaW5kZXggMjE0YTU4N2Nk MDUwZTExODBkMTIyOWRmNjY1NjUxNjE5MzM4MTZiOS4uMzFkNTAzMjc1MmJhYWZlZTZlYTQ5MDA1 YzZlYjdjMjgzY2VhOTJmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCkBAIC0xOTYsNiArMTk2LDcg QEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICB7 CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9yZWZyZXNoVGltZW91dDsKIAorICAgICAgICB0aGlzLl91 cGRhdGVXaW5kb3coKTsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yLnNldFdpbmRv dyh0aGlzLl9tb2RlbC5taW5pbXVtUmVjb3JkVGltZSgpLCB0aGlzLl9tb2RlbC5tYXhpbXVtUmVj b3JkVGltZSgpKTsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yLnNldERpc3BsYXlX aW5kb3coMCwgdGhpcy5fb3ZlcnZpZXdDb250YWluZXIuY2xpZW50V2lkdGgpOwogCkBAIC0zMTEs NiArMzEyLDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9 IHsKIAogICAgIF9vbldpbmRvd0NoYW5nZWQ6IGZ1bmN0aW9uKCkKICAgICB7CisgICAgICAgIGlm ICh0aGlzLl9pZ25vcmVXaW5kb3dDaGFuZ2VkRXZlbnQpCisgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIGlmICh0aGlzLl9mcmFtZU92ZXJ2aWV3KSB7CiAgICAgICAgICAgICB2YXIgdGltZXMg PSB0aGlzLl9mcmFtZU92ZXJ2aWV3LmdldFdpbmRvd1RpbWVzKHRoaXMud2luZG93TGVmdCgpLCB0 aGlzLndpbmRvd1JpZ2h0KCkpOwogICAgICAgICAgICAgdGhpcy5fd2luZG93U3RhcnRUaW1lID0g dGltZXMuc3RhcnRUaW1lOwpAQCAtMzI1LDYgKzMyOCwyOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlld1BhbmUucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBA cGFyYW0ge051bWJlcn0gbGVmdAorICAgICAqIEBwYXJhbSB7TnVtYmVyfSByaWdodAorICAgICAq LworICAgIHNldFdpbmRvd1RpbWVzOiBmdW5jdGlvbihsZWZ0LCByaWdodCkKKyAgICB7CisgICAg ICAgIHRoaXMuX3dpbmRvd1N0YXJ0VGltZSA9IGxlZnQ7CisgICAgICAgIHRoaXMuX3dpbmRvd0Vu ZFRpbWUgPSByaWdodDsKKyAgICAgICAgdGhpcy5fdXBkYXRlV2luZG93KCk7CisgICAgfSwKKwor ICAgIF91cGRhdGVXaW5kb3c6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBvZmZzZXQg PSB0aGlzLl9tb2RlbC5taW5pbXVtUmVjb3JkVGltZSgpOworICAgICAgICB2YXIgdGltZVNwYW4g PSB0aGlzLl9tb2RlbC5tYXhpbXVtUmVjb3JkVGltZSgpIC0gb2Zmc2V0OworICAgICAgICB2YXIg bGVmdCA9IHRoaXMuX3dpbmRvd1N0YXJ0VGltZSA/ICh0aGlzLl93aW5kb3dTdGFydFRpbWUgLSBv ZmZzZXQpIC8gdGltZVNwYW4gOiAwOworICAgICAgICB2YXIgcmlnaHQgPSB0aGlzLl93aW5kb3dF bmRUaW1lIDwgSW5maW5pdHkgPyAodGhpcy5fd2luZG93RW5kVGltZSAtIG9mZnNldCkgLyB0aW1l U3BhbiA6IDE7CisgICAgICAgIHRoaXMuX2lnbm9yZVdpbmRvd0NoYW5nZWRFdmVudCA9IHRydWU7 CisgICAgICAgIHRoaXMuX292ZXJ2aWV3V2luZG93Ll9zZXRXaW5kb3cobGVmdCwgcmlnaHQpOwor ICAgICAgICB0aGlzLl9pZ25vcmVXaW5kb3dDaGFuZ2VkRXZlbnQgPSBmYWxzZTsKKyAgICB9LAor CisgICAgLyoqCiAgICAgICogQHBhcmFtIHtib29sZWFufSB2YWx1ZQogICAgICAqLwogICAgIHNl dFNob3dTaG9ydEV2ZW50czogZnVuY3Rpb24odmFsdWUpCkBAIC0zMzgsNyArMzYzLDcgQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgaWYgKCF0aGlzLmlzU2hvd2luZygpKQogICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICB0aGlzLl9yZWZyZXNoVGltZW91dCA9IHNldFRpbWVvdXQodGhpcy5fdXBk YXRlLmJpbmQodGhpcyksIDEwMCk7CisgICAgICAgIHRoaXMuX3JlZnJlc2hUaW1lb3V0ID0gc2V0 VGltZW91dCh0aGlzLl91cGRhdGUuYmluZCh0aGlzKSwgMzAwKTsKICAgICB9CiB9CiAKQEAgLTUw OSw2ICs1MzQsMTYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cucHJvdG90 eXBlID0gewogICAgICAgICB0aGlzLl9zZXRXaW5kb3dQb3NpdGlvbigwLCB0aGlzLl9wYXJlbnRF bGVtZW50LmNsaWVudFdpZHRoKTsKICAgICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFtIHtu dW1iZXJ9IGxlZnQKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gcmlnaHQKKyAgICAgKi8KKyAgICBf c2V0V2luZG93OiBmdW5jdGlvbihsZWZ0LCByaWdodCkKKyAgICB7CisgICAgICAgIHZhciBjbGll bnRXaWR0aCA9IHRoaXMuX3BhcmVudEVsZW1lbnQuY2xpZW50V2lkdGg7CisgICAgICAgIHRoaXMu X3NldFdpbmRvd1Bvc2l0aW9uKGxlZnQgKiBjbGllbnRXaWR0aCwgcmlnaHQgKiBjbGllbnRXaWR0 aCk7CisgICAgfSwKKwogICAgIF9zZXRXaW5kb3dQb3NpdGlvbjogZnVuY3Rpb24oc3RhcnQsIGVu ZCkKICAgICB7CiAgICAgICAgIHZhciBjbGllbnRXaWR0aCA9IHRoaXMuX3BhcmVudEVsZW1lbnQu Y2xpZW50V2lkdGg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RpbWVsaW5lUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1RpbWVsaW5lUGFuZWwuanMKaW5kZXggYjgzY2U2ZDY5YzE3NDhhOTczZjFmNTI3YzY2Y2Y4N2Uz NGQ0ZGFkNi4uMDI1MjY4M2Q1NmZhNzEzODg3OWIxYWEwNjViNDdmMDllY2Q2NzQ5YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5q cwpAQCAtNDgwLDggKzQ4MCw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlw ZSA9IHsKIAogICAgIF9vblRpbWVsaW5lRXZlbnRSZWNvcmRlZDogZnVuY3Rpb24oZXZlbnQpCiAg ICAgewotICAgICAgICB0aGlzLl9pbm5lckFkZFJlY29yZFRvVGltZWxpbmUoZXZlbnQuZGF0YSwg dGhpcy5fcm9vdFJlY29yZCgpKTsKLSAgICAgICAgdGhpcy5fc2NoZWR1bGVSZWZyZXNoKGZhbHNl KTsKKyAgICAgICAgaWYgKHRoaXMuX2lubmVyQWRkUmVjb3JkVG9UaW1lbGluZShldmVudC5kYXRh LCB0aGlzLl9yb290UmVjb3JkKCkpKQorICAgICAgICAgICAgdGhpcy5fc2NoZWR1bGVSZWZyZXNo KGZhbHNlKTsKICAgICB9LAogCiAgICAgX2lubmVyQWRkUmVjb3JkVG9UaW1lbGluZTogZnVuY3Rp b24ocmVjb3JkLCBwYXJlbnRSZWNvcmQpCkBAIC00OTUsNyArNDk1LDkgQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmlzRXZlbnREaXZpZGVyKHJlY29yZCkpCiAgICAg ICAgICAgICAgICAgdGltZVN0YW1wUmVjb3Jkcy5wdXNoKHJlY29yZCk7CiAgICAgICAgIH0KLSAg ICAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuZm9yQWxsUmVjb3Jk cyhbIGZvcm1hdHRlZFJlY29yZCBdLCBhZGRUaW1lc3RhbXBSZWNvcmRzKTsKKyAgICAgICAgdmFy IHJlY29yZHMgPSBbIGZvcm1hdHRlZFJlY29yZCBdOworICAgICAgICBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5mb3JBbGxSZWNvcmRzKHJlY29yZHMsIGFkZFRpbWVzdGFt cFJlY29yZHMpOworICAgICAgICByZXR1cm4gISF0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5maWx0 ZXJSZWNvcmRzKHJlY29yZHMpLmxlbmd0aCB8fCBmb3JtYXR0ZWRSZWNvcmQucGFyZW50ICE9PSB0 aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5yb290UmVjb3JkOwogICAgIH0sCiAKICAgICBzaWRlYmFy UmVzaXplZDogZnVuY3Rpb24oZXZlbnQpCkBAIC01MzQsNiArNTM2LDcgQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9hZGp1c3RTY3JvbGxQ b3NpdGlvbigwKTsKICAgICAgICAgdGhpcy5fY2xvc2VSZWNvcmREZXRhaWxzKCk7CiAgICAgICAg IHRoaXMuX2FsbFJlY29yZHNDb3VudCA9IDA7CisgICAgICAgIHRoaXMuX2F1dG9tYXRpY2FsbHlT aXplV2luZG93ID0gdHJ1ZTsKICAgICB9LAogCiAgICAgZWxlbWVudHNUb1Jlc3RvcmVTY3JvbGxQ b3NpdGlvbnNGb3I6IGZ1bmN0aW9uKCkKQEAgLTU4MCw3ICs1ODMsNyBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl9yZWZyZXNoKCk7 CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgaWYgKCF0aGlzLl9yZWZyZXNoVGltZW91dCkK LSAgICAgICAgICAgICAgICB0aGlzLl9yZWZyZXNoVGltZW91dCA9IHNldFRpbWVvdXQodGhpcy5f cmVmcmVzaC5iaW5kKHRoaXMpLCAxMDApOworICAgICAgICAgICAgICAgIHRoaXMuX3JlZnJlc2hU aW1lb3V0ID0gc2V0VGltZW91dCh0aGlzLl9yZWZyZXNoLmJpbmQodGhpcyksIDMwMCk7CiAgICAg ICAgIH0KICAgICB9LAogCkBAIC02NTIsNiArNjU1LDE1IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gQ29udmVydCB2aXNpYmxlIGFyZWEgdG8g dmlzaWJsZSBpbmRleGVzLiBBbHdheXMgaW5jbHVkZSB0b3AtbGV2ZWwgcmVjb3JkIGZvciBhIHZp c2libGUgbmVzdGVkIHJlY29yZC4KICAgICAgICAgdmFyIHN0YXJ0SW5kZXggPSBNYXRoLm1heCgw LCBNYXRoLm1pbihNYXRoLmZsb29yKHZpc2libGVUb3AgLyByb3dIZWlnaHQpIC0gMSwgcmVjb3Jk c0luV2luZG93Lmxlbmd0aCAtIDEpKTsKICAgICAgICAgdmFyIGVuZEluZGV4ID0gTWF0aC5taW4o cmVjb3Jkc0luV2luZG93Lmxlbmd0aCwgTWF0aC5jZWlsKHZpc2libGVCb3R0b20gLyByb3dIZWln aHQpKTsKKyAgICAgICAgdmFyIGxhc3RWaXNpYmxlTGluZSA9IE1hdGgubWF4KDAsIE1hdGguZmxv b3IodmlzaWJsZUJvdHRvbSAvIHJvd0hlaWdodCkgLSAxKTsKKyAgICAgICAgaWYgKHRoaXMuX2F1 dG9tYXRpY2FsbHlTaXplV2luZG93ICYmIHJlY29yZHNJbldpbmRvdy5sZW5ndGggPiBsYXN0Vmlz aWJsZUxpbmUpIHsKKyAgICAgICAgICAgIHRoaXMuX2F1dG9tYXRpY2FsbHlTaXplV2luZG93ID0g ZmFsc2U7CisgICAgICAgICAgICAvLyBJZiB3ZSdyZSBhdCB0aGUgdG9wLCBhbHdheXMgdXNlIHJl YWwgdGltZWxpbmUgc3RhcnQgYXMgYSBsZWZ0IHdpbmRvdyBib3VuZCBzbyB0aGF0IGV4cGFuc2lv biBhcnJvdyBwYWRkaW5nIGxvZ2ljIHdvcmtzLgorICAgICAgICAgICAgdmFyIHdpbmRvd1N0YXJ0 VGltZSA9IHN0YXJ0SW5kZXggPyByZWNvcmRzSW5XaW5kb3dbc3RhcnRJbmRleF0uc3RhcnRUaW1l IDogdGhpcy5fbW9kZWwubWluaW11bVJlY29yZFRpbWUoKTsKKyAgICAgICAgICAgIHRoaXMuX292 ZXJ2aWV3UGFuZS5zZXRXaW5kb3dUaW1lcyh3aW5kb3dTdGFydFRpbWUsIHJlY29yZHNJbldpbmRv d1tNYXRoLm1heCgwLCBsYXN0VmlzaWJsZUxpbmUgLSAxKV0uZW5kVGltZSk7CisgICAgICAgICAg ICByZWNvcmRzSW5XaW5kb3cgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5maWx0ZXJlZFJlY29y ZHMoKTsKKyAgICAgICAgICAgIGVuZEluZGV4ID0gTWF0aC5taW4ocmVjb3Jkc0luV2luZG93Lmxl bmd0aCwgbGFzdFZpc2libGVMaW5lKTsKKyAgICAgICAgfQogCiAgICAgICAgIC8vIFJlc2l6ZSBn YXBzIGZpcnN0LgogICAgICAgICBjb25zdCB0b3AgPSAoc3RhcnRJbmRleCAqIHJvd0hlaWdodCkg KyAicHgiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U aW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IDNkMDNhMWQ5MzA5YzY2 MzVlZTZjMTAwYjcyZjM1OWM3ZDNhYzc2Y2EuLmViOTFhMDY0YjA2N2JmNjYxMTI2ZDA4ZTQ5MTBi MzJjNjc4MGQ0YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTI5NSw2ICsy OTUsMTEgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBl ID0gewogCiAgICAgZmlsdGVyZWRSZWNvcmRzOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5maWx0ZXJSZWNvcmRzKHRoaXMuX3Jvb3RSZWNvcmQuY2hpbGRyZW4pOworICAg IH0sCisKKyAgICBmaWx0ZXJSZWNvcmRzOiBmdW5jdGlvbihyZWNvcmRzKQorICAgIHsKICAgICAg ICAgZnVuY3Rpb24gZmlsdGVyKHJlY29yZCkKICAgICAgICAgewogICAgICAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCB0aGlzLl9maWx0ZXJzLmxlbmd0aDsgKytpKSB7CkBAIC0zMDMsMTQgKzMw OCwxOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQot ICAgICAgICByZXR1cm4gdGhpcy5fZmlsdGVyUmVjb3JkcyhmaWx0ZXIuYmluZCh0aGlzKSk7Cisg ICAgICAgIHJldHVybiB0aGlzLl9pbm5lckZpbHRlclJlY29yZHMoZmlsdGVyLmJpbmQodGhpcyks IHJlY29yZHMpOwogICAgIH0sCiAKLSAgICBfZmlsdGVyUmVjb3JkczogZnVuY3Rpb24oZmlsdGVy KQorICAgIC8qKgorICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLlRpbWVsaW5l UHJlc2VudGF0aW9uTW9kZWwuUmVjb3JkKTpib29sZWFufSBmaWx0ZXIKKyAgICAgKiBAcGFyYW0g e0FycmF5LjxXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5SZWNvcmQ+fSBp bnB1dFJlY29yZHMKKyAgICAgKi8KKyAgICBfaW5uZXJGaWx0ZXJSZWNvcmRzOiBmdW5jdGlvbihm aWx0ZXIsIGlucHV0UmVjb3JkcykKICAgICB7CiAgICAgICAgIHZhciByZWNvcmRzSW5XaW5kb3cg PSBbXTsKIAotICAgICAgICB2YXIgc3RhY2sgPSBbe2NoaWxkcmVuOiB0aGlzLl9yb290UmVjb3Jk LmNoaWxkcmVuLCBpbmRleDogMCwgcGFyZW50SXNDb2xsYXBzZWQ6IGZhbHNlfV07CisgICAgICAg IHZhciBzdGFjayA9IFt7Y2hpbGRyZW46IGlucHV0UmVjb3JkcywgaW5kZXg6IDAsIHBhcmVudElz Q29sbGFwc2VkOiBmYWxzZX1dOwogICAgICAgICB3aGlsZSAoc3RhY2subGVuZ3RoKSB7CiAgICAg ICAgICAgICB2YXIgZW50cnkgPSBzdGFja1tzdGFjay5sZW5ndGggLSAxXTsKICAgICAgICAgICAg IHZhciByZWNvcmRzID0gZW50cnkuY2hpbGRyZW47Cg==