195471 2019-03-08 10:49:20 -0800 Web Inspector: CPU Usage Timeline - Enable by default 2019-03-11 14:32:22 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1514075 0 joepeck 2019-03-08 10:49:20 -0800 CPU Usage Timeline - Enable by default - And remove Legacy 1514076 1 364034 joepeck 2019-03-08 10:50:32 -0800 Created attachment 364034 [PATCH] Proposed Fix 1514290 2 364034 hi 2019-03-08 17:56:34 -0800 Comment on attachment 364034 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=364034&action=review r=me > Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js:113 > + if (WI.CPUInstrument.supported()) > + defaultTypes.push(WI.TimelineRecord.Type.CPU); Should we put this above the FPS instrument, seeing as it's shown in the same grouping as the other default types (e.g. the rendering frame timeline is a separate "view"/"tab" from Network/Layout/Script)? 1515007 3 joepeck 2019-03-11 14:31:08 -0700 https://trac.webkit.org/r242741 1515009 4 webkit-bug-importer 2019-03-11 14:32:22 -0700 <rdar://problem/48782918> 364034 2019-03-08 10:50:32 -0800 2019-03-08 17:56:34 -0800 [PATCH] Proposed Fix enable-1.patch text/plain 21961 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDM3Zjk1NTZkZjQ5Li4wZjRjMGNjNmMzNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTktMDMtMDggIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBDUFUgVXNhZ2UgVGltZWxpbmUgLSBFbmFibGUgYnkgZGVmYXVsdAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1NDcxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGV4cGVyaW1lbnRhbCBzZXR0 aW5nIGFuZCBpbmNsdWRlIHRoZSBDUFUgdGltZWxpbmUgaW4gdGhlCisgICAgICAgIGRlZmF1bHQg c2V0IG9mIHRpbWVsaW5lcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5n LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2Vy LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVNYW5hZ2VyLmRlZmF1bHRUaW1lbGluZVR5cGVzKToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01haW4uaHRtbDoKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0NQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5jc3M6CisgICAgICAgICgudGltZWxp bmUtb3ZlcnZpZXctZ3JhcGguY3B1ID4gLnN0YWNrZWQtY29sdW1uLWNoYXJ0ID4gc3ZnID4gcmVj dC5zZWxlY3RlZCk6CisgICAgICAgICgudGltZWxpbmUtb3ZlcnZpZXctZ3JhcGguY3B1ID4gLmNv bHVtbi1jaGFydCA+IHN2ZyA+IHJlY3QpOiBEZWxldGVkLgorICAgICAgICAoYm9keVtkaXI9cnRs XSAudGltZWxpbmUtb3ZlcnZpZXctZ3JhcGguY3B1ID4gLmNvbHVtbi1jaGFydCk6IERlbGV0ZWQu CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGgu anM6CisgICAgICAgIChXSS5DUFVUaW1lbGluZU92ZXJ2aWV3R3JhcGgpOgorICAgICAgICAoV0ku Q1BVVGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5sYXlvdXQpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5Db250ZW50Vmll dy5jcmVhdGVGcm9tUmVwcmVzZW50ZWRPYmplY3QpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvTGVnYWN5Q1BVVGltZWxpbmVWaWV3LmNzczogUmVtb3ZlZC4KKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeUNQVVRpbWVsaW5lVmlldy5qczogUmVtb3ZlZC4KKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRXhwZXJpbWVu dGFsU2V0dGluZ3NWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1ZhcmlhYmxl cy5jc3M6CisgICAgICAgICg6cm9vdCk6CisKIDIwMTktMDMtMDYgIEpvc2VwaCBQZWNvcmFybyAg PHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDUFUgVXNhZ2Ug VGltZWxpbmUgLSBBZGQgbGVnZW5kIGFuZCBncmFwaCBob3ZlciBlZmZlY3RzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKaW5kZXgg ZDA4ZTMwZGNmNjYuLjA1MjZhZTUzNjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCkBAIC0xNTgsNyArMTU4LDYgQEAgV0ku c2V0dGluZ3MgPSB7CiAgICAgem9vbUZhY3RvcjogbmV3IFdJLlNldHRpbmcoInpvb20tZmFjdG9y IiwgMSksCiAKICAgICAvLyBFeHBlcmltZW50YWwKLSAgICBleHBlcmltZW50YWxFbmFibGVDUFVV c2FnZUVuaGFuY2VtZW50czogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1jcHUtdXNhZ2Ui LCBmYWxzZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFiOiBuZXcgV0kuU2V0dGlu ZygiZXhwZXJpbWVudGFsLWVuYWJsZS1sYXllcnMtdGFiIiwgZmFsc2UpLAogICAgIGV4cGVyaW1l bnRhbEVuYWJsZU5ld1RhYkJhcjogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFibGUt bmV3LXRhYi1iYXIiLCBmYWxzZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlU291cmNlc1RhYjog bmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFibGUtc291cmNlcy10YWIiLCBmYWxzZSks CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9UaW1lbGluZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXggNWQ0MjFkY2FkZGYuLjgw ZWY4YzIxOWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCkBAIC0xMDks NiArMTA5LDggQEAgV0kuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4 dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAgaWYgKFdJLkZQU0luc3RydW1lbnQuc3VwcG9ydGVk KCkpCiAgICAgICAgICAgICBkZWZhdWx0VHlwZXMucHVzaChXSS5UaW1lbGluZVJlY29yZC5UeXBl LlJlbmRlcmluZ0ZyYW1lKTsKKyAgICAgICAgaWYgKFdJLkNQVUluc3RydW1lbnQuc3VwcG9ydGVk KCkpCisgICAgICAgICAgICBkZWZhdWx0VHlwZXMucHVzaChXSS5UaW1lbGluZVJlY29yZC5UeXBl LkNQVSk7CiAKICAgICAgICAgcmV0dXJuIGRlZmF1bHRUeXBlczsKICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKaW5kZXggMjY1NmU2NzFlM2Uu LjAzYWIwOTQxYjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9NYWluLmh0bWwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TWFpbi5odG1sCkBAIC0xMjksNyArMTI5LDYgQEAKICAgICA8bGluayByZWw9InN0eWxlc2hlZXQi IGhyZWY9IlZpZXdzL0xheWVyczNEQ29udGVudFZpZXcuY3NzIj4KICAgICA8bGluayByZWw9InN0 eWxlc2hlZXQiIGhyZWY9IlZpZXdzL0xheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5jc3MiPgog ICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3 LmNzcyI+Ci0gICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9MZWdhY3lDUFVU aW1lbGluZVZpZXcuY3NzIj4KICAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdz L0xvZ0NvbnRlbnRWaWV3LmNzcyI+CiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJW aWV3cy9Mb2dJY29uLmNzcyI+CiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3 cy9NZWRpYVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5jc3MiPgpAQCAtNzEyLDcgKzcxMSw2IEBACiAg ICAgPHNjcmlwdCBzcmM9IlZpZXdzL0xheW91dFRpbWVsaW5lRGF0YUdyaWROb2RlLmpzIj48L3Nj cmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBo LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3 LmpzIj48L3NjcmlwdD4KLSAgICA8c2NyaXB0IHNyYz0iVmlld3MvTGVnYWN5Q1BVVGltZWxpbmVW aWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvTG9nQ29udGVudFZpZXcu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9NZWRpYVRpbWVsaW5lRGF0YUdy aWROb2RlLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvTWVkaWFUaW1lbGlu ZU92ZXJ2aWV3R3JhcGguanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NQVVRpbWVsaW5lT3Zl cnZpZXdHcmFwaC5jc3MKaW5kZXggMmJjMzZiMDc1NDAuLjMwYjk2NWZlYzQyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZU92 ZXJ2aWV3R3JhcGguY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5jc3MKQEAgLTgyLDEzICs4MiwzIEBAIGJv ZHlbZGlyPXJ0bF0gLnRpbWVsaW5lLW92ZXJ2aWV3LWdyYXBoLmNwdSA+IC5zdGFja2VkLWNvbHVt bi1jaGFydCB7CiAgICAgc3Ryb2tlOiB2YXIoLS1zZWxlY3RlZC1iYWNrZ3JvdW5kLWNvbG9yLWFj dGl2ZSkgIWltcG9ydGFudDsKICAgICBzdHJva2Utb3BhY2l0eTogMC44OwogfQotCi0vKiBMZWdh Y3lDUFVUaW1lbGluZSAqLwotLnRpbWVsaW5lLW92ZXJ2aWV3LWdyYXBoLmNwdSA+IC5jb2x1bW4t Y2hhcnQgPiBzdmcgPiByZWN0IHsKLSAgICBzdHJva2U6IHZhcigtLWNwdS1zdHJva2UtY29sb3Ip OwotICAgIGZpbGw6IHZhcigtLWNwdS1tYWluLXRocmVhZC1maWxsLWNvbG9yKTsKLX0KLQotYm9k eVtkaXI9cnRsXSAudGltZWxpbmUtb3ZlcnZpZXctZ3JhcGguY3B1ID4gLmNvbHVtbi1jaGFydCB7 Ci0gICAgdHJhbnNmb3JtOiBzY2FsZVgoLTEpOwotfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVP dmVydmlld0dyYXBoLmpzCmluZGV4IDk3MmIyZTJmNDBjLi5hNTJhZjVkZjQ3MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVP dmVydmlld0dyYXBoLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwpAQCAtMzgsMTEgKzM4LDggQEAgV0ku Q1BVVGltZWxpbmVPdmVydmlld0dyYXBoID0gY2xhc3MgQ1BVVGltZWxpbmVPdmVydmlld0dyYXBo IGV4dGVuZHMgV0kuVGltZWxpbmUKICAgICAgICAgdGhpcy5fY3B1VGltZWxpbmUuYWRkRXZlbnRM aXN0ZW5lcihXSS5UaW1lbGluZS5FdmVudC5SZWNvcmRBZGRlZCwgdGhpcy5fY3B1VGltZWxpbmVS ZWNvcmRBZGRlZCwgdGhpcyk7CiAKICAgICAgICAgbGV0IHNpemUgPSBuZXcgV0kuU2l6ZSgwLCB0 aGlzLmhlaWdodCk7Ci0gICAgICAgIGlmIChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVD UFVVc2FnZUVuaGFuY2VtZW50cy52YWx1ZSkgewotICAgICAgICAgICAgdGhpcy5fY2hhcnQgPSBu ZXcgV0kuU3RhY2tlZENvbHVtbkNoYXJ0KHNpemUpOwotICAgICAgICAgICAgdGhpcy5fY2hhcnQu aW5pdGlhbGl6ZVNlY3Rpb25zKFsibWFpbi10aHJlYWQtdXNhZ2UiLCAid29ya2VyLXRocmVhZC11 c2FnZSIsICJ0b3RhbC11c2FnZSJdKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICB0aGlz Ll9jaGFydCA9IG5ldyBXSS5Db2x1bW5DaGFydChzaXplKTsKKyAgICAgICAgdGhpcy5fY2hhcnQg PSBuZXcgV0kuU3RhY2tlZENvbHVtbkNoYXJ0KHNpemUpOworICAgICAgICB0aGlzLl9jaGFydC5p bml0aWFsaXplU2VjdGlvbnMoWyJtYWluLXRocmVhZC11c2FnZSIsICJ3b3JrZXItdGhyZWFkLXVz YWdlIiwgInRvdGFsLXVzYWdlIl0pOwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fY2hh cnQpOwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY2hhcnQuZWxlbWVu dCk7CiAKQEAgLTEyOSwxNiArMTI2LDEzIEBAIFdJLkNQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaCA9 IGNsYXNzIENQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaCBleHRlbmRzIFdJLlRpbWVsaW5lCiAKICAg ICAgICAgLy8gQmFycyBmb3IgZWFjaCByZWNvcmQuCiAgICAgICAgIGZvciAobGV0IHJlY29yZCBv ZiB2aXNpYmxlUmVjb3JkcykgeworICAgICAgICAgICAgbGV0IGFkZGl0aW9uYWxDbGFzcyA9IHJl Y29yZCA9PT0gdGhpcy5zZWxlY3RlZFJlY29yZCA/ICJzZWxlY3RlZCIgOiB1bmRlZmluZWQ7CiAg ICAgICAgICAgICBsZXQgdyA9IGludGVydmFsV2lkdGg7CisgICAgICAgICAgICBsZXQgeCA9IHhT Y2FsZShyZWNvcmQuc3RhcnRUaW1lIC0gKENQVVRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5zYW1wbGlu Z1JhdGVQZXJTZWNvbmQgLyAyKSk7ICAgICAgICAgICAgCisgICAgICAgICAgICBsZXQgaDEgPSBN YXRoLm1heChtaW5pbXVtRGlzcGxheUhlaWdodCwgeVNjYWxlKHJlY29yZC5tYWluVGhyZWFkVXNh Z2UpKTsKKyAgICAgICAgICAgIGxldCBoMiA9IE1hdGgubWF4KG1pbmltdW1EaXNwbGF5SGVpZ2h0 LCB5U2NhbGUocmVjb3JkLm1haW5UaHJlYWRVc2FnZSArIHJlY29yZC53b3JrZXJUaHJlYWRVc2Fn ZSkpOwogICAgICAgICAgICAgbGV0IGgzID0gTWF0aC5tYXgobWluaW11bURpc3BsYXlIZWlnaHQs IHlTY2FsZShyZWNvcmQudXNhZ2UpKTsKLSAgICAgICAgICAgIGxldCB4ID0geFNjYWxlKHJlY29y ZC5zdGFydFRpbWUgLSAoQ1BVVGltZWxpbmVPdmVydmlld0dyYXBoLnNhbXBsaW5nUmF0ZVBlclNl Y29uZCAvIDIpKTsKLSAgICAgICAgICAgIGlmIChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFi bGVDUFVVc2FnZUVuaGFuY2VtZW50cy52YWx1ZSkgewotICAgICAgICAgICAgICAgIGxldCBhZGRp dGlvbmFsQ2xhc3MgPSByZWNvcmQgPT09IHRoaXMuc2VsZWN0ZWRSZWNvcmQgPyAic2VsZWN0ZWQi IDogdW5kZWZpbmVkOwotICAgICAgICAgICAgICAgIGxldCBoMSA9IE1hdGgubWF4KG1pbmltdW1E aXNwbGF5SGVpZ2h0LCB5U2NhbGUocmVjb3JkLm1haW5UaHJlYWRVc2FnZSkpOwotICAgICAgICAg ICAgICAgIGxldCBoMiA9IE1hdGgubWF4KG1pbmltdW1EaXNwbGF5SGVpZ2h0LCB5U2NhbGUocmVj b3JkLm1haW5UaHJlYWRVc2FnZSArIHJlY29yZC53b3JrZXJUaHJlYWRVc2FnZSkpOwotICAgICAg ICAgICAgICAgIHRoaXMuX2NoYXJ0LmFkZENvbHVtblNldCh4LCBoZWlnaHQsIHcsIFtoMSwgaDIs IGgzXSwgYWRkaXRpb25hbENsYXNzKTsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAg ICAgIHRoaXMuX2NoYXJ0LmFkZENvbHVtbih4LCBoZWlnaHQgLSBoMywgdywgaDMpOworICAgICAg ICAgICAgdGhpcy5fY2hhcnQuYWRkQ29sdW1uU2V0KHgsIGhlaWdodCwgdywgW2gxLCBoMiwgaDNd LCBhZGRpdGlvbmFsQ2xhc3MpOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3LmpzCmlu ZGV4IDI5YzYxN2VmNDczLi41NThlNDVlMDI0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXcuanMKQEAgLTgzLDEx ICs4Myw4IEBAIFdJLkNvbnRlbnRWaWV3ID0gY2xhc3MgQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5W aWV3CiAgICAgICAgICAgICBpZiAodGltZWxpbmVUeXBlID09PSBXSS5UaW1lbGluZVJlY29yZC5U eXBlLlJlbmRlcmluZ0ZyYW1lKQogICAgICAgICAgICAgICAgIHJldHVybiBuZXcgV0kuUmVuZGVy aW5nRnJhbWVUaW1lbGluZVZpZXcocmVwcmVzZW50ZWRPYmplY3QsIGV4dHJhQXJndW1lbnRzKTsK IAotICAgICAgICAgICAgaWYgKHRpbWVsaW5lVHlwZSA9PT0gV0kuVGltZWxpbmVSZWNvcmQuVHlw ZS5DUFUpIHsKLSAgICAgICAgICAgICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5h YmxlQ1BVVXNhZ2VFbmhhbmNlbWVudHMudmFsdWUpCi0gICAgICAgICAgICAgICAgICAgIHJldHVy biBuZXcgV0kuQ1BVVGltZWxpbmVWaWV3KHJlcHJlc2VudGVkT2JqZWN0LCBleHRyYUFyZ3VtZW50 cyk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBXSS5MZWdhY3lDUFVUaW1lbGluZVZpZXco cmVwcmVzZW50ZWRPYmplY3QsIGV4dHJhQXJndW1lbnRzKTsKLSAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIGlmICh0aW1lbGluZVR5cGUgPT09IFdJLlRpbWVsaW5lUmVjb3JkLlR5cGUuQ1BVKQor ICAgICAgICAgICAgICAgIHJldHVybiBuZXcgV0kuQ1BVVGltZWxpbmVWaWV3KHJlcHJlc2VudGVk T2JqZWN0LCBleHRyYUFyZ3VtZW50cyk7CiAKICAgICAgICAgICAgIGlmICh0aW1lbGluZVR5cGUg PT09IFdJLlRpbWVsaW5lUmVjb3JkLlR5cGUuTWVtb3J5KQogICAgICAgICAgICAgICAgIHJldHVy biBuZXcgV0kuTWVtb3J5VGltZWxpbmVWaWV3KHJlcHJlc2VudGVkT2JqZWN0LCBleHRyYUFyZ3Vt ZW50cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9MZWdhY3lDUFVUaW1lbGluZVZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTGVnYWN5Q1BVVGltZWxpbmVWaWV3LmNzcwpkZWxldGVkIGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggZDVhNGZmMDY2ZWEuLjAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeUNQVVRpbWVsaW5lVmlldy5j c3MKKysrIC9kZXYvbnVsbApAQCAtMSw2OSArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAy MDE5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2Ug Y29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBS ZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNv cHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMg YGBBUyBJUycnCi0gKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRS SUJVVE9SUwotICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgotICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKLSAqIFNVQlNUSVRVVEUg R09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUwotICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KLSAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBP UiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCi0gKiBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GCi0gKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotYm9keSAudGlt ZWxpbmUtdmlldy5sZWdhY3ktY3B1IHsKLSAgICBvdmVyZmxvdzogc2Nyb2xsOwotfQotCi0udGlt ZWxpbmUtdmlldy5sZWdhY3ktY3B1ID4gLmNvbnRlbnQgewotICAgIG1hcmdpbi10b3A6IDEwcHg7 Ci19Ci0KLS50aW1lbGluZS12aWV3LmxlZ2FjeS1jcHUgPiAuY29udGVudCAuc3VidGl0bGUgewot ICAgIGZvbnQtZmFtaWx5OiAtd2Via2l0LXN5c3RlbS1mb250LCBzYW5zLXNlcmlmOwotICAgIGZv bnQtc2l6ZTogMTRweDsKLX0KLQotLnRpbWVsaW5lLXZpZXcubGVnYWN5LWNwdSA+IC5jb250ZW50 ID4gLmRldGFpbHMgewotICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKLX0KLQotLnRpbWVsaW5lLXZp ZXcubGVnYWN5LWNwdSA+IC5jb250ZW50ID4gLmRldGFpbHMgPiAudGltZWxpbmUtcnVsZXIgewot ICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB0b3A6IDVweDsKLSAgICBib3R0b206IDA7Ci0g ICAgcmlnaHQ6IDA7Ci0gICAgbGVmdDogMDsKLQotICAgIC0tY3B1LXRpbWVsaW5lLXZpZXctZGV0 YWlscy10aW1lbGluZS1ydWxlci1vZmZzZXQtc3RhcnQ6IDE1MHB4OwotfQotCi1ib2R5W2Rpcj1s dHJdIC50aW1lbGluZS12aWV3LmxlZ2FjeS1jcHUgPiAuY29udGVudCA+IC5kZXRhaWxzID4gLnRp bWVsaW5lLXJ1bGVyIHsKLSAgICBsZWZ0OiB2YXIoLS1jcHUtdGltZWxpbmUtdmlldy1kZXRhaWxz LXRpbWVsaW5lLXJ1bGVyLW9mZnNldC1zdGFydCk7Ci19Ci0KLWJvZHlbZGlyPXJ0bF0gLnRpbWVs aW5lLXZpZXcubGVnYWN5LWNwdSA+IC5jb250ZW50ID4gLmRldGFpbHMgPiAudGltZWxpbmUtcnVs ZXIgewotICAgIHJpZ2h0OiB2YXIoLS1jcHUtdGltZWxpbmUtdmlldy1kZXRhaWxzLXRpbWVsaW5l LXJ1bGVyLW9mZnNldC1zdGFydCk7Ci19Ci0KLS50aW1lbGluZS12aWV3LmxlZ2FjeS1jcHUgPiAu Y29udGVudCA+IC5kZXRhaWxzID4gLnN1YnRpdGxlIHsKLSAgICBwYWRkaW5nOiAwIDEwcHggMTBw eDsKLSAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgdmFyKC0tYm9yZGVyLWNvbG9yKTsKLX0K LQotLnRpbWVsaW5lLXZpZXcubGVnYWN5LWNwdSAuY3B1LXVzYWdlLXZpZXcgLmFyZWEtY2hhcnQg PiBzdmcgPiBwYXRoIHsKLSAgICBzdHJva2U6IHZhcigtLWNwdS1zdHJva2UtY29sb3IpOwotICAg IGZpbGw6IHZhcigtLWNwdS1tYWluLXRocmVhZC1maWxsLWNvbG9yKTsKLX0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeUNQVVRpbWVs aW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xl Z2FjeUNQVVRpbWVsaW5lVmlldy5qcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMTA5 MWU3ZGI2ZDIuLjAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0xlZ2FjeUNQVVRpbWVsaW5lVmlldy5qcworKysgL2Rldi9udWxsCkBAIC0x LDIwMiArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDE5IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1l dDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUg YWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGlu IHRoZQotICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVk IHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVE IEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCi0gKiBBTkQgQU5Z IEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywKLSAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5P IEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwotICogQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZ LCBPUgotICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YKLSAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExP U1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwotICogSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4KLSAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpCi0gKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCi0gKiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotV0kuTGVnYWN5Q1BVVGltZWxpbmVWaWV3ID0gY2xh c3MgTGVnYWN5Q1BVVGltZWxpbmVWaWV3IGV4dGVuZHMgV0kuVGltZWxpbmVWaWV3Ci17Ci0gICAg Y29uc3RydWN0b3IodGltZWxpbmUsIGV4dHJhQXJndW1lbnRzKQotICAgIHsKLSAgICAgICAgY29u c29sZS5hc3NlcnQodGltZWxpbmUudHlwZSA9PT0gV0kuVGltZWxpbmVSZWNvcmQuVHlwZS5DUFUs IHRpbWVsaW5lKTsKLQotICAgICAgICBzdXBlcih0aW1lbGluZSwgZXh0cmFBcmd1bWVudHMpOwot Ci0gICAgICAgIHRoaXMuX3JlY29yZGluZyA9IGV4dHJhQXJndW1lbnRzLnJlY29yZGluZzsKLSAg ICAgICAgdGhpcy5fbWF4VXNhZ2UgPSAtSW5maW5pdHk7Ci0KLSAgICAgICAgdGhpcy5lbGVtZW50 LmNsYXNzTGlzdC5hZGQoImxlZ2FjeS1jcHUiKTsKLQotICAgICAgICBsZXQgY29udGVudEVsZW1l bnQgPSB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 IikpOwotICAgICAgICBjb250ZW50RWxlbWVudC5jbGFzc0xpc3QuYWRkKCJjb250ZW50Iik7Ci0K LSAgICAgICAgbGV0IGRldGFpbHNDb250YWluZXJFbGVtZW50ID0gdGhpcy5fZGV0YWlsc0NvbnRh aW5lckVsZW1lbnQgPSBjb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJkaXYiKSk7Ci0gICAgICAgIGRldGFpbHNDb250YWluZXJFbGVtZW50LmNsYXNzTGlz dC5hZGQoImRldGFpbHMiKTsKLQotICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyID0gbmV3IFdJ LlRpbWVsaW5lUnVsZXI7Ci0gICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlzLl90aW1lbGluZVJ1 bGVyKTsKLSAgICAgICAgZGV0YWlsc0NvbnRhaW5lckVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5f dGltZWxpbmVSdWxlci5lbGVtZW50KTsKLQotICAgICAgICBsZXQgZGV0YWlsc1N1YnRpdGxlRWxl bWVudCA9IGRldGFpbHNDb250YWluZXJFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpKTsKLSAgICAgICAgZGV0YWlsc1N1YnRpdGxlRWxlbWVudC5jbGFzc0xp c3QuYWRkKCJzdWJ0aXRsZSIpOwotICAgICAgICBkZXRhaWxzU3VidGl0bGVFbGVtZW50LnRleHRD b250ZW50ID0gV0kuVUlTdHJpbmcoIkNQVSBVc2FnZSIpOwotCi0gICAgICAgIHRoaXMuX2NwdVVz YWdlVmlldyA9IG5ldyBXSS5DUFVVc2FnZVZpZXc7Ci0gICAgICAgIHRoaXMuYWRkU3Vidmlldyh0 aGlzLl9jcHVVc2FnZVZpZXcpOwotICAgICAgICB0aGlzLl9kZXRhaWxzQ29udGFpbmVyRWxlbWVu dC5hcHBlbmRDaGlsZCh0aGlzLl9jcHVVc2FnZVZpZXcuZWxlbWVudCk7Ci0KLSAgICAgICAgdGlt ZWxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXSS5UaW1lbGluZS5FdmVudC5SZWNvcmRBZGRlZCwgdGhp cy5fY3B1VGltZWxpbmVSZWNvcmRBZGRlZCwgdGhpcyk7Ci0gICAgfQotCi0gICAgLy8gU3RhdGlj Ci0KLSAgICBzdGF0aWMgZ2V0IGNwdVVzYWdlVmlld0hlaWdodCgpIHsgcmV0dXJuIDE1MDsgfQot Ci0gICAgLy8gUHVibGljCi0KLSAgICBzaG93bigpCi0gICAgewotICAgICAgICBzdXBlci5zaG93 bigpOwotCi0gICAgICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIudXBkYXRlTGF5b3V0KFdJLlZpZXcu TGF5b3V0UmVhc29uLlJlc2l6ZSk7Ci0gICAgfQotCi0gICAgY2xvc2VkKCkKLSAgICB7Ci0gICAg ICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMucmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXSS5U aW1lbGluZSk7Ci0gICAgICAgIHRoaXMucmVwcmVzZW50ZWRPYmplY3QucmVtb3ZlRXZlbnRMaXN0 ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKLSAgICB9Ci0KLSAgICByZXNldCgpCi0gICAgewotICAg ICAgICBzdXBlci5yZXNldCgpOwotCi0gICAgICAgIHRoaXMuX21heFVzYWdlID0gLUluZmluaXR5 OwotCi0gICAgICAgIHRoaXMuY2xlYXIoKTsKLSAgICB9Ci0KLSAgICBjbGVhcigpCi0gICAgewot ICAgICAgICB0aGlzLl9jcHVVc2FnZVZpZXcuY2xlYXIoKTsKLSAgICB9Ci0KLSAgICBnZXQgc2Ny b2xsYWJsZUVsZW1lbnRzKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBbdGhpcy5lbGVtZW50XTsK LSAgICB9Ci0KLSAgICAvLyBQcm90ZWN0ZWQKLQotICAgIGdldCBzaG93c0ZpbHRlckJhcigpIHsg cmV0dXJuIGZhbHNlOyB9Ci0KLSAgICBpbml0aWFsTGF5b3V0KCkKLSAgICB7Ci0gICAgICAgIHRo aXMuZWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgiLS1jcHUtdXNhZ2Utdmlldy1oZWlnaHQiLCBM ZWdhY3lDUFVUaW1lbGluZVZpZXcuY3B1VXNhZ2VWaWV3SGVpZ2h0ICsgInB4Iik7Ci0gICAgfQot Ci0gICAgbGF5b3V0KCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLmxheW91dFJlYXNvbiA9PT0g V0kuVmlldy5MYXlvdXRSZWFzb24uUmVzaXplKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAg ICAgIC8vIEFsd2F5cyB1cGRhdGUgdGltZWxpbmUgcnVsZXIuCi0gICAgICAgIHRoaXMuX3RpbWVs aW5lUnVsZXIuemVyb1RpbWUgPSB0aGlzLnplcm9UaW1lOwotICAgICAgICB0aGlzLl90aW1lbGlu ZVJ1bGVyLnN0YXJ0VGltZSA9IHRoaXMuc3RhcnRUaW1lOwotICAgICAgICB0aGlzLl90aW1lbGlu ZVJ1bGVyLmVuZFRpbWUgPSB0aGlzLmVuZFRpbWU7Ci0KLSAgICAgICAgbGV0IGdyYXBoU3RhcnRU aW1lID0gdGhpcy5zdGFydFRpbWU7Ci0gICAgICAgIGxldCBncmFwaEVuZFRpbWUgPSB0aGlzLmVu ZFRpbWU7Ci0gICAgICAgIGxldCBzZWNvbmRzUGVyUGl4ZWwgPSB0aGlzLl90aW1lbGluZVJ1bGVy LnNlY29uZHNQZXJQaXhlbDsKLSAgICAgICAgbGV0IHZpc2libGVFbmRUaW1lID0gTWF0aC5taW4o dGhpcy5lbmRUaW1lLCB0aGlzLmN1cnJlbnRUaW1lKTsKLQotICAgICAgICBsZXQgZGlzY29udGlu dWl0aWVzID0gdGhpcy5fcmVjb3JkaW5nLmRpc2NvbnRpbnVpdGllc0luVGltZVJhbmdlKGdyYXBo U3RhcnRUaW1lLCB2aXNpYmxlRW5kVGltZSk7Ci0KLSAgICAgICAgLy8gRG9uJ3QgaW5jbHVkZSB0 aGUgcmVjb3JkIGJlZm9yZSB0aGUgZ3JhcGggc3RhcnQgaWYgdGhlIGdyYXBoIHN0YXJ0IGlzIHdp dGhpbiBhIGdhcC4KLSAgICAgICAgbGV0IGluY2x1ZGVSZWNvcmRCZWZvcmVTdGFydCA9ICFkaXNj b250aW51aXRpZXMubGVuZ3RoIHx8IGRpc2NvbnRpbnVpdGllc1swXS5zdGFydFRpbWUgPiBncmFw aFN0YXJ0VGltZTsKLSAgICAgICAgbGV0IHZpc2libGVSZWNvcmRzID0gdGhpcy5yZXByZXNlbnRl ZE9iamVjdC5yZWNvcmRzSW5UaW1lUmFuZ2UoZ3JhcGhTdGFydFRpbWUsIHZpc2libGVFbmRUaW1l LCBpbmNsdWRlUmVjb3JkQmVmb3JlU3RhcnQpOwotICAgICAgICBpZiAoIXZpc2libGVSZWNvcmRz Lmxlbmd0aCB8fCAodmlzaWJsZVJlY29yZHMubGVuZ3RoID09PSAxICYmIHZpc2libGVSZWNvcmRz WzBdLmVuZFRpbWUgPCBncmFwaFN0YXJ0VGltZSkpIHsKLSAgICAgICAgICAgIHRoaXMuY2xlYXIo KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGxldCBkYXRhUG9p bnRzID0gW107Ci0gICAgICAgIGxldCBtYXggPSAtSW5maW5pdHk7Ci0gICAgICAgIGxldCBtaW4g PSBJbmZpbml0eTsKLSAgICAgICAgbGV0IGF2ZXJhZ2UgPSAwOwotCi0gICAgICAgIGZvciAobGV0 IHJlY29yZCBvZiB2aXNpYmxlUmVjb3JkcykgewotICAgICAgICAgICAgbGV0IHRpbWUgPSByZWNv cmQuc3RhcnRUaW1lOwotICAgICAgICAgICAgbGV0IHVzYWdlID0gcmVjb3JkLnVzYWdlOwotCi0g ICAgICAgICAgICBpZiAoZGlzY29udGludWl0aWVzLmxlbmd0aCAmJiBkaXNjb250aW51aXRpZXNb MF0uZW5kVGltZSA8IHRpbWUpIHsKLSAgICAgICAgICAgICAgICBsZXQgc3RhcnREaXNjb250aW51 aXR5ID0gZGlzY29udGludWl0aWVzLnNoaWZ0KCk7Ci0gICAgICAgICAgICAgICAgbGV0IGVuZERp c2NvbnRpbnVpdHkgPSBzdGFydERpc2NvbnRpbnVpdHk7Ci0gICAgICAgICAgICAgICAgd2hpbGUg KGRpc2NvbnRpbnVpdGllcy5sZW5ndGggJiYgZGlzY29udGludWl0aWVzWzBdLmVuZFRpbWUgPCB0 aW1lKQotICAgICAgICAgICAgICAgICAgICBlbmREaXNjb250aW51aXR5ID0gZGlzY29udGludWl0 aWVzLnNoaWZ0KCk7Ci0gICAgICAgICAgICAgICAgZGF0YVBvaW50cy5wdXNoKHt0aW1lOiBzdGFy dERpc2NvbnRpbnVpdHkuc3RhcnRUaW1lLCBzaXplOiAwfSk7Ci0gICAgICAgICAgICAgICAgZGF0 YVBvaW50cy5wdXNoKHt0aW1lOiBlbmREaXNjb250aW51aXR5LmVuZFRpbWUsIHNpemU6IDB9KTsK LSAgICAgICAgICAgICAgICBkYXRhUG9pbnRzLnB1c2goe3RpbWU6IGVuZERpc2NvbnRpbnVpdHku ZW5kVGltZSwgc2l6ZTogdXNhZ2V9KTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgZGF0 YVBvaW50cy5wdXNoKHt0aW1lLCBzaXplOiB1c2FnZX0pOwotICAgICAgICAgICAgbWF4ID0gTWF0 aC5tYXgobWF4LCB1c2FnZSk7Ci0gICAgICAgICAgICBtaW4gPSBNYXRoLm1pbihtaW4sIHVzYWdl KTsKLSAgICAgICAgICAgIGF2ZXJhZ2UgKz0gdXNhZ2U7Ci0gICAgICAgIH0KLQotICAgICAgICBh dmVyYWdlIC89IHZpc2libGVSZWNvcmRzLmxlbmd0aDsKLQotICAgICAgICAvLyBJZiB0aGUgZ3Jh cGggZW5kIHRpbWUgaXMgaW5zaWRlIGEgZ2FwLCB0aGUgbGFzdCBkYXRhIHBvaW50IHNob3VsZAot ICAgICAgICAvLyBvbmx5IGJlIGV4dGVuZGVkIHRvIHRoZSBzdGFydCBvZiB0aGUgZGlzY29udGlu dWl0eS4KLSAgICAgICAgaWYgKGRpc2NvbnRpbnVpdGllcy5sZW5ndGgpCi0gICAgICAgICAgICB2 aXNpYmxlRW5kVGltZSA9IGRpc2NvbnRpbnVpdGllc1swXS5zdGFydFRpbWU7Ci0KLSAgICAgICAg ZnVuY3Rpb24gbGF5b3V0Vmlldyh2aWV3LCB7ZGF0YVBvaW50cywgbWluLCBtYXgsIGF2ZXJhZ2V9 KSB7Ci0gICAgICAgICAgICBpZiAobWluID09PSBJbmZpbml0eSkKLSAgICAgICAgICAgICAgICBt aW4gPSAwOwotICAgICAgICAgICAgaWYgKG1heCA9PT0gLUluZmluaXR5KQotICAgICAgICAgICAg ICAgIG1heCA9IDA7Ci0KLSAgICAgICAgICAgIC8vIFpvb20gaW4gdG8gdGhlIHRvcCBvZiBlYWNo IGdyYXBoIHRvIGFjY2VudHVhdGUgc21hbGwgY2hhbmdlcy4KLSAgICAgICAgICAgIGxldCBncmFw aE1pbiA9IG1pbiAqIDAuOTU7Ci0gICAgICAgICAgICBsZXQgZ3JhcGhNYXggPSAobWF4ICogMS4w NSkgLSBncmFwaE1pbjsKLQotICAgICAgICAgICAgZnVuY3Rpb24geFNjYWxlKHRpbWUpIHsKLSAg ICAgICAgICAgICAgICByZXR1cm4gKHRpbWUgLSBncmFwaFN0YXJ0VGltZSkgLyBzZWNvbmRzUGVy UGl4ZWw7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGxldCBzaXplID0gbmV3IFdJLlNp emUoeFNjYWxlKGdyYXBoRW5kVGltZSksIExlZ2FjeUNQVVRpbWVsaW5lVmlldy5jcHVVc2FnZVZp ZXdIZWlnaHQpOwotCi0gICAgICAgICAgICBmdW5jdGlvbiB5U2NhbGUodmFsdWUpIHsKLSAgICAg ICAgICAgICAgICByZXR1cm4gc2l6ZS5oZWlnaHQgLSAoKCh2YWx1ZSAtIGdyYXBoTWluKSAvIGdy YXBoTWF4KSAqIHNpemUuaGVpZ2h0KTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgdmll dy51cGRhdGVDaGFydChkYXRhUG9pbnRzLCBzaXplLCB2aXNpYmxlRW5kVGltZSwgbWluLCBtYXgs IGF2ZXJhZ2UsIHhTY2FsZSwgeVNjYWxlLCAic2l6ZSIpOwotICAgICAgICB9Ci0KLSAgICAgICAg bGF5b3V0Vmlldyh0aGlzLl9jcHVVc2FnZVZpZXcsIHtkYXRhUG9pbnRzLCBtaW4sIG1heCwgYXZl cmFnZX0pOwotICAgIH0KLQotICAgIC8vIFByaXZhdGUKLQotICAgIF9jcHVUaW1lbGluZVJlY29y ZEFkZGVkKGV2ZW50KQotICAgIHsKLSAgICAgICAgbGV0IGNwdVRpbWVsaW5lUmVjb3JkID0gZXZl bnQuZGF0YS5yZWNvcmQ7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KGNwdVRpbWVsaW5lUmVjb3Jk IGluc3RhbmNlb2YgV0kuQ1BVVGltZWxpbmVSZWNvcmQpOwotCi0gICAgICAgIHRoaXMuX21heFVz YWdlID0gTWF0aC5tYXgodGhpcy5fbWF4VXNhZ2UsIGNwdVRpbWVsaW5lUmVjb3JkLnVzYWdlKTsK LQotICAgICAgICBpZiAoY3B1VGltZWxpbmVSZWNvcmQuc3RhcnRUaW1lID49IHRoaXMuc3RhcnRU aW1lICYmIGNwdVRpbWVsaW5lUmVjb3JkLmVuZFRpbWUgPD0gdGhpcy5lbmRUaW1lKQotICAgICAg ICAgICAgdGhpcy5uZWVkc0xheW91dCgpOwotICAgIH0KLX07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NU YWJDb250ZW50Vmlldy5qcwppbmRleCAxZWNkMzZjM2UzMS4uMjQ3ZDkwNzRhYjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFi Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMjcyLDkgKzI3Miw2IEBAIFdJLlNl dHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVu ZHMgV0kuVGFiQ29udGVudFZpCiAgICAgICAgIGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRT ZXR0aW5nKFdJLlVJU3RyaW5nKCJVc2VyIEludGVyZmFjZToiKSwgV0kuc2V0dGluZ3MuZXhwZXJp bWVudGFsRW5hYmxlTmV3VGFiQmFyLCBXSS5VSVN0cmluZygiRW5hYmxlIE5ldyBUYWIgQmFyIikp OwogICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2VwYXJhdG9yKCk7CiAKLSAg ICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNldHRpbmcoV0kudW5sb2NhbGl6ZWRT dHJpbmcoIkNQVSBVc2FnZToiKSwgV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlQ1BVVXNh Z2VFbmhhbmNlbWVudHMsIFdJLnVubG9jYWxpemVkU3RyaW5nKCJFbmhhbmNlbWVudHMiKSk7Ci0g ICAgICAgIGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKLQogICAgICAg ICBsZXQgcmVsb2FkSW5zcGVjdG9yQnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0 dG9uIik7CiAgICAgICAgIHJlbG9hZEluc3BlY3RvckJ1dHRvbi50ZXh0Q29udGVudCA9IFdJLlVJ U3RyaW5nKCJSZWxvYWQgV2ViIEluc3BlY3RvciIpOwogICAgICAgICByZWxvYWRJbnNwZWN0b3JC dXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCAoZXZlbnQpID0+IHsKQEAgLTMwMiw3ICsy OTksNiBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250 ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2Uo V0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlU291cmNlc1RhYik7CiAgICAgICAgIGxpc3Rl bkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVMYXllcnNUYWIpOwogICAg ICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlTmV3VGFi QmFyKTsKLSAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVu YWJsZUNQVVVzYWdlRW5oYW5jZW1lbnRzKTsKIAogICAgICAgICB0aGlzLmFkZFNldHRpbmdzVmll dyhleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1ZhcmlhYmxlcy5jc3MgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WYXJpYWJsZXMuY3NzCmluZGV4IDcy ZmExMTQyMDE0Li5jNjBkZTQ4MDVlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVmFyaWFibGVzLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WYXJpYWJsZXMuY3NzCkBAIC0xMzIsMTAgKzEzMiw2 IEBACiAgICAgLS1tZW1vcnktbWF4LWNvbXBhcmlzb24tZmlsbC1jb2xvcjogaHNsKDIyMCwgMTAl LCA3NSUpOwogICAgIC0tbWVtb3J5LW1heC1jb21wYXJpc29uLXN0cm9rZS1jb2xvcjogaHNsKDIy MCwgMTAlLCA1NSUpOwogCi0gICAgLyogTGVnYWN5Q1BVVGltZWxpbmUgKi8KLSAgICAtLWNwdS1m aWxsLWNvbG9yOiBoc2woODEsIDgwJSwgNTAlKTsKLSAgICAtLWNwdS1zdHJva2UtY29sb3I6IGhz bCgxMTgsIDMzJSwgNDIlKTsKLQogICAgIC0tY3B1LW90aGVyLXRocmVhZC1maWxsLWNvbG9yOiBo c2woODEsIDgwJSwgNTAlKTsKICAgICAtLWNwdS1vdGhlci10aHJlYWQtc3Ryb2tlLWNvbG9yOiBo c2woODEsIDgwJSwgMzAlKTsKICAgICAtLWNwdS1tYWluLXRocmVhZC1maWxsLWNvbG9yOiBoc2wo MTE4LCA0MyUsIDU1JSk7Cg==