79907 2012-02-29 07:14:18 -0800 Web Inspector: remove calculator's updateBoundaries in the timeline panel. 2012-02-29 07:59:40 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 567592 0 pfeldman 2012-02-29 07:14:18 -0800 Patch to follow. 567595 1 129443 pfeldman 2012-02-29 07:16:25 -0800 Created attachment 129443 Patch 567629 2 pfeldman 2012-02-29 07:59:40 -0800 Committed r109216: <http://trac.webkit.org/changeset/109216> 129443 2012-02-29 07:16:25 -0800 2012-02-29 07:40:54 -0800 Patch bug-79907-20120229191623.patch text/plain 18803 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODdjOTUwMTZiZGEwN2Vh ZTE3MWEzYTJmMWFmYjUwYjYxZmRiZjkxOC4uY2VkNGU1YWQ3NTA0OTg0MzhiMWE4NWQwMDgyZDhj MWI4YjE2YWNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTAyLTI5ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiByZW1vdmUgY2FsY3VsYXRvcidzIHVwZGF0ZUJvdW5kYXJpZXMgaW4gdGhlIHRpbWVsaW5lIHBh bmVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk5 MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5ldHdvcmtCYXNlQ2FsY3VsYXRvci5wcm90b3R5cGUuY29tcHV0ZUJhckdyYXBoTGFiZWxzKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrQmFzZUNhbGN1bGF0b3IucHJvdG90eXBlLmZv cm1hdFRpbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lQ2FsY3VsYXRvci5w cm90b3R5cGUuY29tcHV0ZUJhckdyYXBoTGFiZWxzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrVGltZUNhbGN1bGF0b3IucHJvdG90eXBlLmZvcm1hdFRpbWUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLk5ldHdvcmtUcmFuc2ZlclRpbWVDYWxjdWxhdG9yLnByb3RvdHlwZS5mb3JtYXRU aW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrVHJhbnNmZXJEdXJhdGlvbkNhbGN1 bGF0b3IucHJvdG90eXBlLmZvcm1hdFRpbWUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lR3JpZC5w cm90b3R5cGUudXBkYXRlRGl2aWRlcnMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv VGltZWxpbmVPdmVydmlld1BhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlld0NhbGN1bGF0b3IucHJvdG90eXBlLmZvcm1hdFRpbWUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lU3RhcnRBdFplcm9PdmVydmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVTdGFydEF0WmVyb092ZXJ2aWV3LnByb3RvdHlwZS51cGRhdGUpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZVBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBh bmVsLnByb3RvdHlwZS5fdG9nZ2xlU3RhcnRBdFplcm9CdXR0b25DbGlja2VkKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX3JlZnJlc2hSZWNvcmRzKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5nZXQgdGltZWxp bmVQYWRkaW5nTGVmdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVDYWxjdWxhdG9y KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNhbGN1bGF0b3IucHJvdG90eXBlLnNl dFdpbmRvdyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVDYWxjdWxhdG9yLnByb3Rv dHlwZS5zZXRSZWNvcmRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNhbGN1bGF0 b3IucHJvdG90eXBlLmZvcm1hdFRpbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l Rml0SW5XaW5kb3dDYWxjdWxhdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUZp dEluV2luZG93Q2FsY3VsYXRvci5wcm90b3R5cGUuc2V0V2luZG93KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZUZpdEluV2luZG93Q2FsY3VsYXRvci5wcm90b3R5cGUuc2V0UmVjb3Jk cyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVByZXNlbnRhdGlvbk1v ZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwu UmVjb3JkLnByb3RvdHlwZS5nZW5lcmF0ZVBvcHVwQ29udGVudCk6CisKIDIwMTItMDItMjggIFl1 cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogbW92ZSBET00gY291bnRlciBncmFwaHMgb3V0IG9mIGV4cGVyaW1lbnRhbApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRl eCA5YjY1YTg3MTc1ODY3MzNjZjM4ODdhZDMzMjRkMTRmMTNhMTQ1MjU1Li44OGMyNzBkNGI3NGJi Y2JlYTE3NjY1NWFmYTk4NmZjODhiNGRmOGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtMTQ1MSw3ICsxNDUxLDcgQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtCYXNlQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAKICAgICBj b21wdXRlQmFyR3JhcGhMYWJlbHM6IGZ1bmN0aW9uKGl0ZW0pCiAgICAgewotICAgICAgICBjb25z dCBsYWJlbCA9IHRoaXMuZm9ybWF0VmFsdWUodGhpcy5fdmFsdWUoaXRlbSkpOworICAgICAgICBj b25zdCBsYWJlbCA9IHRoaXMuZm9ybWF0VGltZSh0aGlzLl92YWx1ZShpdGVtKSk7CiAgICAgICAg IHJldHVybiB7bGVmdDogbGFiZWwsIHJpZ2h0OiBsYWJlbCwgdG9vbHRpcDogbGFiZWx9OwogICAg IH0sCiAKQEAgLTE0ODMsNyArMTQ4Myw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrQmFzZUNhbGN1 bGF0b3IucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gMDsKICAgICB9LAogCi0gICAgZm9y bWF0VmFsdWU6IGZ1bmN0aW9uKHZhbHVlKQorICAgIGZvcm1hdFRpbWU6IGZ1bmN0aW9uKHZhbHVl KQogICAgIHsKICAgICAgICAgcmV0dXJuIHZhbHVlLnRvU3RyaW5nKCk7CiAgICAgfQpAQCAtMTU1 MywxMSArMTU1MywxMSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVDYWxjdWxhdG9yLnByb3Rv dHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciByaWdodExhYmVsID0gIiI7CiAgICAgICAgIGlm IChyZXNvdXJjZS5yZXNwb25zZVJlY2VpdmVkVGltZSAhPT0gLTEgJiYgcmVzb3VyY2UuZW5kVGlt ZSAhPT0gLTEpCi0gICAgICAgICAgICByaWdodExhYmVsID0gdGhpcy5mb3JtYXRWYWx1ZShyZXNv dXJjZS5lbmRUaW1lIC0gcmVzb3VyY2UucmVzcG9uc2VSZWNlaXZlZFRpbWUpOworICAgICAgICAg ICAgcmlnaHRMYWJlbCA9IHRoaXMuZm9ybWF0VGltZShyZXNvdXJjZS5lbmRUaW1lIC0gcmVzb3Vy Y2UucmVzcG9uc2VSZWNlaXZlZFRpbWUpOwogCiAgICAgICAgIHZhciBoYXNMYXRlbmN5ID0gcmVz b3VyY2UubGF0ZW5jeSA+IDA7CiAgICAgICAgIGlmIChoYXNMYXRlbmN5KQotICAgICAgICAgICAg dmFyIGxlZnRMYWJlbCA9IHRoaXMuZm9ybWF0VmFsdWUocmVzb3VyY2UubGF0ZW5jeSk7CisgICAg ICAgICAgICB2YXIgbGVmdExhYmVsID0gdGhpcy5mb3JtYXRUaW1lKHJlc291cmNlLmxhdGVuY3kp OwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB2YXIgbGVmdExhYmVsID0gcmlnaHRMYWJlbDsK IApAQCAtMTU2NSw3ICsxNTY1LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lQ2FsY3VsYXRv ci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm4ge2xlZnQ6IGxlZnRMYWJlbCwgcmln aHQ6IHJpZ2h0TGFiZWx9OwogCiAgICAgICAgIGlmIChoYXNMYXRlbmN5ICYmIHJpZ2h0TGFiZWwp IHsKLSAgICAgICAgICAgIHZhciB0b3RhbCA9IHRoaXMuZm9ybWF0VmFsdWUocmVzb3VyY2UuZHVy YXRpb24pOworICAgICAgICAgICAgdmFyIHRvdGFsID0gdGhpcy5mb3JtYXRUaW1lKHJlc291cmNl LmR1cmF0aW9uKTsKICAgICAgICAgICAgIHZhciB0b29sdGlwID0gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCIlcyBsYXRlbmN5LCAlcyBkb3dubG9hZCAoJXMgdG90YWwpIiwgbGVmdExhYmVsLCByaWdo dExhYmVsLCB0b3RhbCk7CiAgICAgICAgIH0gZWxzZSBpZiAoaGFzTGF0ZW5jeSkKICAgICAgICAg ICAgIHZhciB0b29sdGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlcyBsYXRlbmN5IiwgbGVm dExhYmVsKTsKQEAgLTE2MDEsNyArMTYwMSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZUNh bGN1bGF0b3IucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gZGlkQ2hhbmdlOwogICAgIH0s CiAKLSAgICBmb3JtYXRWYWx1ZTogZnVuY3Rpb24odmFsdWUpCisgICAgZm9ybWF0VGltZTogZnVu Y3Rpb24odmFsdWUpCiAgICAgewogICAgICAgICByZXR1cm4gTnVtYmVyLnNlY29uZHNUb1N0cmlu Zyh2YWx1ZSk7CiAgICAgfSwKQEAgLTE2MjksNyArMTYyOSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3 b3JrVHJhbnNmZXJUaW1lQ2FsY3VsYXRvciA9IGZ1bmN0aW9uKCkKIH0KIAogV2ViSW5zcGVjdG9y Lk5ldHdvcmtUcmFuc2ZlclRpbWVDYWxjdWxhdG9yLnByb3RvdHlwZSA9IHsKLSAgICBmb3JtYXRW YWx1ZTogZnVuY3Rpb24odmFsdWUpCisgICAgZm9ybWF0VGltZTogZnVuY3Rpb24odmFsdWUpCiAg ICAgewogICAgICAgICByZXR1cm4gTnVtYmVyLnNlY29uZHNUb1N0cmluZyh2YWx1ZSk7CiAgICAg fSwKQEAgLTE2NTcsNyArMTY1Nyw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrVHJhbnNmZXJEdXJh dGlvbkNhbGN1bGF0b3IgPSBmdW5jdGlvbigpCiB9CiAKIFdlYkluc3BlY3Rvci5OZXR3b3JrVHJh bnNmZXJEdXJhdGlvbkNhbGN1bGF0b3IucHJvdG90eXBlID0gewotICAgIGZvcm1hdFZhbHVlOiBm dW5jdGlvbih2YWx1ZSkKKyAgICBmb3JtYXRUaW1lOiBmdW5jdGlvbih2YWx1ZSkKICAgICB7CiAg ICAgICAgIHJldHVybiBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHZhbHVlKTsKICAgICB9LApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUdyaWQu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lR3JpZC5qcwpp bmRleCA0YWE2ZDEyMjBkMDc5MGMwMTllYmFhMTNhZTVkNTNjOWYwODAyMzY4Li5lZmY0MGZlZTk5 NmY2YmIxY2Q4ZmJhYjBjZTYxNjUxOWRjNzhmYWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lR3JpZC5qcwpAQCAtMTE5LDcgKzExOSw3IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhp cy5fc2V0RGl2aWRlckFuZEJhckxlZnQoZGl2aWRlciwgZGl2aWRlckxhYmVsQmFyLCBwZXJjZW50 TGVmdCk7CiAKICAgICAgICAgICAgIGlmICghaXNOYU4oc2xpY2UpKQotICAgICAgICAgICAgICAg IGRpdmlkZXJMYWJlbEJhci5fbGFiZWxFbGVtZW50LnRleHRDb250ZW50ID0gY2FsY3VsYXRvci5m b3JtYXRWYWx1ZShzbGljZSAqIGkpOworICAgICAgICAgICAgICAgIGRpdmlkZXJMYWJlbEJhci5f bGFiZWxFbGVtZW50LnRleHRDb250ZW50ID0gY2FsY3VsYXRvci5mb3JtYXRUaW1lKHNsaWNlICog aSk7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgZGl2aWRlckxhYmVsQmFyLl9s YWJlbEVsZW1lbnQudGV4dENvbnRlbnQgPSAiIjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKaW5kZXgg YzBjZGE3MWI3Zjg2MjlkMjhiZTI4YjE4NTI1NjVmZjYwYTE2NmExMi4uYWVlNTFiNzMzZDJkODM2 ZDBmZDhhZGVjNjJhZTEwOTQwMTI4ZDg5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCkBAIC01NDMs NyArNTQzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdDYWxjdWxhdG9yLnByb3Rv dHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMubWF4aW11bUJvdW5kYXJ5IC0gdGhpcy5taW5p bXVtQm91bmRhcnk7CiAgICAgfSwKIAotICAgIGZvcm1hdFZhbHVlOiBmdW5jdGlvbih2YWx1ZSkK KyAgICBmb3JtYXRUaW1lOiBmdW5jdGlvbih2YWx1ZSkKICAgICB7CiAgICAgICAgIHJldHVybiBO dW1iZXIuc2Vjb25kc1RvU3RyaW5nKHZhbHVlKTsKICAgICB9CkBAIC03NzQsNyArNzc0LDYgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lU3RhcnRBdFplcm9PdmVydmlldyA9IGZ1bmN0aW9uKHBhbmUp IHsKICAgICB0aGlzLl9vdmVydmlld1dpbmRvdyA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlld1dpbmRvdyh0aGlzLmVsZW1lbnQpOwogICAgIHRoaXMuX292ZXJ2aWV3V2luZG93LmFk ZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cuRXZlbnRz LldpbmRvd0NoYW5nZWQsIHRoaXMuX29uV2luZG93Q2hhbmdlZCwgdGhpcyk7CiAgICAgdGhpcy5f cmVjb3Jkc1BlckJhciA9IDE7Ci0gICAgdGhpcy5fY2FsY3VsYXRvciA9IG5ldyBXZWJJbnNwZWN0 b3IuVGltZWxpbmVTdGFydEF0WmVyb0NhbGN1bGF0b3IoKTsKIH0KIAogV2ViSW5zcGVjdG9yLlRp bWVsaW5lU3RhcnRBdFplcm9PdmVydmlldy5wcm90b3R5cGUgPSB7CkBAIC03ODYsMTIgKzc4NSwx NiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTdGFydEF0WmVyb092ZXJ2aWV3LnByb3RvdHlwZSA9 IHsKIAogICAgIHVwZGF0ZTogZnVuY3Rpb24ocmVjb3JkcykKICAgICB7Ci0gICAgICAgIHRoaXMu X2NhbGN1bGF0b3IucmVzZXQoKTsKICAgICAgICAgcmVjb3JkcyA9IHRoaXMuX2ZpbHRlclJlY29y ZHMocmVjb3Jkcyk7Ci0gICAgICAgIHJlY29yZHMuZm9yRWFjaCh0aGlzLl9jYWxjdWxhdG9yLnVw ZGF0ZUJvdW5kYXJpZXMsIHRoaXMuX2NhbGN1bGF0b3IpOwotICAgICAgICB0aGlzLl9jYWxjdWxh dG9yLmNhbGN1bGF0ZVdpbmRvdygpOwotCi0gICAgICAgIHZhciBzY2FsZSA9ICh0aGlzLl9vdmVy dmlld0VsZW1lbnQuY2xpZW50SGVpZ2h0IC0gNCkgLyB0aGlzLl9jYWxjdWxhdG9yLmJvdW5kYXJ5 U3BhbjsKKyAgICAgICAgdmFyIGJvdW5kYXJ5U3BhbiA9IDA7CisgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgcmVjb3Jkcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgdmFyIHJlY29yZCA9 IHJlY29yZHNbaV07CisgICAgICAgICAgICB2YXIgZHVyYXRpb24gPSByZWNvcmQuZW5kVGltZSAt IHJlY29yZC5zdGFydFRpbWU7CisgICAgICAgICAgICBpZiAoYm91bmRhcnlTcGFuIDwgZHVyYXRp b24pCisgICAgICAgICAgICAgICAgYm91bmRhcnlTcGFuID0gZHVyYXRpb247CisgICAgICAgIH0K KyAgICAgIAorICAgICAgICB2YXIgc2NhbGUgPSAodGhpcy5fb3ZlcnZpZXdFbGVtZW50LmNsaWVu dEhlaWdodCAtIDQpIC8gYm91bmRhcnlTcGFuOwogICAgICAgICB0aGlzLl9yZWNvcmRzUGVyQmFy ID0gTWF0aC5tYXgoMSwgcmVjb3Jkcy5sZW5ndGggKiA0IC8gdGhpcy5lbGVtZW50LmNsaWVudFdp ZHRoKTsKICAgICAgICAgdmFyIG51bWJlck9mQmFycyA9IE1hdGguY2VpbChyZWNvcmRzLmxlbmd0 aCAvIHRoaXMuX3JlY29yZHNQZXJCYXIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKaW5kZXggNjk3ODI0OWYwYWE5MjZlYTU5 MDhkZWMyMDlkN2I4MzcxODhjNjdlMi4uOGJhYjkzY2NkM2MyMjAwZjdkZjczMGVkZWIwNmY2NjBh NGNmMDlhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U aW1lbGluZVBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VGltZWxpbmVQYW5lbC5qcwpAQCAtOTQsNyArOTQsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9leHBhbmRFbGVtZW50cy5pZCA9ICJvcnBoYW4t ZXhwYW5kLWVsZW1lbnRzIjsKICAgICB0aGlzLl9pdGVtc0dyYXBoc0VsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5fZXhwYW5kRWxlbWVudHMpOwogCi0gICAgdGhpcy5fY2FsY3VsYXRvciA9IG5ldyBX ZWJJbnNwZWN0b3IuVGltZWxpbmVDYWxjdWxhdG9yKCk7CisgICAgdGhpcy5fY2FsY3VsYXRvciA9 IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYWxjdWxhdG9yKHRoaXMuX3ByZXNlbnRhdGlvbk1v ZGVsKTsKICAgICB2YXIgc2hvcnRSZWNvcmRUaHJlc2hvbGRUaXRsZSA9IE51bWJlci5zZWNvbmRz VG9TdHJpbmcoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuc2hvcnRSZWNv cmRUaHJlc2hvbGQpOwogICAgIHRoaXMuX3Nob3dTaG9ydFJlY29yZHNUaXRsZVRleHQgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgdGhlIHJlY29yZHMgdGhhdCBhcmUgc2hvcnRlciB0aGFu ICVzIiwgc2hvcnRSZWNvcmRUaHJlc2hvbGRUaXRsZSk7CiAgICAgdGhpcy5faGlkZVNob3J0UmVj b3Jkc1RpdGxlVGV4dCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSGlkZSB0aGUgcmVjb3JkcyB0 aGF0IGFyZSBzaG9ydGVyIHRoYW4gJXMiLCBzaG9ydFJlY29yZFRocmVzaG9sZFRpdGxlKTsKQEAg LTQyNSw3ICs0MjUsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHZhciB0b2dnbGVkID0gIXRoaXMudG9nZ2xlU3RhcnRBdFplcm9CdXR0b24udG9n Z2xlZAogICAgICAgICB0aGlzLl9nbHVlUGFyZW50QnV0dG9uLmRpc2FibGVkID0gdG9nZ2xlZDsK ICAgICAgICAgdGhpcy50b2dnbGVTdGFydEF0WmVyb0J1dHRvbi50b2dnbGVkID0gdG9nZ2xlZDsK LSAgICAgICAgdGhpcy5fY2FsY3VsYXRvciA9IHRvZ2dsZWQgPyBuZXcgV2ViSW5zcGVjdG9yLlRp bWVsaW5lU3RhcnRBdFplcm9DYWxjdWxhdG9yKCkgOiBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5l Q2FsY3VsYXRvcigpOworICAgICAgICB0aGlzLl9jYWxjdWxhdG9yID0gdG9nZ2xlZCA/IG5ldyBX ZWJJbnNwZWN0b3IuVGltZWxpbmVGaXRJbldpbmRvd0NhbGN1bGF0b3IodGhpcy5fcHJlc2VudGF0 aW9uTW9kZWwpIDogbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZUNhbGN1bGF0b3IodGhpcy5fcHJl c2VudGF0aW9uTW9kZWwpOwogICAgICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zZXRHbHVl UmVjb3Jkcyh0aGlzLl9nbHVlUGFyZW50QnV0dG9uLnRvZ2dsZWQgJiYgIXRoaXMudG9nZ2xlU3Rh cnRBdFplcm9CdXR0b24udG9nZ2xlZCk7CiAgICAgICAgIHRoaXMuX3JlcG9wdWxhdGVSZWNvcmRz KCk7CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3UGFuZS5zZXRTdGFydEF0WmVybyh0b2dnbGVkKTsK QEAgLTU1Niw4ICs1NTYsMTIgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBl ID0gewogCiAgICAgICAgIHRoaXMuX292ZXJ2aWV3UGFuZS51cGRhdGUodGhpcy5fcm9vdFJlY29y ZCgpLmNoaWxkcmVuLCB0aGlzLl9zaG93U2hvcnRFdmVudHMpOwogCi0gICAgICAgIGlmICghdGhp cy5fYm91bmRhcmllc0FyZVZhbGlkKQotICAgICAgICAgICAgdGhpcy5fdXBkYXRlQm91bmRhcmll cygpOworICAgICAgICBpZiAoIXRoaXMuX2JvdW5kYXJpZXNBcmVWYWxpZCkgeworICAgICAgICAg ICAgdmFyIG1pbiA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLm1pbmltdW1SZWNvcmRUaW1lKCk7 CisgICAgICAgICAgICB2YXIgbWF4ID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwubWF4aW11bVJl Y29yZFRpbWUoKTsKKyAgICAgICAgICAgIHRoaXMuX2NhbGN1bGF0b3Iuc2V0V2luZG93KG1pbiAr IChtYXggLSBtaW4pICogdGhpcy5fb3ZlcnZpZXdQYW5lLndpbmRvd0xlZnQoKSwgbWluICsgKG1h eCAtIG1pbikgKiB0aGlzLl9vdmVydmlld1BhbmUud2luZG93UmlnaHQoKSk7CisgICAgICAgIH0K KwogICAgICAgICB2YXIgcmVjb3Jkc0luV2luZG93Q291bnQgPSB0aGlzLl9yZWZyZXNoUmVjb3Jk cyghdGhpcy5fYm91bmRhcmllc0FyZVZhbGlkKTsKICAgICAgICAgdGhpcy5fdXBkYXRlUmVjb3Jk c0NvdW50ZXIocmVjb3Jkc0luV2luZG93Q291bnQpOwogICAgICAgICBpZighdGhpcy5fYm91bmRh cmllc0FyZVZhbGlkKQpAQCAtNTY3LDE4ICs1NzEsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2JvdW5kYXJpZXNBcmVWYWxpZCA9IHRy dWU7CiAgICAgfSwKIAotICAgIF91cGRhdGVCb3VuZGFyaWVzOiBmdW5jdGlvbigpCi0gICAgewot ICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLnJlc2V0KCk7Ci0gICAgICAgIHRoaXMuX2NhbGN1bGF0 b3Iud2luZG93TGVmdCA9IHRoaXMuX292ZXJ2aWV3UGFuZS53aW5kb3dMZWZ0KCk7Ci0gICAgICAg IHRoaXMuX2NhbGN1bGF0b3Iud2luZG93UmlnaHQgPSB0aGlzLl9vdmVydmlld1BhbmUud2luZG93 UmlnaHQoKTsKLQotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3Jvb3RSZWNvcmQo KS5jaGlsZHJlbi5sZW5ndGg7ICsraSkKLSAgICAgICAgICAgIHRoaXMuX2NhbGN1bGF0b3IudXBk YXRlQm91bmRhcmllcyh0aGlzLl9yb290UmVjb3JkKCkuY2hpbGRyZW5baV0pOwotCi0gICAgICAg IHRoaXMuX2NhbGN1bGF0b3IuY2FsY3VsYXRlV2luZG93KCk7Ci0gICAgfSwKLQogICAgIHJldmVh bFJlY29yZEF0OiBmdW5jdGlvbih0aW1lKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3N0YXJ0 QXRaZXJvKQpAQCAtNjEyLDYgKzYwNCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnBy b3RvdHlwZSA9IHsKICAgICBfcmVmcmVzaFJlY29yZHM6IGZ1bmN0aW9uKHVwZGF0ZUJvdW5kYXJp ZXMpCiAgICAgewogICAgICAgICB2YXIgcmVjb3Jkc0luV2luZG93ID0gdGhpcy5fcHJlc2VudGF0 aW9uTW9kZWwuZmlsdGVyZWRSZWNvcmRzKCk7CisgICAgICAgIHRoaXMuX2NhbGN1bGF0b3Iuc2V0 UmVjb3JkcyhyZWNvcmRzSW5XaW5kb3cpOwogCiAgICAgICAgIC8vIENhbGN1bGF0ZSB0aGUgdmlz aWJsZSBhcmVhLgogICAgICAgICB0aGlzLl9zY3JvbGxUb3AgPSB0aGlzLl9jb250YWluZXJFbGVt ZW50LnNjcm9sbFRvcDsKQEAgLTY5Myw3ICs2ODYsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBnZXQgdGltZWxpbmVQYWRkaW5nTGVmdCgpCiAgICAg ewotICAgICAgICByZXR1cm4gdGhpcy5fY2FsY3VsYXRvci53aW5kb3dMZWZ0ID09PSAwID8gdGhp cy5fZXhwYW5kT2Zmc2V0IDogMDsKKyAgICAgICAgcmV0dXJuICF0aGlzLl9vdmVydmlld1BhbmUu d2luZG93TGVmdCgpID8gdGhpcy5fZXhwYW5kT2Zmc2V0IDogMDsKICAgICB9LAogCiAgICAgX2Fk anVzdFNjcm9sbFBvc2l0aW9uOiBmdW5jdGlvbih0b3RhbEhlaWdodCkKQEAgLTc1NSwxMiArNzQ4 LDExIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBX ZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlOwogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgorICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbH0gcHJlc2VudGF0 aW9uTW9kZWwKICAqLwotV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2FsY3VsYXRvciA9IGZ1bmN0aW9u KCkKK1dlYkluc3BlY3Rvci5UaW1lbGluZUNhbGN1bGF0b3IgPSBmdW5jdGlvbihwcmVzZW50YXRp b25Nb2RlbCkKIHsKLSAgICB0aGlzLnJlc2V0KCk7Ci0gICAgdGhpcy53aW5kb3dMZWZ0ID0gMC4w OwotICAgIHRoaXMud2luZG93UmlnaHQgPSAxLjA7CisgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9k ZWwgPSBwcmVzZW50YXRpb25Nb2RlbDsKIH0KIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2FsY3Vs YXRvci5wcm90b3R5cGUgPSB7CkBAIC03ODksMTA1ICs3ODEsNTYgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB7bGVmdDogbGVm dCwgd2lkdGg6IHdpZHRoLCB3aWR0aFdpdGhDaGlsZHJlbjogd2lkdGhXaXRoQ2hpbGRyZW4sIGNw dVdpZHRoOiBjcHVXaWR0aH07CiAgICAgfSwKIAotICAgIGNhbGN1bGF0ZVdpbmRvdzogZnVuY3Rp b24oKQorICAgIHNldFdpbmRvdzogZnVuY3Rpb24obWluaW11bUJvdW5kYXJ5LCBtYXhpbXVtQm91 bmRhcnkpCiAgICAgewotICAgICAgICB0aGlzLm1pbmltdW1Cb3VuZGFyeSA9IHRoaXMuX2Fic29s dXRlTWluaW11bUJvdW5kYXJ5ICsgdGhpcy53aW5kb3dMZWZ0ICogKHRoaXMuX2Fic29sdXRlTWF4 aW11bUJvdW5kYXJ5IC0gdGhpcy5fYWJzb2x1dGVNaW5pbXVtQm91bmRhcnkpOwotICAgICAgICB0 aGlzLm1heGltdW1Cb3VuZGFyeSA9IHRoaXMuX2Fic29sdXRlTWluaW11bUJvdW5kYXJ5ICsgdGhp cy53aW5kb3dSaWdodCAqICh0aGlzLl9hYnNvbHV0ZU1heGltdW1Cb3VuZGFyeSAtIHRoaXMuX2Fi c29sdXRlTWluaW11bUJvdW5kYXJ5KTsKKyAgICAgICAgdGhpcy5taW5pbXVtQm91bmRhcnkgPSBt aW5pbXVtQm91bmRhcnk7CisgICAgICAgIHRoaXMubWF4aW11bUJvdW5kYXJ5ID0gbWF4aW11bUJv dW5kYXJ5OwogICAgICAgICB0aGlzLmJvdW5kYXJ5U3BhbiA9IHRoaXMubWF4aW11bUJvdW5kYXJ5 IC0gdGhpcy5taW5pbXVtQm91bmRhcnk7CiAgICAgfSwKIAotICAgIHJlc2V0OiBmdW5jdGlvbigp Ci0gICAgewotICAgICAgICB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSA9IC0xOwotICAg ICAgICB0aGlzLl9hYnNvbHV0ZU1heGltdW1Cb3VuZGFyeSA9IC0xOwotICAgIH0sCi0KLSAgICB1 cGRhdGVCb3VuZGFyaWVzOiBmdW5jdGlvbihyZWNvcmQpCisgICAgc2V0UmVjb3JkczogZnVuY3Rp b24ocmVjb3JkcykKICAgICB7Ci0gICAgICAgIHZhciBsb3dlckJvdW5kID0gcmVjb3JkLnN0YXJ0 VGltZTsKLSAgICAgICAgaWYgKHRoaXMuX2Fic29sdXRlTWluaW11bUJvdW5kYXJ5ID09PSAtMSB8 fCBsb3dlckJvdW5kIDwgdGhpcy5fYWJzb2x1dGVNaW5pbXVtQm91bmRhcnkpCi0gICAgICAgICAg ICB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSA9IGxvd2VyQm91bmQ7Ci0KLSAgICAgICAg Y29uc3QgbWluaW11bVRpbWVGcmFtZSA9IDAuMTsKLSAgICAgICAgY29uc3QgbWluaW11bURlbHRh Rm9yWmVyb1NpemVFdmVudHMgPSAwLjAxOwotICAgICAgICB2YXIgdXBwZXJCb3VuZCA9IE1hdGgu bWF4KHJlY29yZC5sYXN0Q2hpbGRFbmRUaW1lICsgbWluaW11bURlbHRhRm9yWmVyb1NpemVFdmVu dHMsIGxvd2VyQm91bmQgKyBtaW5pbXVtVGltZUZyYW1lKTsKLSAgICAgICAgaWYgKHRoaXMuX2Fi c29sdXRlTWF4aW11bUJvdW5kYXJ5ID09PSAtMSB8fCB1cHBlckJvdW5kID4gdGhpcy5fYWJzb2x1 dGVNYXhpbXVtQm91bmRhcnkpCi0gICAgICAgICAgICB0aGlzLl9hYnNvbHV0ZU1heGltdW1Cb3Vu ZGFyeSA9IHVwcGVyQm91bmQ7CiAgICAgfSwKIAotICAgIGZvcm1hdFZhbHVlOiBmdW5jdGlvbih2 YWx1ZSkKKyAgICBmb3JtYXRUaW1lOiBmdW5jdGlvbih2YWx1ZSkKICAgICB7Ci0gICAgICAgIHJl dHVybiBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHZhbHVlICsgdGhpcy5taW5pbXVtQm91bmRhcnkg LSB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeSk7CisgICAgICAgIHJldHVybiBOdW1iZXIu c2Vjb25kc1RvU3RyaW5nKHZhbHVlICsgdGhpcy5taW5pbXVtQm91bmRhcnkgLSB0aGlzLl9wcmVz ZW50YXRpb25Nb2RlbC5taW5pbXVtUmVjb3JkVGltZSgpKTsKICAgICB9CiB9CiAKIC8qKgogICog QGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlv bk1vZGVsfSBwcmVzZW50YXRpb25Nb2RlbAogICogQGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRpbWVs aW5lQ2FsY3VsYXRvcgogICovCi1XZWJJbnNwZWN0b3IuVGltZWxpbmVTdGFydEF0WmVyb0NhbGN1 bGF0b3IgPSBmdW5jdGlvbigpCitXZWJJbnNwZWN0b3IuVGltZWxpbmVGaXRJbldpbmRvd0NhbGN1 bGF0b3IgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKIHsKLSAgICB0aGlzLnJlc2V0KCk7 Ci0gICAgdGhpcy53aW5kb3dMZWZ0ID0gMC4wOwotICAgIHRoaXMud2luZG93UmlnaHQgPSAxLjA7 CisgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2FsY3VsYXRvci5jYWxsKHRoaXMsIHByZXNlbnRh dGlvbk1vZGVsKTsKIH0KIAotV2ViSW5zcGVjdG9yLlRpbWVsaW5lU3RhcnRBdFplcm9DYWxjdWxh dG9yLnByb3RvdHlwZSA9IHsKLSAgICBjb21wdXRlQmFyR3JhcGhQZXJjZW50YWdlczogZnVuY3Rp b24ocmVjb3JkKQorV2ViSW5zcGVjdG9yLlRpbWVsaW5lRml0SW5XaW5kb3dDYWxjdWxhdG9yLnBy b3RvdHlwZSA9IHsKKyAgICBzZXRXaW5kb3c6IGZ1bmN0aW9uKG1pbmltdW1Cb3VuZGFyeSwgbWF4 aW11bUJvdW5kYXJ5KQogICAgIHsKLSAgICAgICAgdmFyIHNjYWxlID0gMTAwIC8gdGhpcy5tYXhp bXVtQm91bmRhcnk7Ci0gICAgICAgIHJldHVybiB7Ci0gICAgICAgICAgICBzdGFydDogcmVjb3Jk Ll9pbml0aWF0b3JPZmZzZXQgKiBzY2FsZSwKLSAgICAgICAgICAgIGVuZDogKHJlY29yZC5faW5p dGlhdG9yT2Zmc2V0ICsgcmVjb3JkLmVuZFRpbWUgLSByZWNvcmQuc3RhcnRUaW1lKSAqIHNjYWxl LAotICAgICAgICAgICAgZW5kV2l0aENoaWxkcmVuOiAocmVjb3JkLl9pbml0aWF0b3JPZmZzZXQg KyByZWNvcmQubGFzdENoaWxkRW5kVGltZSAtIHJlY29yZC5zdGFydFRpbWUpICogc2NhbGUKLSAg ICAgICAgfTsKICAgICB9LAogCi0gICAgY29tcHV0ZUJhckdyYXBoV2luZG93UG9zaXRpb246IGZ1 bmN0aW9uKHJlY29yZCwgY2xpZW50V2lkdGgpCisgICAgc2V0UmVjb3JkczogZnVuY3Rpb24ocmVj b3JkcykKICAgICB7Ci0gICAgICAgIGNvbnN0IG1pbldpZHRoID0gNTsKLSAgICAgICAgY29uc3Qg Ym9yZGVyV2lkdGggPSA0OwotICAgICAgICB2YXIgd29ya2luZ0FyZWEgPSBjbGllbnRXaWR0aCAt IG1pbldpZHRoIC0gYm9yZGVyV2lkdGg7Ci0gICAgICAgIHZhciBwZXJjZW50YWdlcyA9IHRoaXMu Y29tcHV0ZUJhckdyYXBoUGVyY2VudGFnZXMocmVjb3JkKTsKLSAgICAgICAgdmFyIGxlZnQgPSBw ZXJjZW50YWdlcy5zdGFydCAvIDEwMCAqIHdvcmtpbmdBcmVhOwotICAgICAgICB2YXIgd2lkdGgg PSAocGVyY2VudGFnZXMuZW5kIC0gcGVyY2VudGFnZXMuc3RhcnQpIC8gMTAwICogd29ya2luZ0Fy ZWEgKyBtaW5XaWR0aDsKLSAgICAgICAgdmFyIHdpZHRoV2l0aENoaWxkcmVuID0gIChwZXJjZW50 YWdlcy5lbmRXaXRoQ2hpbGRyZW4gLSBwZXJjZW50YWdlcy5zdGFydCkgLyAxMDAgKiB3b3JraW5n QXJlYTsKLSAgICAgICAgaWYgKHBlcmNlbnRhZ2VzLmVuZFdpdGhDaGlsZHJlbiA+IHBlcmNlbnRh Z2VzLmVuZCkKLSAgICAgICAgICAgIHdpZHRoV2l0aENoaWxkcmVuICs9IGJvcmRlcldpZHRoICsg bWluV2lkdGg7Ci0KLSAgICAgICAgcmV0dXJuIHtsZWZ0OiBsZWZ0LCB3aWR0aDogd2lkdGgsIHdp ZHRoV2l0aENoaWxkcmVuOiB3aWR0aFdpdGhDaGlsZHJlbn07Ci0gICAgfSwKLQotICAgIGNhbGN1 bGF0ZVdpbmRvdzogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5taW5pbXVtQm91bmRh cnkgPSB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3VuZGFyeTsKLSAgICAgICAgdGhpcy5tYXhpbXVt Qm91bmRhcnkgPSB0aGlzLl9hYnNvbHV0ZU1heGltdW1Cb3VuZGFyeSAqIDEuMDU7Ci0gICAgICAg IHRoaXMuYm91bmRhcnlTcGFuID0gdGhpcy5tYXhpbXVtQm91bmRhcnkgPj0gMCA/IHRoaXMubWF4 aW11bUJvdW5kYXJ5IDogMDsKLSAgICB9LAotCi0gICAgcmVzZXQ6IGZ1bmN0aW9uKCkKLSAgICB7 Ci0gICAgICAgIHRoaXMuX2Fic29sdXRlTWluaW11bUJvdW5kYXJ5ID0gLTE7Ci0gICAgICAgIHRo aXMuX2Fic29sdXRlTWF4aW11bUJvdW5kYXJ5ID0gLTE7Ci0gICAgfSwKKyAgICAgICAgdGhpcy5t aW5pbXVtQm91bmRhcnkgPSAtMTsKKyAgICAgICAgdGhpcy5tYXhpbXVtQm91bmRhcnkgPSAtMTsK IAotICAgIHVwZGF0ZUJvdW5kYXJpZXM6IGZ1bmN0aW9uKHJlY29yZCkKLSAgICB7Ci0gICAgICAg IHZhciBsb3dlckJvdW5kID0gcmVjb3JkLnN0YXJ0VGltZTsKLSAgICAgICAgaWYgKHRoaXMuX2Fi c29sdXRlTWluaW11bUJvdW5kYXJ5ID09PSAtMSB8fCBsb3dlckJvdW5kIDwgdGhpcy5fYWJzb2x1 dGVNaW5pbXVtQm91bmRhcnkpCi0gICAgICAgICAgICB0aGlzLl9hYnNvbHV0ZU1pbmltdW1Cb3Vu ZGFyeSA9IGxvd2VyQm91bmQ7Ci0KLSAgICAgICAgY29uc3QgbWluaW11bVRpbWVGcmFtZSA9IDAu MDAxOwotICAgICAgICB2YXIgdXBwZXJCb3VuZCA9IE1hdGgubWF4KHJlY29yZC5lbmRUaW1lIC0g cmVjb3JkLnN0YXJ0VGltZSwgbWluaW11bVRpbWVGcmFtZSk7Ci0gICAgICAgIGlmICh0aGlzLl9h YnNvbHV0ZU1heGltdW1Cb3VuZGFyeSA9PT0gLTEgfHwgdXBwZXJCb3VuZCA+IHRoaXMuX2Fic29s dXRlTWF4aW11bUJvdW5kYXJ5KQotICAgICAgICAgICAgdGhpcy5fYWJzb2x1dGVNYXhpbXVtQm91 bmRhcnkgPSB1cHBlckJvdW5kOwotICAgIH0sCi0KLSAgICBmb3JtYXRWYWx1ZTogZnVuY3Rpb24o dmFsdWUpCi0gICAgewotICAgICAgICByZXR1cm4gTnVtYmVyLnNlY29uZHNUb1N0cmluZyh2YWx1 ZSwgdHJ1ZSk7CisgICAgICAgIHZhciBib3VuZGFyeVNwYW4gPSAwOworICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHJlY29yZHMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciByZWNv cmQgPSByZWNvcmRzW2ldOworICAgICAgICAgICAgaWYgKHRoaXMubWluaW11bUJvdW5kYXJ5ID09 IC0xIHx8IHJlY29yZC5zdGFydFRpbWUgPCB0aGlzLm1pbmltdW1Cb3VuZGFyeSkKKyAgICAgICAg ICAgICAgICB0aGlzLm1pbmltdW1Cb3VuZGFyeSA9IHJlY29yZC5zdGFydFRpbWU7CisgICAgICAg ICAgICBpZiAodGhpcy5tYXhpbXVtQm91bmRhcnkgPT0gLTEgfHwgcmVjb3JkLmVuZFRpbWUgPiB0 aGlzLm1heGltdW1Cb3VuZGFyeSkKKyAgICAgICAgICAgICAgICB0aGlzLm1heGltdW1Cb3VuZGFy eSA9IHJlY29yZC5lbmRUaW1lOworICAgICAgICB9CisgICAgICAgIHRoaXMuYm91bmRhcnlTcGFu ID0gdGhpcy5tYXhpbXVtQm91bmRhcnkgLSB0aGlzLm1pbmltdW1Cb3VuZGFyeTsKICAgICB9Ci19 OworfQorCitXZWJJbnNwZWN0b3IuVGltZWxpbmVGaXRJbldpbmRvd0NhbGN1bGF0b3IucHJvdG90 eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZUNhbGN1bGF0b3IucHJvdG90eXBl OwogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmpzCmlu ZGV4IGFkY2Q0NDc5YjliODM4ZTIzYzMwN2I2NjdhZTBiNDhhZTVmNTg2NmQuLjY4Yzk4N2M0ZDY4 ZjE3NDczNWE5NDQ1MGUxODk2MDBkZDBlNjgyMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUHJlc2VudGF0aW9uTW9k ZWwuanMKQEAgLTQzMSw3ICs0MzEsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRp b25Nb2RlbC5SZWNvcmQucHJvdG90eXBlID0gewogICAgICAgICAgICAgY29udGVudEhlbHBlci5f YXBwZW5kRWxlbWVudFJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFnZ3JlZ2F0ZWQgVGltZSIp LCB0aGlzLl9nZW5lcmF0ZUFnZ3JlZ2F0ZWRJbmZvKCkpOwogICAgICAgICB9CiAgICAgICAgIHZh ciB0ZXh0ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlcyAoYXQgJXMpIiwgTnVtYmVyLnNlY29u ZHNUb1N0cmluZyh0aGlzLl9sYXN0Q2hpbGRFbmRUaW1lIC0gdGhpcy5zdGFydFRpbWUsIHRydWUp LAotICAgICAgICAgICAgY2FsY3VsYXRvci5mb3JtYXRWYWx1ZSh0aGlzLnN0YXJ0VGltZSAtIGNh bGN1bGF0b3IubWluaW11bUJvdW5kYXJ5KSk7CisgICAgICAgICAgICBOdW1iZXIuc2Vjb25kc1Rv U3RyaW5nKHRoaXMuc3RhcnRUaW1lIC0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwubWluaW11bVJl Y29yZFRpbWUoKSkpOwogICAgICAgICBjb250ZW50SGVscGVyLl9hcHBlbmRUZXh0Um93KFdlYklu c3BlY3Rvci5VSVN0cmluZygiRHVyYXRpb24iKSwgdGV4dCk7CiAKICAgICAgICAgY29uc3QgcmVj b3JkVHlwZXMgPSBXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbC5SZWNvcmRUeXBlOwo=