141293 2015-02-05 10:13:36 -0800 Web Inspector: eliminate some unnecessary layout/painting in timeline overview and ruler 2015-02-08 00:14:48 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 burg burg commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1067122 0 burg 2015-02-05 10:13:36 -0800 . 1067123 1 webkit-bug-importer 2015-02-05 10:14:04 -0800 <rdar://problem/19731525> 1067132 2 246108 burg 2015-02-05 10:28:34 -0800 Created attachment 246108 Patch 1067136 3 246109 burg 2015-02-05 10:38:43 -0800 Created attachment 246109 Proposed Fix Latest patch fixes the conditional in TimelineOverview.shown() 1067166 4 246109 commit-queue 2015-02-05 12:12:44 -0800 Comment on attachment 246109 Proposed Fix Clearing flags on attachment: 246109 Committed r179701: <http://trac.webkit.org/changeset/179701> 1067167 5 commit-queue 2015-02-05 12:12:49 -0800 All reviewed patches have been landed. Closing bug. 1067655 6 burg 2015-02-08 00:14:48 -0800 *** Bug 138397 has been marked as a duplicate of this bug. *** 246108 2015-02-05 10:28:34 -0800 2015-02-05 10:38:39 -0800 Patch bug-141293-20150205102834.patch text/plain 6918 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5NDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj OGY2NmFiYWMyYzJhNTUxZDQ5MGU2YTVjYWNkNmIwY2MwMzY3YTgwLi5iNTBlNzJlNWYwOTAyMjVh ZmVjZDdlZTA1OWE5YzJhMGFiMmFmODIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNiBAQAorMjAxNS0wMi0wNSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZWxpbWluYXRlIHNvbWUgdW5uZWNlc3Nh cnkgbGF5b3V0L3BhaW50aW5nIGluIHRpbWVsaW5lIG92ZXJ2aWV3IGFuZCBydWxlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMjkzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHRpbWVsaW5lIG92 ZXJ2aWV3J3MgcnVsZXIgd2FzIGZvcmNpbmcgcmVwYWludHMgb2YgZGl2aWRlciBsYWJlbHMgZXZl biBpZiB0aGUgbGFiZWxzCisgICAgICAgIGhhZCBub3QgY2hhbmdlZCBzaW5jZSB0aGUgbGFzdCBy ZXF1ZXN0QW5pbWF0aW9uRnJhbWUuIEJhaWwgb3V0IGVhcmx5IGlmIG5vdGhpbmcgY2hhbmdlZC4K KworICAgICAgICBUaGUgdGltZWxpbmUgb3ZlcnZpZXcgYW5kIGl0cyBncmFwaHMgd2VyZSB1cGRh dGluZyBsYXlvdXQgdXNpbmcgcmVxdWVzdEFuaW1hdGlvbkZyYW1lCisgICAgICAgIGV2ZW4gd2hl biB0aGUgVGltZWxpbmVDb250ZW50VmlldyBpcyBub3QgdmlzaWJsZS4gRml4IHRoaXMgYnkgcHJv cGFnYXRpbmcgdmlzaWJpbGl0eQorICAgICAgICBjaGFuZ2VzIHRvIHN1YnZpZXdzLCBhbmQgbm90 IHVwZGF0aW5nIGxheW91dCB3aGVuIGhpZGRlbi4KKworICAgICAgICBUaGUgYWJvdmUgY2hhbmdl IGFsc28gZml4ZXMgYW4gYXNzZXJ0aW9uIHNvbWV0aW1lcyBlbmNvdW50ZXJlZCB3aGVuIHRoZSB0 aW1lbGluZSB2aWV3CisgICAgICAgIHRyaWVzIHRvIGNhY2hlIGFuIGVsZW1lbnQncyBvZmZzZXQg d2lkdGgsIGJ1dCBjYW5ub3QgYmVjYXVzZSBpdCBpc24ndCB2aXNpYmxlLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lQ29udGVudFZpZXcucHJvdG90eXBlLnNob3duKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5oaWRkZW4pOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5nZXQgdmlzaWJsZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuc2hvd24pOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlLmhpZGRlbik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX25lZWRz TGF5b3V0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXdH cmFwaC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJv dG90eXBlLmdldCB2aXNpYmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3R3JhcGgucHJvdG90eXBlLnNob3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGlu ZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBlLmhpZGRlbik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5uZWVkc0xheW91dCk6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lUnVsZXIucHJvdG90eXBlLnVwZGF0ZUxheW91dCk6CisKIDIwMTUtMDEtMTIg IEJyaWFuIEouIEJ1cmcgIDxidXJnQGNzLndhc2hpbmd0b24uZWR1PgogCiAgICAgICAgIFdlYiBS ZXBsYXk6IHJlY29yZCBldmVudCBsb29wIHRpbWluZ3MgdXNpbmcgZWxhcHNlZCB0aW1lIGR1cmlu ZyBjYXB0dXJpbmcgb25seQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lQ29udGVudFZpZXcuanMKaW5kZXggMTIy MjE2Zjk5YzM2ODlkY2U5ZTViNGE1NjU0MWVlNTUzZDU2ZWZhOS4uNDhmZGJhMWMwOGQxMTc1Zjkz OTBjZjA0NTY3ZTM3NTk2OWJkNjBlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZUNvbnRlbnRWaWV3Lmpz CkBAIC0xNzIsOCArMTcyLDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCF0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3KQogICAg ICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuc2hvd24o KTsKICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5zaG93bigpOwogICAgICAgICB0 aGlzLl9jbGVhclRpbWVsaW5lTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IHRoaXMuX3JlY29yZGlu Zy5pc1dyaXRhYmxlKCk7CisKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFn ZXIuYWN0aXZlUmVjb3JkaW5nID09PSB0aGlzLl9yZWNvcmRpbmcgJiYgV2ViSW5zcGVjdG9yLnRp bWVsaW5lTWFuYWdlci5pc0NhcHR1cmluZygpKQorICAgICAgICAgICAgdGhpcy5fc3RhcnRVcGRh dGluZ0N1cnJlbnRUaW1lKCk7CiAgICAgfSwKIAogICAgIGhpZGRlbjogZnVuY3Rpb24oKQpAQCAt MTgxLDcgKzE4NSwxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGlmICghdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldykKICAgICAgICAg ICAgIHJldHVybjsKIAorICAgICAgICB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LmhpZGRlbigpOwog ICAgICAgICB0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3LmhpZGRlbigpOworCisgICAgICAgIGlm ICh0aGlzLl91cGRhdGluZykKKyAgICAgICAgICAgIHRoaXMuX3N0b3BVcGRhdGluZ0N1cnJlbnRU aW1lKCk7CiAgICAgfSwKIAogICAgIGZpbHRlckRpZENoYW5nZTogZnVuY3Rpb24oKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVP dmVydmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lT3ZlcnZpZXcuanMKaW5kZXggY2ZjNDA4YWIxNGM1Njg0ZmE2ZmJjYWFiZDliOTg4YmJm NzQ3NWVmMS4uZDNlM2EzMGI5NDA2NTI3ODQwYWZjZTRiYmE3YWFmNjUwY2U2ZTBlYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVP dmVydmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZU92ZXJ2aWV3LmpzCkBAIC0yMzAsNiArMjMwLDI5IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbmVlZHNMYXlvdXQo KTsKICAgICB9LAogCisgICAgZ2V0IHZpc2libGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRo aXMuX3Zpc2libGU7CisgICAgfSwKKworICAgIHNob3duOiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICB0aGlzLl92aXNpYmxlID0gdHJ1ZTsKKworICAgICAgICBmb3IgKHZhciB0aW1lbGluZU92 ZXJ2aWV3R3JhcGggb2YgdGhpcy5fdGltZWxpbmVPdmVydmlld0dyYXBoc01hcC52YWx1ZXMoKSkK KyAgICAgICAgICAgIHRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5zaG93bigpOworCisgICAgICAgIHRo aXMudXBkYXRlTGF5b3V0KCk7CisgICAgfSwKKworICAgIGhpZGRlbjogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgdGhpcy5fdmlzaWJsZSA9IGZhbHNlOworCisgICAgICAgIGZvciAodmFyIHRp bWVsaW5lT3ZlcnZpZXdHcmFwaCBvZiB0aGlzLl90aW1lbGluZU92ZXJ2aWV3R3JhcGhzTWFwLnZh bHVlcygpKQorICAgICAgICAgICAgdGltZWxpbmVPdmVydmlld0dyYXBoLmhpZGRlbigpOworICAg IH0sCisKICAgICBhZGRNYXJrZXI6IGZ1bmN0aW9uKG1hcmtlcikKICAgICB7CiAgICAgICAgIHRo aXMuX3RpbWVsaW5lUnVsZXIuYWRkTWFya2VyKG1hcmtlcik7CkBAIC0zMTcsOCArMzQwLDEyIEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKIAogICAgIF9uZWVk c0xheW91dDogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl92aXNpYmxlKQor ICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIGlmICh0aGlzLl9zY2hlZHVsZWRMYXlvdXRV cGRhdGVJZGVudGlmaWVyKQogICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIHRoaXMuX3Nj aGVkdWxlZExheW91dFVwZGF0ZUlkZW50aWZpZXIgPSByZXF1ZXN0QW5pbWF0aW9uRnJhbWUodGhp cy51cGRhdGVMYXlvdXQuYmluZCh0aGlzKSk7CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBo LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVP dmVydmlld0dyYXBoLmpzCmluZGV4IDY1NmMyNmRhMWNkNjAyNzQ3YjVkNTE0Njk5ZWRkNmYyMTlj YWU5ZTEuLjllZjcwOGRjMGUyMDk2OWUwMGNlZGZjYTQ3OWQ2ZTkwZGNiZTcyNmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3Zl cnZpZXdHcmFwaC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKQEAgLTE1OCw2ICsxNTgsMjIgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMu bmVlZHNMYXlvdXQoKTsKICAgICB9LAogCisgICAgZ2V0IHZpc2libGUoKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIHRoaXMuX3Zpc2libGU7CisgICAgfSwKKworICAgIHNob3duOiBmdW5jdGlvbigp CisgICAgeworICAgICAgICB0aGlzLl92aXNpYmxlID0gdHJ1ZTsKKyAgICAgICAgdGhpcy51cGRh dGVMYXlvdXQoKTsKKyAgICB9LAorCisgICAgaGlkZGVuOiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICB0aGlzLl92aXNpYmxlID0gZmFsc2U7CisgICAgfSwKKwogICAgIHJlc2V0OiBmdW5jdGlv bigpCiAgICAgewogICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWItY2xhc3NlcyBpZiBuZWVk ZWQuCkBAIC0xODQsNiArMjAwLDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdHcmFw aC5wcm90b3R5cGUgPSB7CiAKICAgICBuZWVkc0xheW91dDogZnVuY3Rpb24oKQogICAgIHsKKyAg ICAgICAgaWYgKCF0aGlzLl92aXNpYmxlKQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAg IGlmICh0aGlzLl9zY2hlZHVsZWRMYXlvdXRVcGRhdGVJZGVudGlmaWVyKQogICAgICAgICAgICAg cmV0dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcwppbmRleCBiZWEyYTNmYTY0ZDc5NGZkMTA5NDcw ZTMxMDY3ZGQxMzIwMDk3OTMwLi4wYTFkNmZiZjhlMDQ2MzYyYTE5NTcxZTY0N2I3NDAyNzNiNTJk ZmJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVJ1bGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuanMKQEAgLTM0OCw2ICszNDgsMTYgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lUnVsZXIucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX2VuZFRp bWVQaW5uZWQpCiAgICAgICAgICAgICArK2RpdmlkZXJDb3VudDsKIAorICAgICAgICB2YXIgZGl2 aWRlckRhdGEgPSB7CisgICAgICAgICAgICBjb3VudDogZGl2aWRlckNvdW50LAorICAgICAgICAg ICAgZmlyc3RUaW1lOiBmaXJzdERpdmlkZXJUaW1lLAorICAgICAgICAgICAgbGFzdFRpbWU6IGxh c3REaXZpZGVyVGltZSwKKyAgICAgICAgfQorCisgICAgICAgIGlmIChPYmplY3Quc2hhbGxvd0Vx dWFsKGRpdmlkZXJEYXRhLCB0aGlzLl9jdXJyZW50RGl2aWRlcnMpKQorICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB0aGlzLl9jdXJyZW50RGl2aWRlcnMgPSBkaXZpZGVyRGF0YTsKKwogICAg ICAgICB2YXIgbWFya2VyRGl2aWRlcnMgPSB0aGlzLl9tYXJrZXJzRWxlbWVudC5xdWVyeVNlbGVj dG9yQWxsKCIuIiArIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLkRpdmlkZXJFbGVtZW50U3R5 bGVDbGFzc05hbWUpOwogCiAgICAgICAgIHZhciBkaXZpZGVyRWxlbWVudCA9IHRoaXMuX2hlYWRl ckVsZW1lbnQuZmlyc3RDaGlsZDsK 246109 2015-02-05 10:38:43 -0800 2015-02-05 12:12:44 -0800 Proposed Fix bug-141293-20150205103843.patch text/plain 6937 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5NDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj OGY2NmFiYWMyYzJhNTUxZDQ5MGU2YTVjYWNkNmIwY2MwMzY3YTgwLi5iNTBlNzJlNWYwOTAyMjVh ZmVjZDdlZTA1OWE5YzJhMGFiMmFmODIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNiBAQAorMjAxNS0wMi0wNSAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rv bi5lZHU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogZWxpbWluYXRlIHNvbWUgdW5uZWNlc3Nh cnkgbGF5b3V0L3BhaW50aW5nIGluIHRpbWVsaW5lIG92ZXJ2aWV3IGFuZCBydWxlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMjkzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHRpbWVsaW5lIG92 ZXJ2aWV3J3MgcnVsZXIgd2FzIGZvcmNpbmcgcmVwYWludHMgb2YgZGl2aWRlciBsYWJlbHMgZXZl biBpZiB0aGUgbGFiZWxzCisgICAgICAgIGhhZCBub3QgY2hhbmdlZCBzaW5jZSB0aGUgbGFzdCBy ZXF1ZXN0QW5pbWF0aW9uRnJhbWUuIEJhaWwgb3V0IGVhcmx5IGlmIG5vdGhpbmcgY2hhbmdlZC4K KworICAgICAgICBUaGUgdGltZWxpbmUgb3ZlcnZpZXcgYW5kIGl0cyBncmFwaHMgd2VyZSB1cGRh dGluZyBsYXlvdXQgdXNpbmcgcmVxdWVzdEFuaW1hdGlvbkZyYW1lCisgICAgICAgIGV2ZW4gd2hl biB0aGUgVGltZWxpbmVDb250ZW50VmlldyBpcyBub3QgdmlzaWJsZS4gRml4IHRoaXMgYnkgcHJv cGFnYXRpbmcgdmlzaWJpbGl0eQorICAgICAgICBjaGFuZ2VzIHRvIHN1YnZpZXdzLCBhbmQgbm90 IHVwZGF0aW5nIGxheW91dCB3aGVuIGhpZGRlbi4KKworICAgICAgICBUaGUgYWJvdmUgY2hhbmdl IGFsc28gZml4ZXMgYW4gYXNzZXJ0aW9uIHNvbWV0aW1lcyBlbmNvdW50ZXJlZCB3aGVuIHRoZSB0 aW1lbGluZSB2aWV3CisgICAgICAgIHRyaWVzIHRvIGNhY2hlIGFuIGVsZW1lbnQncyBvZmZzZXQg d2lkdGgsIGJ1dCBjYW5ub3QgYmVjYXVzZSBpdCBpc24ndCB2aXNpYmxlLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lQ29udGVudFZpZXcucHJvdG90eXBlLnNob3duKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5oaWRkZW4pOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5nZXQgdmlzaWJsZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuc2hvd24pOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlLmhpZGRlbik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX25lZWRz TGF5b3V0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXdH cmFwaC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJv dG90eXBlLmdldCB2aXNpYmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3R3JhcGgucHJvdG90eXBlLnNob3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGlu ZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBlLmhpZGRlbik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5uZWVkc0xheW91dCk6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lUnVsZXIucHJvdG90eXBlLnVwZGF0ZUxheW91dCk6CisKIDIwMTUtMDEtMTIg IEJyaWFuIEouIEJ1cmcgIDxidXJnQGNzLndhc2hpbmd0b24uZWR1PgogCiAgICAgICAgIFdlYiBS ZXBsYXk6IHJlY29yZCBldmVudCBsb29wIHRpbWluZ3MgdXNpbmcgZWxhcHNlZCB0aW1lIGR1cmlu ZyBjYXB0dXJpbmcgb25seQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lQ29udGVudFZpZXcuanMKaW5kZXggMTIy MjE2Zjk5YzM2ODlkY2U5ZTViNGE1NjU0MWVlNTUzZDU2ZWZhOS4uOTE5OGZkYzc5NWVkNmYzZjg0 MDQwNTJkMjcxYjBlNGMzNTFhZWE2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZUNvbnRlbnRWaWV3Lmpz CkBAIC0xNzIsOCArMTcyLDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCF0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3KQogICAg ICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuc2hvd24o KTsKICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5zaG93bigpOwogICAgICAgICB0 aGlzLl9jbGVhclRpbWVsaW5lTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IHRoaXMuX3JlY29yZGlu Zy5pc1dyaXRhYmxlKCk7CisKKyAgICAgICAgaWYgKCF0aGlzLl91cGRhdGluZyAmJiBXZWJJbnNw ZWN0b3IudGltZWxpbmVNYW5hZ2VyLmFjdGl2ZVJlY29yZGluZyA9PT0gdGhpcy5fcmVjb3JkaW5n ICYmIFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIuaXNDYXB0dXJpbmcoKSkKKyAgICAgICAg ICAgIHRoaXMuX3N0YXJ0VXBkYXRpbmdDdXJyZW50VGltZSgpOwogICAgIH0sCiAKICAgICBoaWRk ZW46IGZ1bmN0aW9uKCkKQEAgLTE4MSw3ICsxODUsMTEgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l Q29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX2N1cnJlbnRUaW1l bGluZVZpZXcpCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgdGhpcy5fdGltZWxpbmVP dmVydmlldy5oaWRkZW4oKTsKICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5oaWRk ZW4oKTsKKworICAgICAgICBpZiAodGhpcy5fdXBkYXRpbmcpCisgICAgICAgICAgICB0aGlzLl9z dG9wVXBkYXRpbmdDdXJyZW50VGltZSgpOwogICAgIH0sCiAKICAgICBmaWx0ZXJEaWRDaGFuZ2U6 IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzCmluZGV4IGNmYzQwOGFiMTRjNTY4 NGZhNmZiY2FhYmQ5Yjk4OGJiZjc0NzVlZjEuLmQzZTNhMzBiOTQwNjUyNzg0MGFmY2U0YmJhN2Fh ZjY1MGNlNmUwZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcwpAQCAtMjMwLDYgKzIzMCwy OSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuX25lZWRzTGF5b3V0KCk7CiAgICAgfSwKIAorICAgIGdldCB2aXNpYmxlKCkKKyAgICB7 CisgICAgICAgIHJldHVybiB0aGlzLl92aXNpYmxlOworICAgIH0sCisKKyAgICBzaG93bjogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fdmlzaWJsZSA9IHRydWU7CisKKyAgICAgICAg Zm9yICh2YXIgdGltZWxpbmVPdmVydmlld0dyYXBoIG9mIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXdH cmFwaHNNYXAudmFsdWVzKCkpCisgICAgICAgICAgICB0aW1lbGluZU92ZXJ2aWV3R3JhcGguc2hv d24oKTsKKworICAgICAgICB0aGlzLnVwZGF0ZUxheW91dCgpOworICAgIH0sCisKKyAgICBoaWRk ZW46IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Zpc2libGUgPSBmYWxzZTsKKwor ICAgICAgICBmb3IgKHZhciB0aW1lbGluZU92ZXJ2aWV3R3JhcGggb2YgdGhpcy5fdGltZWxpbmVP dmVydmlld0dyYXBoc01hcC52YWx1ZXMoKSkKKyAgICAgICAgICAgIHRpbWVsaW5lT3ZlcnZpZXdH cmFwaC5oaWRkZW4oKTsKKyAgICB9LAorCiAgICAgYWRkTWFya2VyOiBmdW5jdGlvbihtYXJrZXIp CiAgICAgewogICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLmFkZE1hcmtlcihtYXJrZXIpOwpA QCAtMzE3LDggKzM0MCwxMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5 cGUgPSB7CiAKICAgICBfbmVlZHNMYXlvdXQ6IGZ1bmN0aW9uKCkKICAgICB7CisgICAgICAgIGlm ICghdGhpcy5fdmlzaWJsZSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBpZiAodGhp cy5fc2NoZWR1bGVkTGF5b3V0VXBkYXRlSWRlbnRpZmllcikKICAgICAgICAgICAgIHJldHVybjsK KwogICAgICAgICB0aGlzLl9zY2hlZHVsZWRMYXlvdXRVcGRhdGVJZGVudGlmaWVyID0gcmVxdWVz dEFuaW1hdGlvbkZyYW1lKHRoaXMudXBkYXRlTGF5b3V0LmJpbmQodGhpcykpOwogICAgIH0sCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lT3ZlcnZpZXdHcmFwaC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwppbmRleCA2NTZjMjZkYTFjZDYwMjc0 N2I1ZDUxNDY5OWVkZDZmMjE5Y2FlOWUxLi45ZWY3MDhkYzBlMjA5NjllMDBjZWRmY2E0NzlkNmU5 MGRjYmU3MjZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBoLmpzCkBAIC0xNTgs NiArMTU4LDIyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBl ID0gewogICAgICAgICB0aGlzLm5lZWRzTGF5b3V0KCk7CiAgICAgfSwKIAorICAgIGdldCB2aXNp YmxlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl92aXNpYmxlOworICAgIH0sCisKKyAg ICBzaG93bjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fdmlzaWJsZSA9IHRydWU7 CisgICAgICAgIHRoaXMudXBkYXRlTGF5b3V0KCk7CisgICAgfSwKKworICAgIGhpZGRlbjogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fdmlzaWJsZSA9IGZhbHNlOworICAgIH0sCisK ICAgICByZXNldDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgLy8gSW1wbGVtZW50ZWQgYnkg c3ViLWNsYXNzZXMgaWYgbmVlZGVkLgpAQCAtMTg0LDYgKzIwMCw5IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBlID0gewogCiAgICAgbmVlZHNMYXlvdXQ6IGZ1 bmN0aW9uKCkKICAgICB7CisgICAgICAgIGlmICghdGhpcy5fdmlzaWJsZSkKKyAgICAgICAgICAg IHJldHVybjsKKwogICAgICAgICBpZiAodGhpcy5fc2NoZWR1bGVkTGF5b3V0VXBkYXRlSWRlbnRp ZmllcikKICAgICAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuanMKaW5kZXggYmVh MmEzZmE2NGQ3OTRmZDEwOTQ3MGUzMTA2N2RkMTMyMDA5NzkzMC4uMGExZDZmYmY4ZTA0NjM2MmEx OTU3MWU2NDdiNzQwMjczYjUyZGZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmpzCkBAIC0zNDgsNiAr MzQ4LDE2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLnByb3RvdHlwZSA9IHsKICAgICAg ICAgaWYgKCF0aGlzLl9lbmRUaW1lUGlubmVkKQogICAgICAgICAgICAgKytkaXZpZGVyQ291bnQ7 CiAKKyAgICAgICAgdmFyIGRpdmlkZXJEYXRhID0geworICAgICAgICAgICAgY291bnQ6IGRpdmlk ZXJDb3VudCwKKyAgICAgICAgICAgIGZpcnN0VGltZTogZmlyc3REaXZpZGVyVGltZSwKKyAgICAg ICAgICAgIGxhc3RUaW1lOiBsYXN0RGl2aWRlclRpbWUsCisgICAgICAgIH0KKworICAgICAgICBp ZiAoT2JqZWN0LnNoYWxsb3dFcXVhbChkaXZpZGVyRGF0YSwgdGhpcy5fY3VycmVudERpdmlkZXJz KSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fY3VycmVudERpdmlkZXJzID0g ZGl2aWRlckRhdGE7CisKICAgICAgICAgdmFyIG1hcmtlckRpdmlkZXJzID0gdGhpcy5fbWFya2Vy c0VsZW1lbnQucXVlcnlTZWxlY3RvckFsbCgiLiIgKyBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxl ci5EaXZpZGVyRWxlbWVudFN0eWxlQ2xhc3NOYW1lKTsKIAogICAgICAgICB2YXIgZGl2aWRlckVs ZW1lbnQgPSB0aGlzLl9oZWFkZXJFbGVtZW50LmZpcnN0Q2hpbGQ7Cg==