153390 2016-01-22 21:18:18 -0800 Web Inspector: Reduce unnecessary forced layouts in TimelineRuler 2016-01-22 22:47:12 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1157952 0 joepeck 2016-01-22 21:18:18 -0800 * SUMMARY Reduce unnecessary forced layouts in TimelineRuler TimelineRuler is potentially forcing a synchronous layout (element.clientWidth) every time it does a layout. This is unnecessary expensive, and in some cases this causes the entire inspector process to hang while it draws/layout/draw/layout repeatedly. The only reason the TimelineRuler would need its clientWidth is to calculate the width of the element. So this value can be updated only when the ruler is resized. 1157953 1 webkit-bug-importer 2016-01-22 21:18:32 -0800 <rdar://problem/24312241> 1157954 2 269639 joepeck 2016-01-22 21:23:31 -0800 Created attachment 269639 [PATCH] Proposed Fix 1157985 3 269639 commit-queue 2016-01-22 22:47:08 -0800 Comment on attachment 269639 [PATCH] Proposed Fix Clearing flags on attachment: 269639 Committed r195504: <http://trac.webkit.org/changeset/195504> 1157986 4 commit-queue 2016-01-22 22:47:12 -0800 All reviewed patches have been landed. Closing bug. 269639 2016-01-22 21:23:31 -0800 2016-01-22 22:47:08 -0800 [PATCH] Proposed Fix ruler.patch text/plain 8128 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDA0YmRmODQuLjczZmMxNzUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDE2LTAxLTIyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVkdWNl IHVubmVjZXNzYXJ5IGZvcmNlZCBsYXlvdXRzIGluIFRpbWVsaW5lUnVsZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MzM5MAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMjQzMTIyNDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGltZWxpbmVSdWxlcidzIHdpZHRoIHJhcmVseSBjaGFuZ2VzLiBJdCBz aG91bGQgb25seSBuZWVkIHRvIGNhbGN1bGF0ZQorICAgICAgICBpdHMgd2lkdGggd2hlbiBhZGRl ZCB0byB0aGUgRE9NIG9yIGlmIHRoZSBjb250ZW50IHZpZXcgY29udGFpbmluZyBpdAorICAgICAg ICBoYXMgcmVzaXplZCBhbmQgdGhlIGJvdW5kcyBvZiB0aGUgcnVsZXIgbWF5IGhhdmUgY2hhbmdl ZC4KKworICAgICAgICBTd2l0Y2ggZXZlcnl0aGluZyBpbiBUaW1lbGluZVJ1bGVyIHRvIHVzaW5n IGEgY2FjaGVkIHdpZHRoLCBhbmQgYWRkCisgICAgICAgIGFuIGV4cGxpY2l0IG1ldGhvZCwgcmVz aXplLCB0byB1cGRhdGUgdGhpcyB3aWR0aC4gVGhpcyBlbGltaW5hdGVkCisgICAgICAgIGZyZXF1 ZW50IGhhbmdzIEkgd2FzIHNlZWluZyB3aGlsZSByZWNvcmRpbmcgdGltZWxpbmVzLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldy5wcm90b3R5cGUuc2hvd24pOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZS51cGRh dGVMYXlvdXRGb3JSZXNpemUpOgorICAgICAgICBSZXNpemUgdGhlIHJ1bGVyIHdoZW4gdGhlIHZp ZXcgaXMgc2hvd24gb3IgcmVzaXplZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVPdmVydmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3LnByb3RvdHlwZS5zaG93bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlldy5wcm90b3R5cGUudXBkYXRlTGF5b3V0Rm9yUmVzaXplKToKKyAgICAgICAgUmVzaXplIHRo ZSBydWxlciB3aGVuIHRoZSB2aWV3IGlzIHNob3duIG9yIHJlc2l6ZWQuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUu bGF5b3V0KToKKyAgICAgICAgSW5mb3JtIHRoZSBjdXJyZW50IGNvbnRlbnQgdmlldyBvZiBhIHJl c2l6ZSBpZiBwb3NzaWJsZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxp bmVSdWxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLnByb3RvdHlw ZS5yZXNpemUpOgorICAgICAgICBVcGRhdGUgdGhlIHdpZHRoLgorCisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGltZWxpbmVSdWxlci5wcm90b3R5cGUuX3JlY2FsY3VsYXRlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLnByb3RvdHlwZS5fbmVlZHNNYXJrZXJMYXlvdXQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIucHJvdG90eXBlLl9uZWVkc1NlbGVj dGlvbkxheW91dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5wcm90b3R5 cGUuX2hhbmRsZU1vdXNlTW92ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxl ci5wcm90b3R5cGUuX2hhbmRsZVNlbGVjdGlvbkhhbmRsZU1vdXNlTW92ZSk6CisgICAgICAgIFVz ZSBjYWNoZWQgd2lkdGguCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l UmVjb3JkQmFyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkQmFyLmNy ZWF0ZUNvbWJpbmVkQmFycyk6IERlbGV0ZWQuCisgICAgICAgIFJlbW92ZSBzb21lIHN0YWxlIGNv ZGUuCisKIDIwMTYtMDEtMjIgIERldmluIFJvdXNzbyAgPGRjcm91c3NvK3dlYmtpdEBnbWFpbC5j b20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogU2lkZWJhcidzIHNob3VsZCByZW1lbWJlciB0 aGVpciB3aWR0aCdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzCmluZGV4IGE2ZTZl YzMuLmQ4ZDlmYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzCkBAIC04MSw2 ICs4MSw3IEBAIFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldyA9IGNsYXNzIE92ZXJ2 aWV3VGltZWxpbmVWaWV3IGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgIHN1cGVyLnNob3duKCk7 CiAKICAgICAgICAgdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci5zeW5jaHJv bml6ZSgpOworICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLnJlc2l6ZSgpOwogICAgIH0KIAog ICAgIGNsb3NlZCgpCkBAIC0xNTksNiArMTYwLDExIEBAIFdlYkluc3BlY3Rvci5PdmVydmlld1Rp bWVsaW5lVmlldyA9IGNsYXNzIE92ZXJ2aWV3VGltZWxpbmVWaWV3IGV4dGVuZHMgV2ViSW5zcGVj CiAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93T3JpZ2luYWxPckZvcm1hdHRlZFNvdXJjZUNvZGVM b2NhdGlvbih0cmVlRWxlbWVudC5zb3VyY2VDb2RlVGltZWxpbmUuc291cmNlQ29kZUxvY2F0aW9u KTsKICAgICB9CiAKKyAgICB1cGRhdGVMYXlvdXRGb3JSZXNpemUoKQorICAgIHsKKyAgICAgICAg dGhpcy5fdGltZWxpbmVSdWxlci5yZXNpemUoKTsKKyAgICB9CisKICAgICBsYXlvdXQoKQogICAg IHsKICAgICAgICAgbGV0IG9sZFplcm9UaW1lID0gdGhpcy5fdGltZWxpbmVSdWxlci56ZXJvVGlt ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lT3ZlcnZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzCmluZGV4IGFjNzg5YzcuLjg2YmNlMzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l T3ZlcnZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVPdmVydmlldy5qcwpAQCAtMjcwLDYgKzI3MCw4IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdlYkluc3Bl Y3Rvci5WaWV3CiAgICAgewogICAgICAgICB0aGlzLl92aXNpYmxlID0gdHJ1ZTsKIAorICAgICAg ICB0aGlzLl90aW1lbGluZVJ1bGVyLnJlc2l6ZSgpCisKICAgICAgICAgZm9yICh2YXIgdGltZWxp bmVPdmVydmlld0dyYXBoIG9mIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXdHcmFwaHNNYXAudmFsdWVz KCkpCiAgICAgICAgICAgICB0aW1lbGluZU92ZXJ2aWV3R3JhcGguc2hvd24oKTsKIApAQCAtMzI2 LDYgKzMyOCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxp bmVPdmVydmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgdXBkYXRlTGF5b3V0Rm9y UmVzaXplKCkKICAgICB7CiAgICAgICAgIHRoaXMuX2NhY2hlZFNjcm9sbENvbnRhaW5lcldpZHRo ID0gTmFOOworICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLnJlc2l6ZSgpCiAgICAgICAgIHRo aXMudXBkYXRlTGF5b3V0KCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZEJhci5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmpzCmlu ZGV4IDU1NjBlYTguLjdiYTA1MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmpzCkBAIC0x MjUsOCArMTI1LDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkQmFyID0gY2xhc3MgVGlt ZWxpbmVSZWNvcmRCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2IKICAgICAgICAgICAgIHZpc2li bGVSZWNvcmRzLnNvcnQoY29tcGFyZUJ5QWN0aXZlU3RhcnRUaW1lKTsKICAgICAgICAgfQogCi0g ICAgICAgIGxhc3RSZWNvcmRUeXBlID0gbnVsbDsKLQogICAgICAgICB2YXIgYWN0aXZlU3RhcnRU aW1lID0gTmFOOwogICAgICAgICB2YXIgYWN0aXZlRW5kVGltZSA9IE5hTjsKICAgICAgICAgdmFy IGFjdGl2ZVJlY29yZHMgPSBbXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0Nv bnRlbnRWaWV3LmpzCmluZGV4IDJkMzQ3ZjkuLmYwMDA5OTI1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRl bnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKQEAgLTMyOSw2ICszMjksMTAgQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgPSBjbGFzcyBUaW1lbGluZVJl Y29yZGluZ0NvbnRlbnRWaWV3IGUKICAgICBsYXlvdXQoKQogICAgIHsKICAgICAgICAgdGhpcy5f Y3VycmVudFRpbWVsaW5lT3ZlcnZpZXcudXBkYXRlTGF5b3V0Rm9yUmVzaXplKCk7CisKKyAgICAg ICAgbGV0IGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmN1 cnJlbnRDb250ZW50VmlldzsKKyAgICAgICAgaWYgKGN1cnJlbnRDb250ZW50VmlldyAmJiBjdXJy ZW50Q29udGVudFZpZXcudXBkYXRlTGF5b3V0Rm9yUmVzaXplKQorICAgICAgICAgICAgY3VycmVu dENvbnRlbnRWaWV3LnVwZGF0ZUxheW91dEZvclJlc2l6ZSgpOwogICAgIH0KIAogICAgIC8vIFBy aXZhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lUnVsZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmpzCmluZGV4IDU4YzFjMjcuLmQ4YmQxOTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVs ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVSdWxlci5qcwpAQCAtNTA2LDcgKzUwNiw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1 bGVyID0gY2xhc3MgVGltZWxpbmVSdWxlciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAg ICAgIHRoaXMuX3NjaGVkdWxlZE1hcmtlckxheW91dFVwZGF0ZUlkZW50aWZpZXIgPSByZXF1ZXN0 QW5pbWF0aW9uRnJhbWUoKCkgPT4gewogICAgICAgICAgICAgdGhpcy5fc2NoZWR1bGVkTWFya2Vy TGF5b3V0VXBkYXRlSWRlbnRpZmllciA9IHVuZGVmaW5lZDsKIAotICAgICAgICAgICAgbGV0IHZp c2libGVXaWR0aCA9IHRoaXMuZWxlbWVudC5jbGllbnRXaWR0aDsKKyAgICAgICAgICAgIGxldCB2 aXNpYmxlV2lkdGggPSB0aGlzLl9jYWNoZWRDbGllbnRXaWR0aDsKICAgICAgICAgICAgIGlmICh2 aXNpYmxlV2lkdGggPD0gMCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTUyOSw3ICs1 MjksNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlciA9IGNsYXNzIFRpbWVsaW5lUnVsZXIg ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0aGlzLl9zY2hlZHVsZWRTZWxlY3Rp b25MYXlvdXRVcGRhdGVJZGVudGlmaWVyID0gcmVxdWVzdEFuaW1hdGlvbkZyYW1lKCgpID0+IHsK ICAgICAgICAgICAgIHRoaXMuX3NjaGVkdWxlZFNlbGVjdGlvbkxheW91dFVwZGF0ZUlkZW50aWZp ZXIgPSB1bmRlZmluZWQ7CiAKLSAgICAgICAgICAgIGxldCB2aXNpYmxlV2lkdGggPSB0aGlzLmVs ZW1lbnQuY2xpZW50V2lkdGg7CisgICAgICAgICAgICBsZXQgdmlzaWJsZVdpZHRoID0gdGhpcy5f Y2FjaGVkQ2xpZW50V2lkdGg7CiAgICAgICAgICAgICBpZiAodmlzaWJsZVdpZHRoIDw9IDApCiAg ICAgICAgICAgICAgICAgcmV0dXJuOwogCkBAIC01MzcsOSArNTM3LDE1IEBAIFdlYkluc3BlY3Rv ci5UaW1lbGluZVJ1bGVyID0gY2xhc3MgVGltZWxpbmVSdWxlciBleHRlbmRzIFdlYkluc3BlY3Rv ci5WaWV3CiAgICAgICAgIH0pOwogICAgIH0KIAorICAgIHJlc2l6ZSgpCisgICAgeworICAgICAg ICB0aGlzLl9jYWNoZWRDbGllbnRXaWR0aCA9IHRoaXMuZWxlbWVudC5jbGllbnRXaWR0aDsKKyAg ICAgICAgdGhpcy5fcmVjYWxjdWxhdGUoKTsKKyAgICB9CisKICAgICBfcmVjYWxjdWxhdGUoKQog ICAgIHsKLSAgICAgICAgbGV0IHZpc2libGVXaWR0aCA9IHRoaXMuZWxlbWVudC5jbGllbnRXaWR0 aDsKKyAgICAgICAgbGV0IHZpc2libGVXaWR0aCA9IHRoaXMuX2NhY2hlZENsaWVudFdpZHRoOwog ICAgICAgICBpZiAodmlzaWJsZVdpZHRoIDw9IDApCiAgICAgICAgICAgICByZXR1cm4gMDsKIApA QCAtNzMyLDcgKzczOCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyID0gY2xhc3MgVGlt ZWxpbmVSdWxlciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICB0aGlzLmVs ZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5SZXNpemluZ1Nl bGVjdGlvblN0eWxlQ2xhc3NOYW1lKTsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuX3VwZGF0 ZVNlbGVjdGlvbih0aGlzLmVsZW1lbnQuY2xpZW50V2lkdGgsIHRoaXMuZHVyYXRpb24pOworICAg ICAgICB0aGlzLl91cGRhdGVTZWxlY3Rpb24odGhpcy5fY2FjaGVkQ2xpZW50V2lkdGgsIHRoaXMu ZHVyYXRpb24pOwogCiAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CiAgICAgICAgIGV2 ZW50LnN0b3BQcm9wYWdhdGlvbigpOwpAQCAtODI2LDcgKzgzMiw3IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZVJ1bGVyID0gY2xhc3MgVGltZWxpbmVSdWxlciBleHRlbmRzIFdlYkluc3BlY3Rvci5W aWV3CiAgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25FbmRUaW1lID0gTWF0aC5taW4oTWF0 aC5tYXgodGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgKyB0aGlzLm1pbmltdW1TZWxlY3Rpb25EdXJh dGlvbiwgY3VycmVudFRpbWUpLCB0aGlzLmVuZFRpbWUpOwogICAgICAgICB9CiAKLSAgICAgICAg dGhpcy5fdXBkYXRlU2VsZWN0aW9uKHRoaXMuZWxlbWVudC5jbGllbnRXaWR0aCwgdGhpcy5kdXJh dGlvbik7CisgICAgICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbih0aGlzLl9jYWNoZWRDbGllbnRX aWR0aCwgdGhpcy5kdXJhdGlvbik7CiAKICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsK ICAgICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7Cg==