123367 2013-10-25 15:44:24 -0700 Web Inspector: Implement TimelineRecording and per-callsite timelines 2014-01-20 19:00:38 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy graouts joepeck timothy webkit-bug-importer oldest_to_newest 943795 0 timothy 2013-10-25 15:44:24 -0700 Add the implementation for TimelineRecording and helpers. 943796 1 webkit-bug-importer 2013-10-25 15:44:31 -0700 <rdar://problem/15324242> 943798 2 215224 timothy 2013-10-25 15:47:20 -0700 Created attachment 215224 Patch 944151 3 215224 joepeck 2013-10-28 10:44:59 -0700 Comment on attachment 215224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=215224&action=review r=me > Source/WebInspectorUI/UserInterface/TimelineRecording.js:32 > + this._timelines = {script: new WebInspector.Timeline, layout: new WebInspector.Timeline}; > + this._sourceCodeTimelinesMap = new Map; > + this._eventMarkers = []; When are these cleared? > Source/WebInspectorUI/UserInterface/TimelineRecording.js:41 > + get timelines() { Style: { on its own line 944163 4 215224 timothy 2013-10-28 11:18:57 -0700 Comment on attachment 215224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=215224&action=review >> Source/WebInspectorUI/UserInterface/TimelineRecording.js:32 >> + this._eventMarkers = []; > > When are these cleared? They are cleared when the recordings are cleared, on reload. 970114 5 timothy 2014-01-20 19:00:38 -0800 https://trac.webkit.org/changeset/162401 215224 2013-10-25 15:47:20 -0700 2013-10-28 11:18:56 -0700 Patch bug-123367-20131025154719.patch text/plain 10560 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3ODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA4 MGUzMzFlYjA4ZDcxMzU5OGM3NDkzNjMwODc5ZmYyMGMzODgxYjJmLi41NTAyZTI4Y2RkNWMwYmUy NzIxMWE3MjFlMjBjMmUwMDgwMDJhNmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzNSBAQAogMjAxMy0xMC0yNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgSW1wbGVtZW50IFRpbWVsaW5lUmVjb3JkaW5nIGFuZCBwZXItY2FsbC1z aXRlIHRpbWVsaW5lcy4KKworICAgICAgICBLZWVwIHRyYWNrIG9mIHRpbWVsaW5lIHJlY29yZHMg cGVyIGdsb2JhbCB0aW1lbGluZSBhbmQgcGVyIHNvdXJjZSBjb2RlIGxvY2F0aW9uLgorICAgICAg ICBUaGlzIHdpbGwgYmUgdXNlZCB0byBkaXNwbGF5IHRoZW0gaW4gdGhlIFVJIGluIGxhdGVyIHBh dGNoZXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMzM2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9NYWluLmh0bWw6CisgICAgICAgICogVXNlckludGVyZmFjZS9Tb3Vy Y2VDb2RlVGltZWxpbmUuanM6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNv ZGVUaW1lbGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRpbWVsaW5lLnBy b3RvdHlwZS5nZXQgc291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlQ29k ZVRpbWVsaW5lLnByb3RvdHlwZS5nZXQgc291cmNlQ29kZUxvY2F0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Tb3VyY2VDb2RlVGltZWxpbmUucHJvdG90eXBlLmdldCByZWNvcmRUeXBlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGltZWxpbmUucHJvdG90eXBlLmdldCBy ZWNvcmRFdmVudFR5cGUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVGltZWxpbmUuanM6IEFk ZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZS5wcm90b3R5cGUuZ2V0IHJlY29yZHMpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lLnByb3RvdHlwZS5hZGRSZWNvcmQpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVGltZWxpbmVSZWNvcmRpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVS ZWNvcmRpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLnByb3Rv dHlwZS5nZXQgdGltZWxpbmVzKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVSZWNvcmRpbmcucHJvdG90eXBlLnNvdXJjZUNvZGVUaW1lbGluZXNGb3JTb3VyY2VDb2RlKTog QWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcucHJvdG90eXBl LmFkZEV2ZW50TWFya2VyKTogSW1wbGVtZW50ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSZWNvcmRpbmcucHJvdG90eXBlLmFkZFJlY29yZCk6IEltcGxlbWVudGVkLgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLnByb3RvdHlwZS5fa2V5Rm9yUmVjb3Jk KTogQWRkZWQuCisKKzIwMTMtMTAtMjUgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUu Y29tPgorCiAgICAgICAgIEFkZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBUaW1lbGluZSByZWNvcmRp bmdzLgogCiAgICAgICAgIFdlIGFsc28gZG9uJ3QgZXhwbGljaXRseSBhZGQgUmVzb3VyY2VUaW1l bGluZVJlY29yZHMgYW55bW9yZS4gVGhlc2Ugd2lsbCBiZSB0cmFja2VkIGF1dG9tYXRpY2FsbHkg aW4gYSBsYXRlciBwYXRjaC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01haW4uaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01haW4uaHRtbAppbmRleCBkNTgzMTc3YTBmNjk5MDI1MDMwMDViNmMwNjgyMWE4OGM2MGYxNzFh Li40YWQ0YTEwYjI0MTZlNGNkZGE2MTRiZTk2YjdmOTY5NmIwMjg0N2IxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCkBAIC0xODIsNiArMTgyLDgg QEAKICAgICA8c2NyaXB0IHNyYz0iVGltZWxpbmVPYnNlcnZlci5qcyI+PC9zY3JpcHQ+CiAgICAg PHNjcmlwdCBzcmM9IlRpbWVsaW5lTWFuYWdlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBz cmM9IlRpbWVsaW5lUmVjb3JkaW5nLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iVGlt ZWxpbmUuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJTb3VyY2VDb2RlVGltZWxpbmUu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJUaW1lbGluZVJlY29yZC5qcyI+PC9zY3Jp cHQ+CiAgICAgPHNjcmlwdCBzcmM9IlRpbWVsaW5lRXZlbnRNYXJrZXIuanMiPjwvc2NyaXB0Pgog ICAgIDxzY3JpcHQgc3JjPSJSZXNvdXJjZVRpbWVsaW5lUmVjb3JkLmpzIj48L3NjcmlwdD4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1NvdXJjZUNvZGVU aW1lbGluZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1NvdXJjZUNv ZGVUaW1lbGluZS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42YmU3MTJjZTAxNGU3YmI5ZjY2NTBmMjFlYjA1NDYx YjM1M2RmYmRhCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvU291cmNlQ29kZVRpbWVsaW5lLmpzCkBAIC0wLDAgKzEsNjQgQEAKKy8qCisgKiBD b3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRT IENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5D LiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFM IERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgor ICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBS T0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBP TiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklD VCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkK KyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAq LworCitXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRpbWVsaW5lID0gZnVuY3Rpb24oc291cmNlQ29k ZSwgc291cmNlQ29kZUxvY2F0aW9uLCByZWNvcmRUeXBlLCByZWNvcmRFdmVudFR5cGUpCit7Cisg ICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lLmNhbGwodGhpcyk7CisKKyAgICBjb25zb2xlLmFzc2Vy dChzb3VyY2VDb2RlKTsKKyAgICBjb25zb2xlLmFzc2VydChyZWNvcmRUeXBlKTsKKworICAgIHRo aXMuX3NvdXJjZUNvZGUgPSBzb3VyY2VDb2RlOworICAgIHRoaXMuX3NvdXJjZUNvZGVMb2NhdGlv biA9IHNvdXJjZUNvZGVMb2NhdGlvbiB8fCBudWxsOworICAgIHRoaXMuX3JlY29yZFR5cGUgPSBy ZWNvcmRUeXBlOworICAgIHRoaXMuX3JlY29yZEV2ZW50VHlwZSA9IHJlY29yZEV2ZW50VHlwZSB8 fCBudWxsOworfTsKKworV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUaW1lbGluZS5wcm90b3R5cGUg PSB7CisgICAgY29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGltZWxpbmUsCisg ICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuVGltZWxpbmUucHJvdG90eXBlLAorCisgICAgLy8g UHVibGljCisKKyAgICBnZXQgc291cmNlQ29kZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhp cy5fc291cmNlQ29kZTsKKyAgICB9LAorCisgICAgZ2V0IHNvdXJjZUNvZGVMb2NhdGlvbigpCisg ICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlQ29kZUxvY2F0aW9uOworICAgIH0sCisK KyAgICBnZXQgcmVjb3JkVHlwZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcmVjb3Jk VHlwZTsKKyAgICB9LAorCisgICAgZ2V0IHJlY29yZEV2ZW50VHlwZSgpCisgICAgeworICAgICAg ICByZXR1cm4gdGhpcy5fcmVjb3JkRXZlbnRUeXBlOworICAgIH0KK307CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZS5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lLmpzCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjAzODAz ODZhZTNhY2VmODgzMDk4Y2IyYjNlOWI3NzcyYWZiYzVlZjIKLS0tIC9kZXYvbnVsbAorKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZS5qcwpAQCAtMCwwICsx LDQ4IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAq IDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZv cm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQor ICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGgg dGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQ UExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywK KyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNT IEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBB TlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgor ICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg UFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0Yg VVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAq IENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5D RSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0Yg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCisgKi8KKworV2ViSW5zcGVjdG9yLlRpbWVsaW5lID0gZnVuY3Rpb24oKQor eworICAgIFdlYkluc3BlY3Rvci5PYmplY3QuY2FsbCh0aGlzKTsKKworICAgIHRoaXMuX3JlY29y ZHMgPSBbXTsKK307CisKK1dlYkluc3BlY3Rvci5UaW1lbGluZS5wcm90b3R5cGUgPSB7CisgICAg Y29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5UaW1lbGluZSwKKyAgICBfX3Byb3RvX186IFdlYklu c3BlY3Rvci5PYmplY3QucHJvdG90eXBlLAorCisgICAgLy8gUHVibGljCisKKyAgICBnZXQgcmVj b3JkcygpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcmVjb3JkczsKKyAgICB9LAorCisg ICAgYWRkUmVjb3JkOiBmdW5jdGlvbihyZWNvcmQpCisgICAgeworICAgICAgICB0aGlzLl9yZWNv cmRzLnB1c2gocmVjb3JkKTsKKyAgICB9Cit9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVSZWNvcmRpbmcuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVJlY29yZGluZy5qcwppbmRleCAyMjhjOTZi Nzk1Yjg3ODUzMzA2ZjJmNWEzZmU0NGJjNTM5YWRkNDM5Li4yYTZiMWZhN2M5OTRjMThjMWJjNDMy ODQyNGI1Y2NmYTFhNTliNjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9UaW1lbGluZVJlY29yZGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9UaW1lbGluZVJlY29yZGluZy5qcwpAQCAtMjYsNiArMjYsMTAgQEAK IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZyA9IGZ1bmN0aW9uKCkKIHsKICAgICBXZWJJ bnNwZWN0b3IuT2JqZWN0LmNhbGwodGhpcyk7CisKKyAgICB0aGlzLl90aW1lbGluZXMgPSB7c2Ny aXB0OiBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lLCBsYXlvdXQ6IG5ldyBXZWJJbnNwZWN0b3Iu VGltZWxpbmV9OworICAgIHRoaXMuX3NvdXJjZUNvZGVUaW1lbGluZXNNYXAgPSBuZXcgTWFwOwor ICAgIHRoaXMuX2V2ZW50TWFya2VycyA9IFtdOwogfTsKIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5l UmVjb3JkaW5nLnByb3RvdHlwZSA9IHsKQEAgLTM0LDEzICszOCw2NCBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVSZWNvcmRpbmcucHJvdG90eXBlID0gewogCiAgICAgLy8gUHVibGljCiAKKyAgICBn ZXQgdGltZWxpbmVzKCkgeworICAgICAgICByZXR1cm4gdGhpcy5fdGltZWxpbmVzOworICAgIH0s CisKKyAgICBzb3VyY2VDb2RlVGltZWxpbmVzRm9yU291cmNlQ29kZTogZnVuY3Rpb24oc291cmNl Q29kZSkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VDb2RlVGltZWxpbmVzTWFw LmdldChzb3VyY2VDb2RlKSB8fCBbXTsKKyAgICB9LAorCiAgICAgYWRkRXZlbnRNYXJrZXI6IGZ1 bmN0aW9uKGV2ZW50TWFya2VyKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IEltcGxlbWVudC4K KyAgICAgICAgdGhpcy5fZXZlbnRNYXJrZXJzLnB1c2goZXZlbnRNYXJrZXIpOwogICAgIH0sCiAK ICAgICBhZGRSZWNvcmQ6IGZ1bmN0aW9uKHJlY29yZCkKICAgICB7Ci0gICAgICAgIC8vIEZJWE1F OiBJbXBsZW1lbnQuCisgICAgICAgIC8vIE5ldHdvcmsgcmVjb3JkcyBhcmUgbm90IGFkZGVkIGJl Y2F1c2UgdGhleSBhcmUgaGFuZGxlZCBzZXBhcmF0ZWx5IGFuZCBhbHdheXMgdHJhY2tlZCBieSB0 aGUgRnJhbWVSZXNvdXJjZU1hbmFnZXIgZm9yIHVzLgorICAgICAgICBjb25zb2xlLmFzc2VydChy ZWNvcmQudHlwZSAhPT0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTmV0d29yayk7 CisgICAgICAgIGlmIChyZWNvcmQudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3Jk LlR5cGUuTmV0d29yaykKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAvLyBBZGQgdGhl IHJlY29yZHMgdG8gdGhlIGdsb2JhbCB0aW1lbGluZXMuCisgICAgICAgIHN3aXRjaCAocmVjb3Jk LnR5cGUpIHsKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5M YXlvdXQ6CisgICAgICAgICAgICB0aGlzLl90aW1lbGluZXMubGF5b3V0LmFkZFJlY29yZChyZWNv cmQpOworICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSZWNvcmQuVHlwZS5TY3JpcHQ6CisgICAgICAgICAgICB0aGlzLl90aW1lbGluZXMuc2Ny aXB0LmFkZFJlY29yZChyZWNvcmQpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKwor ICAgICAgICAvLyBBZGQgdGhlIHJlY29yZCB0byB0aGUgc291cmNlIGNvZGUgdGltZWxpbmVzLgor ICAgICAgICB2YXIgc291cmNlQ29kZSA9IHJlY29yZC5zb3VyY2VDb2RlTG9jYXRpb24gPyByZWNv cmQuc291cmNlQ29kZUxvY2F0aW9uLnNvdXJjZUNvZGUgOiBXZWJJbnNwZWN0b3IuZnJhbWVSZXNv dXJjZU1hbmFnZXIubWFpbkZyYW1lLm1haW5SZXNvdXJjZTsKKworICAgICAgICB2YXIgc291cmNl Q29kZVRpbWVsaW5lcyA9IHRoaXMuX3NvdXJjZUNvZGVUaW1lbGluZXNNYXAuZ2V0KHNvdXJjZUNv ZGUpOworICAgICAgICBpZiAoIXNvdXJjZUNvZGVUaW1lbGluZXMpIHsKKyAgICAgICAgICAgIHNv dXJjZUNvZGVUaW1lbGluZXMgPSB7fTsKKyAgICAgICAgICAgIHRoaXMuX3NvdXJjZUNvZGVUaW1l bGluZXNNYXAuc2V0KHNvdXJjZUNvZGUsIHNvdXJjZUNvZGVUaW1lbGluZXMpOworICAgICAgICB9 CisKKyAgICAgICAgdmFyIGtleSA9IHRoaXMuX2tleUZvclJlY29yZChyZWNvcmQpOworICAgICAg ICB2YXIgc291cmNlQ29kZVRpbWVsaW5lID0gc291cmNlQ29kZVRpbWVsaW5lc1trZXldOworICAg ICAgICBpZiAoIXNvdXJjZUNvZGVUaW1lbGluZSkKKyAgICAgICAgICAgIHNvdXJjZUNvZGVUaW1l bGluZSA9IHNvdXJjZUNvZGVUaW1lbGluZXNba2V5XSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNl Q29kZVRpbWVsaW5lKHNvdXJjZUNvZGUsIHJlY29yZC5zb3VyY2VDb2RlTG9jYXRpb24sIHJlY29y ZC50eXBlLCByZWNvcmQuZXZlbnRUeXBlKTsKKworICAgICAgICBzb3VyY2VDb2RlVGltZWxpbmUu YWRkUmVjb3JkKHJlY29yZCk7CisgICAgfSwKKworICAgIC8vIFByaXZhdGUKKworICAgIF9rZXlG b3JSZWNvcmQ6IGZ1bmN0aW9uKHJlY29yZCkKKyAgICB7CisgICAgICAgIHZhciBrZXkgPSByZWNv cmQudHlwZTsKKyAgICAgICAgaWYgKHJlY29yZCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TY3Jp cHRUaW1lbGluZVJlY29yZCB8fCByZWNvcmQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuTGF5b3V0 VGltZWxpbmVSZWNvcmQpCisgICAgICAgICAgICBrZXkgKz0gIjoiICsgcmVjb3JkLmV2ZW50VHlw ZTsKKyAgICAgICAgaWYgKHJlY29yZC5zb3VyY2VDb2RlTG9jYXRpb24pCisgICAgICAgICAgICBr ZXkgKz0gIjoiICsgcmVjb3JkLnNvdXJjZUNvZGVMb2NhdGlvbi5saW5lTnVtYmVyICsgIjoiICsg cmVjb3JkLnNvdXJjZUNvZGVMb2NhdGlvbi5jb2x1bW5OdW1iZXI7CisgICAgICAgIHJldHVybiBr ZXk7CiAgICAgfQogfTsK