79669 2012-02-27 06:43:41 -0800 Web Inspector: reveal corresponding timeline record when user clicks on memory graph 2012-02-27 06:57:17 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 565619 0 yurys 2012-02-27 06:43:41 -0800 Timeline grid should be scrolled to reveal corresponding record. 565620 1 129030 yurys 2012-02-27 06:45:37 -0800 Created attachment 129030 Patch 565623 2 129030 pfeldman 2012-02-27 06:52:02 -0800 Comment on attachment 129030 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129030&action=review > Source/WebCore/inspector/front-end/TimelinePanel.js:772 > + if (this._startAtZero) You could easily find your top-level record using binary search. 565625 3 yurys 2012-02-27 06:53:23 -0800 (In reply to comment #2) > (From update of attachment 129030 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=129030&action=review > > > Source/WebCore/inspector/front-end/TimelinePanel.js:772 > > + if (this._startAtZero) > > You could easily find your top-level record using binary search. It is fast enough at the moment and I wouldn't like to complicate the code even more. 565628 4 yurys 2012-02-27 06:57:17 -0800 Committed r108989: <http://trac.webkit.org/changeset/108989> 129030 2012-02-27 06:45:37 -0800 2012-02-27 06:52:02 -0800 Patch bug-79669-20120227184535.patch text/plain 9606 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4OTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QzMzg3NGQwNGM1N2Uz OWIzZTY2YjY5NDc1NGE3MzAxNzgyNWEzOC4uNmFkZWIzOTFhNjg0NDBhY2JkMmY0NjZmZWExNWVh YTllNWI5ODc0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTAyLTI3ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJldmVhbCBjb3JyZXNwb25kaW5nIHRpbWVsaW5lIHJlY29yZCB3aGVuIHVzZXIgY2xpY2tz IG9uIG1lbW9yeSBncmFwaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9Nzk2NjkKKworICAgICAgICBXaGVuIHVzZXIgY2xpY2tzIG9uIERPTSBjb3VudGVy IGdyYXBoIGNvcnJlc3BvbmRpbmcgdGltZWxpbmUgcmVjb3JkIGlzCisgICAgICAgIHJldmVhbGVk IGluIHRpbWVsaW1lIGdyaWQgYW5kIGFsbCBpdHMgYW5jZXN0b3JzIGFyZSBleHBhbmRlZC4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvTWVtb3J5U3RhdGlzdGljcy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5N ZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlwZS5fb25DbGljayk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5IZWFwR3JhcGgucHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuSGVhcEdyYXBoLnByb3RvdHlwZS5fY2xlYXIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBh bmVsLnByb3RvdHlwZS5yZXZlYWxSZWNvcmRBdC5yZWNvcmRGaW5kZXIpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLnJldmVhbFJlY29yZEF0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaFJlY29yZHMp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuZm9yQWxsUmVjb3Jkcyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90 eXBlLmNvbnRhaW5zVGltZSk6CisKKzIwMTItMDItMjcgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5 c0BjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmVwYWludCBjb3VudGVy IGdyYXBocyB3aGVuIHRpbWVsaW5lIHNwbGl0dGVyIG1vdmVzCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTY0NAogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01lbW9yeVN0YXRpc3RpY3MuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01lbW9yeVN0YXRpc3RpY3MuanMKaW5kZXggYmM1 ZWQ5YzI1NDM0NWE1N2QyNGMyNThjY2YzNTNhNGYxZWE2ZGUxNi4uOTM0ZDg3Zjc3ZDE4Yzk1MGIw Y2Y2ZDcyNzQ3ZjQ5NDQzYjk3NjU0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9NZW1vcnlTdGF0aXN0aWNzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTWVtb3J5U3RhdGlzdGljcy5qcwpAQCAtNTIsOSArNTIsMTAgQEAg V2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MgPSBmdW5jdGlvbih0aW1lbGluZVBhbmVsLCBz aWRlYmFyV2lkdGgpCiAgICAgdGhpcy5fY2FudmFzLmlkID0gIm1lbW9yeS1jb3VudGVycy1ncmFw aCI7CiAgICAgdGhpcy5fbGFzdE1hcmtlclhQb3NpdGlvbiA9IDA7CiAKLSAgICB0aGlzLl9jYW52 YXNDb250YWluZXIuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdmVyIiwgdGhpcy5fb25Nb3VzZU92 ZXIuYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgdGhpcy5fY2FudmFzQ29udGFpbmVyLmFkZEV2ZW50 TGlzdGVuZXIoIm1vdXNlbW92ZSIsIHRoaXMuX29uTW91c2VNb3ZlLmJpbmQodGhpcyksIHRydWUp OwotICAgIHRoaXMuX2NhbnZhc0NvbnRhaW5lci5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW91dCIs IHRoaXMuX29uTW91c2VPdXQuYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgdGhpcy5fY2FudmFzLmFk ZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3ZlciIsIHRoaXMuX29uTW91c2VPdmVyLmJpbmQodGhpcyks IHRydWUpOworICAgIHRoaXMuX2NhbnZhcy5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCB0 aGlzLl9vbk1vdXNlTW92ZS5iaW5kKHRoaXMpLCB0cnVlKTsKKyAgICB0aGlzLl9jYW52YXMuYWRk RXZlbnRMaXN0ZW5lcigibW91c2VvdXQiLCB0aGlzLl9vbk1vdXNlT3V0LmJpbmQodGhpcyksIHRy dWUpOworICAgIHRoaXMuX2NhbnZhcy5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX29u Q2xpY2suYmluZCh0aGlzKSwgdHJ1ZSk7CiAKICAgICAvLyBQb3B1bGF0ZSBzaWRlYmFyCiAgICAg dGhpcy5fbWVtb3J5U3BsaXRWaWV3LnNpZGViYXJFbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAi c2lkZWJhci10cmVlIHNpZGViYXItdHJlZS1zZWN0aW9uIikudGV4dENvbnRlbnQgPSBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkNPVU5URVJTIik7CkBAIC0yNzgsNiArMjc5LDE0IEBAIFdlYkluc3Bl Y3Rvci5NZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbWF4VGlt ZSA9IGVuZDsKICAgICB9LAogCisgICAgX29uQ2xpY2s6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsK KyAgICAgICAgdmFyIHggPSBldmVudC54IC0gZXZlbnQudGFyZ2V0Lm9mZnNldFBhcmVudC5vZmZz ZXRMZWZ0CisgICAgICAgIHZhciBpID0gdGhpcy5fcmVjb3JkSW5kZXhBdCh4KTsKKyAgICAgICAg dmFyIGNvdW50ZXIgPSB0aGlzLl9jb3VudGVyc1tpXTsKKyAgICAgICAgdGhpcy5fdGltZWxpbmVQ YW5lbC5yZXZlYWxSZWNvcmRBdChjb3VudGVyLnRpbWUgLyAxMDAwKTsKKyAgICB9LAorCiAgICAg X29uTW91c2VPdXQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgZGVsZXRlIHRoaXMu X21hcmtlclhQb3NpdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCmluZGV4IDg1ODc0MmM2YzVhNGIw YzAwZTE4ZjgwMzAxZmZjZjkxOTljNzc1OTMuLjU5MjZkYjcwZTU4YjcxYmQwYTA1NWZjNTJlMTk5 YjlmZTY5MzA4MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcwpAQCAtMTYxLDI1ICsxNjEsNiBAQCBX ZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl9jYXRlZ29yeUdyYXBoc1tjYXRlZ29yeS5uYW1lXS5kaW1tZWQgPSBjYXRlZ29yeS5oaWRk ZW47CiAgICAgfSwKIAotICAgIF9mb3JBbGxSZWNvcmRzOiBmdW5jdGlvbihyZWNvcmRzQXJyYXks IGNhbGxiYWNrKQotICAgIHsKLSAgICAgICAgaWYgKCFyZWNvcmRzQXJyYXkpCi0gICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgIHZhciBzdGFjayA9IFt7YXJyYXk6IHJlY29yZHNBcnJheSwgaW5k ZXg6IDB9XTsKLSAgICAgICAgd2hpbGUgKHN0YWNrLmxlbmd0aCkgewotICAgICAgICAgICAgdmFy IGVudHJ5ID0gc3RhY2tbc3RhY2subGVuZ3RoIC0gMV07Ci0gICAgICAgICAgICB2YXIgcmVjb3Jk cyA9IGVudHJ5LmFycmF5OwotICAgICAgICAgICAgaWYgKGVudHJ5LmluZGV4IDwgcmVjb3Jkcy5s ZW5ndGgpIHsKLSAgICAgICAgICAgICAgICAgdmFyIHJlY29yZCA9IHJlY29yZHNbZW50cnkuaW5k ZXhdOwotICAgICAgICAgICAgICAgICBjYWxsYmFjayhyZWNvcmQpOwotICAgICAgICAgICAgICAg ICBpZiAocmVjb3JkLmNoaWxkcmVuKQotICAgICAgICAgICAgICAgICAgICAgc3RhY2sucHVzaCh7 YXJyYXk6IHJlY29yZC5jaGlsZHJlbiwgaW5kZXg6IDB9KTsKLSAgICAgICAgICAgICAgICAgKytl bnRyeS5pbmRleDsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAgIHN0YWNrLnBv cCgpOwotICAgICAgICB9Ci0gICAgfSwKLQogICAgIHVwZGF0ZTogZnVuY3Rpb24ocmVjb3Jkcywg c2hvd1Nob3J0RXZlbnRzKQogICAgIHsKICAgICAgICAgdGhpcy5fcmVjb3JkcyA9IHJlY29yZHM7 CkBAIC0xOTMsNyArMTc0LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnBy b3RvdHlwZSA9IHsKIAogICAgICAgICAvLyBDcmVhdGUgc3BhcnNlIGFycmF5cyB3aXRoIDEwMSBj ZWxscyBlYWNoIHRvIGZpbGwgd2l0aCBjaHVua3MgZm9yIGEgZ2l2ZW4gY2F0ZWdvcnkuCiAgICAg ICAgIHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRvci5yZXNldCgpOwotICAgICAgICB0aGlzLl9mb3JB bGxSZWNvcmRzKHJlY29yZHMsIHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRvci51cGRhdGVCb3VuZGFy aWVzLmJpbmQodGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yKSk7CisgICAgICAgIFdlYkluc3BlY3Rv ci5UaW1lbGluZVBhbmVsLmZvckFsbFJlY29yZHMocmVjb3JkcywgdGhpcy5fb3ZlcnZpZXdDYWxj dWxhdG9yLnVwZGF0ZUJvdW5kYXJpZXMuYmluZCh0aGlzLl9vdmVydmlld0NhbGN1bGF0b3IpKTsK IAogICAgICAgICBmdW5jdGlvbiBtYXJrUGVyY2VudGFnZXNGb3JSZWNvcmQocmVjb3JkKQogICAg ICAgICB7CkBAIC0yMDYsNyArMTg3LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQ YW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGZvciAodmFyIGogPSBNYXRoLnJvdW5kKHBl cmNlbnRhZ2VzLnN0YXJ0KTsgaiA8PSBlbmQ7ICsraikKICAgICAgICAgICAgICAgICB0aW1lbGlu ZXNbY2F0ZWdvcnlOYW1lXVtqXSA9IHRydWU7CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5fZm9y QWxsUmVjb3JkcyhyZWNvcmRzLCBtYXJrUGVyY2VudGFnZXNGb3JSZWNvcmQuYmluZCh0aGlzKSk7 CisgICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLmZvckFsbFJlY29yZHMocmVjb3Jk cywgbWFya1BlcmNlbnRhZ2VzRm9yUmVjb3JkLmJpbmQodGhpcykpOwogCiAgICAgICAgIC8vIENv bnZlcnQgc3BhcnNlIGFycmF5cyB0byBjb250aW51b3VzIHNlZ21lbnRzLCByZW5kZXIgZ3JhcGhz IGZvciBlYWNoLgogICAgICAgICBmb3IgKHZhciBjYXRlZ29yeSBpbiB0aGlzLl9wcmVzZW50YXRp b25Nb2RlbC5jYXRlZ29yaWVzKSB7CkBAIC02NjIsNyArNjQzLDcgQEAgV2ViSW5zcGVjdG9yLkhl YXBHcmFwaC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBtaW5Vc2VkSGVhcFNpemUgPSAxMDAw MDAwMDAwMDA7CiAgICAgICAgIHZhciBtaW5UaW1lOwogICAgICAgICB2YXIgbWF4VGltZTsKLSAg ICAgICAgdGhpcy5fZm9yQWxsUmVjb3JkcyhyZWNvcmRzLCBmdW5jdGlvbihyKSB7CisgICAgICAg IFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLmZvckFsbFJlY29yZHMocmVjb3JkcywgZnVuY3Rp b24ocikgewogICAgICAgICAgICAgbWF4VXNlZEhlYXBTaXplID0gTWF0aC5tYXgobWF4VXNlZEhl YXBTaXplLCByLnVzZWRIZWFwU2l6ZSB8fCBtYXhVc2VkSGVhcFNpemUpOwogICAgICAgICAgICAg bWluVXNlZEhlYXBTaXplID0gTWF0aC5taW4obWluVXNlZEhlYXBTaXplLCByLnVzZWRIZWFwU2l6 ZSB8fCBtaW5Vc2VkSGVhcFNpemUpOwogCkBAIC02NzksNyArNjYwLDcgQEAgV2ViSW5zcGVjdG9y LkhlYXBHcmFwaC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB5RmFjdG9yID0gaGVpZ2h0IC8g KG1heFVzZWRIZWFwU2l6ZSAtIG1pblVzZWRIZWFwU2l6ZSk7CiAKICAgICAgICAgdmFyIGhpc3Rv Z3JhbSA9IG5ldyBBcnJheSh3aWR0aCk7Ci0gICAgICAgIHRoaXMuX2ZvckFsbFJlY29yZHMocmVj b3JkcywgZnVuY3Rpb24ocikgeworICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5m b3JBbGxSZWNvcmRzKHJlY29yZHMsIGZ1bmN0aW9uKHIpIHsKICAgICAgICAgICAgIGlmICghci51 c2VkSGVhcFNpemUpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgIHZhciB4 ID0gTWF0aC5yb3VuZCgoci5lbmRUaW1lIC0gbWluVGltZSkgKiB4RmFjdG9yKTsKQEAgLTcyOCw4 ICs3MDksNiBAQCBXZWJJbnNwZWN0b3IuSGVhcEdyYXBoLnByb3RvdHlwZSA9IHsKICAgICAgICAg Y3R4LmZpbGxTdHlsZSA9ICJyZ2JhKDI1NSwyNTUsMjU1LDAuOCkiOwogICAgICAgICBjdHguZmls bFJlY3QoMCwgMCwgdGhpcy5fY2FudmFzLndpZHRoLCB0aGlzLl9jYW52YXMuaGVpZ2h0KTsKICAg ICB9LAotCi0gICAgX2ZvckFsbFJlY29yZHM6IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 UGFuZS5wcm90b3R5cGUuX2ZvckFsbFJlY29yZHMKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKaW5kZXggOWE1YzQ3 OWFjM2Q5ZWVlNGNiZjUwZDExODFkMzQ5MmUwMzI5NmFmNy4uY2JhNjRkNmY0MjBiZGIxYjkxMzNk Y2U5OWMyMWFjODU0Yzg5MzcwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwpAQCAtNzY3LDcgKzc2NywzNyBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiByZWNvcmRz SW5XaW5kb3c7CiAgICAgfSwKIAotICAgIF9yZWZyZXNoUmVjb3JkczogZnVuY3Rpb24odXBkYXRl Qm91bmRhcmllcykKKyAgICByZXZlYWxSZWNvcmRBdDogZnVuY3Rpb24odGltZSkKKyAgICB7Cisg ICAgICAgIGlmICh0aGlzLl9zdGFydEF0WmVybykKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgdmFyIGZpbHRlciA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRGaWx0ZXIodGhp cy5fY2FsY3VsYXRvciwgdGhpcy5fc2hvd1Nob3J0RXZlbnRzKTsKKyAgICAgICAgdmFyIHJlY29y ZFRvUmV2ZWFsOworICAgICAgICBmdW5jdGlvbiByZWNvcmRGaW5kZXIocmVjb3JkKQorICAgICAg ICB7CisgICAgICAgICAgICBpZiAoZmlsdGVyLmFjY2VwdChyZWNvcmQpICYmIHJlY29yZC5jb250 YWluc1RpbWUodGltZSkpIHsKKyAgICAgICAgICAgICAgICByZWNvcmRUb1JldmVhbCA9IHJlY29y ZDsKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxp bmVQYW5lbC5mb3JBbGxSZWNvcmRzKHRoaXMuX3Jvb3RSZWNvcmQuY2hpbGRyZW4sIHJlY29yZEZp bmRlcik7CisKKyAgICAgICAgLy8gVGhlIHJlY29yZCBlbmRzIGJlZm9yZSB0aGUgd2luZG93IGxl ZnQgYm91bmQgc28gc2Nyb2xsIHRvIHRoZSB0b3AuCisgICAgICAgIGlmICghcmVjb3JkVG9SZXZl YWwpIHsKKyAgICAgICAgICAgIHRoaXMuX2NvbnRhaW5lckVsZW1lbnQuc2Nyb2xsVG9wID0gMDsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIC8vIEV4cGFuZCBhbGwg YW5jZXN0b3JzLgorICAgICAgICBmb3IgKHZhciBwYXJlbnQgPSByZWNvcmRUb1JldmVhbC5wYXJl bnQ7IHBhcmVudCAhPT0gdGhpcy5fcm9vdFJlY29yZDsgcGFyZW50ID0gcGFyZW50LnBhcmVudCkK KyAgICAgICAgICAgIHBhcmVudC5jb2xsYXBzZWQgPSBmYWxzZTsKKyAgICAgICAgdmFyIHJlY29y ZHNJbldpbmRvdyA9IHRoaXMuX2ZpbHRlclJlY29yZHMoKTsKKyAgICAgICAgdmFyIGluZGV4ID0g cmVjb3Jkc0luV2luZG93LmluZGV4T2YocmVjb3JkVG9SZXZlYWwpOworICAgICAgICB0aGlzLl9j b250YWluZXJFbGVtZW50LnNjcm9sbFRvcCA9IGluZGV4ICogV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwucm93SGVpZ2h0OworICAgIH0sCisKKyAgICBfcmVmcmVzaFJlY29yZHM6IGZ1bmN0aW9u KHVwZGF0ZUJvdW5kYXJpZXMsIHJlY29yZFRvUmV2ZWFsKQogICAgIHsKICAgICAgICAgdmFyIHJl Y29yZHNJbldpbmRvdyA9IHRoaXMuX2ZpbHRlclJlY29yZHMoKTsKIApAQCAtMTE2MCw2ICsxMTkw LDI2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZEdyYXBoUm93LnByb3RvdHlwZSA9IHsK ICAgICB9CiB9CiAKK1dlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLmZvckFsbFJlY29yZHMgPSBm dW5jdGlvbihyZWNvcmRzQXJyYXksIGNhbGxiYWNrKQoreworICAgIGlmICghcmVjb3Jkc0FycmF5 KQorICAgICAgICByZXR1cm47CisgICAgdmFyIHN0YWNrID0gW3thcnJheTogcmVjb3Jkc0FycmF5 LCBpbmRleDogMH1dOworICAgIHdoaWxlIChzdGFjay5sZW5ndGgpIHsKKyAgICAgICAgdmFyIGVu dHJ5ID0gc3RhY2tbc3RhY2subGVuZ3RoIC0gMV07CisgICAgICAgIHZhciByZWNvcmRzID0gZW50 cnkuYXJyYXk7CisgICAgICAgIGlmIChlbnRyeS5pbmRleCA8IHJlY29yZHMubGVuZ3RoKSB7Cisg ICAgICAgICAgICAgdmFyIHJlY29yZCA9IHJlY29yZHNbZW50cnkuaW5kZXhdOworICAgICAgICAg ICAgIGlmIChjYWxsYmFjayhyZWNvcmQpKQorICAgICAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgICAgICAgaWYgKHJlY29yZC5jaGlsZHJlbikKKyAgICAgICAgICAgICAgICAgc3RhY2sucHVz aCh7YXJyYXk6IHJlY29yZC5jaGlsZHJlbiwgaW5kZXg6IDB9KTsKKyAgICAgICAgICAgICArK2Vu dHJ5LmluZGV4OworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIHN0YWNrLnBvcCgpOworICAg IH0KK30KKwogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqLwpAQCAtMTI0NCw2ICsxMjk0LDExIEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHJldHVybiB0aGlzLl9jaGlsZHJlbjsKICAgICB9LAogCisgICAgY29udGFpbnNU aW1lOiBmdW5jdGlvbih0aW1lKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuc3RhcnRUaW1l IDw9IHRpbWUgJiYgdGltZSA8PSB0aGlzLmVuZFRpbWU7CisgICAgfSwKKwogICAgIF9nZW5lcmF0 ZUFnZ3JlZ2F0ZWRJbmZvOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgY2VsbCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsK