135827 2014-08-11 19:18:20 -0700 Web Inspector: Easier Way to go back to the Timeline Overviews 2014-08-12 01:13:09 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned benjamin commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1028394 0 joepeck 2014-08-11 19:18:20 -0700 * SUMMARY Often times I want to go immediately to the Timeline Overview or specific TimelineView after having selected a Resource Element / SourceCodeLocation record in the timeline tree outline. Right now it is hard. After discussing this with Tim, it sounded like a close button when a tree element triggers a resource content view would work well. That feels pretty good to me. * NOTES See also: <https://webkit.org/b/135306> Web Inspector: There should be a button to go directly to the Timeline Overview 1028398 1 236424 joepeck 2014-08-11 19:24:25 -0700 Created attachment 236424 [PATCH] Proposed Fix 1028442 2 webkit-bug-importer 2014-08-12 00:31:24 -0700 <rdar://problem/17987681> 1028454 3 236424 commit-queue 2014-08-12 01:13:06 -0700 Comment on attachment 236424 [PATCH] Proposed Fix Clearing flags on attachment: 236424 Committed r172435: <http://trac.webkit.org/changeset/172435> 1028455 4 commit-queue 2014-08-12 01:13:09 -0700 All reviewed patches have been landed. Closing bug. 236424 2014-08-11 19:24:25 -0700 2014-08-12 01:13:05 -0700 [PATCH] Proposed Fix close-button.patch text/plain 17342 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDY2NzE0YjkuLjVhMzllN2YgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDE0LTA4LTExICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRWFzaWVy IFdheSB0byBnbyBiYWNrIHRvIHRoZSBUaW1lbGluZSBPdmVydmlld3MKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTgyNworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICBBZGRlZCBuZXcgdG9vbHRpcCBVSVN0cmlu Zy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvSW1hZ2VzL0Nsb3NlLnN2ZzoKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL0ltYWdlcy9DbG9zZUxhcmdlLnN2ZzoKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL0ltYWdlcy9MZWdhY3kvQ2xvc2Uuc3ZnOgorICAgICAgICBBZGQgInN0cm9rZWQiIGNs YXNzIHNvIHRoZSBidXR0b25zIGNhbiBmaWxsIHdpdGggd2hpdGUgb24gc2VsZWN0ZWQgcm93cy4K KyAgICAgICAgQWxzbyByZS1jZW50ZXIgdGhlIG5vbi1sZWdhY3kgaW1hZ2VzIGhvcml6b250YWxs eS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50Lmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkdlbmVyYWxUcmVlRWxlbWVudC5wcm90b3R5cGUuc2V0 IHN0YXR1cyk6CisgICAgICAgIERvIG5vdCByZWNyZWF0ZSBlbGVtZW50cyBpZiB0aGUgc3RhdHVz IGRpZCBub3QgY2hhbmdlLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRU aW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcucHJvdG90eXBlLl90 cmVlRWxlbWVudERlc2VsZWN0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVs aW5lVmlldy5wcm90b3R5cGUuX3RyZWVFbGVtZW50U2VsZWN0ZWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkxheW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUuX3VwZGF0ZVRyZWVFbGVtZW50V2l0 aENsb3NlQnV0dG9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcu cHJvdG90eXBlLl9jbG9zZVN0YXR1c0J1dHRvbkNsaWNrZWQpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OZXR3b3JrVGltZWxpbmVWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrVGlt ZWxpbmVWaWV3LnByb3RvdHlwZS5fdHJlZUVsZW1lbnREZXNlbGVjdGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3LnByb3RvdHlwZS5fdHJlZUVsZW1lbnRTZWxl Y3RlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5wcm90b3R5 cGUuX3VwZGF0ZVRyZWVFbGVtZW50V2l0aENsb3NlQnV0dG9uKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3LnByb3RvdHlwZS5fY2xvc2VTdGF0dXNCdXR0b25DbGlj a2VkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVWaWV3 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlw ZS5fdHJlZUVsZW1lbnREZXNlbGVjdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmll d1RpbWVsaW5lVmlldy5wcm90b3R5cGUuX3RyZWVFbGVtZW50U2VsZWN0ZWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fdXBkYXRlVHJlZUVs ZW1lbnRXaXRoQ2xvc2VCdXR0b24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGlt ZWxpbmVWaWV3LnByb3RvdHlwZS5fY2xvc2VTdGF0dXNCdXR0b25DbGlja2VkKToKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNj cmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUuX3RyZWVFbGVtZW50RGVzZWxlY3RlZCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fdHJlZUVsZW1l bnRTZWxlY3RlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LnBy b3RvdHlwZS5fdXBkYXRlVHJlZUVsZW1lbnRXaXRoQ2xvc2VCdXR0b24pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUuX2Nsb3NlU3RhdHVzQnV0dG9u Q2xpY2tlZCk6CisgICAgICAgIFByb3ZpZGUgc2VsZWN0L2Rlc2VsZWN0IGhhbmRsZXJzIHRvIHNo b3cvaGlkZSB0aGUgY2xvc2Ugc3RhdHVzIGJhciBidXR0b24KKyAgICAgICAgd2hlbiBzZWxlY3Rp bmcgYSByb3cgdGhhdCBzaG93cyBhIG5vbi1UaW1lbGluZSBjb250ZW50IHZpZXcuIEN1cnJlbnRs eSB0aGUKKyAgICAgICAgb25seSBjb250ZW50IHZpZXdzIHRoZSB0cmVlIGVsZW1lbnRzIGNhbiBz aG93IGFyZSBSZXNvdXJjZSB2aWV3cywgc28gdGhlCisgICAgICAgIHRvb2x0aXAgaXMgdGhlIHNh bWUgZXZlcnl3aGVyZS4KKwogMjAxNC0wOC0wOCAgQnJpYW4gSi4gQnVyZyAgPGJ1cmdAY3Mud2Fz aGluZ3Rvbi5lZHU+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogRGVidWdnZXJNYW5hZ2VyIGNv bW1hbmRzIHNob3VsZCByZXR1cm4gcHJvbWlzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdz LmpzCmluZGV4IDQzMmQwODg3MGE3ZGJmZDIxNjcwZWUwZTcwNDg5YmYxZDA3OWVkOGYuLmMxZGU0 MThmNDVmYmJmOWRlMDhjYWJjMmMxOTgyN2IyYjlkMWE5OTYgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0 Y2gKZGVsdGEgNjIKemNtY2IlaFdXLT88XyNPdzF5ZE9tNz5YRUQ4SHlTNThBXmV5PGpHZCpzLWg/ Jkt2QE5iR0tTMl8+LWg5SHVUKT5WCkY0Z2YjXzUrREVvCgpkZWx0YSAxNApXY21jYnltaWdLbTxf I093SHlkaiNUP1lVKiVtKClXCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvSW1hZ2VzL0Nsb3NlLnN2ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0ltYWdlcy9DbG9zZS5zdmcKaW5kZXggYjM1ZGVkMi4uMzFhMWRiMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0Nsb3NlLnN2 ZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQ2xvc2Uu c3ZnCkBAIC0xLDUgKzEsNSBAQAogPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgi Pz4KIDwhLS0gQ29weXJpZ2h0IMKpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LiAtLT4KIDxzdmcgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9z dmciIHZpZXdCb3g9IjAgMCAxNiAxNCI+Ci0gICAgPHBhdGggZmlsbD0ibm9uZSIgc3Ryb2tlPSJi bGFjayIgc3Ryb2tlLWxpbmVjYXA9InNxdWFyZSIgZD0iTSAzLjUgNC41IEwgMTAuNSAxMS41IE0g My41IDExLjUgTCAxMC41IDQuNSIvPgorICAgIDxwYXRoIGNsYXNzPSJzdHJva2VkIiBmaWxsPSJu b25lIiBzdHJva2U9ImJsYWNrIiBzdHJva2UtbGluZWNhcD0ic3F1YXJlIiBkPSJNIDQuNSA0LjUg TCAxMS41IDExLjUgTSA0LjUgMTEuNSBMIDExLjUgNC41Ii8+CiA8L3N2Zz4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9DbG9zZUxhcmdlLnN2 ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9DbG9zZUxhcmdl LnN2ZwppbmRleCAyOGVlY2FkLi4zNTdjOWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQ2xvc2VMYXJnZS5zdmcKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0Nsb3NlTGFyZ2Uuc3ZnCkBAIC0xLDUg KzEsNSBAQAogPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KIDwhLS0gQ29w eXJpZ2h0IMKpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KIDxzdmcg dmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9 IjAgMCAxNiAxNiI+Ci0gICAgPHBhdGggY2xhc3M9InN0cm9rZWQiIGZpbGw9Im5vbmUiIHN0cm9r ZT0iYmxhY2siIHN0cm9rZS1saW5lY2FwPSJzcXVhcmUiIGQ9Ik0gMS41IDIuNSBMIDEyLjUgMTMu NSBNIDEuNSAxMy41IEwgMTIuNSAyLjUiLz4KKyAgICA8cGF0aCBjbGFzcz0ic3Ryb2tlZCIgZmls bD0ibm9uZSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLWxpbmVjYXA9InNxdWFyZSIgZD0iTSAyLjUg Mi41IEwgMTMuNSAxMy41IE0gMi41IDEzLjUgTCAxMy41IDIuNSIvPgogPC9zdmc+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvTGVnYWN5L0Ns b3NlLnN2ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9MZWdh Y3kvQ2xvc2Uuc3ZnCmluZGV4IDFlNDlkOGQuLmNjZTYwMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9MZWdhY3kvQ2xvc2Uuc3ZnCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9MZWdhY3kvQ2xvc2Uu c3ZnCkBAIC0xLDUgKzEsNSBAQAogPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgi Pz4KIDwhLS0gQ29weXJpZ2h0IMKpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LiAtLT4KIDxzdmcgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9z dmciIHZpZXdCb3g9IjAgMCAxNiAxNCI+Ci0gICAgPHBhdGggZD0iTSAxMi45NDkyMTkgMTAuNTM1 MTU2IEwgMTEuNTM1MTU2IDExLjk0OTIxOSBMIDggOC40MTQwNjIgTCA0LjQ2NDg0NCAxMS45NDky MTkgTCAzLjA1MDc4MSAxMC41MzUxNTYgTCA2LjU4NTkzOCA3IEwgMy4wNTA3ODEgMy40NjQ4NDQg TCA0LjQ2NDg0NCAyLjA1MDc4MSBMIDggNS41ODU5MzggTCAxMS41MzUxNTYgMi4wNTA3ODEgTCAx Mi45NDkyMTkgMy40NjQ4NDQgTCA5LjQxNDA2MiA3IFoiLz4KKyAgICA8cGF0aCBjbGFzcz0ic3Ry b2tlZCIgZD0iTSAxMi45NDkyMTkgMTAuNTM1MTU2IEwgMTEuNTM1MTU2IDExLjk0OTIxOSBMIDgg OC40MTQwNjIgTCA0LjQ2NDg0NCAxMS45NDkyMTkgTCAzLjA1MDc4MSAxMC41MzUxNTYgTCA2LjU4 NTkzOCA3IEwgMy4wNTA3ODEgMy40NjQ4NDQgTCA0LjQ2NDg0NCAyLjA1MDc4MSBMIDggNS41ODU5 MzggTCAxMS41MzUxNTYgMi4wNTA3ODEgTCAxMi45NDkyMTkgMy40NjQ4NDQgTCA5LjQxNDA2MiA3 IFoiLz4KIDwvc3ZnPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRyZWVFbGVtZW50LmpzCmluZGV4IDExYzFiZjAu LmRhMmJkODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0dlbmVyYWxUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsVHJlZUVsZW1lbnQuanMKQEAgLTIwMiw2ICsyMDIs OSBAQCBXZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKIAogICAg IHNldCBzdGF0dXMoeCkKICAgICB7CisgICAgICAgIGlmICh0aGlzLl9zdGF0dXMgPT09IHgpCisg ICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgdGhpcy5fc3RhdHVzID0geCB8fCAiIjsKICAg ICAgICAgdGhpcy5fdXBkYXRlU3RhdHVzRWxlbWVudCgpOwogICAgIH0sCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRU aW1lbGluZVZpZXcuanMKaW5kZXggOWY2M2RlNy4uYTAwMDJlNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRp bWVsaW5lVmlldy5qcwpAQCAtMzAsNiArMzAsNyBAQCBXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxp bmVWaWV3ID0gZnVuY3Rpb24odGltZWxpbmUpCiAgICAgY29uc29sZS5hc3NlcnQodGltZWxpbmUu dHlwZSA9PT0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTGF5b3V0KTsKIAogICAg IHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5vbnNlbGVjdCA9IHRoaXMuX3RyZWVF bGVtZW50U2VsZWN0ZWQuYmluZCh0aGlzKTsKKyAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJl ZU91dGxpbmUub25kZXNlbGVjdCA9IHRoaXMuX3RyZWVFbGVtZW50RGVzZWxlY3RlZC5iaW5kKHRo aXMpOwogICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5lbGVtZW50LmNsYXNz TGlzdC5hZGQoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwuSGlkZURpc2Nsb3N1 cmVCdXR0b25zU3R5bGVDbGFzc05hbWUpOwogICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVl T3V0bGluZS5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5l Vmlldy5UcmVlT3V0bGluZVN0eWxlQ2xhc3NOYW1lKTsKIApAQCAtMTcxLDYgKzE3MiwxMiBAQCBX ZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5FdmVu dC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSk7CiAgICAgfSwKIAorICAgIF90cmVl RWxlbWVudERlc2VsZWN0ZWQ6IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQorICAgIHsKKyAgICAgICAg aWYgKHRyZWVFbGVtZW50LnN0YXR1cykKKyAgICAgICAgICAgIHRyZWVFbGVtZW50LnN0YXR1cyA9 ICIiOworICAgIH0sCisKICAgICBfdHJlZUVsZW1lbnRTZWxlY3RlZDogZnVuY3Rpb24odHJlZUVs ZW1lbnQsIHNlbGVjdGVkQnlVc2VyKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2RhdGFHcmlk LnNob3VsZElnbm9yZVNlbGVjdGlvbkV2ZW50KCkpCkBAIC0xOTMsNSArMjAwLDI3IEBAIFdlYklu c3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAg ICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlU2lkZWJhclBhbmVsLnNob3dPcmlnaW5hbE9yRm9y bWF0dGVkU291cmNlQ29kZUxvY2F0aW9uKHRyZWVFbGVtZW50LnJlY29yZC5zb3VyY2VDb2RlTG9j YXRpb24pOworICAgICAgICB0aGlzLl91cGRhdGVUcmVlRWxlbWVudFdpdGhDbG9zZUJ1dHRvbih0 cmVlRWxlbWVudCk7CisgICAgfSwKKworICAgIF91cGRhdGVUcmVlRWxlbWVudFdpdGhDbG9zZUJ1 dHRvbjogZnVuY3Rpb24odHJlZUVsZW1lbnQpCisgICAgeworICAgICAgICBpZiAodGhpcy5fY2xv c2VTdGF0dXNCdXR0b24pIHsKKyAgICAgICAgICAgIHRyZWVFbGVtZW50LnN0YXR1cyA9IHRoaXMu X2Nsb3NlU3RhdHVzQnV0dG9uLmVsZW1lbnQ7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IH0KKworICAgICAgICB3cmFwcGVkU1ZHRG9jdW1lbnQocGxhdGZvcm1JbWFnZVBhdGgoIkNsb3Nl LnN2ZyIpLCBudWxsLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsb3NlIHJlc291cmNlIHZpZXci KSwgZnVuY3Rpb24oZWxlbWVudCkgeworICAgICAgICAgICAgdGhpcy5fY2xvc2VTdGF0dXNCdXR0 b24gPSBuZXcgV2ViSW5zcGVjdG9yLlRyZWVFbGVtZW50U3RhdHVzQnV0dG9uKGVsZW1lbnQpOwor ICAgICAgICAgICAgdGhpcy5fY2xvc2VTdGF0dXNCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuVHJlZUVsZW1lbnRTdGF0dXNCdXR0b24uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fY2xv c2VTdGF0dXNCdXR0b25DbGlja2VkLCB0aGlzKTsKKyAgICAgICAgICAgIGlmICh0cmVlRWxlbWVu dCA9PT0gdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1l bnQpCisgICAgICAgICAgICAgICAgdGhpcy5fdXBkYXRlVHJlZUVsZW1lbnRXaXRoQ2xvc2VCdXR0 b24odHJlZUVsZW1lbnQpOworICAgICAgICB9LmJpbmQodGhpcykpOworICAgIH0sCisKKyAgICBf Y2xvc2VTdGF0dXNCdXR0b25DbGlja2VkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAg IHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50LmRl c2VsZWN0KCk7CisgICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5zaG93 VGltZWxpbmVWaWV3Rm9yVHlwZShXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5MYXlv dXQpOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcwppbmRleCAzMDk3 OTBiLi42ODA3NzIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKQEAgLTMwLDYg KzMwLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZVZpZXcgPSBmdW5jdGlvbih0aW1l bGluZSkKICAgICBjb25zb2xlLmFzc2VydCh0aW1lbGluZS50eXBlID09PSBXZWJJbnNwZWN0b3Iu VGltZWxpbmVSZWNvcmQuVHlwZS5OZXR3b3JrKTsKIAogICAgIHRoaXMubmF2aWdhdGlvblNpZGVi YXJUcmVlT3V0bGluZS5vbnNlbGVjdCA9IHRoaXMuX3RyZWVFbGVtZW50U2VsZWN0ZWQuYmluZCh0 aGlzKTsKKyAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUub25kZXNlbGVjdCA9 IHRoaXMuX3RyZWVFbGVtZW50RGVzZWxlY3RlZC5iaW5kKHRoaXMpOyAgICAKICAgICB0aGlzLm5h dmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUuZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3Bl Y3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLkhpZGVEaXNjbG9zdXJlQnV0dG9uc1N0eWxlQ2xh c3NOYW1lKTsKICAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUuZWxlbWVudC5j bGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3LlRyZWVPdXRsaW5l U3R5bGVDbGFzc05hbWUpOwogCkBAIC0xOTIsNiArMTkzLDEyIEBAIFdlYkluc3BlY3Rvci5OZXR3 b3JrVGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5FdmVudC5TZWxlY3Rpb25QYXRo Q29tcG9uZW50c0RpZENoYW5nZSk7CiAgICAgfSwKIAorICAgIF90cmVlRWxlbWVudERlc2VsZWN0 ZWQ6IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQorICAgIHsKKyAgICAgICAgaWYgKHRyZWVFbGVtZW50 LnN0YXR1cykKKyAgICAgICAgICAgIHRyZWVFbGVtZW50LnN0YXR1cyA9ICIiOworICAgIH0sCisK ICAgICBfdHJlZUVsZW1lbnRTZWxlY3RlZDogZnVuY3Rpb24odHJlZUVsZW1lbnQsIHNlbGVjdGVk QnlVc2VyKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2RhdGFHcmlkLnNob3VsZElnbm9yZVNl bGVjdGlvbkV2ZW50KCkpCkBAIC0yMDUsOSArMjEyLDMxIEBAIFdlYkluc3BlY3Rvci5OZXR3b3Jr VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAodHJlZUVsZW1lbnQgaW5z dGFuY2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudCB8fCB0cmVlRWxlbWVudCBp bnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TY3JpcHRUcmVlRWxlbWVudCkgewogICAgICAgICAgICAg V2ViSW5zcGVjdG9yLnJlc291cmNlU2lkZWJhclBhbmVsLnNob3dTb3VyY2VDb2RlKHRyZWVFbGVt ZW50LnJlcHJlc2VudGVkT2JqZWN0KTsKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVRyZWVFbGVt ZW50V2l0aENsb3NlQnV0dG9uKHRyZWVFbGVtZW50KTsKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQogCiAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gdHJlZSBlbGVtZW50IHNl bGVjdGVkLiIpOworICAgIH0sCisKKyAgICBfdXBkYXRlVHJlZUVsZW1lbnRXaXRoQ2xvc2VCdXR0 b246IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2Nsb3Nl U3RhdHVzQnV0dG9uKSB7CisgICAgICAgICAgICB0cmVlRWxlbWVudC5zdGF0dXMgPSB0aGlzLl9j bG9zZVN0YXR1c0J1dHRvbi5lbGVtZW50OworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9 CisKKyAgICAgICAgd3JhcHBlZFNWR0RvY3VtZW50KHBsYXRmb3JtSW1hZ2VQYXRoKCJDbG9zZS5z dmciKSwgbnVsbCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbG9zZSByZXNvdXJjZSB2aWV3Iiks IGZ1bmN0aW9uKGVsZW1lbnQpIHsKKyAgICAgICAgICAgIHRoaXMuX2Nsb3NlU3RhdHVzQnV0dG9u ID0gbmV3IFdlYkluc3BlY3Rvci5UcmVlRWxlbWVudFN0YXR1c0J1dHRvbihlbGVtZW50KTsKKyAg ICAgICAgICAgIHRoaXMuX2Nsb3NlU3RhdHVzQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLlRyZWVFbGVtZW50U3RhdHVzQnV0dG9uLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2Nsb3Nl U3RhdHVzQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CisgICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQg PT09IHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50 KQorICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVRyZWVFbGVtZW50V2l0aENsb3NlQnV0dG9u KHRyZWVFbGVtZW50KTsKKyAgICAgICAgfS5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisgICAgX2Ns b3NlU3RhdHVzQnV0dG9uQ2xpY2tlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB0 aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNl bGVjdCgpOworICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwuc2hvd1Rp bWVsaW5lVmlld0ZvclR5cGUoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTmV0d29y ayk7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanMKaW5kZXggYjkw MjU2OS4uYWFmY2E0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanMKQEAgLTI4 LDYgKzI4LDcgQEAgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3ID0gZnVuY3Rpb24o cmVjb3JkaW5nKQogICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcuY2FsbCh0aGlzLCByZWNv cmRpbmcpOwogCiAgICAgdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLm9uc2VsZWN0 ID0gdGhpcy5fdHJlZUVsZW1lbnRTZWxlY3RlZC5iaW5kKHRoaXMpOworICAgIHRoaXMubmF2aWdh dGlvblNpZGViYXJUcmVlT3V0bGluZS5vbmRlc2VsZWN0ID0gdGhpcy5fdHJlZUVsZW1lbnREZXNl bGVjdGVkLmJpbmQodGhpcyk7CiAKICAgICB0aGlzLl9yZWNvcmRpbmcgPSByZWNvcmRpbmc7CiAK QEAgLTMzMCw2ICszMzEsMTIgQEAgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5z cGVjdG9yLlRpbWVsaW5lVmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5n ZSk7CiAgICAgfSwKIAorICAgIF90cmVlRWxlbWVudERlc2VsZWN0ZWQ6IGZ1bmN0aW9uKHRyZWVF bGVtZW50KQorICAgIHsKKyAgICAgICAgaWYgKHRyZWVFbGVtZW50LnN0YXR1cykKKyAgICAgICAg ICAgIHRyZWVFbGVtZW50LnN0YXR1cyA9ICIiOworICAgIH0sCisKICAgICBfdHJlZUVsZW1lbnRT ZWxlY3RlZDogZnVuY3Rpb24odHJlZUVsZW1lbnQsIHNlbGVjdGVkQnlVc2VyKQogICAgIHsKICAg ICAgICAgaWYgKCFXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwuY2FuU2hvd0RpZmZl cmVudENvbnRlbnRWaWV3KCkpCkBAIC0zNDAsNiArMzQ3LDcgQEAgV2ViSW5zcGVjdG9yLk92ZXJ2 aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAodHJlZUVsZW1lbnQg aW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudCB8fCB0cmVlRWxlbWVu dCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5TY3JpcHRUcmVlRWxlbWVudCkgewogICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLnJlc291cmNlU2lkZWJhclBhbmVsLnNob3dTb3VyY2VDb2RlKHRyZWVF bGVtZW50LnJlcHJlc2VudGVkT2JqZWN0KTsKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVRyZWVF bGVtZW50V2l0aENsb3NlQnV0dG9uKHRyZWVFbGVtZW50KTsKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgfQogCkBAIC0zNTQsNSArMzYyLDI3IEBAIFdlYkluc3BlY3Rvci5PdmVydmlld1Rp bWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICBXZWJJbnNwZWN0 b3IucmVzb3VyY2VTaWRlYmFyUGFuZWwuc2hvd09yaWdpbmFsT3JGb3JtYXR0ZWRTb3VyY2VDb2Rl TG9jYXRpb24odHJlZUVsZW1lbnQuc291cmNlQ29kZVRpbWVsaW5lLnNvdXJjZUNvZGVMb2NhdGlv bik7CisgICAgICAgIHRoaXMuX3VwZGF0ZVRyZWVFbGVtZW50V2l0aENsb3NlQnV0dG9uKHRyZWVF bGVtZW50KTsKKyAgICB9LAorCisgICAgX3VwZGF0ZVRyZWVFbGVtZW50V2l0aENsb3NlQnV0dG9u OiBmdW5jdGlvbih0cmVlRWxlbWVudCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9jbG9zZVN0 YXR1c0J1dHRvbikgeworICAgICAgICAgICAgdHJlZUVsZW1lbnQuc3RhdHVzID0gdGhpcy5fY2xv c2VTdGF0dXNCdXR0b24uZWxlbWVudDsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQor CisgICAgICAgIHdyYXBwZWRTVkdEb2N1bWVudChwbGF0Zm9ybUltYWdlUGF0aCgiQ2xvc2Uuc3Zn IiksIG51bGwsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xvc2UgcmVzb3VyY2UgdmlldyIpLCBm dW5jdGlvbihlbGVtZW50KSB7CisgICAgICAgICAgICB0aGlzLl9jbG9zZVN0YXR1c0J1dHRvbiA9 IG5ldyBXZWJJbnNwZWN0b3IuVHJlZUVsZW1lbnRTdGF0dXNCdXR0b24oZWxlbWVudCk7CisgICAg ICAgICAgICB0aGlzLl9jbG9zZVN0YXR1c0J1dHRvbi5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5UcmVlRWxlbWVudFN0YXR1c0J1dHRvbi5FdmVudC5DbGlja2VkLCB0aGlzLl9jbG9zZVN0 YXR1c0J1dHRvbkNsaWNrZWQsIHRoaXMpOworICAgICAgICAgICAgaWYgKHRyZWVFbGVtZW50ID09 PSB0aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudCkK KyAgICAgICAgICAgICAgICB0aGlzLl91cGRhdGVUcmVlRWxlbWVudFdpdGhDbG9zZUJ1dHRvbih0 cmVlRWxlbWVudCk7CisgICAgICAgIH0uYmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIF9jbG9z ZVN0YXR1c0J1dHRvbkNsaWNrZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhp cy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxl Y3QoKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnRpbWVsaW5lU2lkZWJhclBhbmVsLnNob3dUaW1l bGluZU92ZXJ2aWV3KCk7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcwpp bmRleCA1OWI0NDUxLi43OGZjZGFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVWaWV3LmpzCkBA IC0zMCw2ICszMCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVZpZXcgPSBmdW5jdGlv bih0aW1lbGluZSkKICAgICBjb25zb2xlLmFzc2VydCh0aW1lbGluZS50eXBlID09PSBXZWJJbnNw ZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5TY3JpcHQpOwogCiAgICAgdGhpcy5uYXZpZ2F0aW9u U2lkZWJhclRyZWVPdXRsaW5lLm9uc2VsZWN0ID0gdGhpcy5fdHJlZUVsZW1lbnRTZWxlY3RlZC5i aW5kKHRoaXMpOworICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5vbmRlc2Vs ZWN0ID0gdGhpcy5fdHJlZUVsZW1lbnREZXNlbGVjdGVkLmJpbmQodGhpcyk7CiAgICAgdGhpcy5u YXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNw ZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LlRyZWVPdXRsaW5lU3R5bGVDbGFzc05hbWUpOwogCiAg ICAgdmFyIGNvbHVtbnMgPSB7bG9jYXRpb246IHt9LCBjYWxsQ291bnQ6IHt9LCBzdGFydFRpbWU6 IHt9LCB0b3RhbFRpbWU6IHt9LCBzZWxmVGltZToge30sIGF2ZXJhZ2VUaW1lOiB7fX07CkBAIC0y NTIsNiArMjUzLDEyIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVZpZXcucHJvdG90eXBl ID0gewogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3Iu VGltZWxpbmVWaWV3LkV2ZW50LlNlbGVjdGlvblBhdGhDb21wb25lbnRzRGlkQ2hhbmdlKTsKICAg ICB9LAogCisgICAgX3RyZWVFbGVtZW50RGVzZWxlY3RlZDogZnVuY3Rpb24odHJlZUVsZW1lbnQp CisgICAgeworICAgICAgICBpZiAodHJlZUVsZW1lbnQuc3RhdHVzKQorICAgICAgICAgICAgdHJl ZUVsZW1lbnQuc3RhdHVzID0gIiI7CisgICAgfSwKKwogICAgIF90cmVlRWxlbWVudFNlbGVjdGVk OiBmdW5jdGlvbih0cmVlRWxlbWVudCwgc2VsZWN0ZWRCeVVzZXIpCiAgICAgewogICAgICAgICBp ZiAodGhpcy5fZGF0YUdyaWQuc2hvdWxkSWdub3JlU2VsZWN0aW9uRXZlbnQoKSkKQEAgLTI3Nyw1 ICsyODQsMjcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgICAgIH0KIAogICAgICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VTaWRlYmFyUGFuZWwu c2hvd09yaWdpbmFsT3JGb3JtYXR0ZWRTb3VyY2VDb2RlTG9jYXRpb24oc291cmNlQ29kZUxvY2F0 aW9uKTsKKyAgICAgICAgdGhpcy5fdXBkYXRlVHJlZUVsZW1lbnRXaXRoQ2xvc2VCdXR0b24odHJl ZUVsZW1lbnQpOworICAgIH0sCisKKyAgICBfdXBkYXRlVHJlZUVsZW1lbnRXaXRoQ2xvc2VCdXR0 b246IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2Nsb3Nl U3RhdHVzQnV0dG9uKSB7CisgICAgICAgICAgICB0cmVlRWxlbWVudC5zdGF0dXMgPSB0aGlzLl9j bG9zZVN0YXR1c0J1dHRvbi5lbGVtZW50OworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9 CisKKyAgICAgICAgd3JhcHBlZFNWR0RvY3VtZW50KHBsYXRmb3JtSW1hZ2VQYXRoKCJDbG9zZS5z dmciKSwgbnVsbCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbG9zZSByZXNvdXJjZSB2aWV3Iiks IGZ1bmN0aW9uKGVsZW1lbnQpIHsKKyAgICAgICAgICAgIHRoaXMuX2Nsb3NlU3RhdHVzQnV0dG9u ID0gbmV3IFdlYkluc3BlY3Rvci5UcmVlRWxlbWVudFN0YXR1c0J1dHRvbihlbGVtZW50KTsKKyAg ICAgICAgICAgIHRoaXMuX2Nsb3NlU3RhdHVzQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5z cGVjdG9yLlRyZWVFbGVtZW50U3RhdHVzQnV0dG9uLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2Nsb3Nl U3RhdHVzQnV0dG9uQ2xpY2tlZCwgdGhpcyk7CisgICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQg PT09IHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50 KQorICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVRyZWVFbGVtZW50V2l0aENsb3NlQnV0dG9u KHRyZWVFbGVtZW50KTsKKyAgICAgICAgfS5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisgICAgX2Ns b3NlU3RhdHVzQnV0dG9uQ2xpY2tlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB0 aGlzLm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNl bGVjdCgpOworICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVTaWRlYmFyUGFuZWwuc2hvd1Rp bWVsaW5lVmlld0ZvclR5cGUoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuU2NyaXB0 KTsKICAgICB9CiB9Owo=