194793 2019-02-18 14:59:03 -0800 Web Inspector: Provide a way to avoid a recording auto-stop on reload 2019-02-22 11:56:02 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 194956 1 joepeck joepeck commit-queue inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1507462 0 joepeck 2019-02-18 14:59:03 -0800 Provide a way to avoid a recording auto-stop on reload Often with Timelines I want to record a load, interact with the page and stop. However with since there is an auto stop mechanism (dead time / max timeout) I have no way of guaranteeing the recording won't stop before the end of my interactions. For starters, a way to record without auto-stop, or disable / relax the auto-stop would be great. 1507466 1 362343 joepeck 2019-02-18 15:01:04 -0800 Created attachment 362343 [PATCH] Proposed Fix This has bugged me for a very long time, this gives me at least one way to avoid an auto-stop. 1507481 2 362343 mattbaker 2019-02-18 15:17:55 -0800 Comment on attachment 362343 [PATCH] Proposed Fix r=me, I've also wanted this! I think we could potentially iterate on this UI in the future, but it's a good start. Right now it requires knowing the keyboard shortcut, and pressing override within a potentially very brief window. My only comment before landing is to fix the "continue" button appearance in dark mode. It's current black-on-darkgray. 1507506 3 joepeck 2019-02-18 15:57:37 -0800 > My only comment before landing is to fix the "continue" button appearance in > dark mode. It's current black-on-darkgray. Good catch, fixed. 1507507 4 362352 joepeck 2019-02-18 15:57:59 -0800 Created attachment 362352 [PATCH] For Landing 1507537 5 362352 commit-queue 2019-02-18 16:52:46 -0800 Comment on attachment 362352 [PATCH] For Landing Clearing flags on attachment: 362352 Committed r241750: <https://trac.webkit.org/changeset/241750> 1507548 6 webkit-bug-importer 2019-02-18 17:31:09 -0800 <rdar://problem/48184907> 362343 2019-02-18 15:01:04 -0800 2019-02-18 15:57:23 -0800 [PATCH] Proposed Fix auto-stop-1.patch text/plain 9681 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGVkODA5Y2JlZjA5Li5iZTU4ZTYwNDZmMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTktMDItMTggIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBQcm92aWRlIGEgd2F5IHRvIGF2b2lkIGEgcmVjb3JkaW5nIGF1dG8tc3RvcCBvbiByZWxvYWQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDc5Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICBOZXcgdG9vbHRp cC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2Vy LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZS53aWxsQXV0b1N0b3Ap OgorICAgICAgICAoV0kuVGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZS5yZWxheEF1dG9TdG9wKToK KyAgICAgICAgR2V0dGVyIGFuZCByZWxheGVyIGZvciBhdXRvIHN0b3AgYmVoYXZpb3IuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0TmF2aWdhdGlvblNpZGViYXJQYW5lbC5q czoKKyAgICAgICAgKFdJLkF1ZGl0TmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuc2hv d0RlZmF1bHRDb250ZW50Vmlldyk6CisgICAgICAgIERyaXZlLWJ5IGZpeCBzb21lIHdoaXRlc3Bh Y2UgaXNzdWVzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNv bnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVUYWJDb250ZW50Vmlldyk6CisgICAg ICAgIChXSS5UaW1lbGluZVRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fc2hvd1JlY29yZEJ1dHRv bik6CisgICAgICAgIChXSS5UaW1lbGluZVRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fc2hvd0Nv bnRpbnVlQnV0dG9uKToKKyAgICAgICAgKFdJLlRpbWVsaW5lVGFiQ29udGVudFZpZXcucHJvdG90 eXBlLl91cGRhdGVOYXZpZ2F0aW9uQmFyQnV0dG9ucyk6CisgICAgICAgIChXSS5UaW1lbGluZVRh YkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY2FwdHVyaW5nU3RhcnRlZE9yU3RvcHBlZCk6CisgICAg ICAgIChXSS5UaW1lbGluZVRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fZ2xvYmFsTW9kaWZpZXJL ZXlzRGlkQ2hhbmdlKToKKyAgICAgICAgKFdJLlRpbWVsaW5lVGFiQ29udGVudFZpZXcucHJvdG90 eXBlLl9jb250aW51ZUJ1dHRvbkNsaWNrZWQpOgorICAgICAgICBTaG93IGEgImNvbnRpbnVlIiBs aWtlIGljb24gaW5zdGVhZCBvZiB0aGUgdXN1YWwgc3RvcCBidXR0b24gd2hlbgorICAgICAgICBh IHJlY29yZGluZyB3b3VsZCBhdXRvLXN0b3AgYW5kIHRoZSBhbHQga2V5IGlzIGRvd24uIFdoZW4g cHJlc3NlZAorICAgICAgICB0aGlzIGJ1dHRvbiB3aWxsIHJlbGF4IHRoZSBhdXRvLXN0b3AgYW5k IGNvbnRpbnVlIHRoZSByZWNvcmRpbmcKKyAgICAgICAgdW50aWwgZXhwbGljaXRseSBzdG9wcGVk IGJ5IHRoZSB1c2VyLgorCiAyMDE5LTAyLTE4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0Bh cHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IGEgdHlwbyBjYXVzaW5nIGFz c2VydGlvbnMgaW4gQ29uc29sZU1hbmFnZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz CmluZGV4IGIyOWU5MjY4MzE5Li42MGU1MWU2MjY2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCkBAIC0yNTQsNiArMjU0LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siQ29udGVudCBT ZWN1cml0eSBQb2xpY3kgdmlvbGF0aW9uIG9mIGRpcmVjdGl2ZTogJXMiXSA9ICJDb250ZW4KIGxv Y2FsaXplZFN0cmluZ3NbIkNvbnRpbnVhdGlvbiBGcmFtZSJdID0gIkNvbnRpbnVhdGlvbiBGcmFt ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb250aW51ZSBzY3JpcHQgZXhlY3V0aW9uICglcyBvciAl cykiXSA9ICJDb250aW51ZSBzY3JpcHQgZXhlY3V0aW9uICglcyBvciAlcykiOwogbG9jYWxpemVk U3RyaW5nc1siQ29udGludWUgdG8gSGVyZSJdID0gIkNvbnRpbnVlIHRvIEhlcmUiOworbG9jYWxp emVkU3RyaW5nc1siQ29udGludWUgd2l0aG91dCBhdXRvbWF0aWNhbGx5IHN0b3BwaW5nIl0gPSAi Q29udGludWUgd2l0aG91dCBhdXRvbWF0aWNhbGx5IHN0b3BwaW5nIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkNvbnRyb2xzIl0gPSAiQ29udHJvbHMiOwogbG9jYWxpemVkU3RyaW5nc1siQ29va2llcyJd ID0gIkNvb2tpZXMiOwogbG9jYWxpemVkU3RyaW5nc1siQ29weSJdID0gIkNvcHkiOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGlt ZWxpbmVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCmluZGV4IDYyYzFkMTExN2E5Li44Y2E5ZDk3YmE0 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwpAQCAtMjAxLDYgKzIwMSwy NCBAQCBXSS5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1lbGluZU1hbmFnZXIgZXh0ZW5kcyBX SS5PYmplY3QKICAgICAgICAgcmV0dXJuIHRoaXMuX2lzQ2FwdHVyaW5nUGFnZVJlbG9hZDsKICAg ICB9CiAKKyAgICB3aWxsQXV0b1N0b3AoKQorICAgIHsKKyAgICAgICAgcmV0dXJuICEhdGhpcy5f c3RvcENhcHR1cmluZ1RpbWVvdXQ7CisgICAgfQorCisgICAgcmVsYXhBdXRvU3RvcCgpCisgICAg eworICAgICAgICBpZiAodGhpcy5fc3RvcENhcHR1cmluZ1RpbWVvdXQpIHsKKyAgICAgICAgICAg IGNsZWFyVGltZW91dCh0aGlzLl9zdG9wQ2FwdHVyaW5nVGltZW91dCk7CisgICAgICAgICAgICB0 aGlzLl9zdG9wQ2FwdHVyaW5nVGltZW91dCA9IHVuZGVmaW5lZDsKKyAgICAgICAgfQorCisgICAg ICAgIGlmICh0aGlzLl9kZWFkVGltZVRpbWVvdXQpIHsKKyAgICAgICAgICAgIGNsZWFyVGltZW91 dCh0aGlzLl9kZWFkVGltZVRpbWVvdXQpOworICAgICAgICAgICAgdGhpcy5fZGVhZFRpbWVUaW1l b3V0ID0gdW5kZWZpbmVkOworICAgICAgICB9CisgICAgfQorCiAgICAgc3RhcnRDYXB0dXJpbmco c2hvdWxkQ3JlYXRlUmVjb3JkaW5nKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQoIXRo aXMuX2lzQ2FwdHVyaW5nLCAiVGltZWxpbmVNYW5hZ2VyIGlzIGFscmVhZHkgY2FwdHVyaW5nLiIp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv QXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCmluZGV4IDFj MTc2MzVjZjQ4Li45ZWMyYmY3ZjU5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0TmF2aWdhdGlv blNpZGViYXJQYW5lbC5qcwpAQCAtNTIsMTEgKzUyLDExIEBAIFdJLkF1ZGl0TmF2aWdhdGlvblNp ZGViYXJQYW5lbCA9IGNsYXNzIEF1ZGl0TmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRzIFdJ Lk5hCiAgICAgICAgICAgICBsZXQgY29udGVudFBsYWNlaG9sZGVyID0gV0kuY3JlYXRlTWVzc2Fn ZVRleHRWaWV3KFdJLlVJU3RyaW5nKCJObyBhdWRpdCBzZWxlY3RlZCIpKTsKICAgICAgICAgICAg IGNvbnRlbnRWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQoY29udGVudFBsYWNlaG9sZGVyKTsKIAot ICAgICAgICAgICAgIGxldCBpbXBvcnROYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5CdXR0b25OYXZp Z2F0aW9uSXRlbSgiaW1wb3J0LWF1ZGl0IiwgV0kuVUlTdHJpbmcoIkltcG9ydCIpLCAiSW1hZ2Vz L0ltcG9ydC5zdmciLCAxNSwgMTUpOworICAgICAgICAgICAgbGV0IGltcG9ydE5hdmlnYXRpb25J dGVtID0gbmV3IFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJpbXBvcnQtYXVkaXQiLCBXSS5VSVN0 cmluZygiSW1wb3J0IiksICJJbWFnZXMvSW1wb3J0LnN2ZyIsIDE1LCAxNSk7CiAgICAgICAgICAg ICBpbXBvcnROYXZpZ2F0aW9uSXRlbS5idXR0b25TdHlsZSA9IFdJLkJ1dHRvbk5hdmlnYXRpb25J dGVtLlN0eWxlLkltYWdlQW5kVGV4dDsKICAgICAgICAgICAgIGltcG9ydE5hdmlnYXRpb25JdGVt LmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwg dGhpcy5faGFuZGxlSW1wb3J0QnV0dG9uTmF2aWdhdGlvbkl0ZW1DbGlja2VkLCB0aGlzKTsKIAot ICAgICAgICAgICAgIGxldCBpbXBvcnRIZWxwRWxlbWVudCA9IFdJLmNyZWF0ZU5hdmlnYXRpb25J dGVtSGVscChXSS5VSVN0cmluZygiUHJlc3MgJXMgdG8gaW1wb3J0IGEgdGVzdCBvciByZXN1bHQg ZmlsZSIpLCBpbXBvcnROYXZpZ2F0aW9uSXRlbSk7CisgICAgICAgICAgICBsZXQgaW1wb3J0SGVs cEVsZW1lbnQgPSBXSS5jcmVhdGVOYXZpZ2F0aW9uSXRlbUhlbHAoV0kuVUlTdHJpbmcoIlByZXNz ICVzIHRvIGltcG9ydCBhIHRlc3Qgb3IgcmVzdWx0IGZpbGUiKSwgaW1wb3J0TmF2aWdhdGlvbkl0 ZW0pOwogICAgICAgICAgICAgY29udGVudFBsYWNlaG9sZGVyLmFwcGVuZENoaWxkKGltcG9ydEhl bHBFbGVtZW50KTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmll dy5qcwppbmRleCBlOWQ3MGNlY2RjZS4uZGIxMzliODc1N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxp bmVUYWJDb250ZW50Vmlldy5qcwpAQCAtNTIsNyArNTIsMTMgQEAgV0kuVGltZWxpbmVUYWJDb250 ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5lVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 QnJvd3MKICAgICAgICAgdGhpcy5fcmVjb3JkQnV0dG9uLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJ Lk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CiAgICAgICAgIHRoaXMuX3Jl Y29yZEJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtLkV2ZW50 LkNsaWNrZWQsIHRoaXMuX3JlY29yZEJ1dHRvbkNsaWNrZWQsIHRoaXMpOwogCisgICAgICAgIHRo aXMuX2NvbnRpbnVlQnV0dG9uID0gbmV3IFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJyZWNvcmQt Y29udGludWUiLCBXSS5VSVN0cmluZygiQ29udGludWUgd2l0aG91dCBhdXRvbWF0aWNhbGx5IHN0 b3BwaW5nIiksICJJbWFnZXMvUmVzdW1lLnN2ZyIsIDEzLCAxMyk7CisgICAgICAgIHRoaXMuX2Nv bnRpbnVlQnV0dG9uLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2li aWxpdHlQcmlvcml0eS5Mb3c7CisgICAgICAgIHRoaXMuX2NvbnRpbnVlQnV0dG9uLmFkZEV2ZW50 TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fY29u dGludWVCdXR0b25DbGlja2VkLCB0aGlzKTsKKyAgICAgICAgdGhpcy5fY29udGludWVCdXR0b24u aGlkZGVuID0gdHJ1ZTsKKwogICAgICAgICB0aGlzLmNvbnRlbnRCcm93c2VyLm5hdmlnYXRpb25C YXIuaW5zZXJ0TmF2aWdhdGlvbkl0ZW0odGhpcy5fcmVjb3JkQnV0dG9uLCAwKTsKKyAgICAgICAg dGhpcy5jb250ZW50QnJvd3Nlci5uYXZpZ2F0aW9uQmFyLmluc2VydE5hdmlnYXRpb25JdGVtKHRo aXMuX2NvbnRpbnVlQnV0dG9uLCAxKTsKIAogICAgICAgICBpZiAoV0kuRlBTSW5zdHJ1bWVudC5z dXBwb3J0ZWQoKSkgewogICAgICAgICAgICAgbGV0IHRpbWVsaW5lc05hdmlnYXRpb25JdGVtID0g bmV3IFdJLlJhZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0oV0kuVGltZWxpbmVPdmVydmlldy5WaWV3 TW9kZS5UaW1lbGluZXMsIFdJLlVJU3RyaW5nKCJFdmVudHMiKSk7CkBAIC02MSw3ICs2Nyw3IEBA IFdJLlRpbWVsaW5lVGFiQ29udGVudFZpZXcgPSBjbGFzcyBUaW1lbGluZVRhYkNvbnRlbnRWaWV3 IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzCiAgICAgICAgICAgICBsZXQgdmlld01vZGVHcm91cCA9 IG5ldyBXSS5Hcm91cE5hdmlnYXRpb25JdGVtKFt0aW1lbGluZXNOYXZpZ2F0aW9uSXRlbSwgcmVu ZGVyaW5nRnJhbWVzTmF2aWdhdGlvbkl0ZW1dKTsKICAgICAgICAgICAgIHZpZXdNb2RlR3JvdXAu dmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0eVByaW9yaXR5 LkhpZ2g7CiAKLSAgICAgICAgICAgIHRoaXMuY29udGVudEJyb3dzZXIubmF2aWdhdGlvbkJhci5p bnNlcnROYXZpZ2F0aW9uSXRlbSh2aWV3TW9kZUdyb3VwLCAxKTsKKyAgICAgICAgICAgIHRoaXMu Y29udGVudEJyb3dzZXIubmF2aWdhdGlvbkJhci5pbnNlcnROYXZpZ2F0aW9uSXRlbSh2aWV3TW9k ZUdyb3VwLCAyKTsKICAgICAgICAgICAgIHRoaXMuY29udGVudEJyb3dzZXIubmF2aWdhdGlvbkJh ci5hZGRFdmVudExpc3RlbmVyKFdJLk5hdmlnYXRpb25CYXIuRXZlbnQuTmF2aWdhdGlvbkl0ZW1T ZWxlY3RlZCwgdGhpcy5fdmlld01vZGVTZWxlY3RlZCwgdGhpcyk7CiAgICAgICAgIH0KIApAQCAt NzIsNiArNzgsNyBAQCBXSS5UaW1lbGluZVRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVU YWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93cwogICAgICAgICBXSS50aW1lbGlu ZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5UaW1lbGluZU1hbmFnZXIuRXZlbnQuQ2FwdHVy aW5nU3RvcHBlZCwgdGhpcy5fY2FwdHVyaW5nU3RhcnRlZE9yU3RvcHBlZCwgdGhpcyk7CiAKICAg ICAgICAgV0kubm90aWZpY2F0aW9ucy5hZGRFdmVudExpc3RlbmVyKFdJLk5vdGlmaWNhdGlvbi5W aXNpYmlsaXR5U3RhdGVEaWRDaGFuZ2UsIHRoaXMuX2luc3BlY3RvclZpc2liaWxpdHlDaGFuZ2Vk LCB0aGlzKTsKKyAgICAgICAgV0kubm90aWZpY2F0aW9ucy5hZGRFdmVudExpc3RlbmVyKFdJLk5v dGlmaWNhdGlvbi5HbG9iYWxNb2RpZmllcktleXNEaWRDaGFuZ2UsIHRoaXMuX2dsb2JhbE1vZGlm aWVyS2V5c0RpZENoYW5nZSwgdGhpcyk7CiAKICAgICAgICAgdGhpcy5fZGlzcGxheWVkUmVjb3Jk aW5nID0gbnVsbDsKICAgICAgICAgdGhpcy5fZGlzcGxheWVkQ29udGVudFZpZXcgPSBudWxsOwpA QCAtMzk4LDEwICs0MDUsMzIgQEAgV0kuVGltZWxpbmVUYWJDb250ZW50VmlldyA9IGNsYXNzIFRp bWVsaW5lVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3MKIAogICAgIC8vIFBy aXZhdGUKIAorICAgIF9zaG93UmVjb3JkQnV0dG9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Jl Y29yZEJ1dHRvbi5oaWRkZW4gPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fY29udGludWVCdXR0b24u aGlkZGVuID0gdHJ1ZTsKKyAgICB9CisKKyAgICBfc2hvd0NvbnRpbnVlQnV0dG9uKCkKKyAgICB7 CisgICAgICAgIHRoaXMuX3JlY29yZEJ1dHRvbi5oaWRkZW4gPSB0cnVlOworICAgICAgICB0aGlz Ll9jb250aW51ZUJ1dHRvbi5oaWRkZW4gPSBmYWxzZTsKKyAgICB9CisKKyAgICBfdXBkYXRlTmF2 aWdhdGlvbkJhckJ1dHRvbnMoKQorICAgIHsKKyAgICAgICAgaWYgKCFXSS5tb2RpZmllcktleXMu YWx0S2V5IHx8ICFXSS50aW1lbGluZU1hbmFnZXIud2lsbEF1dG9TdG9wKCkpCisgICAgICAgICAg ICB0aGlzLl9zaG93UmVjb3JkQnV0dG9uKCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRo aXMuX3Nob3dDb250aW51ZUJ1dHRvbigpOworICAgIH0KKwogICAgIF9jYXB0dXJpbmdTdGFydGVk T3JTdG9wcGVkKGV2ZW50KQogICAgIHsKICAgICAgICAgbGV0IGlzQ2FwdHVyaW5nID0gV0kudGlt ZWxpbmVNYW5hZ2VyLmlzQ2FwdHVyaW5nKCk7CiAgICAgICAgIHRoaXMuX3JlY29yZEJ1dHRvbi50 b2dnbGVkID0gaXNDYXB0dXJpbmc7CisKKyAgICAgICAgdGhpcy5fdXBkYXRlTmF2aWdhdGlvbkJh ckJ1dHRvbnMoKTsKICAgICB9CiAKICAgICBfaW5zcGVjdG9yVmlzaWJpbGl0eUNoYW5nZWQoZXZl bnQpCkBAIC00MDksNiArNDM4LDExIEBAIFdJLlRpbWVsaW5lVGFiQ29udGVudFZpZXcgPSBjbGFz cyBUaW1lbGluZVRhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzCiAgICAgICAg IFdJLnRpbWVsaW5lTWFuYWdlci5hdXRvQ2FwdHVyZU9uUGFnZUxvYWQgPSAhIXRoaXMudmlzaWJs ZSAmJiAhIVdJLnZpc2libGU7CiAgICAgfQogCisgICAgX2dsb2JhbE1vZGlmaWVyS2V5c0RpZENo YW5nZShldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMuX3VwZGF0ZU5hdmlnYXRpb25CYXJCdXR0 b25zKCk7CisgICAgfQorCiAgICAgX3RvZ2dsZVJlY29yZGluZ09uU3BhY2ViYXIoZXZlbnQpCiAg ICAgewogICAgICAgICBpZiAoV0kuaXNFdmVudFRhcmdldEFuRWRpdGFibGVGaWVsZChldmVudCkp CkBAIC00NTAsNiArNDg0LDE1IEBAIFdJLlRpbWVsaW5lVGFiQ29udGVudFZpZXcgPSBjbGFzcyBU aW1lbGluZVRhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzCiAgICAgICAgIHRo aXMuX3RvZ2dsZVJlY29yZGluZyhzaG91bGRDcmVhdGVOZXdSZWNvcmRpbmcpOwogICAgIH0KIAor ICAgIF9jb250aW51ZUJ1dHRvbkNsaWNrZWQoZXZlbnQpCisgICAgeworICAgICAgICBjb25zb2xl LmFzc2VydChXSS50aW1lbGluZU1hbmFnZXIud2lsbEF1dG9TdG9wKCkpOworCisgICAgICAgIFdJ LnRpbWVsaW5lTWFuYWdlci5yZWxheEF1dG9TdG9wKCk7CisKKyAgICAgICAgdGhpcy5fdXBkYXRl TmF2aWdhdGlvbkJhckJ1dHRvbnMoKTsKKyAgICB9CisKICAgICBfcmVjb3JkaW5nc1RyZWVTZWxl Y3Rpb25EaWRDaGFuZ2UoZXZlbnQpCiAgICAgewogICAgICAgICBsZXQgdHJlZUVsZW1lbnQgPSB0 aGlzLl9yZWNvcmRpbmdzVHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudDsK 362352 2019-02-18 15:57:59 -0800 2019-02-18 16:52:46 -0800 [PATCH] For Landing for-landing2.patch text/plain 10910 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGVkODA5Y2JlZjA5Li5jOTFmMzAyNjEzZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTktMDItMTggIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBQcm92aWRlIGEgd2F5IHRvIGF2b2lkIGEgcmVjb3JkaW5nIGF1dG8tc3RvcCBvbiByZWxvYWQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDc5Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE1hdHQgQmFrZXIuCisKKyAgICAgICAgKiBMb2NhbGl6YXRp b25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgIE5ldyB0b29sdGlwLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanM6 CisgICAgICAgIChXSS5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLndpbGxBdXRvU3RvcCk6Cisg ICAgICAgIChXSS5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLnJlbGF4QXV0b1N0b3ApOgorICAg ICAgICBHZXR0ZXIgYW5kIHJlbGF4ZXIgZm9yIGF1dG8gc3RvcCBiZWhhdmlvci4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzOgor ICAgICAgICAoV0kuQXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5zaG93RGVm YXVsdENvbnRlbnRWaWV3KToKKyAgICAgICAgRHJpdmUtYnkgZml4IHNvbWUgd2hpdGVzcGFjZSBp c3N1ZXMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXSS5UaW1lbGluZVRhYkNvbnRlbnRWaWV3KToKKyAgICAgICAg KFdJLlRpbWVsaW5lVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9zaG93UmVjb3JkQnV0dG9uKToK KyAgICAgICAgKFdJLlRpbWVsaW5lVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9zaG93Q29udGlu dWVCdXR0b24pOgorICAgICAgICAoV0kuVGltZWxpbmVUYWJDb250ZW50Vmlldy5wcm90b3R5cGUu X3VwZGF0ZU5hdmlnYXRpb25CYXJCdXR0b25zKToKKyAgICAgICAgKFdJLlRpbWVsaW5lVGFiQ29u dGVudFZpZXcucHJvdG90eXBlLl9jYXB0dXJpbmdTdGFydGVkT3JTdG9wcGVkKToKKyAgICAgICAg KFdJLlRpbWVsaW5lVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9nbG9iYWxNb2RpZmllcktleXNE aWRDaGFuZ2UpOgorICAgICAgICAoV0kuVGltZWxpbmVUYWJDb250ZW50Vmlldy5wcm90b3R5cGUu X2NvbnRpbnVlQnV0dG9uQ2xpY2tlZCk6CisgICAgICAgIFNob3cgYSAiY29udGludWUiIGxpa2Ug aWNvbiBpbnN0ZWFkIG9mIHRoZSB1c3VhbCBzdG9wIGJ1dHRvbiB3aGVuCisgICAgICAgIGEgcmVj b3JkaW5nIHdvdWxkIGF1dG8tc3RvcCBhbmQgdGhlIGFsdCBrZXkgaXMgZG93bi4gV2hlbiBwcmVz c2VkCisgICAgICAgIHRoaXMgYnV0dG9uIHdpbGwgcmVsYXggdGhlIGF1dG8tc3RvcCBhbmQgY29u dGludWUgdGhlIHJlY29yZGluZworICAgICAgICB1bnRpbCBleHBsaWNpdGx5IHN0b3BwZWQgYnkg dGhlIHVzZXIuCisKIDIwMTktMDItMTggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBGaXggYSB0eXBvIGNhdXNpbmcgYXNzZXJ0 aW9ucyBpbiBDb25zb2xlTWFuYWdlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5k ZXggYjI5ZTkyNjgzMTkuLjYwZTUxZTYyNjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmlu Z3MuanMKQEAgLTI1NCw2ICsyNTQsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJDb250ZW50IFNlY3Vy aXR5IFBvbGljeSB2aW9sYXRpb24gb2YgZGlyZWN0aXZlOiAlcyJdID0gIkNvbnRlbgogbG9jYWxp emVkU3RyaW5nc1siQ29udGludWF0aW9uIEZyYW1lIl0gPSAiQ29udGludWF0aW9uIEZyYW1lIjsK IGxvY2FsaXplZFN0cmluZ3NbIkNvbnRpbnVlIHNjcmlwdCBleGVjdXRpb24gKCVzIG9yICVzKSJd ID0gIkNvbnRpbnVlIHNjcmlwdCBleGVjdXRpb24gKCVzIG9yICVzKSI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJDb250aW51ZSB0byBIZXJlIl0gPSAiQ29udGludWUgdG8gSGVyZSI7Citsb2NhbGl6ZWRT dHJpbmdzWyJDb250aW51ZSB3aXRob3V0IGF1dG9tYXRpY2FsbHkgc3RvcHBpbmciXSA9ICJDb250 aW51ZSB3aXRob3V0IGF1dG9tYXRpY2FsbHkgc3RvcHBpbmciOwogbG9jYWxpemVkU3RyaW5nc1si Q29udHJvbHMiXSA9ICJDb250cm9scyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb29raWVzIl0gPSAi Q29va2llcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb3B5Il0gPSAiQ29weSI7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGlu ZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXggNjJjMWQxMTE3YTkuLjhjYTlkOTdiYTQzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9UaW1lbGluZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCkBAIC0yMDEsNiArMjAxLDI0IEBA IFdJLlRpbWVsaW5lTWFuYWdlciA9IGNsYXNzIFRpbWVsaW5lTWFuYWdlciBleHRlbmRzIFdJLk9i amVjdAogICAgICAgICByZXR1cm4gdGhpcy5faXNDYXB0dXJpbmdQYWdlUmVsb2FkOwogICAgIH0K IAorICAgIHdpbGxBdXRvU3RvcCgpCisgICAgeworICAgICAgICByZXR1cm4gISF0aGlzLl9zdG9w Q2FwdHVyaW5nVGltZW91dDsKKyAgICB9CisKKyAgICByZWxheEF1dG9TdG9wKCkKKyAgICB7Cisg ICAgICAgIGlmICh0aGlzLl9zdG9wQ2FwdHVyaW5nVGltZW91dCkgeworICAgICAgICAgICAgY2xl YXJUaW1lb3V0KHRoaXMuX3N0b3BDYXB0dXJpbmdUaW1lb3V0KTsKKyAgICAgICAgICAgIHRoaXMu X3N0b3BDYXB0dXJpbmdUaW1lb3V0ID0gdW5kZWZpbmVkOworICAgICAgICB9CisKKyAgICAgICAg aWYgKHRoaXMuX2RlYWRUaW1lVGltZW91dCkgeworICAgICAgICAgICAgY2xlYXJUaW1lb3V0KHRo aXMuX2RlYWRUaW1lVGltZW91dCk7CisgICAgICAgICAgICB0aGlzLl9kZWFkVGltZVRpbWVvdXQg PSB1bmRlZmluZWQ7CisgICAgICAgIH0KKyAgICB9CisKICAgICBzdGFydENhcHR1cmluZyhzaG91 bGRDcmVhdGVSZWNvcmRpbmcpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5f aXNDYXB0dXJpbmcsICJUaW1lbGluZU1hbmFnZXIgaXMgYWxyZWFkeSBjYXB0dXJpbmcuIik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BdWRp dE5hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9BdWRpdE5hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5kZXggMWMxNzYz NWNmNDguLjllYzJiZjdmNTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9BdWRpdE5hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXROYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLmpzCkBAIC01MiwxMSArNTIsMTEgQEAgV0kuQXVkaXROYXZpZ2F0aW9uU2lkZWJh clBhbmVsID0gY2xhc3MgQXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmEK ICAgICAgICAgICAgIGxldCBjb250ZW50UGxhY2Vob2xkZXIgPSBXSS5jcmVhdGVNZXNzYWdlVGV4 dFZpZXcoV0kuVUlTdHJpbmcoIk5vIGF1ZGl0IHNlbGVjdGVkIikpOwogICAgICAgICAgICAgY29u dGVudFZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZChjb250ZW50UGxhY2Vob2xkZXIpOwogCi0gICAg ICAgICAgICAgbGV0IGltcG9ydE5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkJ1dHRvbk5hdmlnYXRp b25JdGVtKCJpbXBvcnQtYXVkaXQiLCBXSS5VSVN0cmluZygiSW1wb3J0IiksICJJbWFnZXMvSW1w b3J0LnN2ZyIsIDE1LCAxNSk7CisgICAgICAgICAgICBsZXQgaW1wb3J0TmF2aWdhdGlvbkl0ZW0g PSBuZXcgV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImltcG9ydC1hdWRpdCIsIFdJLlVJU3RyaW5n KCJJbXBvcnQiKSwgIkltYWdlcy9JbXBvcnQuc3ZnIiwgMTUsIDE1KTsKICAgICAgICAgICAgIGlt cG9ydE5hdmlnYXRpb25JdGVtLmJ1dHRvblN0eWxlID0gV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0u U3R5bGUuSW1hZ2VBbmRUZXh0OwogICAgICAgICAgICAgaW1wb3J0TmF2aWdhdGlvbkl0ZW0uYWRk RXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlz Ll9oYW5kbGVJbXBvcnRCdXR0b25OYXZpZ2F0aW9uSXRlbUNsaWNrZWQsIHRoaXMpOwogCi0gICAg ICAgICAgICAgbGV0IGltcG9ydEhlbHBFbGVtZW50ID0gV0kuY3JlYXRlTmF2aWdhdGlvbkl0ZW1I ZWxwKFdJLlVJU3RyaW5nKCJQcmVzcyAlcyB0byBpbXBvcnQgYSB0ZXN0IG9yIHJlc3VsdCBmaWxl IiksIGltcG9ydE5hdmlnYXRpb25JdGVtKTsKKyAgICAgICAgICAgIGxldCBpbXBvcnRIZWxwRWxl bWVudCA9IFdJLmNyZWF0ZU5hdmlnYXRpb25JdGVtSGVscChXSS5VSVN0cmluZygiUHJlc3MgJXMg dG8gaW1wb3J0IGEgdGVzdCBvciByZXN1bHQgZmlsZSIpLCBpbXBvcnROYXZpZ2F0aW9uSXRlbSk7 CiAgICAgICAgICAgICBjb250ZW50UGxhY2Vob2xkZXIuYXBwZW5kQ2hpbGQoaW1wb3J0SGVscEVs ZW1lbnQpOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuY3NzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5j c3MKaW5kZXggZjI1NTY1ZWYxODYuLjRmODU5MTc4ZmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmNz cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZVRhYkNvbnRlbnRWaWV3LmNzcwpAQCAtMjgsMTggKzI4LDIyIEBACiAgICAgZmlsdGVyOiBicmln aHRuZXNzKDEwMCUpOwogfQogCi0udGltZWxpbmUudGFiLmNvbnRlbnQtdmlldyAubmF2aWdhdGlv bi1iYXIgPiAuaXRlbS5yZWNvcmQtc3RhcnQtc3RvcDpob3ZlciB7CisudGltZWxpbmUudGFiLmNv bnRlbnQtdmlldyAubmF2aWdhdGlvbi1iYXIgPiAuaXRlbTptYXRjaGVzKC5yZWNvcmQtc3RhcnQt c3RvcCwgLnJlY29yZC1jb250aW51ZSk6aG92ZXIgewogICAgIGZpbHRlcjogYnJpZ2h0bmVzcyg5 NSUpOwogfQogCi0udGltZWxpbmUudGFiLmNvbnRlbnQtdmlldyAubmF2aWdhdGlvbi1iYXIgPiAu aXRlbS5yZWNvcmQtc3RhcnQtc3RvcDphY3RpdmUgeworLnRpbWVsaW5lLnRhYi5jb250ZW50LXZp ZXcgLm5hdmlnYXRpb24tYmFyID4gLml0ZW06bWF0Y2hlcygucmVjb3JkLXN0YXJ0LXN0b3AsIC5y ZWNvcmQtY29udGludWUpOmFjdGl2ZSB7CiAgICAgZmlsdGVyOiBicmlnaHRuZXNzKDgwJSk7CiB9 CiAKLS50aW1lbGluZS50YWIuY29udGVudC12aWV3IC5uYXZpZ2F0aW9uLWJhciA+IC5pdGVtLnJl Y29yZC1zdGFydC1zdG9wICogeworLnRpbWVsaW5lLnRhYi5jb250ZW50LXZpZXcgLm5hdmlnYXRp b24tYmFyID4gLml0ZW06bWF0Y2hlcygucmVjb3JkLXN0YXJ0LXN0b3AsIC5yZWNvcmQtY29udGlu dWUpICogewogICAgIHBvaW50ZXItZXZlbnRzOiBub25lOwogfQogCisudGltZWxpbmUudGFiLmNv bnRlbnQtdmlldyAubmF2aWdhdGlvbi1iYXIgPiAuaXRlbS5yZWNvcmQtY29udGludWUgeworICAg IGZpbGw6IHZhcigtLWdseXBoLWNvbG9yKTsKK30KKwogLnRpbWVsaW5lLnRhYi5jb250ZW50LXZp ZXcgLm5hdmlnYXRpb24tYmFyID4gLml0ZW0ucmFkaW8gewogICAgIGhlaWdodDogMTdweDsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCmluZGV4IGU5ZDcwY2VjZGNlLi5k YjEzOWI4NzU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCkBAIC01 Miw3ICs1MiwxMyBAQCBXSS5UaW1lbGluZVRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVU YWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93cwogICAgICAgICB0aGlzLl9yZWNv cmRCdXR0b24udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0 eVByaW9yaXR5LkxvdzsKICAgICAgICAgdGhpcy5fcmVjb3JkQnV0dG9uLmFkZEV2ZW50TGlzdGVu ZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fcmVjb3JkQnV0 dG9uQ2xpY2tlZCwgdGhpcyk7CiAKKyAgICAgICAgdGhpcy5fY29udGludWVCdXR0b24gPSBuZXcg V0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInJlY29yZC1jb250aW51ZSIsIFdJLlVJU3RyaW5nKCJD b250aW51ZSB3aXRob3V0IGF1dG9tYXRpY2FsbHkgc3RvcHBpbmciKSwgIkltYWdlcy9SZXN1bWUu c3ZnIiwgMTMsIDEzKTsKKyAgICAgICAgdGhpcy5fY29udGludWVCdXR0b24udmlzaWJpbGl0eVBy aW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKKyAgICAg ICAgdGhpcy5fY29udGludWVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0 aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9jb250aW51ZUJ1dHRvbkNsaWNrZWQsIHRoaXMp OworICAgICAgICB0aGlzLl9jb250aW51ZUJ1dHRvbi5oaWRkZW4gPSB0cnVlOworCiAgICAgICAg IHRoaXMuY29udGVudEJyb3dzZXIubmF2aWdhdGlvbkJhci5pbnNlcnROYXZpZ2F0aW9uSXRlbSh0 aGlzLl9yZWNvcmRCdXR0b24sIDApOworICAgICAgICB0aGlzLmNvbnRlbnRCcm93c2VyLm5hdmln YXRpb25CYXIuaW5zZXJ0TmF2aWdhdGlvbkl0ZW0odGhpcy5fY29udGludWVCdXR0b24sIDEpOwog CiAgICAgICAgIGlmIChXSS5GUFNJbnN0cnVtZW50LnN1cHBvcnRlZCgpKSB7CiAgICAgICAgICAg ICBsZXQgdGltZWxpbmVzTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuUmFkaW9CdXR0b25OYXZpZ2F0 aW9uSXRlbShXSS5UaW1lbGluZU92ZXJ2aWV3LlZpZXdNb2RlLlRpbWVsaW5lcywgV0kuVUlTdHJp bmcoIkV2ZW50cyIpKTsKQEAgLTYxLDcgKzY3LDcgQEAgV0kuVGltZWxpbmVUYWJDb250ZW50Vmll dyA9IGNsYXNzIFRpbWVsaW5lVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3MK ICAgICAgICAgICAgIGxldCB2aWV3TW9kZUdyb3VwID0gbmV3IFdJLkdyb3VwTmF2aWdhdGlvbkl0 ZW0oW3RpbWVsaW5lc05hdmlnYXRpb25JdGVtLCByZW5kZXJpbmdGcmFtZXNOYXZpZ2F0aW9uSXRl bV0pOwogICAgICAgICAgICAgdmlld01vZGVHcm91cC52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5O YXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuSGlnaDsKIAotICAgICAgICAgICAgdGhp cy5jb250ZW50QnJvd3Nlci5uYXZpZ2F0aW9uQmFyLmluc2VydE5hdmlnYXRpb25JdGVtKHZpZXdN b2RlR3JvdXAsIDEpOworICAgICAgICAgICAgdGhpcy5jb250ZW50QnJvd3Nlci5uYXZpZ2F0aW9u QmFyLmluc2VydE5hdmlnYXRpb25JdGVtKHZpZXdNb2RlR3JvdXAsIDIpOwogICAgICAgICAgICAg dGhpcy5jb250ZW50QnJvd3Nlci5uYXZpZ2F0aW9uQmFyLmFkZEV2ZW50TGlzdGVuZXIoV0kuTmF2 aWdhdGlvbkJhci5FdmVudC5OYXZpZ2F0aW9uSXRlbVNlbGVjdGVkLCB0aGlzLl92aWV3TW9kZVNl bGVjdGVkLCB0aGlzKTsKICAgICAgICAgfQogCkBAIC03Miw2ICs3OCw3IEBAIFdJLlRpbWVsaW5l VGFiQ29udGVudFZpZXcgPSBjbGFzcyBUaW1lbGluZVRhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0ku Q29udGVudEJyb3dzCiAgICAgICAgIFdJLnRpbWVsaW5lTWFuYWdlci5hZGRFdmVudExpc3RlbmVy KFdJLlRpbWVsaW5lTWFuYWdlci5FdmVudC5DYXB0dXJpbmdTdG9wcGVkLCB0aGlzLl9jYXB0dXJp bmdTdGFydGVkT3JTdG9wcGVkLCB0aGlzKTsKIAogICAgICAgICBXSS5ub3RpZmljYXRpb25zLmFk ZEV2ZW50TGlzdGVuZXIoV0kuTm90aWZpY2F0aW9uLlZpc2liaWxpdHlTdGF0ZURpZENoYW5nZSwg dGhpcy5faW5zcGVjdG9yVmlzaWJpbGl0eUNoYW5nZWQsIHRoaXMpOworICAgICAgICBXSS5ub3Rp ZmljYXRpb25zLmFkZEV2ZW50TGlzdGVuZXIoV0kuTm90aWZpY2F0aW9uLkdsb2JhbE1vZGlmaWVy S2V5c0RpZENoYW5nZSwgdGhpcy5fZ2xvYmFsTW9kaWZpZXJLZXlzRGlkQ2hhbmdlLCB0aGlzKTsK IAogICAgICAgICB0aGlzLl9kaXNwbGF5ZWRSZWNvcmRpbmcgPSBudWxsOwogICAgICAgICB0aGlz Ll9kaXNwbGF5ZWRDb250ZW50VmlldyA9IG51bGw7CkBAIC0zOTgsMTAgKzQwNSwzMiBAQCBXSS5U aW1lbGluZVRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVUYWJDb250ZW50VmlldyBleHRl bmRzIFdJLkNvbnRlbnRCcm93cwogCiAgICAgLy8gUHJpdmF0ZQogCisgICAgX3Nob3dSZWNvcmRC dXR0b24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fcmVjb3JkQnV0dG9uLmhpZGRlbiA9IGZhbHNl OworICAgICAgICB0aGlzLl9jb250aW51ZUJ1dHRvbi5oaWRkZW4gPSB0cnVlOworICAgIH0KKwor ICAgIF9zaG93Q29udGludWVCdXR0b24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fcmVjb3JkQnV0 dG9uLmhpZGRlbiA9IHRydWU7CisgICAgICAgIHRoaXMuX2NvbnRpbnVlQnV0dG9uLmhpZGRlbiA9 IGZhbHNlOworICAgIH0KKworICAgIF91cGRhdGVOYXZpZ2F0aW9uQmFyQnV0dG9ucygpCisgICAg eworICAgICAgICBpZiAoIVdJLm1vZGlmaWVyS2V5cy5hbHRLZXkgfHwgIVdJLnRpbWVsaW5lTWFu YWdlci53aWxsQXV0b1N0b3AoKSkKKyAgICAgICAgICAgIHRoaXMuX3Nob3dSZWNvcmRCdXR0b24o KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fc2hvd0NvbnRpbnVlQnV0dG9uKCk7 CisgICAgfQorCiAgICAgX2NhcHR1cmluZ1N0YXJ0ZWRPclN0b3BwZWQoZXZlbnQpCiAgICAgewog ICAgICAgICBsZXQgaXNDYXB0dXJpbmcgPSBXSS50aW1lbGluZU1hbmFnZXIuaXNDYXB0dXJpbmco KTsKICAgICAgICAgdGhpcy5fcmVjb3JkQnV0dG9uLnRvZ2dsZWQgPSBpc0NhcHR1cmluZzsKKwor ICAgICAgICB0aGlzLl91cGRhdGVOYXZpZ2F0aW9uQmFyQnV0dG9ucygpOwogICAgIH0KIAogICAg IF9pbnNwZWN0b3JWaXNpYmlsaXR5Q2hhbmdlZChldmVudCkKQEAgLTQwOSw2ICs0MzgsMTEgQEAg V0kuVGltZWxpbmVUYWJDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5lVGFiQ29udGVudFZpZXcg ZXh0ZW5kcyBXSS5Db250ZW50QnJvd3MKICAgICAgICAgV0kudGltZWxpbmVNYW5hZ2VyLmF1dG9D YXB0dXJlT25QYWdlTG9hZCA9ICEhdGhpcy52aXNpYmxlICYmICEhV0kudmlzaWJsZTsKICAgICB9 CiAKKyAgICBfZ2xvYmFsTW9kaWZpZXJLZXlzRGlkQ2hhbmdlKGV2ZW50KQorICAgIHsKKyAgICAg ICAgdGhpcy5fdXBkYXRlTmF2aWdhdGlvbkJhckJ1dHRvbnMoKTsKKyAgICB9CisKICAgICBfdG9n Z2xlUmVjb3JkaW5nT25TcGFjZWJhcihldmVudCkKICAgICB7CiAgICAgICAgIGlmIChXSS5pc0V2 ZW50VGFyZ2V0QW5FZGl0YWJsZUZpZWxkKGV2ZW50KSkKQEAgLTQ1MCw2ICs0ODQsMTUgQEAgV0ku VGltZWxpbmVUYWJDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5lVGFiQ29udGVudFZpZXcgZXh0 ZW5kcyBXSS5Db250ZW50QnJvd3MKICAgICAgICAgdGhpcy5fdG9nZ2xlUmVjb3JkaW5nKHNob3Vs ZENyZWF0ZU5ld1JlY29yZGluZyk7CiAgICAgfQogCisgICAgX2NvbnRpbnVlQnV0dG9uQ2xpY2tl ZChldmVudCkKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KFdJLnRpbWVsaW5lTWFuYWdl ci53aWxsQXV0b1N0b3AoKSk7CisKKyAgICAgICAgV0kudGltZWxpbmVNYW5hZ2VyLnJlbGF4QXV0 b1N0b3AoKTsKKworICAgICAgICB0aGlzLl91cGRhdGVOYXZpZ2F0aW9uQmFyQnV0dG9ucygpOwor ICAgIH0KKwogICAgIF9yZWNvcmRpbmdzVHJlZVNlbGVjdGlvbkRpZENoYW5nZShldmVudCkKICAg ICB7CiAgICAgICAgIGxldCB0cmVlRWxlbWVudCA9IHRoaXMuX3JlY29yZGluZ3NUcmVlT3V0bGlu ZS5zZWxlY3RlZFRyZWVFbGVtZW50Owo=