94819 2012-08-23 08:20:29 -0700 Web Inspector: introduce TimelineGrid.Calculator interface. 2012-08-23 11:07:14 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 94829 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 703011 0 pfeldman 2012-08-23 08:20:29 -0700 This way we can compile TimelineGrid properly. 703019 1 160170 pfeldman 2012-08-23 08:34:10 -0700 Created attachment 160170 Patch 703025 2 160170 caseq 2012-08-23 08:39:53 -0700 Comment on attachment 160170 Patch LGTM 703033 3 pfeldman 2012-08-23 08:45:53 -0700 Committed r126432: <http://trac.webkit.org/changeset/126432> 160170 2012-08-23 08:34:10 -0700 2012-08-23 08:40:53 -0700 Patch bug-94819-20120823193406.patch text/plain 16706 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDc4MjMwMjlkYWJhODI4 OGFiZDZkZWI3YzgyMmNlY2M4ZTU1ZGVhYy4uY2JlMGViNzNkYTAyMWI4ZDA0MzI1MTM5MzNmNDA2 Mjc1OGMzZGFhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEyLTA4LTIzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGludHJvZHVjZSBUaW1lbGluZUdyaWQuQ2FsY3VsYXRvciBpbnRlcmZhY2UuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDgxOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgd2F5IHdlIGNhbiBj b21waWxlIFRpbWVsaW5lR3JpZCBwcm9wZXJseS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvTWVtb3J5U3RhdGlzdGljcy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5NZW1vcnlT dGF0aXN0aWNzLnByb3RvdHlwZS5fY2FsY3VsYXRlVmlzaWJsZUluZGV4ZXMpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lR3JpZC5wcm90b3R5cGUudXBkYXRlRGl2aWRlcnMpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lR3JpZC5DYWxjdWxhdG9yKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UaW1lbGluZUdyaWQuQ2FsY3VsYXRvci5wcm90b3R5cGUuY29tcHV0ZVBvc2l0aW9uKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUdyaWQuQ2FsY3VsYXRvci5wcm90b3R5cGUuZm9y bWF0VGltZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVHcmlkLkNhbGN1bGF0b3Iu cHJvdG90eXBlLm1pbmltdW1Cb3VuZGFyeSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVHcmlkLkNhbGN1bGF0b3IucHJvdG90eXBlLm1heGltdW1Cb3VuZGFyeSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVHcmlkLkNhbGN1bGF0b3IucHJvdG90eXBlLmJvdW5kYXJ5U3Bh bik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3Q2FsY3VsYXRvci5wcm90 b3R5cGUuY29tcHV0ZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92 ZXJ2aWV3Q2FsY3VsYXRvci5wcm90b3R5cGUuY29tcHV0ZUJhckdyYXBoUGVyY2VudGFnZXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdDYWxjdWxhdG9yLnByb3RvdHlw ZS5zZXRXaW5kb3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdDYWxj dWxhdG9yLnByb3RvdHlwZS5mb3JtYXRUaW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZU92ZXJ2aWV3Q2FsY3VsYXRvci5wcm90b3R5cGUubWF4aW11bUJvdW5kYXJ5KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3Q2FsY3VsYXRvci5wcm90b3R5cGUubWlu aW11bUJvdW5kYXJ5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3Q2Fs Y3VsYXRvci5wcm90b3R5cGUuYm91bmRhcnlTcGFuKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbC5wcm90b3R5cGUuX3Nob3VsZFNob3dGcmFtZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lQ2FsY3VsYXRvci5wcm90b3R5cGUuY29tcHV0ZVBvc2l0aW9uKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZUNhbGN1bGF0b3IucHJvdG90eXBlLmNvbXB1dGVCYXJHcmFw aFBlcmNlbnRhZ2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNhbGN1bGF0b3Iu cHJvdG90eXBlLnNldFdpbmRvdyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVDYWxj dWxhdG9yLnByb3RvdHlwZS5mb3JtYXRUaW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1l bGluZUNhbGN1bGF0b3IucHJvdG90eXBlLm1heGltdW1Cb3VuZGFyeSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVDYWxjdWxhdG9yLnByb3RvdHlwZS5taW5pbXVtQm91bmRhcnkpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2FsY3VsYXRvci5wcm90b3R5cGUuYm91bmRh cnlTcGFuKToKKwogMjAxMi0wOC0yMyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBu b2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBGaXggbWFrZSBpbnN0YWxsIG9uIFdpbmRvd3MKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTWVtb3J5U3RhdGlz dGljcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTWVtb3J5U3RhdGlz dGljcy5qcwppbmRleCBhYTUyZTIyMmU3ZDdjODJiYjQzOGI1YWU4YjY1MGE4NTM1MjE4NTBhLi5i NDU5NmUxOTQ5ZDFmOGQwNTQ2NDJlY2I5ZjYxMGYxZDYwYjFiYjIyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01lbW9yeVN0YXRpc3RpY3MuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZW1vcnlTdGF0aXN0aWNzLmpzCkBA IC0yODcsOCArMjg3LDggQEAgV2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MucHJvdG90eXBl ID0gewogICAgIF9jYWxjdWxhdGVWaXNpYmxlSW5kZXhlczogZnVuY3Rpb24oKQogICAgIHsKICAg ICAgICAgdmFyIGNhbGN1bGF0b3IgPSB0aGlzLl90aW1lbGluZVBhbmVsLmNhbGN1bGF0b3I7Ci0g ICAgICAgIHZhciBzdGFydCA9IGNhbGN1bGF0b3IubWluaW11bUJvdW5kYXJ5ICogMTAwMDsKLSAg ICAgICAgdmFyIGVuZCA9IGNhbGN1bGF0b3IubWF4aW11bUJvdW5kYXJ5ICogMTAwMDsKKyAgICAg ICAgdmFyIHN0YXJ0ID0gY2FsY3VsYXRvci5taW5pbXVtQm91bmRhcnkoKSAqIDEwMDA7CisgICAg ICAgIHZhciBlbmQgPSBjYWxjdWxhdG9yLm1heGltdW1Cb3VuZGFyeSgpICogMTAwMDsKICAgICAg ICAgdmFyIGZpcnN0SW5kZXggPSAwOwogICAgICAgICB2YXIgbGFzdEluZGV4ID0gdGhpcy5fY291 bnRlcnMubGVuZ3RoIC0gMTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9jb3Vu dGVycy5sZW5ndGg7IGkrKykgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRleCA2YWE1ZmM5MzViZTUwNDMyYThkZDY2MTU2MmUw ODhjYjE4ZjU4YTk5Li40OTFhYjZjYmI2MWRhMWQwZDM3ZTE2YjU2YWNkY2NmMzk5NDliOTAzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5l bC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5l bC5qcwpAQCAtMTE5MSw3ICsxMTkxLDggQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAvKioKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gcXVlcnkKICAgICAg Ki8KLSAgICBwZXJmb3JtRmlsdGVyOiBmdW5jdGlvbihxdWVyeSkgeworICAgIHBlcmZvcm1GaWx0 ZXI6IGZ1bmN0aW9uKHF1ZXJ5KQorICAgIHsKICAgICAgICAgdGhpcy5fZmlsdGVyZWRPdXRSZXF1 ZXN0cy5jbGVhcigpOwogICAgICAgICB2YXIgZmlsdGVyUmVnRXhwID0gY3JlYXRlUGxhaW5UZXh0 U2VhcmNoUmVnZXgocXVlcnksICJpIik7CiAgICAgICAgIHZhciBzaG93blJlcXVlc3RzID0gW107 CkBAIC0xNDcxLDEwICsxNDcyLDExIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90 eXBlID0gewogICAgIC8qKgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBxdWVyeQogICAgICAqLyAg ICAKLSAgICBwZXJmb3JtRmlsdGVyOiBmdW5jdGlvbihxdWVyeSl7CisgICAgcGVyZm9ybUZpbHRl cjogZnVuY3Rpb24ocXVlcnkpCisgICAgewogICAgICAgICB0aGlzLl9uZXR3b3JrTG9nVmlldy5w ZXJmb3JtRmlsdGVyKHF1ZXJ5KTsKICAgICB9LAotICAgIAorCiAgICAganVtcFRvUHJldmlvdXNT ZWFyY2hSZXN1bHQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX25ldHdvcmtMb2dW aWV3Lmp1bXBUb1ByZXZpb3VzU2VhcmNoUmVzdWx0KCk7CkBAIC0xNTE0LDYgKzE1MTYsNyBAQCBX ZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0 b3IuUGFuZWwucHJvdG90eXBlOwogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgorICogQGltcGxlbWVu dHMge1dlYkluc3BlY3Rvci5UaW1lbGluZUdyaWQuQ2FsY3VsYXRvcn0KICAqLwogV2ViSW5zcGVj dG9yLk5ldHdvcmtCYXNlQ2FsY3VsYXRvciA9IGZ1bmN0aW9uKCkKIHsKQEAgLTE1MjIsMTIgKzE1 MjUsMTIgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtCYXNlQ2FsY3VsYXRvciA9IGZ1bmN0aW9uKCkK IFdlYkluc3BlY3Rvci5OZXR3b3JrQmFzZUNhbGN1bGF0b3IucHJvdG90eXBlID0gewogICAgIGNv bXB1dGVQb3NpdGlvbjogZnVuY3Rpb24odGltZSkKICAgICB7Ci0gICAgICAgIHJldHVybiAodGlt ZSAtIHRoaXMubWluaW11bUJvdW5kYXJ5KSAvIHRoaXMuYm91bmRhcnlTcGFuICogdGhpcy5fd29y a2luZ0FyZWE7CisgICAgICAgIHJldHVybiAodGltZSAtIHRoaXMuX21pbmltdW1Cb3VuZGFyeSkg LyB0aGlzLmJvdW5kYXJ5U3BhbigpICogdGhpcy5fd29ya2luZ0FyZWE7CiAgICAgfSwKIAogICAg IGNvbXB1dGVCYXJHcmFwaFBlcmNlbnRhZ2VzOiBmdW5jdGlvbihpdGVtKQogICAgIHsKLSAgICAg ICAgcmV0dXJuIHtzdGFydDogMCwgbWlkZGxlOiAwLCBlbmQ6ICh0aGlzLl92YWx1ZShpdGVtKSAv IHRoaXMuYm91bmRhcnlTcGFuKSAqIDEwMH07CisgICAgICAgIHJldHVybiB7c3RhcnQ6IDAsIG1p ZGRsZTogMCwgZW5kOiAodGhpcy5fdmFsdWUoaXRlbSkgLyB0aGlzLmJvdW5kYXJ5U3BhbigpKSAq IDEwMH07CiAgICAgfSwKIAogICAgIGNvbXB1dGVCYXJHcmFwaExhYmVsczogZnVuY3Rpb24oaXRl bSkKQEAgLTE1MzYsMTggKzE1MzksMTggQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtCYXNlQ2FsY3Vs YXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB7bGVmdDogbGFiZWwsIHJpZ2h0OiBs YWJlbCwgdG9vbHRpcDogbGFiZWx9OwogICAgIH0sCiAKLSAgICBnZXQgYm91bmRhcnlTcGFuKCkK KyAgICBib3VuZGFyeVNwYW46IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlz Lm1heGltdW1Cb3VuZGFyeSAtIHRoaXMubWluaW11bUJvdW5kYXJ5OworICAgICAgICByZXR1cm4g dGhpcy5fbWF4aW11bUJvdW5kYXJ5IC0gdGhpcy5fbWluaW11bUJvdW5kYXJ5OwogICAgIH0sCiAK ICAgICB1cGRhdGVCb3VuZGFyaWVzOiBmdW5jdGlvbihpdGVtKQogICAgIHsKLSAgICAgICAgdGhp cy5taW5pbXVtQm91bmRhcnkgPSAwOworICAgICAgICB0aGlzLl9taW5pbXVtQm91bmRhcnkgPSAw OwogCiAgICAgICAgIHZhciB2YWx1ZSA9IHRoaXMuX3ZhbHVlKGl0ZW0pOwotICAgICAgICBpZiAo dHlwZW9mIHRoaXMubWF4aW11bUJvdW5kYXJ5ID09PSAidW5kZWZpbmVkIiB8fCB2YWx1ZSA+IHRo aXMubWF4aW11bUJvdW5kYXJ5KSB7Ci0gICAgICAgICAgICB0aGlzLm1heGltdW1Cb3VuZGFyeSA9 IHZhbHVlOworICAgICAgICBpZiAodHlwZW9mIHRoaXMuX21heGltdW1Cb3VuZGFyeSA9PT0gInVu ZGVmaW5lZCIgfHwgdmFsdWUgPiB0aGlzLl9tYXhpbXVtQm91bmRhcnkpIHsKKyAgICAgICAgICAg IHRoaXMuX21heGltdW1Cb3VuZGFyeSA9IHZhbHVlOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTU1NSw4ICsxNTU4LDE4IEBA IFdlYkluc3BlY3Rvci5OZXR3b3JrQmFzZUNhbGN1bGF0b3IucHJvdG90eXBlID0gewogCiAgICAg cmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLm1pbmltdW1Cb3Vu ZGFyeTsKLSAgICAgICAgZGVsZXRlIHRoaXMubWF4aW11bUJvdW5kYXJ5OworICAgICAgICBkZWxl dGUgdGhpcy5fbWluaW11bUJvdW5kYXJ5OworICAgICAgICBkZWxldGUgdGhpcy5fbWF4aW11bUJv dW5kYXJ5OworICAgIH0sCisKKyAgICBtYXhpbXVtQm91bmRhcnk6IGZ1bmN0aW9uKCkKKyAgICB7 CisgICAgICAgIHJldHVybiB0aGlzLl9tYXhpbXVtQm91bmRhcnk7CisgICAgfSwKKworICAgIG1p bmltdW1Cb3VuZGFyeTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX21p bmltdW1Cb3VuZGFyeTsKICAgICB9LAogCiAgICAgX3ZhbHVlOiBmdW5jdGlvbihpdGVtKQpAQCAt MTU5MCwxNyArMTYwMywxNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVDYWxjdWxhdG9yLnBy b3RvdHlwZSA9IHsKICAgICBjb21wdXRlQmFyR3JhcGhQZXJjZW50YWdlczogZnVuY3Rpb24ocmVx dWVzdCkKICAgICB7CiAgICAgICAgIGlmIChyZXF1ZXN0LnN0YXJ0VGltZSAhPT0gLTEpCi0gICAg ICAgICAgICB2YXIgc3RhcnQgPSAoKHJlcXVlc3Quc3RhcnRUaW1lIC0gdGhpcy5taW5pbXVtQm91 bmRhcnkpIC8gdGhpcy5ib3VuZGFyeVNwYW4pICogMTAwOworICAgICAgICAgICAgdmFyIHN0YXJ0 ID0gKChyZXF1ZXN0LnN0YXJ0VGltZSAtIHRoaXMuX21pbmltdW1Cb3VuZGFyeSkgLyB0aGlzLmJv dW5kYXJ5U3BhbigpKSAqIDEwMDsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdmFyIHN0YXJ0 ID0gMDsKIAogICAgICAgICBpZiAocmVxdWVzdC5yZXNwb25zZVJlY2VpdmVkVGltZSAhPT0gLTEp Ci0gICAgICAgICAgICB2YXIgbWlkZGxlID0gKChyZXF1ZXN0LnJlc3BvbnNlUmVjZWl2ZWRUaW1l IC0gdGhpcy5taW5pbXVtQm91bmRhcnkpIC8gdGhpcy5ib3VuZGFyeVNwYW4pICogMTAwOworICAg ICAgICAgICAgdmFyIG1pZGRsZSA9ICgocmVxdWVzdC5yZXNwb25zZVJlY2VpdmVkVGltZSAtIHRo aXMuX21pbmltdW1Cb3VuZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3BhbigpKSAqIDEwMDsKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgdmFyIG1pZGRsZSA9ICh0aGlzLnN0YXJ0QXRaZXJvID8gc3Rh cnQgOiAxMDApOwogCiAgICAgICAgIGlmIChyZXF1ZXN0LmVuZFRpbWUgIT09IC0xKQotICAgICAg ICAgICAgdmFyIGVuZCA9ICgocmVxdWVzdC5lbmRUaW1lIC0gdGhpcy5taW5pbXVtQm91bmRhcnkp IC8gdGhpcy5ib3VuZGFyeVNwYW4pICogMTAwOworICAgICAgICAgICAgdmFyIGVuZCA9ICgocmVx dWVzdC5lbmRUaW1lIC0gdGhpcy5fbWluaW11bUJvdW5kYXJ5KSAvIHRoaXMuYm91bmRhcnlTcGFu KCkpICogMTAwOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB2YXIgZW5kID0gKHRoaXMuc3Rh cnRBdFplcm8gPyBtaWRkbGUgOiAxMDApOwogCkBAIC0xNjE5LDcgKzE2MzIsNyBAQCBXZWJJbnNw ZWN0b3IuTmV0d29ya1RpbWVDYWxjdWxhdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gb2Yg YSBzcGVjaWZpYyBldmVudC4gSWYgc3RhcnRBdFplcm8gaXMgc2V0LCB0aGVuIHRoaXMgaXMgdXNl bGVzcywgYW5kIHdlCiAgICAgICAgIC8vIHdhbnQgdG8gcmV0dXJuIDAuCiAgICAgICAgIGlmIChl dmVudFRpbWUgIT09IC0xICYmICF0aGlzLnN0YXJ0QXRaZXJvKQotICAgICAgICAgICAgcmV0dXJu ICgoZXZlbnRUaW1lIC0gdGhpcy5taW5pbXVtQm91bmRhcnkpIC8gdGhpcy5ib3VuZGFyeVNwYW4p ICogMTAwOworICAgICAgICAgICAgcmV0dXJuICgoZXZlbnRUaW1lIC0gdGhpcy5fbWluaW11bUJv dW5kYXJ5KSAvIHRoaXMuYm91bmRhcnlTcGFuKCkpICogMTAwOwogCiAgICAgICAgIHJldHVybiAw OwogICAgIH0sCkBAIC0xNjI5LDggKzE2NDIsOCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVD YWxjdWxhdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKGV2ZW50VGltZSA9PT0gLTEgfHwg dGhpcy5zdGFydEF0WmVybykKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICBp ZiAodHlwZW9mIHRoaXMubWF4aW11bUJvdW5kYXJ5ID09PSAidW5kZWZpbmVkIiB8fCBldmVudFRp bWUgPiB0aGlzLm1heGltdW1Cb3VuZGFyeSkgewotICAgICAgICAgICAgdGhpcy5tYXhpbXVtQm91 bmRhcnkgPSBldmVudFRpbWU7CisgICAgICAgIGlmICh0eXBlb2YgdGhpcy5fbWF4aW11bUJvdW5k YXJ5ID09PSAidW5kZWZpbmVkIiB8fCBldmVudFRpbWUgPiB0aGlzLl9tYXhpbXVtQm91bmRhcnkp IHsKKyAgICAgICAgICAgIHRoaXMuX21heGltdW1Cb3VuZGFyeSA9IGV2ZW50VGltZTsKICAgICAg ICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAg LTE2NzQsMTQgKzE2ODcsMTQgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lQ2FsY3VsYXRvci5w cm90b3R5cGUgPSB7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGxvd2VyQm91bmQgPSB0aGlz Ll9sb3dlckJvdW5kKHJlcXVlc3QpOwogCi0gICAgICAgIGlmIChsb3dlckJvdW5kICE9PSAtMSAm JiAodHlwZW9mIHRoaXMubWluaW11bUJvdW5kYXJ5ID09PSAidW5kZWZpbmVkIiB8fCBsb3dlckJv dW5kIDwgdGhpcy5taW5pbXVtQm91bmRhcnkpKSB7Ci0gICAgICAgICAgICB0aGlzLm1pbmltdW1C b3VuZGFyeSA9IGxvd2VyQm91bmQ7CisgICAgICAgIGlmIChsb3dlckJvdW5kICE9PSAtMSAmJiAo dHlwZW9mIHRoaXMuX21pbmltdW1Cb3VuZGFyeSA9PT0gInVuZGVmaW5lZCIgfHwgbG93ZXJCb3Vu ZCA8IHRoaXMuX21pbmltdW1Cb3VuZGFyeSkpIHsKKyAgICAgICAgICAgIHRoaXMuX21pbmltdW1C b3VuZGFyeSA9IGxvd2VyQm91bmQ7CiAgICAgICAgICAgICBkaWRDaGFuZ2UgPSB0cnVlOwogICAg ICAgICB9CiAKICAgICAgICAgdmFyIHVwcGVyQm91bmQgPSB0aGlzLl91cHBlckJvdW5kKHJlcXVl c3QpOwotICAgICAgICBpZiAodXBwZXJCb3VuZCAhPT0gLTEgJiYgKHR5cGVvZiB0aGlzLm1heGlt dW1Cb3VuZGFyeSA9PT0gInVuZGVmaW5lZCIgfHwgdXBwZXJCb3VuZCA+IHRoaXMubWF4aW11bUJv dW5kYXJ5KSkgewotICAgICAgICAgICAgdGhpcy5tYXhpbXVtQm91bmRhcnkgPSB1cHBlckJvdW5k OworICAgICAgICBpZiAodXBwZXJCb3VuZCAhPT0gLTEgJiYgKHR5cGVvZiB0aGlzLl9tYXhpbXVt Qm91bmRhcnkgPT09ICJ1bmRlZmluZWQiIHx8IHVwcGVyQm91bmQgPiB0aGlzLl9tYXhpbXVtQm91 bmRhcnkpKSB7CisgICAgICAgICAgICB0aGlzLl9tYXhpbXVtQm91bmRhcnkgPSB1cHBlckJvdW5k OwogICAgICAgICAgICAgZGlkQ2hhbmdlID0gdHJ1ZTsKICAgICAgICAgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lR3JpZC5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVHcmlkLmpzCmluZGV4IGE4 MjNhZGVmNjRkYmU1NTI3ZGJlMWU0YzliZDhkZjJkNWE2OTc0MWMuLmEwY2Q3Yzg1Yzk0MWQ1MWNl NTU0YTYyYzEyNjdiMDUwNzE3MjA0NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGltZWxpbmVHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGltZWxpbmVHcmlkLmpzCkBAIC0xMzIsNyArMTMyLDcgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgbGVmdCA9 IGRpdmlkZXJzRWxlbWVudENsaWVudFdpZHRoIC8gZGl2aWRlckNvdW50ICogaSArIHBhZGRpbmdM ZWZ0OwogICAgICAgICAgICAgICAgIGRpdmlkZXJMYWJlbEJhci5fbGFiZWxFbGVtZW50LnRleHRD b250ZW50ID0gIiI7CiAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIGxlZnQg PSBjYWxjdWxhdG9yLmNvbXB1dGVQb3NpdGlvbihjYWxjdWxhdG9yLm1pbmltdW1Cb3VuZGFyeSAr IHNsaWNlICogaSk7CisgICAgICAgICAgICAgICAgbGVmdCA9IGNhbGN1bGF0b3IuY29tcHV0ZVBv c2l0aW9uKGNhbGN1bGF0b3IubWluaW11bUJvdW5kYXJ5KCkgKyBzbGljZSAqIGkpOwogICAgICAg ICAgICAgICAgIGRpdmlkZXJMYWJlbEJhci5fbGFiZWxFbGVtZW50LnRleHRDb250ZW50ID0gY2Fs Y3VsYXRvci5mb3JtYXRUaW1lKHNsaWNlICogaSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB2YXIgcGVyY2VudExlZnQgPSAxMDAgKiBsZWZ0IC8gZGl2aWRlcnNFbGVtZW50Q2xpZW50V2lk dGg7CkBAIC0yMDAsMyArMjAwLDI1IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUdyaWQucHJvdG90 eXBlID0gewogICAgICAgICB0aGlzLl9kaXZpZGVyc0VsZW1lbnQuc3R5bGUudG9wID0gc2Nyb2xs VG9wICsgInB4IjsKICAgICB9CiB9CisKKy8qKgorICogQGludGVyZmFjZQorICovCitXZWJJbnNw ZWN0b3IuVGltZWxpbmVHcmlkLkNhbGN1bGF0b3IgPSBmdW5jdGlvbigpIHsgfQorCitXZWJJbnNw ZWN0b3IuVGltZWxpbmVHcmlkLkNhbGN1bGF0b3IucHJvdG90eXBlID0geworICAgIC8qKiBAcGFy YW0ge251bWJlcn0gdGltZSAqLworICAgIGNvbXB1dGVQb3NpdGlvbjogZnVuY3Rpb24odGltZSkg eyB9LAorCisgICAgLyoqIEBwYXJhbSB7bnVtYmVyfSB0aW1lICovCisgICAgZm9ybWF0VGltZTog ZnVuY3Rpb24odGltZSkgeyB9LAorCisgICAgLyoqIEByZXR1cm4ge251bWJlcn0gKi8KKyAgICBt aW5pbXVtQm91bmRhcnk6IGZ1bmN0aW9uKCkgeyB9LAorCisgICAgLyoqIEByZXR1cm4ge251bWJl cn0gKi8KKyAgICBtYXhpbXVtQm91bmRhcnk6IGZ1bmN0aW9uKCkgeyB9LAorCisgICAgLyoqIEBy ZXR1cm4ge251bWJlcn0gKi8KKyAgICBib3VuZGFyeVNwYW46IGZ1bmN0aW9uKCkgeyB9Cit9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3Zl cnZpZXdQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGlu ZU92ZXJ2aWV3UGFuZS5qcwppbmRleCA0OGQ5OTYwMmM4OTI5YTVlMWY5Y2MwYWVjYWM0ZTNhMTBj ODA0MDRlLi43OTdkZjIwOGI1NDI4YzIwNzY3ZmJhMDYwN2E3YjY3Y2JmMTgxOGQ4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQ YW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVP dmVydmlld1BhbmUuanMKQEAgLTY1MiwxMyArNjUyLDEzIEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZU92ZXJ2aWV3Q2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgY29tcHV0ZVBv c2l0aW9uOiBmdW5jdGlvbih0aW1lKQogICAgIHsKLSAgICAgICAgcmV0dXJuICh0aW1lIC0gdGhp cy5taW5pbXVtQm91bmRhcnkpIC8gdGhpcy5ib3VuZGFyeVNwYW4gKiB0aGlzLl93b3JraW5nQXJl YSArIHRoaXMucGFkZGluZ0xlZnQ7CisgICAgICAgIHJldHVybiAodGltZSAtIHRoaXMuX21pbmlt dW1Cb3VuZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3BhbigpICogdGhpcy5fd29ya2luZ0FyZWEgKyB0 aGlzLnBhZGRpbmdMZWZ0OwogICAgIH0sCiAKICAgICBjb21wdXRlQmFyR3JhcGhQZXJjZW50YWdl czogZnVuY3Rpb24ocmVjb3JkKQogICAgIHsKLSAgICAgICAgdmFyIHN0YXJ0ID0gKFdlYkluc3Bl Y3Rvci5UaW1lbGluZU1vZGVsLnN0YXJ0VGltZUluU2Vjb25kcyhyZWNvcmQpIC0gdGhpcy5taW5p bXVtQm91bmRhcnkpIC8gdGhpcy5ib3VuZGFyeVNwYW4gKiAxMDA7Ci0gICAgICAgIHZhciBlbmQg PSAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTW9kZWwuZW5kVGltZUluU2Vjb25kcyhyZWNvcmQpIC0g dGhpcy5taW5pbXVtQm91bmRhcnkpIC8gdGhpcy5ib3VuZGFyeVNwYW4gKiAxMDA7CisgICAgICAg IHZhciBzdGFydCA9IChXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbC5zdGFydFRpbWVJblNlY29u ZHMocmVjb3JkKSAtIHRoaXMuX21pbmltdW1Cb3VuZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3Bhbigp ICogMTAwOworICAgICAgICB2YXIgZW5kID0gKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLmVu ZFRpbWVJblNlY29uZHMocmVjb3JkKSAtIHRoaXMuX21pbmltdW1Cb3VuZGFyeSkgLyB0aGlzLmJv dW5kYXJ5U3BhbigpICogMTAwOwogICAgICAgICByZXR1cm4ge3N0YXJ0OiBzdGFydCwgZW5kOiBl bmR9OwogICAgIH0sCiAKQEAgLTY2OCw5ICs2NjgsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlld0NhbGN1bGF0b3IucHJvdG90eXBlID0gewogICAgICAqLwogICAgIHNldFdpbmRvdzog ZnVuY3Rpb24obWluaW11bSwgbWF4aW11bSkKICAgICB7Ci0gICAgICAgIHRoaXMubWluaW11bUJv dW5kYXJ5ID0gbWluaW11bSA+PSAwID8gbWluaW11bSA6IHVuZGVmaW5lZDsKLSAgICAgICAgdGhp cy5tYXhpbXVtQm91bmRhcnkgPSBtYXhpbXVtID49IDAgPyBtYXhpbXVtIDogdW5kZWZpbmVkOwot ICAgICAgICB0aGlzLmJvdW5kYXJ5U3BhbiA9IHRoaXMubWF4aW11bUJvdW5kYXJ5IC0gdGhpcy5t aW5pbXVtQm91bmRhcnk7CisgICAgICAgIHRoaXMuX21pbmltdW1Cb3VuZGFyeSA9IG1pbmltdW0g Pj0gMCA/IG1pbmltdW0gOiB1bmRlZmluZWQ7CisgICAgICAgIHRoaXMuX21heGltdW1Cb3VuZGFy eSA9IG1heGltdW0gPj0gMCA/IG1heGltdW0gOiB1bmRlZmluZWQ7CiAgICAgfSwKIAogICAgIC8q KgpAQCAtNjkxLDYgKzY5MCwyMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld0NhbGN1 bGF0b3IucHJvdG90eXBlID0gewogICAgIGZvcm1hdFRpbWU6IGZ1bmN0aW9uKHZhbHVlKQogICAg IHsKICAgICAgICAgcmV0dXJuIE51bWJlci5zZWNvbmRzVG9TdHJpbmcodmFsdWUpOworICAgIH0s CisKKyAgICBtYXhpbXVtQm91bmRhcnk6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVy biB0aGlzLl9tYXhpbXVtQm91bmRhcnk7CisgICAgfSwKKworICAgIG1pbmltdW1Cb3VuZGFyeTog ZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX21pbmltdW1Cb3VuZGFyeTsK KyAgICB9LAorCisgICAgYm91bmRhcnlTcGFuOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5fbWF4aW11bUJvdW5kYXJ5IC0gdGhpcy5fbWluaW11bUJvdW5kYXJ5OwogICAg IH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U aW1lbGluZVBhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1l bGluZVBhbmVsLmpzCmluZGV4IDY2MWQ2YmI4YzRkM2IxMjc2NzNlZjlmMWI0NzIxNDlkYmRhNTZk YmIuLmRiZmQ4YThjMGZkNjE4YzZlZDlkNjI0ZjgxZjA3NDQ1ZDZmMTRhYzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAg LTQxNSw3ICs0MTUsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7 CiAKICAgICBfc2hvdWxkU2hvd0ZyYW1lczogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmV0 dXJuIHRoaXMuX2ZyYW1lTW9kZSAmJiB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5mcmFtZXMoKS5s ZW5ndGggPiAwICYmIHRoaXMuY2FsY3VsYXRvci5ib3VuZGFyeVNwYW4gPCAxLjA7CisgICAgICAg IHJldHVybiB0aGlzLl9mcmFtZU1vZGUgJiYgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuZnJhbWVz KCkubGVuZ3RoID4gMCAmJiB0aGlzLmNhbGN1bGF0b3IuYm91bmRhcnlTcGFuKCkgPCAxLjA7CiAg ICAgfSwKIAogICAgIF91cGRhdGVGcmFtZXM6IGZ1bmN0aW9uKCkKQEAgLTk5Niw2ICs5OTYsNyBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5z cGVjdG9yLlBhbmVsLnByb3RvdHlwZTsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAcGFyYW0g e1dlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsfSBtb2RlbAorICogQGltcGxlbWVudHMge1dlYklu c3BlY3Rvci5UaW1lbGluZUdyaWQuQ2FsY3VsYXRvcn0KICAqLwogV2ViSW5zcGVjdG9yLlRpbWVs aW5lQ2FsY3VsYXRvciA9IGZ1bmN0aW9uKG1vZGVsKQogewpAQCAtMTAxMCwxNSArMTAxMSwxNSBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYWxjdWxhdG9yLnByb3RvdHlwZSA9IHsKICAgICAgKi8K ICAgICBjb21wdXRlUG9zaXRpb246IGZ1bmN0aW9uKHRpbWUpCiAgICAgewotICAgICAgICByZXR1 cm4gKHRpbWUgLSB0aGlzLm1pbmltdW1Cb3VuZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3BhbiAqIHRo aXMuX3dvcmtpbmdBcmVhICsgdGhpcy5wYWRkaW5nTGVmdDsKKyAgICAgICAgcmV0dXJuICh0aW1l IC0gdGhpcy5fbWluaW11bUJvdW5kYXJ5KSAvIHRoaXMuYm91bmRhcnlTcGFuKCkgKiB0aGlzLl93 b3JraW5nQXJlYSArIHRoaXMucGFkZGluZ0xlZnQ7CiAgICAgfSwKIAogICAgIGNvbXB1dGVCYXJH cmFwaFBlcmNlbnRhZ2VzOiBmdW5jdGlvbihyZWNvcmQpCiAgICAgewotICAgICAgICB2YXIgc3Rh cnQgPSAocmVjb3JkLnN0YXJ0VGltZSAtIHRoaXMubWluaW11bUJvdW5kYXJ5KSAvIHRoaXMuYm91 bmRhcnlTcGFuICogMTAwOwotICAgICAgICB2YXIgZW5kID0gKHJlY29yZC5zdGFydFRpbWUgKyBy ZWNvcmQuc2VsZlRpbWUgLSB0aGlzLm1pbmltdW1Cb3VuZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3Bh biAqIDEwMDsKLSAgICAgICAgdmFyIGVuZFdpdGhDaGlsZHJlbiA9IChyZWNvcmQubGFzdENoaWxk RW5kVGltZSAtIHRoaXMubWluaW11bUJvdW5kYXJ5KSAvIHRoaXMuYm91bmRhcnlTcGFuICogMTAw OwotICAgICAgICB2YXIgY3B1V2lkdGggPSByZWNvcmQuY3B1VGltZSAvIHRoaXMuYm91bmRhcnlT cGFuICogMTAwOworICAgICAgICB2YXIgc3RhcnQgPSAocmVjb3JkLnN0YXJ0VGltZSAtIHRoaXMu X21pbmltdW1Cb3VuZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3BhbigpICogMTAwOworICAgICAgICB2 YXIgZW5kID0gKHJlY29yZC5zdGFydFRpbWUgKyByZWNvcmQuc2VsZlRpbWUgLSB0aGlzLl9taW5p bXVtQm91bmRhcnkpIC8gdGhpcy5ib3VuZGFyeVNwYW4oKSAqIDEwMDsKKyAgICAgICAgdmFyIGVu ZFdpdGhDaGlsZHJlbiA9IChyZWNvcmQubGFzdENoaWxkRW5kVGltZSAtIHRoaXMuX21pbmltdW1C b3VuZGFyeSkgLyB0aGlzLmJvdW5kYXJ5U3BhbigpICogMTAwOworICAgICAgICB2YXIgY3B1V2lk dGggPSByZWNvcmQuY3B1VGltZSAvIHRoaXMuYm91bmRhcnlTcGFuKCkgKiAxMDA7CiAgICAgICAg IHJldHVybiB7c3RhcnQ6IHN0YXJ0LCBlbmQ6IGVuZCwgZW5kV2l0aENoaWxkcmVuOiBlbmRXaXRo Q2hpbGRyZW4sIGNwdVdpZHRoOiBjcHVXaWR0aH07CiAgICAgfSwKIApAQCAtMTA0Myw5ICsxMDQ0 LDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAKICAg ICBzZXRXaW5kb3c6IGZ1bmN0aW9uKG1pbmltdW1Cb3VuZGFyeSwgbWF4aW11bUJvdW5kYXJ5KQog ICAgIHsKLSAgICAgICAgdGhpcy5taW5pbXVtQm91bmRhcnkgPSBtaW5pbXVtQm91bmRhcnk7Ci0g ICAgICAgIHRoaXMubWF4aW11bUJvdW5kYXJ5ID0gbWF4aW11bUJvdW5kYXJ5OwotICAgICAgICB0 aGlzLmJvdW5kYXJ5U3BhbiA9IHRoaXMubWF4aW11bUJvdW5kYXJ5IC0gdGhpcy5taW5pbXVtQm91 bmRhcnk7CisgICAgICAgIHRoaXMuX21pbmltdW1Cb3VuZGFyeSA9IG1pbmltdW1Cb3VuZGFyeTsK KyAgICAgICAgdGhpcy5fbWF4aW11bUJvdW5kYXJ5ID0gbWF4aW11bUJvdW5kYXJ5OwogICAgIH0s CiAKICAgICAvKioKQEAgLTEwNjAsNyArMTA2MCwyMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVD YWxjdWxhdG9yLnByb3RvdHlwZSA9IHsKIAogICAgIGZvcm1hdFRpbWU6IGZ1bmN0aW9uKHZhbHVl KQogICAgIHsKLSAgICAgICAgcmV0dXJuIE51bWJlci5zZWNvbmRzVG9TdHJpbmcodmFsdWUgKyB0 aGlzLm1pbmltdW1Cb3VuZGFyeSAtIHRoaXMuX21vZGVsLm1pbmltdW1SZWNvcmRUaW1lKCkpOwor ICAgICAgICByZXR1cm4gTnVtYmVyLnNlY29uZHNUb1N0cmluZyh2YWx1ZSArIHRoaXMuX21pbmlt dW1Cb3VuZGFyeSAtIHRoaXMuX21vZGVsLm1pbmltdW1SZWNvcmRUaW1lKCkpOworICAgIH0sCisK KyAgICBtYXhpbXVtQm91bmRhcnk6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0 aGlzLl9tYXhpbXVtQm91bmRhcnk7CisgICAgfSwKKworICAgIG1pbmltdW1Cb3VuZGFyeTogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX21pbmltdW1Cb3VuZGFyeTsKKyAg ICB9LAorCisgICAgYm91bmRhcnlTcGFuOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1 cm4gdGhpcy5fbWF4aW11bUJvdW5kYXJ5IC0gdGhpcy5fbWluaW11bUJvdW5kYXJ5OwogICAgIH0K IH0KIAo=