83043 2012-04-03 10:13:28 -0700 Web Inspector: event marks are missing in the timeline overview 2012-04-04 09:15:01 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED Regression P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 594590 0 caseq 2012-04-03 10:13:28 -0700 0. Navigate to http://webkit.org 1. Open inspector 2. Switch to timeline 3. Start record 4. Reload 5. Stop record 6. Notice blue/red event marks are present on the lower pane but absent in the overview This was regressed since r112409 594598 1 135352 caseq 2012-04-03 10:17:53 -0700 Created attachment 135352 Patch 594634 2 135362 caseq 2012-04-03 10:45:38 -0700 Created attachment 135362 Patch 595308 3 caseq 2012-04-04 01:47:25 -0700 Committed r113151: <http://trac.webkit.org/changeset/113151> 135352 2012-04-03 10:17:53 -0700 2012-04-03 10:45:31 -0700 Patch bug-83043-20120403211752.patch text/plain 13193 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDU0MWJhNjc1YTkzOWMz YmIyMTBkNmI5M2FkMjRlZDIzOTExOGE0ZC4uMzEwZGM0N2U3MmIwNWRjZTRkYmZhNWY1ZGE1NGFj OGVlYWNiYzI4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA0LTAzICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogZXZlbnQgbWFya3MgYXJlIG1pc3NpbmcgaW4gdGhlIHRpbWVsaW5lIG92ZXJ2aWV3CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzA0MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gaW52b2tlIG92ZXJ2 aWV3IGV2ZW50IGRpdmlkZXJzIHVwZGF0ZSBhcyBwYXJ0IG9mIG92ZXJ2aWV3IHVwZGF0ZSwgbm90 IGxvd2VyIHBhbmUgdXBkYXRlOworICAgICAgICAtIHN0b3JlIHJhdyByZWNvcmRzIGZvciBldmVu dCBkaXZpZGVycyB3aXRoaW4gb3ZlcnZpZXc7CisgICAgICAgIC0gbW92ZWQgY3JlYXRlRXZlbnRE aXZpZGVycyB0byBhIGNsYXNzIG1ldGhvZCBvZiBUaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsIGZv ciByZXVzZS4KKyAgICAgICAgLSBkaXR0byBmb3IgZm9yQWxsUmVjb3JkcworCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlLl91cGRhdGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5fdXBkYXRlQ2F0ZWdvcnlTdHJp cHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlw ZS5fdXBkYXRlRXZlbnREaXZpZGVycyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlld1BhbmUucHJvdG90eXBlLl9vblJlY29yZEFkZGVkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuX3Jlc2V0KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5IZWFwR3JhcGgucHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRp bWVsaW5lUGFuZWwucHJvdG90eXBlLl91cGRhdGVFdmVudERpdmlkZXJzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5faW5uZXJBZGRSZWNvcmRUb1RpbWVs aW5lLmFkZFRpbWVzdGFtcFJlY29yZHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwucHJvdG90eXBlLl9pbm5lckFkZFJlY29yZFRvVGltZWxpbmUpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmlzRXZlbnREaXZpZGVyKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmZvckFsbFJl Y29yZHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwu Y3JlYXRlRXZlbnREaXZpZGVyKToKKwogMjAxMi0wNC0wMyAgTWFyayBQaWxncmltICA8cGlsZ3Jp bUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ2FsbCBpbmNyZW1lbnRTdGF0c0NvdW50ZXIgZGly ZWN0bHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGlt ZWxpbmVPdmVydmlld1BhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCmluZGV4IDEyNTI1NGIyMDk0NzMxYmNhMjUxODA0MjAz NzVmOWNjZjQ2NGM5YWYuLjBlZmJkM2I1YmI1MjBlNzZlNjEwMjI4ZGRlNzZiMDY5ZmQxOWUxODIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVP dmVydmlld1BhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U aW1lbGluZU92ZXJ2aWV3UGFuZS5qcwpAQCAtNDEsNiArNDEsNyBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlld1BhbmUgPSBmdW5jdGlvbihtb2RlbCkKIAogICAgIHRoaXMuX3dpbmRvd1N0 YXJ0VGltZSA9IDA7CiAgICAgdGhpcy5fd2luZG93RW5kVGltZSA9IEluZmluaXR5OworICAgIHRo aXMuX2V2ZW50RGl2aWRlcnMgPSBbXTsKIAogICAgIHRoaXMuX21vZGVsID0gbW9kZWw7CiAKQEAg LTExMCw3ICsxMTEsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUgPSBmdW5j dGlvbihtb2RlbCkKICAgICB0aGlzLl9vdmVydmlld0dyaWQuc2V0U2Nyb2xsQW5kRGl2aWRlclRv cCgwLCAwKTsKICAgICB0aGlzLl9vdmVydmlld0NhbGN1bGF0b3IgPSBuZXcgV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdDYWxjdWxhdG9yKCk7CiAKLSAgICBtb2RlbC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLkV2ZW50cy5SZWNvcmRBZGRlZCwgdGhpcy5f c2NoZWR1bGVSZWZyZXNoLCB0aGlzKTsKKyAgICBtb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5UaW1lbGluZU1vZGVsLkV2ZW50cy5SZWNvcmRBZGRlZCwgdGhpcy5fb25SZWNvcmRB ZGRlZCwgdGhpcyk7CiAgICAgbW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGlt ZWxpbmVNb2RlbC5FdmVudHMuUmVjb3Jkc0NsZWFyZWQsIHRoaXMuX3Jlc2V0LCB0aGlzKTsKIH0K IApAQCAtMjA0LDYgKzIwNSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5w cm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yLnNldFdpbmRv dyh0aGlzLl9tb2RlbC5taW5pbXVtUmVjb3JkVGltZSgpLCB0aGlzLl9tb2RlbC5tYXhpbXVtUmVj b3JkVGltZSgpKTsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdHcmlkLnVwZGF0ZURpdmlkZXJzKHRy dWUsIHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRvcik7CisgICAgICAgIHRoaXMuX3VwZGF0ZUV2ZW50 RGl2aWRlcnMoKTsKICAgICB9LAogCiAgICAgX3VwZGF0ZUNhdGVnb3J5U3RyaXBzOiBmdW5jdGlv bigpCkBAIC0yMzEsNyArMjMzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5l LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB0aW1lbGluZXNbY2F0ZWdvcnlOYW1lXVtq XSA9IHRydWU7CiAgICAgICAgIH0KICAgICAgICAgdmFyIHJlY29yZHMgPSB0aGlzLl9tb2RlbC5y ZWNvcmRzOwotICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5mb3JBbGxSZWNvcmRz KHJlY29yZHMsIG1hcmtQZXJjZW50YWdlc0ZvclJlY29yZC5iaW5kKHRoaXMpKTsKKyAgICAgICAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuZm9yQWxsUmVjb3JkcyhyZWNv cmRzLCBtYXJrUGVyY2VudGFnZXNGb3JSZWNvcmQuYmluZCh0aGlzKSk7CiAKICAgICAgICAgLy8g Q29udmVydCBzcGFyc2UgYXJyYXlzIHRvIGNvbnRpbnVvdXMgc2VnbWVudHMsIHJlbmRlciBncmFw aHMgZm9yIGVhY2guCiAgICAgICAgIGZvciAodmFyIGNhdGVnb3J5IGluIGNhdGVnb3JpZXMpIHsK QEAgLTI1NiwxOSArMjU4LDE4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAgdXBkYXRlRXZlbnREaXZpZGVy czogZnVuY3Rpb24ocmVjb3JkcywgZGl2aWRlckNvbnN0cnVjdG9yKQorICAgIF91cGRhdGVFdmVu dERpdmlkZXJzOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICB2YXIgcmVjb3JkcyA9IHRoaXMu X2V2ZW50RGl2aWRlcnM7CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5yZW1vdmVFdmVudERp dmlkZXJzKCk7CiAgICAgICAgIHZhciBkaXZpZGVycyA9IFtdOwogICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHJlY29yZHMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciByZWNvcmQg PSByZWNvcmRzW2ldOwotICAgICAgICAgICAgaWYgKHJlY29yZC50eXBlID09PSBXZWJJbnNwZWN0 b3IuVGltZWxpbmVNb2RlbC5SZWNvcmRUeXBlLkJlZ2luRnJhbWUpCi0gICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgICAgICB2YXIgcG9zaXRpb25zID0gdGhpcy5fb3ZlcnZpZXdDYWxj dWxhdG9yLmNvbXB1dGVCYXJHcmFwaFBlcmNlbnRhZ2VzKHJlY29yZCk7CiAgICAgICAgICAgICB2 YXIgZGl2aWRlclBvc2l0aW9uID0gTWF0aC5yb3VuZChwb3NpdGlvbnMuc3RhcnQgKiAxMCk7CiAg ICAgICAgICAgICBpZiAoZGl2aWRlcnNbZGl2aWRlclBvc2l0aW9uXSkKICAgICAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgICAgIHZhciBkaXZpZGVyID0gZGl2aWRlckNvbnN0cnVjdG9y KHJlY29yZCk7CisgICAgICAgICAgICB2YXIgZGl2aWRlciA9IFdlYkluc3BlY3Rvci5UaW1lbGlu ZVByZXNlbnRhdGlvbk1vZGVsLmNyZWF0ZUV2ZW50RGl2aWRlcihyZWNvcmQpOwogICAgICAgICAg ICAgZGl2aWRlci5zdHlsZS5sZWZ0ID0gcG9zaXRpb25zLnN0YXJ0ICsgIiUiOwogICAgICAgICAg ICAgZGl2aWRlcnNbZGl2aWRlclBvc2l0aW9uXSA9IGRpdmlkZXI7CiAgICAgICAgIH0KQEAgLTI5 MCw2ICsyOTEsMTUgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy5fc2NoZWR1bGVSZWZyZXNoKCk7CiAgICAgfSwKIAorICAgIF9v blJlY29yZEFkZGVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciByZWNvcmQg PSBldmVudC5kYXRhOworICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0 aW9uTW9kZWwuaXNFdmVudERpdmlkZXIocmVjb3JkKSkKKyAgICAgICAgICAgIHRoaXMuX2V2ZW50 RGl2aWRlcnMucHVzaChyZWNvcmQpOworICAgICAgIAorICAgICAgICB0aGlzLl9zY2hlZHVsZVJl ZnJlc2goKTsKKyAgICB9LAorCiAgICAgX3Jlc2V0OiBmdW5jdGlvbigpCiAgICAgewogICAgICAg ICB0aGlzLl93aW5kb3dTdGFydFRpbWUgPSAwOwpAQCAtMjk3LDYgKzMwNyw3IEBAIFdlYkluc3Bl Y3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX292 ZXJ2aWV3V2luZG93LnJlc2V0KCk7CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRvci5y ZXNldCgpOwogICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQudXBkYXRlRGl2aWRlcnModHJ1ZSwg dGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yKTsKKyAgICAgICAgdGhpcy5fZXZlbnREaXZpZGVycyA9 IFtdOwogICAgICAgICBpZiAodGhpcy5fdmVydGljYWxPdmVydmlldykKICAgICAgICAgICAgIHRo aXMuX3ZlcnRpY2FsT3ZlcnZpZXcucmVzZXQoKTsKICAgICAgICAgdGhpcy5fdXBkYXRlKCk7CkBA IC03NDUsNyArNzU2LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBHcmFwaC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHZhciBtaW5Vc2VkSGVhcFNpemUgPSAxMDAwMDAwMDAwMDA7CiAgICAgICAgIHZhciBt aW5UaW1lID0gdGhpcy5fbW9kZWwubWluaW11bVJlY29yZFRpbWUoKTsKICAgICAgICAgdmFyIG1h eFRpbWUgPSB0aGlzLl9tb2RlbC5tYXhpbXVtUmVjb3JkVGltZSgpOzsKLSAgICAgICAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lUGFuZWwuZm9yQWxsUmVjb3JkcyhyZWNvcmRzLCBmdW5jdGlvbihyKSB7 CisgICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmZvckFsbFJl Y29yZHMocmVjb3JkcywgZnVuY3Rpb24ocikgewogICAgICAgICAgICAgbWF4VXNlZEhlYXBTaXpl ID0gTWF0aC5tYXgobWF4VXNlZEhlYXBTaXplLCByLnVzZWRIZWFwU2l6ZSB8fCBtYXhVc2VkSGVh cFNpemUpOwogICAgICAgICAgICAgbWluVXNlZEhlYXBTaXplID0gTWF0aC5taW4obWluVXNlZEhl YXBTaXplLCByLnVzZWRIZWFwU2l6ZSB8fCBtaW5Vc2VkSGVhcFNpemUpOwogICAgICAgICB9KTsK QEAgLTc1Nyw3ICs3NjgsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcEdyYXBoLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdmFyIHlGYWN0b3IgPSBoZWlnaHQgLyAobWF4VXNlZEhlYXBTaXplIC0gbWluVXNl ZEhlYXBTaXplKTsKIAogICAgICAgICB2YXIgaGlzdG9ncmFtID0gbmV3IEFycmF5KHdpZHRoKTsK LSAgICAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuZm9yQWxsUmVjb3JkcyhyZWNvcmRz LCBmdW5jdGlvbihyKSB7CisgICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlv bk1vZGVsLmZvckFsbFJlY29yZHMocmVjb3JkcywgZnVuY3Rpb24ocikgewogICAgICAgICAgICAg aWYgKCFyLnVzZWRIZWFwU2l6ZSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICB2YXIgeCA9IE1hdGgucm91bmQoKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLmVuZFRpbWVJ blNlY29uZHMocikgLSBtaW5UaW1lKSAqIHhGYWN0b3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IDc3ZDgzYzEwZmNl YzM4ODM5OTZiNGJhMTVhYjVjMzg4YWEyMmUxNzYuLjBlMGIxYTZkNDgzZTI1ODg0N2RhMjE3Njhj MmMwMzBhMjkwYjc5NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTM0MiwzNiArMzQyLDEyIEBAIFdlYkluc3BlY3Rv ci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHZhciBkaXZpZGVyUG9z aXRpb24gPSBNYXRoLnJvdW5kKHBvc2l0aW9ucy5sZWZ0KTsKICAgICAgICAgICAgIGlmIChkaXZp ZGVyUG9zaXRpb24gPCAwIHx8IGRpdmlkZXJQb3NpdGlvbiA+PSBjbGllbnRXaWR0aCB8fCBkaXZp ZGVyc1tkaXZpZGVyUG9zaXRpb25dKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAg ICAgICAgdmFyIGRpdmlkZXIgPSB0aGlzLl9jcmVhdGVFdmVudERpdmlkZXIocmVjb3JkKTsKKyAg ICAgICAgICAgIHZhciBkaXZpZGVyID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9u TW9kZWwuY3JlYXRlRXZlbnREaXZpZGVyKHJlY29yZCk7CisgICAgICAgICAgICBkaXZpZGVyLnRp dGxlID0gcmVjb3JkLnRpdGxlOwogICAgICAgICAgICAgZGl2aWRlci5zdHlsZS5sZWZ0ID0gKGRp dmlkZXJQb3NpdGlvbiArIHRoaXMuX2V4cGFuZE9mZnNldCkgKyAicHgiOwogICAgICAgICAgICAg ZGl2aWRlcnNbZGl2aWRlclBvc2l0aW9uXSA9IGRpdmlkZXI7CiAgICAgICAgIH0KICAgICAgICAg dGhpcy5fdGltZWxpbmVHcmlkLmFkZEV2ZW50RGl2aWRlcnMoZGl2aWRlcnMpOwotICAgICAgICB0 aGlzLl9vdmVydmlld1BhbmUudXBkYXRlRXZlbnREaXZpZGVycyh0aGlzLl90aW1lU3RhbXBSZWNv cmRzLCB0aGlzLl9jcmVhdGVFdmVudERpdmlkZXIuYmluZCh0aGlzKSk7Ci0gICAgfSwKLQotICAg IF9jcmVhdGVFdmVudERpdmlkZXI6IGZ1bmN0aW9uKHJlY29yZCkKLSAgICB7Ci0gICAgICAgIHZh ciBldmVudERpdmlkZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAg ZXZlbnREaXZpZGVyLmNsYXNzTmFtZSA9ICJyZXNvdXJjZXMtZXZlbnQtZGl2aWRlciI7Ci0gICAg ICAgIHZhciByZWNvcmRUeXBlcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLlJlY29yZFR5 cGU7Ci0KLSAgICAgICAgdmFyIGV2ZW50RGl2aWRlclBhZGRpbmcgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJkaXYiKTsKLSAgICAgICAgZXZlbnREaXZpZGVyUGFkZGluZy5jbGFzc05hbWUgPSAi cmVzb3VyY2VzLWV2ZW50LWRpdmlkZXItcGFkZGluZyI7Ci0gICAgICAgIGV2ZW50RGl2aWRlclBh ZGRpbmcudGl0bGUgPSByZWNvcmQudGl0bGU7Ci0KLSAgICAgICAgaWYgKHJlY29yZC50eXBlID09 PSByZWNvcmRUeXBlcy5NYXJrRE9NQ29udGVudCkKLSAgICAgICAgICAgIGV2ZW50RGl2aWRlci5j bGFzc05hbWUgKz0gIiByZXNvdXJjZXMtYmx1ZS1kaXZpZGVyIjsKLSAgICAgICAgZWxzZSBpZiAo cmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLk1hcmtMb2FkKQotICAgICAgICAgICAgZXZlbnRE aXZpZGVyLmNsYXNzTmFtZSArPSAiIHJlc291cmNlcy1yZWQtZGl2aWRlciI7Ci0gICAgICAgIGVs c2UgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5UaW1lU3RhbXApIHsKLSAgICAgICAg ICAgIGV2ZW50RGl2aWRlci5jbGFzc05hbWUgKz0gIiByZXNvdXJjZXMtb3JhbmdlLWRpdmlkZXIi OwotICAgICAgICAgICAgZXZlbnREaXZpZGVyUGFkZGluZy50aXRsZSA9IHJlY29yZC5kYXRhWyJt ZXNzYWdlIl07Ci0gICAgICAgIH0gZWxzZSBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVz LkJlZ2luRnJhbWUpCi0gICAgICAgICAgICBldmVudERpdmlkZXIuY2xhc3NOYW1lICs9ICIgdGlt ZWxpbmUtZnJhbWUtZGl2aWRlciI7Ci0KLSAgICAgICAgZXZlbnREaXZpZGVyUGFkZGluZy5hcHBl bmRDaGlsZChldmVudERpdmlkZXIpOwotICAgICAgICByZXR1cm4gZXZlbnREaXZpZGVyUGFkZGlu ZzsKICAgICB9LAogCiAgICAgX3RpbWVsaW5lc092ZXJ2aWV3TW9kZUNoYW5nZWQ6IGZ1bmN0aW9u KGV2ZW50KQpAQCAtNDY2LDEyICs0NDIsMTAgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICB2YXIgdGltZVN0YW1wUmVjb3JkcyA9IHRoaXMuX3RpbWVT dGFtcFJlY29yZHM7CiAgICAgICAgIGZ1bmN0aW9uIGFkZFRpbWVzdGFtcFJlY29yZHMocmVjb3Jk KQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVz Lk1hcmtET01Db250ZW50IHx8IHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJrTG9hZCB8 fAotICAgICAgICAgICAgICAgIHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5UaW1lU3RhbXAg fHwgcmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLkJlZ2luRnJhbWUpIHsKKyAgICAgICAgICAg IGlmIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5pc0V2ZW50RGl2aWRl cihyZWNvcmQpIHx8IHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5CZWdpbkZyYW1lKQogICAg ICAgICAgICAgICAgIHRpbWVTdGFtcFJlY29yZHMucHVzaChyZWNvcmQpOwotICAgICAgICAgICAg fQogICAgICAgICB9Ci0gICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLmZvckFsbFJl Y29yZHMoWyBmb3JtYXR0ZWRSZWNvcmQgXSwgYWRkVGltZXN0YW1wUmVjb3Jkcyk7CisgICAgICAg IFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmZvckFsbFJlY29yZHMoWyBm b3JtYXR0ZWRSZWNvcmQgXSwgYWRkVGltZXN0YW1wUmVjb3Jkcyk7CiAgICAgfSwKIAogICAgIHNp ZGViYXJSZXNpemVkOiBmdW5jdGlvbihldmVudCkKQEAgLTkyMCwyNiArODk0LDYgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkR3JhcGhSb3cucHJvdG90eXBlID0gewogICAgIH0KIH0KIAot V2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuZm9yQWxsUmVjb3JkcyA9IGZ1bmN0aW9uKHJlY29y ZHNBcnJheSwgY2FsbGJhY2spCi17Ci0gICAgaWYgKCFyZWNvcmRzQXJyYXkpCi0gICAgICAgIHJl dHVybjsKLSAgICB2YXIgc3RhY2sgPSBbe2FycmF5OiByZWNvcmRzQXJyYXksIGluZGV4OiAwfV07 Ci0gICAgd2hpbGUgKHN0YWNrLmxlbmd0aCkgewotICAgICAgICB2YXIgZW50cnkgPSBzdGFja1tz dGFjay5sZW5ndGggLSAxXTsKLSAgICAgICAgdmFyIHJlY29yZHMgPSBlbnRyeS5hcnJheTsKLSAg ICAgICAgaWYgKGVudHJ5LmluZGV4IDwgcmVjb3Jkcy5sZW5ndGgpIHsKLSAgICAgICAgICAgICB2 YXIgcmVjb3JkID0gcmVjb3Jkc1tlbnRyeS5pbmRleF07Ci0gICAgICAgICAgICAgaWYgKGNhbGxi YWNrKHJlY29yZCkpCi0gICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICBpZiAo cmVjb3JkLmNoaWxkcmVuKQotICAgICAgICAgICAgICAgICBzdGFjay5wdXNoKHthcnJheTogcmVj b3JkLmNoaWxkcmVuLCBpbmRleDogMH0pOwotICAgICAgICAgICAgICsrZW50cnkuaW5kZXg7Ci0g ICAgICAgIH0gZWxzZQotICAgICAgICAgICAgc3RhY2sucG9wKCk7Ci0gICAgfQotfQotCiAvKioK ICAqIEBjb25zdHJ1Y3RvcgogICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXgg ZjMzNzkwMmQ4MWYxMTNkOTVjZWJjOWM5MGQ1NWI1MmZkYzQ1Y2UwNS4uZWQzYzVlZWI4YWMyOWEy MTRiODgzODIxMTQ1ODI2OWU5YTNjMmZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5q cwpAQCAtMTAxLDYgKzEwMSw1NSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25N b2RlbC5jYXRlZ29yeUZvclJlY29yZCA9IGZ1bmN0aW9uKHJlY29yZCkKICAgICAgICAgcmV0dXJu IFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLnJlY29yZFN0eWxlKHJlY29y ZCkuY2F0ZWdvcnk7CiB9CiAKK1dlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVs LmlzRXZlbnREaXZpZGVyID0gZnVuY3Rpb24ocmVjb3JkKQoreworICAgIHZhciByZWNvcmRUeXBl cyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLlJlY29yZFR5cGU7CisgICAgcmV0dXJuIHJl Y29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJrRE9NQ29udGVudCB8fCByZWNvcmQudHlwZSA9 PT0gcmVjb3JkVHlwZXMuTWFya0xvYWQgfHwgcmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLlRp bWVTdGFtcDsKK30KKworV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuZm9y QWxsUmVjb3JkcyA9IGZ1bmN0aW9uKHJlY29yZHNBcnJheSwgY2FsbGJhY2spCit7CisgICAgaWYg KCFyZWNvcmRzQXJyYXkpCisgICAgICAgIHJldHVybjsKKyAgICB2YXIgc3RhY2sgPSBbe2FycmF5 OiByZWNvcmRzQXJyYXksIGluZGV4OiAwfV07CisgICAgd2hpbGUgKHN0YWNrLmxlbmd0aCkgewor ICAgICAgICB2YXIgZW50cnkgPSBzdGFja1tzdGFjay5sZW5ndGggLSAxXTsKKyAgICAgICAgdmFy IHJlY29yZHMgPSBlbnRyeS5hcnJheTsKKyAgICAgICAgaWYgKGVudHJ5LmluZGV4IDwgcmVjb3Jk cy5sZW5ndGgpIHsKKyAgICAgICAgICAgICB2YXIgcmVjb3JkID0gcmVjb3Jkc1tlbnRyeS5pbmRl eF07CisgICAgICAgICAgICAgaWYgKGNhbGxiYWNrKHJlY29yZCkpCisgICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgICBpZiAocmVjb3JkLmNoaWxkcmVuKQorICAgICAgICAgICAg ICAgICBzdGFjay5wdXNoKHthcnJheTogcmVjb3JkLmNoaWxkcmVuLCBpbmRleDogMH0pOworICAg ICAgICAgICAgICsrZW50cnkuaW5kZXg7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgc3Rh Y2sucG9wKCk7CisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25N b2RlbC5jcmVhdGVFdmVudERpdmlkZXIgPSBmdW5jdGlvbihyZWNvcmQpCit7CisgICAgdmFyIGV2 ZW50RGl2aWRlciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIGV2ZW50RGl2 aWRlci5jbGFzc05hbWUgPSAicmVzb3VyY2VzLWV2ZW50LWRpdmlkZXIiOworICAgIHZhciByZWNv cmRUeXBlcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLlJlY29yZFR5cGU7CisKKyAgICB2 YXIgZXZlbnREaXZpZGVyUGFkZGluZyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwor ICAgIGV2ZW50RGl2aWRlclBhZGRpbmcuY2xhc3NOYW1lID0gInJlc291cmNlcy1ldmVudC1kaXZp ZGVyLXBhZGRpbmciOworCisgICAgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJr RE9NQ29udGVudCkKKyAgICAgICAgZXZlbnREaXZpZGVyLmNsYXNzTmFtZSArPSAiIHJlc291cmNl cy1ibHVlLWRpdmlkZXIiOworICAgIGVsc2UgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBl cy5NYXJrTG9hZCkKKyAgICAgICAgZXZlbnREaXZpZGVyLmNsYXNzTmFtZSArPSAiIHJlc291cmNl cy1yZWQtZGl2aWRlciI7CisgICAgZWxzZSBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVz LlRpbWVTdGFtcCkgeworICAgICAgICBldmVudERpdmlkZXIuY2xhc3NOYW1lICs9ICIgcmVzb3Vy Y2VzLW9yYW5nZS1kaXZpZGVyIjsKKyAgICAgICAgZXZlbnREaXZpZGVyUGFkZGluZy50aXRsZSA9 IHJlY29yZC5kYXRhWyJtZXNzYWdlIl07CisgICAgfSBlbHNlIGlmIChyZWNvcmQudHlwZSA9PT0g cmVjb3JkVHlwZXMuQmVnaW5GcmFtZSkKKyAgICAgICAgZXZlbnREaXZpZGVyLmNsYXNzTmFtZSAr PSAiIHRpbWVsaW5lLWZyYW1lLWRpdmlkZXIiOworCisgICAgZXZlbnREaXZpZGVyUGFkZGluZy5h cHBlbmRDaGlsZChldmVudERpdmlkZXIpOworICAgIHJldHVybiBldmVudERpdmlkZXJQYWRkaW5n OworfQorCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50 YXRpb25Nb2RlbC5GaWx0ZXJ9IGZpbHRlcgo= 135362 2012-04-03 10:45:38 -0700 2012-04-04 09:15:01 -0700 Patch bug-83043-20120403214536.patch text/plain 13392 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDU0MWJhNjc1YTkzOWMz YmIyMTBkNmI5M2FkMjRlZDIzOTExOGE0ZC4uMzEwZGM0N2U3MmIwNWRjZTRkYmZhNWY1ZGE1NGFj OGVlYWNiYzI4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA0LTAzICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogZXZlbnQgbWFya3MgYXJlIG1pc3NpbmcgaW4gdGhlIHRpbWVsaW5lIG92ZXJ2aWV3CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzA0MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gaW52b2tlIG92ZXJ2 aWV3IGV2ZW50IGRpdmlkZXJzIHVwZGF0ZSBhcyBwYXJ0IG9mIG92ZXJ2aWV3IHVwZGF0ZSwgbm90 IGxvd2VyIHBhbmUgdXBkYXRlOworICAgICAgICAtIHN0b3JlIHJhdyByZWNvcmRzIGZvciBldmVu dCBkaXZpZGVycyB3aXRoaW4gb3ZlcnZpZXc7CisgICAgICAgIC0gbW92ZWQgY3JlYXRlRXZlbnRE aXZpZGVycyB0byBhIGNsYXNzIG1ldGhvZCBvZiBUaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsIGZv ciByZXVzZS4KKyAgICAgICAgLSBkaXR0byBmb3IgZm9yQWxsUmVjb3JkcworCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlLl91cGRhdGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5fdXBkYXRlQ2F0ZWdvcnlTdHJp cHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlw ZS5fdXBkYXRlRXZlbnREaXZpZGVycyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlld1BhbmUucHJvdG90eXBlLl9vblJlY29yZEFkZGVkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuX3Jlc2V0KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5IZWFwR3JhcGgucHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRp bWVsaW5lUGFuZWwucHJvdG90eXBlLl91cGRhdGVFdmVudERpdmlkZXJzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5faW5uZXJBZGRSZWNvcmRUb1RpbWVs aW5lLmFkZFRpbWVzdGFtcFJlY29yZHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l UGFuZWwucHJvdG90eXBlLl9pbm5lckFkZFJlY29yZFRvVGltZWxpbmUpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmlzRXZlbnREaXZpZGVyKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmZvckFsbFJl Y29yZHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwu Y3JlYXRlRXZlbnREaXZpZGVyKToKKwogMjAxMi0wNC0wMyAgTWFyayBQaWxncmltICA8cGlsZ3Jp bUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ2FsbCBpbmNyZW1lbnRTdGF0c0NvdW50ZXIgZGly ZWN0bHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGlt ZWxpbmVPdmVydmlld1BhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCmluZGV4IDEyNTI1NGIyMDk0NzMxYmNhMjUxODA0MjAz NzVmOWNjZjQ2NGM5YWYuLjUwNDg1MmIzN2RkZjQwY2VmNjFlNmY0ZGJjOWJhOTA1Y2MwYTI4ZWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVP dmVydmlld1BhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U aW1lbGluZU92ZXJ2aWV3UGFuZS5qcwpAQCAtNDEsNiArNDEsNyBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlld1BhbmUgPSBmdW5jdGlvbihtb2RlbCkKIAogICAgIHRoaXMuX3dpbmRvd1N0 YXJ0VGltZSA9IDA7CiAgICAgdGhpcy5fd2luZG93RW5kVGltZSA9IEluZmluaXR5OworICAgIHRo aXMuX2V2ZW50RGl2aWRlcnMgPSBbXTsKIAogICAgIHRoaXMuX21vZGVsID0gbW9kZWw7CiAKQEAg LTExMCw3ICsxMTEsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUgPSBmdW5j dGlvbihtb2RlbCkKICAgICB0aGlzLl9vdmVydmlld0dyaWQuc2V0U2Nyb2xsQW5kRGl2aWRlclRv cCgwLCAwKTsKICAgICB0aGlzLl9vdmVydmlld0NhbGN1bGF0b3IgPSBuZXcgV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdDYWxjdWxhdG9yKCk7CiAKLSAgICBtb2RlbC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLkV2ZW50cy5SZWNvcmRBZGRlZCwgdGhpcy5f c2NoZWR1bGVSZWZyZXNoLCB0aGlzKTsKKyAgICBtb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5UaW1lbGluZU1vZGVsLkV2ZW50cy5SZWNvcmRBZGRlZCwgdGhpcy5fb25SZWNvcmRB ZGRlZCwgdGhpcyk7CiAgICAgbW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGlt ZWxpbmVNb2RlbC5FdmVudHMuUmVjb3Jkc0NsZWFyZWQsIHRoaXMuX3Jlc2V0LCB0aGlzKTsKIH0K IApAQCAtMjA0LDYgKzIwNSw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5w cm90b3R5cGUgPSB7CiAKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yLnNldFdpbmRv dyh0aGlzLl9tb2RlbC5taW5pbXVtUmVjb3JkVGltZSgpLCB0aGlzLl9tb2RlbC5tYXhpbXVtUmVj b3JkVGltZSgpKTsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdHcmlkLnVwZGF0ZURpdmlkZXJzKHRy dWUsIHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRvcik7CisgICAgICAgIHRoaXMuX3VwZGF0ZUV2ZW50 RGl2aWRlcnMoKTsKICAgICB9LAogCiAgICAgX3VwZGF0ZUNhdGVnb3J5U3RyaXBzOiBmdW5jdGlv bigpCkBAIC0yMzEsNyArMjMzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5l LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB0aW1lbGluZXNbY2F0ZWdvcnlOYW1lXVtq XSA9IHRydWU7CiAgICAgICAgIH0KICAgICAgICAgdmFyIHJlY29yZHMgPSB0aGlzLl9tb2RlbC5y ZWNvcmRzOwotICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5mb3JBbGxSZWNvcmRz KHJlY29yZHMsIG1hcmtQZXJjZW50YWdlc0ZvclJlY29yZC5iaW5kKHRoaXMpKTsKKyAgICAgICAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuZm9yQWxsUmVjb3JkcyhyZWNv cmRzLCBtYXJrUGVyY2VudGFnZXNGb3JSZWNvcmQuYmluZCh0aGlzKSk7CiAKICAgICAgICAgLy8g Q29udmVydCBzcGFyc2UgYXJyYXlzIHRvIGNvbnRpbnVvdXMgc2VnbWVudHMsIHJlbmRlciBncmFw aHMgZm9yIGVhY2guCiAgICAgICAgIGZvciAodmFyIGNhdGVnb3J5IGluIGNhdGVnb3JpZXMpIHsK QEAgLTI1NiwxOSArMjU4LDE4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAgdXBkYXRlRXZlbnREaXZpZGVy czogZnVuY3Rpb24ocmVjb3JkcywgZGl2aWRlckNvbnN0cnVjdG9yKQorICAgIF91cGRhdGVFdmVu dERpdmlkZXJzOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICB2YXIgcmVjb3JkcyA9IHRoaXMu X2V2ZW50RGl2aWRlcnM7CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5yZW1vdmVFdmVudERp dmlkZXJzKCk7CiAgICAgICAgIHZhciBkaXZpZGVycyA9IFtdOwogICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHJlY29yZHMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciByZWNvcmQg PSByZWNvcmRzW2ldOwotICAgICAgICAgICAgaWYgKHJlY29yZC50eXBlID09PSBXZWJJbnNwZWN0 b3IuVGltZWxpbmVNb2RlbC5SZWNvcmRUeXBlLkJlZ2luRnJhbWUpCi0gICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgICAgICB2YXIgcG9zaXRpb25zID0gdGhpcy5fb3ZlcnZpZXdDYWxj dWxhdG9yLmNvbXB1dGVCYXJHcmFwaFBlcmNlbnRhZ2VzKHJlY29yZCk7CiAgICAgICAgICAgICB2 YXIgZGl2aWRlclBvc2l0aW9uID0gTWF0aC5yb3VuZChwb3NpdGlvbnMuc3RhcnQgKiAxMCk7CiAg ICAgICAgICAgICBpZiAoZGl2aWRlcnNbZGl2aWRlclBvc2l0aW9uXSkKICAgICAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgICAgIHZhciBkaXZpZGVyID0gZGl2aWRlckNvbnN0cnVjdG9y KHJlY29yZCk7CisgICAgICAgICAgICB2YXIgZGl2aWRlciA9IFdlYkluc3BlY3Rvci5UaW1lbGlu ZVByZXNlbnRhdGlvbk1vZGVsLmNyZWF0ZUV2ZW50RGl2aWRlcihyZWNvcmQpOwogICAgICAgICAg ICAgZGl2aWRlci5zdHlsZS5sZWZ0ID0gcG9zaXRpb25zLnN0YXJ0ICsgIiUiOwogICAgICAgICAg ICAgZGl2aWRlcnNbZGl2aWRlclBvc2l0aW9uXSA9IGRpdmlkZXI7CiAgICAgICAgIH0KQEAgLTI5 MCw2ICsyOTEsMTkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy5fc2NoZWR1bGVSZWZyZXNoKCk7CiAgICAgfSwKIAorICAgIF9v blJlY29yZEFkZGVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciByZWNvcmQg PSBldmVudC5kYXRhOworICAgICAgICB2YXIgZXZlbnREaXZpZGVycyA9IHRoaXMuX2V2ZW50RGl2 aWRlcnM7CisgICAgICAgIGZ1bmN0aW9uIGFkZEV2ZW50RGl2aWRlcnMocmVjb3JkKQorICAgICAg ICB7CisgICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9k ZWwuaXNFdmVudERpdmlkZXIocmVjb3JkKSkKKyAgICAgICAgICAgICAgICBldmVudERpdmlkZXJz LnB1c2gocmVjb3JkKTsKKyAgICAgICAgfQorICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVQ cmVzZW50YXRpb25Nb2RlbC5mb3JBbGxSZWNvcmRzKFtyZWNvcmRdLCBhZGRFdmVudERpdmlkZXJz KTsKKyAgICAgICAgdGhpcy5fc2NoZWR1bGVSZWZyZXNoKCk7CisgICAgfSwKKwogICAgIF9yZXNl dDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fd2luZG93U3RhcnRUaW1lID0gMDsK QEAgLTI5Nyw2ICszMTEsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLl9vdmVydmlld1dpbmRvdy5yZXNldCgpOwogICAgICAg ICB0aGlzLl9vdmVydmlld0NhbGN1bGF0b3IucmVzZXQoKTsKICAgICAgICAgdGhpcy5fb3ZlcnZp ZXdHcmlkLnVwZGF0ZURpdmlkZXJzKHRydWUsIHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRvcik7Cisg ICAgICAgIHRoaXMuX2V2ZW50RGl2aWRlcnMgPSBbXTsKICAgICAgICAgaWYgKHRoaXMuX3ZlcnRp Y2FsT3ZlcnZpZXcpCiAgICAgICAgICAgICB0aGlzLl92ZXJ0aWNhbE92ZXJ2aWV3LnJlc2V0KCk7 CiAgICAgICAgIHRoaXMuX3VwZGF0ZSgpOwpAQCAtNzQ1LDcgKzc2MCw3IEBAIFdlYkluc3BlY3Rv ci5IZWFwR3JhcGgucHJvdG90eXBlID0gewogICAgICAgICB2YXIgbWluVXNlZEhlYXBTaXplID0g MTAwMDAwMDAwMDAwOwogICAgICAgICB2YXIgbWluVGltZSA9IHRoaXMuX21vZGVsLm1pbmltdW1S ZWNvcmRUaW1lKCk7CiAgICAgICAgIHZhciBtYXhUaW1lID0gdGhpcy5fbW9kZWwubWF4aW11bVJl Y29yZFRpbWUoKTs7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLmZvckFsbFJl Y29yZHMocmVjb3JkcywgZnVuY3Rpb24ocikgeworICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxp bmVQcmVzZW50YXRpb25Nb2RlbC5mb3JBbGxSZWNvcmRzKHJlY29yZHMsIGZ1bmN0aW9uKHIpIHsK ICAgICAgICAgICAgIG1heFVzZWRIZWFwU2l6ZSA9IE1hdGgubWF4KG1heFVzZWRIZWFwU2l6ZSwg ci51c2VkSGVhcFNpemUgfHwgbWF4VXNlZEhlYXBTaXplKTsKICAgICAgICAgICAgIG1pblVzZWRI ZWFwU2l6ZSA9IE1hdGgubWluKG1pblVzZWRIZWFwU2l6ZSwgci51c2VkSGVhcFNpemUgfHwgbWlu VXNlZEhlYXBTaXplKTsKICAgICAgICAgfSk7CkBAIC03NTcsNyArNzcyLDcgQEAgV2ViSW5zcGVj dG9yLkhlYXBHcmFwaC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciB5RmFjdG9yID0gaGVpZ2h0 IC8gKG1heFVzZWRIZWFwU2l6ZSAtIG1pblVzZWRIZWFwU2l6ZSk7CiAKICAgICAgICAgdmFyIGhp c3RvZ3JhbSA9IG5ldyBBcnJheSh3aWR0aCk7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVBhbmVsLmZvckFsbFJlY29yZHMocmVjb3JkcywgZnVuY3Rpb24ocikgeworICAgICAgICBXZWJJ bnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5mb3JBbGxSZWNvcmRzKHJlY29yZHMs IGZ1bmN0aW9uKHIpIHsKICAgICAgICAgICAgIGlmICghci51c2VkSGVhcFNpemUpCiAgICAgICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgdmFyIHggPSBNYXRoLnJvdW5kKChXZWJJbnNw ZWN0b3IuVGltZWxpbmVNb2RlbC5lbmRUaW1lSW5TZWNvbmRzKHIpIC0gbWluVGltZSkgKiB4RmFj dG9yKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGlt ZWxpbmVQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxp bmVQYW5lbC5qcwppbmRleCA3N2Q4M2MxMGZjZWMzODgzOTk2YjRiYTE1YWI1YzM4OGFhMjJlMTc2 Li4wZTBiMWE2ZDQ4M2UyNTg4NDdkYTIxNzY4YzJjMDMwYTI5MGI3OTc3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCkBAIC0z NDIsMzYgKzM0MiwxMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICB2YXIgZGl2aWRlclBvc2l0aW9uID0gTWF0aC5yb3VuZChwb3NpdGlvbnMu bGVmdCk7CiAgICAgICAgICAgICBpZiAoZGl2aWRlclBvc2l0aW9uIDwgMCB8fCBkaXZpZGVyUG9z aXRpb24gPj0gY2xpZW50V2lkdGggfHwgZGl2aWRlcnNbZGl2aWRlclBvc2l0aW9uXSkKICAgICAg ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIHZhciBkaXZpZGVyID0gdGhpcy5fY3Jl YXRlRXZlbnREaXZpZGVyKHJlY29yZCk7CisgICAgICAgICAgICB2YXIgZGl2aWRlciA9IFdlYklu c3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmNyZWF0ZUV2ZW50RGl2aWRlcihyZWNv cmQpOworICAgICAgICAgICAgZGl2aWRlci50aXRsZSA9IHJlY29yZC50aXRsZTsKICAgICAgICAg ICAgIGRpdmlkZXIuc3R5bGUubGVmdCA9IChkaXZpZGVyUG9zaXRpb24gKyB0aGlzLl9leHBhbmRP ZmZzZXQpICsgInB4IjsKICAgICAgICAgICAgIGRpdmlkZXJzW2RpdmlkZXJQb3NpdGlvbl0gPSBk aXZpZGVyOwogICAgICAgICB9CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lR3JpZC5hZGRFdmVudERp dmlkZXJzKGRpdmlkZXJzKTsKLSAgICAgICAgdGhpcy5fb3ZlcnZpZXdQYW5lLnVwZGF0ZUV2ZW50 RGl2aWRlcnModGhpcy5fdGltZVN0YW1wUmVjb3JkcywgdGhpcy5fY3JlYXRlRXZlbnREaXZpZGVy LmJpbmQodGhpcykpOwotICAgIH0sCi0KLSAgICBfY3JlYXRlRXZlbnREaXZpZGVyOiBmdW5jdGlv bihyZWNvcmQpCi0gICAgewotICAgICAgICB2YXIgZXZlbnREaXZpZGVyID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIGV2ZW50RGl2aWRlci5jbGFzc05hbWUgPSAicmVz b3VyY2VzLWV2ZW50LWRpdmlkZXIiOwotICAgICAgICB2YXIgcmVjb3JkVHlwZXMgPSBXZWJJbnNw ZWN0b3IuVGltZWxpbmVNb2RlbC5SZWNvcmRUeXBlOwotCi0gICAgICAgIHZhciBldmVudERpdmlk ZXJQYWRkaW5nID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIGV2ZW50 RGl2aWRlclBhZGRpbmcuY2xhc3NOYW1lID0gInJlc291cmNlcy1ldmVudC1kaXZpZGVyLXBhZGRp bmciOwotICAgICAgICBldmVudERpdmlkZXJQYWRkaW5nLnRpdGxlID0gcmVjb3JkLnRpdGxlOwot Ci0gICAgICAgIGlmIChyZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuTWFya0RPTUNvbnRlbnQp Ci0gICAgICAgICAgICBldmVudERpdmlkZXIuY2xhc3NOYW1lICs9ICIgcmVzb3VyY2VzLWJsdWUt ZGl2aWRlciI7Ci0gICAgICAgIGVsc2UgaWYgKHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5N YXJrTG9hZCkKLSAgICAgICAgICAgIGV2ZW50RGl2aWRlci5jbGFzc05hbWUgKz0gIiByZXNvdXJj ZXMtcmVkLWRpdmlkZXIiOwotICAgICAgICBlbHNlIGlmIChyZWNvcmQudHlwZSA9PT0gcmVjb3Jk VHlwZXMuVGltZVN0YW1wKSB7Ci0gICAgICAgICAgICBldmVudERpdmlkZXIuY2xhc3NOYW1lICs9 ICIgcmVzb3VyY2VzLW9yYW5nZS1kaXZpZGVyIjsKLSAgICAgICAgICAgIGV2ZW50RGl2aWRlclBh ZGRpbmcudGl0bGUgPSByZWNvcmQuZGF0YVsibWVzc2FnZSJdOwotICAgICAgICB9IGVsc2UgaWYg KHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5CZWdpbkZyYW1lKQotICAgICAgICAgICAgZXZl bnREaXZpZGVyLmNsYXNzTmFtZSArPSAiIHRpbWVsaW5lLWZyYW1lLWRpdmlkZXIiOwotCi0gICAg ICAgIGV2ZW50RGl2aWRlclBhZGRpbmcuYXBwZW5kQ2hpbGQoZXZlbnREaXZpZGVyKTsKLSAgICAg ICAgcmV0dXJuIGV2ZW50RGl2aWRlclBhZGRpbmc7CiAgICAgfSwKIAogICAgIF90aW1lbGluZXNP dmVydmlld01vZGVDaGFuZ2VkOiBmdW5jdGlvbihldmVudCkKQEAgLTQ2NiwxMiArNDQyLDEwIEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHRp bWVTdGFtcFJlY29yZHMgPSB0aGlzLl90aW1lU3RhbXBSZWNvcmRzOwogICAgICAgICBmdW5jdGlv biBhZGRUaW1lc3RhbXBSZWNvcmRzKHJlY29yZCkKICAgICAgICAgewotICAgICAgICAgICAgaWYg KHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJrRE9NQ29udGVudCB8fCByZWNvcmQudHlw ZSA9PT0gcmVjb3JkVHlwZXMuTWFya0xvYWQgfHwKLSAgICAgICAgICAgICAgICByZWNvcmQudHlw ZSA9PT0gcmVjb3JkVHlwZXMuVGltZVN0YW1wIHx8IHJlY29yZC50eXBlID09PSByZWNvcmRUeXBl cy5CZWdpbkZyYW1lKSB7CisgICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJl c2VudGF0aW9uTW9kZWwuaXNFdmVudERpdmlkZXIocmVjb3JkKSB8fCByZWNvcmQudHlwZSA9PT0g cmVjb3JkVHlwZXMuQmVnaW5GcmFtZSkKICAgICAgICAgICAgICAgICB0aW1lU3RhbXBSZWNvcmRz LnB1c2gocmVjb3JkKTsKLSAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICBXZWJJbnNw ZWN0b3IuVGltZWxpbmVQYW5lbC5mb3JBbGxSZWNvcmRzKFsgZm9ybWF0dGVkUmVjb3JkIF0sIGFk ZFRpbWVzdGFtcFJlY29yZHMpOworICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50 YXRpb25Nb2RlbC5mb3JBbGxSZWNvcmRzKFsgZm9ybWF0dGVkUmVjb3JkIF0sIGFkZFRpbWVzdGFt cFJlY29yZHMpOwogICAgIH0sCiAKICAgICBzaWRlYmFyUmVzaXplZDogZnVuY3Rpb24oZXZlbnQp CkBAIC05MjAsMjYgKzg5NCw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZEdyYXBoUm93 LnByb3RvdHlwZSA9IHsKICAgICB9CiB9CiAKLVdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLmZv ckFsbFJlY29yZHMgPSBmdW5jdGlvbihyZWNvcmRzQXJyYXksIGNhbGxiYWNrKQotewotICAgIGlm ICghcmVjb3Jkc0FycmF5KQotICAgICAgICByZXR1cm47Ci0gICAgdmFyIHN0YWNrID0gW3thcnJh eTogcmVjb3Jkc0FycmF5LCBpbmRleDogMH1dOwotICAgIHdoaWxlIChzdGFjay5sZW5ndGgpIHsK LSAgICAgICAgdmFyIGVudHJ5ID0gc3RhY2tbc3RhY2subGVuZ3RoIC0gMV07Ci0gICAgICAgIHZh ciByZWNvcmRzID0gZW50cnkuYXJyYXk7Ci0gICAgICAgIGlmIChlbnRyeS5pbmRleCA8IHJlY29y ZHMubGVuZ3RoKSB7Ci0gICAgICAgICAgICAgdmFyIHJlY29yZCA9IHJlY29yZHNbZW50cnkuaW5k ZXhdOwotICAgICAgICAgICAgIGlmIChjYWxsYmFjayhyZWNvcmQpKQotICAgICAgICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgICAgICAgaWYgKHJlY29yZC5jaGlsZHJlbikKLSAgICAgICAgICAg ICAgICAgc3RhY2sucHVzaCh7YXJyYXk6IHJlY29yZC5jaGlsZHJlbiwgaW5kZXg6IDB9KTsKLSAg ICAgICAgICAgICArK2VudHJ5LmluZGV4OwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHN0 YWNrLnBvcCgpOwotICAgIH0KLX0KLQogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqLwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVByZXNlbnRh dGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGlu ZVByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IGYzMzc5MDJkODFmMTEzZDk1Y2ViYzljOTBkNTVi NTJmZGM0NWNlMDUuLmVkM2M1ZWViOGFjMjlhMjE0Yjg4MzgyMTE0NTgyNjllOWEzYzJmYmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVz ZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1RpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTEwMSw2ICsxMDEsNTUgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuY2F0ZWdvcnlGb3JSZWNvcmQgPSBmdW5j dGlvbihyZWNvcmQpCiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50 YXRpb25Nb2RlbC5yZWNvcmRTdHlsZShyZWNvcmQpLmNhdGVnb3J5OwogfQogCitXZWJJbnNwZWN0 b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5pc0V2ZW50RGl2aWRlciA9IGZ1bmN0aW9uKHJl Y29yZCkKK3sKKyAgICB2YXIgcmVjb3JkVHlwZXMgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2Rl bC5SZWNvcmRUeXBlOworICAgIHJldHVybiByZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuTWFy a0RPTUNvbnRlbnQgfHwgcmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLk1hcmtMb2FkIHx8IHJl Y29yZC50eXBlID09PSByZWNvcmRUeXBlcy5UaW1lU3RhbXA7Cit9CisKK1dlYkluc3BlY3Rvci5U aW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmZvckFsbFJlY29yZHMgPSBmdW5jdGlvbihyZWNvcmRz QXJyYXksIGNhbGxiYWNrKQoreworICAgIGlmICghcmVjb3Jkc0FycmF5KQorICAgICAgICByZXR1 cm47CisgICAgdmFyIHN0YWNrID0gW3thcnJheTogcmVjb3Jkc0FycmF5LCBpbmRleDogMH1dOwor ICAgIHdoaWxlIChzdGFjay5sZW5ndGgpIHsKKyAgICAgICAgdmFyIGVudHJ5ID0gc3RhY2tbc3Rh Y2subGVuZ3RoIC0gMV07CisgICAgICAgIHZhciByZWNvcmRzID0gZW50cnkuYXJyYXk7CisgICAg ICAgIGlmIChlbnRyeS5pbmRleCA8IHJlY29yZHMubGVuZ3RoKSB7CisgICAgICAgICAgICAgdmFy IHJlY29yZCA9IHJlY29yZHNbZW50cnkuaW5kZXhdOworICAgICAgICAgICAgIGlmIChjYWxsYmFj ayhyZWNvcmQpKQorICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgaWYgKHJl Y29yZC5jaGlsZHJlbikKKyAgICAgICAgICAgICAgICAgc3RhY2sucHVzaCh7YXJyYXk6IHJlY29y ZC5jaGlsZHJlbiwgaW5kZXg6IDB9KTsKKyAgICAgICAgICAgICArK2VudHJ5LmluZGV4OworICAg ICAgICB9IGVsc2UKKyAgICAgICAgICAgIHN0YWNrLnBvcCgpOworICAgIH0KK30KKworV2ViSW5z cGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuY3JlYXRlRXZlbnREaXZpZGVyID0gZnVu Y3Rpb24ocmVjb3JkKQoreworICAgIHZhciBldmVudERpdmlkZXIgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJkaXYiKTsKKyAgICBldmVudERpdmlkZXIuY2xhc3NOYW1lID0gInJlc291cmNlcy1l dmVudC1kaXZpZGVyIjsKKyAgICB2YXIgcmVjb3JkVHlwZXMgPSBXZWJJbnNwZWN0b3IuVGltZWxp bmVNb2RlbC5SZWNvcmRUeXBlOworCisgICAgdmFyIGV2ZW50RGl2aWRlclBhZGRpbmcgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICBldmVudERpdmlkZXJQYWRkaW5nLmNsYXNz TmFtZSA9ICJyZXNvdXJjZXMtZXZlbnQtZGl2aWRlci1wYWRkaW5nIjsKKworICAgIGlmIChyZWNv cmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuTWFya0RPTUNvbnRlbnQpCisgICAgICAgIGV2ZW50RGl2 aWRlci5jbGFzc05hbWUgKz0gIiByZXNvdXJjZXMtYmx1ZS1kaXZpZGVyIjsKKyAgICBlbHNlIGlm IChyZWNvcmQudHlwZSA9PT0gcmVjb3JkVHlwZXMuTWFya0xvYWQpCisgICAgICAgIGV2ZW50RGl2 aWRlci5jbGFzc05hbWUgKz0gIiByZXNvdXJjZXMtcmVkLWRpdmlkZXIiOworICAgIGVsc2UgaWYg KHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5UaW1lU3RhbXApIHsKKyAgICAgICAgZXZlbnRE aXZpZGVyLmNsYXNzTmFtZSArPSAiIHJlc291cmNlcy1vcmFuZ2UtZGl2aWRlciI7CisgICAgICAg IGV2ZW50RGl2aWRlclBhZGRpbmcudGl0bGUgPSByZWNvcmQuZGF0YVsibWVzc2FnZSJdOworICAg IH0gZWxzZSBpZiAocmVjb3JkLnR5cGUgPT09IHJlY29yZFR5cGVzLkJlZ2luRnJhbWUpCisgICAg ICAgIGV2ZW50RGl2aWRlci5jbGFzc05hbWUgKz0gIiB0aW1lbGluZS1mcmFtZS1kaXZpZGVyIjsK KworICAgIGV2ZW50RGl2aWRlclBhZGRpbmcuYXBwZW5kQ2hpbGQoZXZlbnREaXZpZGVyKTsKKyAg ICByZXR1cm4gZXZlbnREaXZpZGVyUGFkZGluZzsKK30KKwogV2ViSW5zcGVjdG9yLlRpbWVsaW5l UHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgIC8qKgogICAgICAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuRmlsdGVyfSBmaWx0ZXIK