196873 2019-04-12 11:35:29 -0700 Web Inspector: drag/drop over the sidebar should load an imported file in Canvas/Audit tab 2019-04-15 11:58:36 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1526854 0 hi 2019-04-12 11:35:29 -0700 # STEPS TO REPRODUCE: 1. inspect any page 2. go to the Audit tab 3. download an audit 4. drag the downloaded Audit over the navigation sidebar 5. drop/release => the file moves back to finder like the drop was "rejected" 1526856 1 webkit-bug-importer 2019-04-12 11:35:45 -0700 <rdar://problem/49858190> 1526865 2 367338 hi 2019-04-12 11:58:23 -0700 Created attachment 367338 Patch 1527207 3 367338 timothy 2019-04-15 10:10:44 -0700 Comment on attachment 367338 Patch Nice! 1527226 4 367338 commit-queue 2019-04-15 10:28:11 -0700 Comment on attachment 367338 Patch Rejecting attachment 367338 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 367338, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=367338&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=196873&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Processing patch 367338 from bug 196873. Fetching: https://bugs.webkit.org/attachment.cgi?id=367338 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Timothy Hatcher']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 6 diffs from patch file(s). patching file Source/WebInspectorUI/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebInspectorUI/UserInterface/Base/Main.js Hunk #1 FAILED at 271. Hunk #2 succeeded at 1524 with fuzz 1. 1 out of 3 hunks FAILED -- saving rejects to file Source/WebInspectorUI/UserInterface/Base/Main.js.rej patching file Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js patching file Source/WebInspectorUI/UserInterface/Views/AuditTabContentView.js patching file Source/WebInspectorUI/UserInterface/Views/CanvasTabContentView.js patching file Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Timothy Hatcher']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: https://webkit-queues.webkit.org/results/11872243 1527267 5 367430 hi 2019-04-15 11:15:17 -0700 Created attachment 367430 Patch 1527306 6 367430 commit-queue 2019-04-15 11:58:34 -0700 Comment on attachment 367430 Patch Clearing flags on attachment: 367430 Committed r244278: <https://trac.webkit.org/changeset/244278> 1527307 7 commit-queue 2019-04-15 11:58:36 -0700 All reviewed patches have been landed. Closing bug. 367338 2019-04-12 11:58:23 -0700 2019-04-15 11:15:16 -0700 Patch bug-196873-20190412115822.patch text/plain 9839 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDkzODM1NTE2MTc2MDYwMzQxODYzMWUzNDNlZjc5 ODI1M2FmOGQzMjQuLmNkMGNlOGViOGNjYTJmNmYwYzEzZTEyYzUzM2Q4YjY5ZmNjOWY2MmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTA0LTEyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBk cmFnL2Ryb3Agb3ZlciB0aGUgc2lkZWJhciBzaG91bGQgbG9hZCBhbiBpbXBvcnRlZCBmaWxlIGlu IENhbnZhcy9BdWRpdCB0YWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5Njg3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDk4NTgxOTA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdJLmNvbnRlbnRMb2FkZWQpOgorICAgICAgICAo V0kuX2hhbmRsZURyYWdPdmVyKTogQWRkZWQuCisgICAgICAgIChXSS5faGFuZGxlRHJvcCk6IEFk ZGVkLgorICAgICAgICAoV0kuX2RyYWdPdmVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0F1ZGl0VGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5BdWRpdFRh YkNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLkF1ZGl0VGFiQ29udGVudFZpZXcucHJvdG90eXBl LmFzeW5jIGhhbmRsZUZpbGVEcm9wKTogQWRkZWQuCisgICAgICAgIChXSS5BdWRpdFRhYkNvbnRl bnRWaWV3LnByb3RvdHlwZS5faGFuZGxlRHJhZ092ZXIpOiBEZWxldGVkLgorICAgICAgICAoV0ku QXVkaXRUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRsZURyb3ApOiBEZWxldGVkLgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzVGFiQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXSS5DYW52YXNUYWJDb250ZW50Vmlldyk6CisgICAgICAgIChXSS5DYW52YXNUYWJDb250 ZW50Vmlldy5wcm90b3R5cGUuYXN5bmMgaGFuZGxlRmlsZURyb3ApOiBBZGRlZC4KKyAgICAgICAg KFdJLkNhbnZhc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxlRHJhZ092ZXIpOiBEZWxl dGVkLgorICAgICAgICAoV0kuQ2FudmFzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVE cm9wKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFi Q29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5UaW1lbGluZVRhYkNvbnRlbnRWaWV3LnByb3Rv dHlwZS5hc3luYyBoYW5kbGVGaWxlRHJvcCk6IEFkZGVkLgorICAgICAgICBDaGVjayB3aGV0aGVy IHRoZSBjdXJyZW50IHRhYiBpcyBhYmxlIHRvIGhhbmRsZSBhIGZpbGUgZHJvcCwgYW5kIGlmIHNv LCBkb24ndCBwcmV2ZW50IHRoZQorICAgICAgICBkcmFnIGZyb20gb2NjdXJpbmcuIFRoaXMgbm93 IGFsbG93cyB0aGUgdXNlciB0byBkcm9wIGFueXdoZXJlIG9uIHRoZSBXZWIgSW5zcGVjdG9yIGFy ZWEgdG8KKyAgICAgICAgaW1wb3J0IGZpbGVzLCBzbyBsb25nIGFzIHRoZSByZWxldmFudCB0YWIg aXMgY3VycmVudGx5IHNlbGVjdGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9s bGVycy9UaW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChXSS5UaW1lbGluZU1hbmFnZXIucHJv dG90eXBlLmFzeW5jIHByb2Nlc3NKU09OKTogQWRkZWQuCisgICAgICAgIChXSS5UaW1lbGluZU1h bmFnZXIucHJvdG90eXBlLnByb2Nlc3NKU09OKTogRGVsZXRlZC4KKyAgICAgICAgTWFrZSBgYXN5 bmNgIHRvIG1hdGNoIG90aGVyIGBwcm9jZXNzSlNPTmAgZnVuY3Rpb25zLgorCiAyMDE5LTA0LTEx ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBSRUdSRVNTSU9OKHIyNDQxOTUpOiBUaW1lbGluZXM6IHVuYWJsZSB0byB0YWtlIGhlYXAg c25hcHNob3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv TWFpbi5qcwppbmRleCA3YmE0NjdhMDA3ZmYyODdlZTc5MjQwNDQzZGY5Nzk3MjBmOGE2NGRkLi45 MDY2ZTNiNzFhZmNmZGJlMjgyMjFmZTBhOTNhNzJlMjI0ZjMxMjNjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC0yNzEsNyArMjcx LDggQEAgV0kuY29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKICAgICBkb2N1bWVudC5hZGRFdmVu dExpc3RlbmVyKCJjb3B5IiwgdGhpcy5fY29weS5iaW5kKHRoaXMpKTsKIAogICAgIGRvY3VtZW50 LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VXYXNDbGlja2VkLmJpbmQodGhp cykpOwotICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRyYWdvdmVyIiwgdGhpcy5fZHJh Z092ZXIuYmluZCh0aGlzKSk7CisgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ292 ZXIiLCBXSS5faGFuZGxlRHJhZ092ZXIpOworICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIo ImRyb3AiLCBXSS5faGFuZGxlRHJvcCk7CiAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi Zm9jdXMiLCBXSS5fZm9jdXNDaGFuZ2VkLmJpbmQodGhpcyksIHRydWUpOwogCiAgICAgd2luZG93 LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fd2luZG93Rm9jdXNlZC5iaW5kKHRoaXMp KTsKQEAgLTE1MjMsNyArMTUyNCw3IEBAIFdJLl9tb3VzZVdhc0NsaWNrZWQgPSBmdW5jdGlvbihl dmVudCkKICAgICB0aGlzLmhhbmRsZVBvc3NpYmxlTGlua0NsaWNrKGV2ZW50KTsKIH07CiAKLVdJ Ll9kcmFnT3ZlciA9IGZ1bmN0aW9uKGV2ZW50KQorV0kuX2hhbmRsZURyYWdPdmVyID0gZnVuY3Rp b24oZXZlbnQpCiB7CiAgICAgLy8gRG8gbm90aGluZyBpZiBhbm90aGVyIGV2ZW50IGxpc3RlbmVy IGhhbmRsZWQgdGhlIGV2ZW50IGFscmVhZHkuCiAgICAgaWYgKGV2ZW50LmRlZmF1bHRQcmV2ZW50 ZWQpCkBAIC0xNTMzLDExICsxNTM0LDM2IEBAIFdJLl9kcmFnT3ZlciA9IGZ1bmN0aW9uKGV2ZW50 KQogICAgIGlmIChXSS5pc0V2ZW50VGFyZ2V0QW5FZGl0YWJsZUZpZWxkKGV2ZW50KSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgLy8gUHJldmVudCB0aGUgZHJvcCBmcm9tIGJlaW5nIGFjY2VwdGVk LgotICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5kcm9wRWZmZWN0ID0gIm5vbmUiOworICAgIGxldCB0 YWJDb250ZW50VmlldyA9IFdJLnRhYkJyb3dzZXIuc2VsZWN0ZWRUYWJDb250ZW50VmlldzsKKyAg ICBpZiAoIXRhYkNvbnRlbnRWaWV3IHx8ICF0YWJDb250ZW50Vmlldy5oYW5kbGVGaWxlRHJvcCB8 fCAhZXZlbnQuZGF0YVRyYW5zZmVyLnR5cGVzLmluY2x1ZGVzKCJGaWxlcyIpKSB7CisgICAgICAg IC8vIFByZXZlbnQgdGhlIGRyb3AgZnJvbSBiZWluZyBhY2NlcHRlZC4KKyAgICAgICAgZXZlbnQu ZGF0YVRyYW5zZmVyLmRyb3BFZmZlY3QgPSAibm9uZSI7CisgICAgfQorCiAgICAgZXZlbnQucHJl dmVudERlZmF1bHQoKTsKIH07CiAKK1dJLl9oYW5kbGVEcm9wID0gZnVuY3Rpb24oZXZlbnQpCit7 CisgICAgLy8gRG8gbm90aGluZyBpZiBhbm90aGVyIGV2ZW50IGxpc3RlbmVyIGhhbmRsZWQgdGhl IGV2ZW50IGFscmVhZHkuCisgICAgaWYgKGV2ZW50LmRlZmF1bHRQcmV2ZW50ZWQpCisgICAgICAg IHJldHVybjsKKworICAgIC8vIEFsbG93IGRyb3BwaW5nIGludG8gZWRpdGFibGUgYXJlYXMuCisg ICAgaWYgKFdJLmlzRXZlbnRUYXJnZXRBbkVkaXRhYmxlRmllbGQoZXZlbnQpKQorICAgICAgICBy ZXR1cm47CisKKyAgICBsZXQgdGFiQ29udGVudFZpZXcgPSBXSS50YWJCcm93c2VyLnNlbGVjdGVk VGFiQ29udGVudFZpZXc7CisgICAgaWYgKHRhYkNvbnRlbnRWaWV3ICYmIHRhYkNvbnRlbnRWaWV3 LmhhbmRsZUZpbGVEcm9wICYmIGV2ZW50LmRhdGFUcmFuc2Zlci5maWxlcykgeworICAgICAgICBl dmVudC5wcmV2ZW50RGVmYXVsdCgpOworCisgICAgICAgIHRhYkNvbnRlbnRWaWV3LmhhbmRsZUZp bGVEcm9wKGV2ZW50LmRhdGFUcmFuc2Zlci5maWxlcykKKyAgICAgICAgLnRoZW4oKCkgPT4gewor ICAgICAgICAgICAgZXZlbnQuZGF0YVRyYW5zZmVyLmNsZWFyRGF0YSgpOworICAgICAgICB9KTsK KyAgICB9Cit9OworCiBXSS5fZGVidWdnZXJEaWRQYXVzZSA9IGZ1bmN0aW9uKGV2ZW50KQogewog ICAgIGlmIChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVTb3VyY2VzVGFiLnZhbHVlKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvVGltZWxpbmVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCmluZGV4IGJiNTJkY2Y1NzY4ZGVjMWIy YTgxOTFlMDE0NmM5MTE4Mzg3YzY1ZGIuLmZlNTE0Yzc1NWE3Njg5ZjFmODYwOGZjZjM4OWJiMGM5 YWRjNzVhNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKQEAgLTI2NCw3 ICsyNjQsNyBAQCBXSS5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1lbGluZU1hbmFnZXIgZXh0 ZW5kcyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5fYWN0aXZlUmVjb3JkaW5nLnN0b3AodGhpcy5f aW5pdGlhdGVkQnlCYWNrZW5kU3RvcCk7CiAgICAgfQogCi0gICAgcHJvY2Vzc0pTT04oe2ZpbGVu YW1lLCBqc29uLCBlcnJvcn0pCisgICAgYXN5bmMgcHJvY2Vzc0pTT04oe2ZpbGVuYW1lLCBqc29u LCBlcnJvcn0pCiAgICAgewogICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgIFdJLlRp bWVsaW5lTWFuYWdlci5zeW50aGVzaXplSW1wb3J0RXJyb3IoZXJyb3IpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUYWJDb250ZW50 Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0 VGFiQ29udGVudFZpZXcuanMKaW5kZXggOWE5ZTY4ZTllMTk4NTIyNzE0ZDVhZDY1OWMxNmUxMTcz NWVmYmQwYi4uZjBjYzljYjI4NjRkYTg0MzhiZGVlNWI3ZDdiOTFjNTYyZTJjNjg2OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUYWJD b250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9BdWRpdFRhYkNvbnRlbnRWaWV3LmpzCkBAIC0zMiw5ICszMiw2IEBAIFdJLkF1ZGl0VGFi Q29udGVudFZpZXcgPSBjbGFzcyBBdWRpdFRhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVu dEJyb3dzZXJUYWJDCiAgICAgICAgIHRoaXMuX3N0YXJ0U3RvcFNob3J0Y3V0ID0gbmV3IFdJLktl eWJvYXJkU2hvcnRjdXQobnVsbCwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuU3BhY2UsIHRoaXMu X2hhbmRsZVNwYWNlLmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLl9zdGFydFN0b3BTaG9ydGN1 dC5pbXBsaWNpdGx5UHJldmVudHNEZWZhdWx0ID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3N0YXJ0 U3RvcFNob3J0Y3V0LmRpc2FibGVkID0gdHJ1ZTsKLQotICAgICAgICB0aGlzLmVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigiZHJhZ292ZXIiLCB0aGlzLl9oYW5kbGVEcmFnT3Zlci5iaW5kKHRoaXMp KTsKLSAgICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRyb3AiLCB0aGlzLl9o YW5kbGVEcm9wLmJpbmQodGhpcykpOwogICAgIH0KIAogICAgIC8vIFN0YXRpYwpAQCAtODYsNiAr ODMsMTEgQEAgV0kuQXVkaXRUYWJDb250ZW50VmlldyA9IGNsYXNzIEF1ZGl0VGFiQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3NlclRhYkMKICAgICAgICAgc3VwZXIuaGlkZGVuKCk7 CiAgICAgfQogCisgICAgYXN5bmMgaGFuZGxlRmlsZURyb3AoZmlsZXMpCisgICAgeworICAgICAg ICBhd2FpdCBXSS5GaWxlVXRpbGl0aWVzLnJlYWRKU09OKGZpbGVzLCAocmVzdWx0KSA9PiBXSS5h dWRpdE1hbmFnZXIucHJvY2Vzc0pTT04ocmVzdWx0KSk7CisgICAgfQorCiAgICAgLy8gUHJvdGVj dGVkCiAKICAgICBpbml0aWFsTGF5b3V0KCkKQEAgLTExMSwyNSArMTEzLDYgQEAgV0kuQXVkaXRU YWJDb250ZW50VmlldyA9IGNsYXNzIEF1ZGl0VGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250 ZW50QnJvd3NlclRhYkMKIAogICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgIH0K LQotICAgIF9oYW5kbGVEcmFnT3ZlcihldmVudCkKLSAgICB7Ci0gICAgICAgIGlmIChldmVudC5k YXRhVHJhbnNmZXIudHlwZXMuaW5jbHVkZXMoIkZpbGVzIikpCi0gICAgICAgICAgICBldmVudC5w cmV2ZW50RGVmYXVsdCgpOwotICAgIH0KLQotICAgIF9oYW5kbGVEcm9wKGV2ZW50KQotICAgIHsK LSAgICAgICAgaWYgKCFldmVudC5kYXRhVHJhbnNmZXIuZmlsZXMgfHwgIWV2ZW50LmRhdGFUcmFu c2Zlci5maWxlcy5sZW5ndGgpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgZXZlbnQu cHJldmVudERlZmF1bHQoKTsKLQotICAgICAgICBXSS5GaWxlVXRpbGl0aWVzLnJlYWRKU09OKGV2 ZW50LmRhdGFUcmFuc2Zlci5maWxlcywgKHJlc3VsdCkgPT4gV0kuYXVkaXRNYW5hZ2VyLnByb2Nl c3NKU09OKHJlc3VsdCkpCi0gICAgICAgIC50aGVuKCgpID0+IHsKLSAgICAgICAgICAgIGV2ZW50 LmRhdGFUcmFuc2Zlci5jbGVhckRhdGEoKTsKLSAgICAgICAgfSk7Ci0gICAgfQogfTsKIAogV0ku QXVkaXRUYWJDb250ZW50Vmlldy5UeXBlID0gImF1ZGl0IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1RhYkNvbnRlbnRWaWV3Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzVGFiQ29u dGVudFZpZXcuanMKaW5kZXggNThhMmNlNTAwY2U2OGExOTFhMjcyZmFlMzMyMGRjZGZiMjNkMTNl OS4uYjBmYjEyODYyNTE4MzIxNDVkOWQxODcwZDk2MDZlMzJjM2QxYWU2YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzVGFiQ29udGVu dFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q2FudmFzVGFiQ29udGVudFZpZXcuanMKQEAgLTU2LDkgKzU2LDYgQEAgV0kuQ2FudmFzVGFiQ29u dGVudFZpZXcgPSBjbGFzcyBDYW52YXNUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRC cm93c2VyVGEKICAgICAgICAgdGhpcy5fcmVjb3JkU2luZ2xlRnJhbWVTaG9ydGN1dC5pbXBsaWNp dGx5UHJldmVudHNEZWZhdWx0ID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3JlY29yZFNpbmdsZUZy YW1lU2hvcnRjdXQuZGlzYWJsZWQgPSB0cnVlOwogCi0gICAgICAgIHRoaXMuZWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJkcmFnb3ZlciIsIHRoaXMuX2hhbmRsZURyYWdPdmVyLmJpbmQodGhpcykp OwotICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZHJvcCIsIHRoaXMuX2hh bmRsZURyb3AuYmluZCh0aGlzKSk7Ci0KICAgICAgICAgV0kuY2FudmFzTWFuYWdlci5lbmFibGUo KTsKICAgICB9CiAKQEAgLTE0MSw2ICsxMzgsMTEgQEAgV0kuQ2FudmFzVGFiQ29udGVudFZpZXcg PSBjbGFzcyBDYW52YXNUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyVGEK ICAgICAgICAgLy8gRklYTUU6IGltcGxlbWVudCBvbmNlIDxodHRwczovL3dlYmtpdC5vcmcvYi8x Nzc2MDY+IGlzIGNvbXBsZXRlLgogICAgIH0KIAorICAgIGFzeW5jIGhhbmRsZUZpbGVEcm9wKGZp bGVzKQorICAgIHsKKyAgICAgICAgYXdhaXQgV0kuRmlsZVV0aWxpdGllcy5yZWFkSlNPTihmaWxl cywgKHJlc3VsdCkgPT4gV0kuY2FudmFzTWFuYWdlci5wcm9jZXNzSlNPTihyZXN1bHQpKTsKKyAg ICB9CisKICAgICAvLyBQcm90ZWN0ZWQKIAogICAgIGluaXRpYWxMYXlvdXQoKQpAQCAtMzAzLDI1 ICszMDUsNiBAQCBXSS5DYW52YXNUYWJDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc1RhYkNvbnRl bnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzZXJUYQogCiAgICAgICAgIGV2ZW50LnByZXZl bnREZWZhdWx0KCk7CiAgICAgfQotCi0gICAgX2hhbmRsZURyYWdPdmVyKGV2ZW50KQotICAgIHsK LSAgICAgICAgaWYgKGV2ZW50LmRhdGFUcmFuc2Zlci50eXBlcy5pbmNsdWRlcygiRmlsZXMiKSkK LSAgICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7Ci0gICAgfQotCi0gICAgX2hhbmRs ZURyb3AoZXZlbnQpCi0gICAgewotICAgICAgICBpZiAoIWV2ZW50LmRhdGFUcmFuc2Zlci5maWxl cyB8fCAhZXZlbnQuZGF0YVRyYW5zZmVyLmZpbGVzLmxlbmd0aCkKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwotCi0gICAgICAgIFdJLkZpbGVV dGlsaXRpZXMucmVhZEpTT04oZXZlbnQuZGF0YVRyYW5zZmVyLmZpbGVzLCAocmVzdWx0KSA9PiBX SS5jYW52YXNNYW5hZ2VyLnByb2Nlc3NKU09OKHJlc3VsdCkpCi0gICAgICAgIC50aGVuKCgpID0+ IHsKLSAgICAgICAgICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5jbGVhckRhdGEoKTsKLSAgICAgICAg fSk7Ci0gICAgfQogfTsKIAogV0kuQ2FudmFzVGFiQ29udGVudFZpZXcuVHlwZSA9ICJjYW52YXMi OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VGltZWxpbmVUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMKaW5kZXggOGRlYTc3MTIzMjZm NjM2MWUwZGY4MmU1NGRhOWMxMjU3NGMwZDVmZi4uYWVkNWVjZjA4M2E5ZmZlZWFjMTg0YzQ1M2E0 NWM1NTJiOWM0MDFhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCkBA IC0zNDMsNiArMzQzLDExIEBAIFdJLlRpbWVsaW5lVGFiQ29udGVudFZpZXcgPSBjbGFzcyBUaW1l bGluZVRhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzCiAgICAgICAgIHJldHVy biByZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdJLlRpbWVsaW5lUmVjb3JkaW5nOwogICAg IH0KIAorICAgIGFzeW5jIGhhbmRsZUZpbGVEcm9wKGZpbGVzKQorICAgIHsKKyAgICAgICAgYXdh aXQgV0kuRmlsZVV0aWxpdGllcy5yZWFkSlNPTihmaWxlcywgKHJlc3VsdCkgPT4gV0kudGltZWxp bmVNYW5hZ2VyLnByb2Nlc3NKU09OKHJlc3VsdCkpOworICAgIH0KKwogICAgIC8vIFByb3RlY3Rl ZAogCiAgICAgcmVzdG9yZUZyb21Db29raWUoY29va2llKQo= 367430 2019-04-15 11:15:17 -0700 2019-04-15 11:58:34 -0700 Patch bug-196873-20190415111516.patch text/plain 10689 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQ5N2U4MTY0YjBjNTVmOGQxNjg3NmM3ODNhNTQw NDg0Y2M3NWRkYzYuLmE0ZjczN2NlMzJhYzhjNjA1ZWUwYzQ5Y2ZiNDIyYzAxZmJiYzE3MmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE5LTA0LTE1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBk cmFnL2Ryb3Agb3ZlciB0aGUgc2lkZWJhciBzaG91bGQgbG9hZCBhbiBpbXBvcnRlZCBmaWxlIGlu IENhbnZhcy9BdWRpdCB0YWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5Njg3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDk4NTgxOTA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXSS5jb250ZW50TG9hZGVkKToKKyAgICAgICAg KFdJLl9oYW5kbGVEcmFnT3Zlcik6IEFkZGVkLgorICAgICAgICAoV0kuX2hhbmRsZURyb3ApOiBB ZGRlZC4KKyAgICAgICAgKFdJLl9kcmFnT3Zlcik6IERlbGV0ZWQuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9BdWRpdFRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuQXVkaXRU YWJDb250ZW50Vmlldyk6CisgICAgICAgIChXSS5BdWRpdFRhYkNvbnRlbnRWaWV3LnByb3RvdHlw ZS5hc3luYyBoYW5kbGVGaWxlRHJvcCk6IEFkZGVkLgorICAgICAgICAoV0kuQXVkaXRUYWJDb250 ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRsZURyYWdPdmVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdJ LkF1ZGl0VGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVEcm9wKTogRGVsZXRlZC4KKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1RhYkNvbnRlbnRWaWV3LmpzOgorICAg ICAgICAoV0kuQ2FudmFzVGFiQ29udGVudFZpZXcpOgorICAgICAgICAoV0kuQ2FudmFzVGFiQ29u dGVudFZpZXcucHJvdG90eXBlLmFzeW5jIGhhbmRsZUZpbGVEcm9wKTogQWRkZWQuCisgICAgICAg IChXSS5DYW52YXNUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRsZURyYWdPdmVyKTogRGVs ZXRlZC4KKyAgICAgICAgKFdJLkNhbnZhc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxl RHJvcCk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRh YkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVUYWJDb250ZW50Vmlldy5wcm90 b3R5cGUuYXN5bmMgaGFuZGxlRmlsZURyb3ApOiBBZGRlZC4KKyAgICAgICAgQ2hlY2sgd2hldGhl ciB0aGUgY3VycmVudCB0YWIgaXMgYWJsZSB0byBoYW5kbGUgYSBmaWxlIGRyb3AsIGFuZCBpZiBz bywgZG9uJ3QgcHJldmVudCB0aGUKKyAgICAgICAgZHJhZyBmcm9tIG9jY3VyaW5nLiBUaGlzIG5v dyBhbGxvd3MgdGhlIHVzZXIgdG8gZHJvcCBhbnl3aGVyZSBvbiB0aGUgV2ViIEluc3BlY3RvciBh cmVhIHRvCisgICAgICAgIGltcG9ydCBmaWxlcywgc28gbG9uZyBhcyB0aGUgcmVsZXZhbnQgdGFi IGlzIGN1cnJlbnRseSBzZWxlY3RlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvQ2FudmFzTWFuYWdlci5qczoKKyAgICAgICAgKFdJLkNhbnZhc01hbmFnZXIucHJvdG90 eXBlLmFzeW5jIHByb2Nlc3NKU09OKTogQWRkZWQuCisgICAgICAgIChXSS5DYW52YXNNYW5hZ2Vy LnByb3RvdHlwZS5wcm9jZXNzSlNPTik6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChXSS5UaW1lbGluZU1h bmFnZXIucHJvdG90eXBlLmFzeW5jIHByb2Nlc3NKU09OKTogQWRkZWQuCisgICAgICAgIChXSS5U aW1lbGluZU1hbmFnZXIucHJvdG90eXBlLnByb2Nlc3NKU09OKTogRGVsZXRlZC4KKyAgICAgICAg TWFrZSBgYXN5bmNgIHRvIG1hdGNoIG90aGVyIGBwcm9jZXNzSlNPTmAgZnVuY3Rpb25zLgorCiAy MDE5LTA0LTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBVbmNhdWdodCBFeGNlcHRpb246IG51bGwgaXMgbm90IGFuIG9iamVjdCAo ZXZhbHVhdGluZyAndGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LnJldmVhbCcpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggMTFjNzZk ZDA3MDUzYTlmZDA5MDY1NjY1MjBmNGJhNjgzMjdlOTFmNi4uYWIwOGQyZTU2ZDIzYjVjY2I1MmNl YWI5ZTIxNDU3ZWI2OTUwNDg0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMjcxLDcgKzI3MSw4IEBAIFdJLmNvbnRlbnRMb2Fk ZWQgPSBmdW5jdGlvbigpCiAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29weSIsIFdJ Ll9jb3B5KTsKIAogICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgV0kuX21v dXNlV2FzQ2xpY2tlZCk7Ci0gICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZHJhZ292ZXIi LCBXSS5fZHJhZ092ZXIpOworICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRyYWdvdmVy IiwgV0kuX2hhbmRsZURyYWdPdmVyKTsKKyAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJk cm9wIiwgV0kuX2hhbmRsZURyb3ApOwogICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImZv Y3VzIiwgV0kuX2ZvY3VzQ2hhbmdlZCwgdHJ1ZSk7CiAKICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0 ZW5lcigiZm9jdXMiLCBXSS5fd2luZG93Rm9jdXNlZCk7CkBAIC0xNTIzLDcgKzE1MjQsNyBAQCBX SS5fbW91c2VXYXNDbGlja2VkID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgV0kuaGFuZGxlUG9zc2li bGVMaW5rQ2xpY2soZXZlbnQpOwogfTsKIAotV0kuX2RyYWdPdmVyID0gZnVuY3Rpb24oZXZlbnQp CitXSS5faGFuZGxlRHJhZ092ZXIgPSBmdW5jdGlvbihldmVudCkKIHsKICAgICAvLyBEbyBub3Ro aW5nIGlmIGFub3RoZXIgZXZlbnQgbGlzdGVuZXIgaGFuZGxlZCB0aGUgZXZlbnQgYWxyZWFkeS4K ICAgICBpZiAoZXZlbnQuZGVmYXVsdFByZXZlbnRlZCkKQEAgLTE1MzMsMTEgKzE1MzQsMzYgQEAg V0kuX2RyYWdPdmVyID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgaWYgKFdJLmlzRXZlbnRUYXJnZXRB bkVkaXRhYmxlRmllbGQoZXZlbnQpKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBQcmV2ZW50 IHRoZSBkcm9wIGZyb20gYmVpbmcgYWNjZXB0ZWQuCi0gICAgZXZlbnQuZGF0YVRyYW5zZmVyLmRy b3BFZmZlY3QgPSAibm9uZSI7CisgICAgbGV0IHRhYkNvbnRlbnRWaWV3ID0gV0kudGFiQnJvd3Nl ci5zZWxlY3RlZFRhYkNvbnRlbnRWaWV3OworICAgIGlmICghdGFiQ29udGVudFZpZXcgfHwgIXRh YkNvbnRlbnRWaWV3LmhhbmRsZUZpbGVEcm9wIHx8ICFldmVudC5kYXRhVHJhbnNmZXIudHlwZXMu aW5jbHVkZXMoIkZpbGVzIikpIHsKKyAgICAgICAgLy8gUHJldmVudCB0aGUgZHJvcCBmcm9tIGJl aW5nIGFjY2VwdGVkLgorICAgICAgICBldmVudC5kYXRhVHJhbnNmZXIuZHJvcEVmZmVjdCA9ICJu b25lIjsKKyAgICB9CisKICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogfTsKIAorV0kuX2hh bmRsZURyb3AgPSBmdW5jdGlvbihldmVudCkKK3sKKyAgICAvLyBEbyBub3RoaW5nIGlmIGFub3Ro ZXIgZXZlbnQgbGlzdGVuZXIgaGFuZGxlZCB0aGUgZXZlbnQgYWxyZWFkeS4KKyAgICBpZiAoZXZl bnQuZGVmYXVsdFByZXZlbnRlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gQWxsb3cgZHJv cHBpbmcgaW50byBlZGl0YWJsZSBhcmVhcy4KKyAgICBpZiAoV0kuaXNFdmVudFRhcmdldEFuRWRp dGFibGVGaWVsZChldmVudCkpCisgICAgICAgIHJldHVybjsKKworICAgIGxldCB0YWJDb250ZW50 VmlldyA9IFdJLnRhYkJyb3dzZXIuc2VsZWN0ZWRUYWJDb250ZW50VmlldzsKKyAgICBpZiAodGFi Q29udGVudFZpZXcgJiYgdGFiQ29udGVudFZpZXcuaGFuZGxlRmlsZURyb3AgJiYgZXZlbnQuZGF0 YVRyYW5zZmVyLmZpbGVzKSB7CisgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisKKyAg ICAgICAgdGFiQ29udGVudFZpZXcuaGFuZGxlRmlsZURyb3AoZXZlbnQuZGF0YVRyYW5zZmVyLmZp bGVzKQorICAgICAgICAudGhlbigoKSA9PiB7CisgICAgICAgICAgICBldmVudC5kYXRhVHJhbnNm ZXIuY2xlYXJEYXRhKCk7CisgICAgICAgIH0pOworICAgIH0KK307CisKIFdJLl9kZWJ1Z2dlckRp ZFBhdXNlID0gZnVuY3Rpb24oZXZlbnQpCiB7CiAgICAgaWYgKFdJLnNldHRpbmdzLmV4cGVyaW1l bnRhbEVuYWJsZVNvdXJjZXNUYWIudmFsdWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52YXNNYW5hZ2VyLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FudmFzTWFuYWdlci5q cwppbmRleCA3MTRhNTI5MjE3MGIwYjY3NDQ5MjcyYjM0ZmY5MGQyOGMxYWRhNzYwLi5hNDgwYzFk MDM5ZmQ5MjFhMTk4Y2E1YjRmZjE2YzNhMTJhNjFmNjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52YXNNYW5hZ2VyLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbnZh c01hbmFnZXIuanMKQEAgLTc1LDcgKzc1LDcgQEAgV0kuQ2FudmFzTWFuYWdlciA9IGNsYXNzIENh bnZhc01hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgcmV0dXJuIEFycmF5LmZyb20o dGhpcy5fc2hhZGVyUHJvZ3JhbUlkZW50aWZpZXJNYXAudmFsdWVzKCkpOwogICAgIH0KIAotICAg IHByb2Nlc3NKU09OKHtmaWxlbmFtZSwganNvbiwgZXJyb3J9KQorICAgIGFzeW5jIHByb2Nlc3NK U09OKHtmaWxlbmFtZSwganNvbiwgZXJyb3J9KQogICAgIHsKICAgICAgICAgaWYgKGVycm9yKSB7 CiAgICAgICAgICAgICBXSS5SZWNvcmRpbmcuc3ludGhlc2l6ZUVycm9yKGVycm9yKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1Rp bWVsaW5lTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwppbmRleCBiYjUyZGNmNTc2OGRlYzFiMmE4MTkx ZTAxNDZjOTExODM4N2M2NWRiLi5mZTUxNGM3NTVhNzY4OWYxZjg2MDhmY2YzODliYjBjOWFkYzc1 YTVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCkBAIC0yNjQsNyArMjY0 LDcgQEAgV0kuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMg V0kuT2JqZWN0CiAgICAgICAgIHRoaXMuX2FjdGl2ZVJlY29yZGluZy5zdG9wKHRoaXMuX2luaXRp YXRlZEJ5QmFja2VuZFN0b3ApOwogICAgIH0KIAotICAgIHByb2Nlc3NKU09OKHtmaWxlbmFtZSwg anNvbiwgZXJyb3J9KQorICAgIGFzeW5jIHByb2Nlc3NKU09OKHtmaWxlbmFtZSwganNvbiwgZXJy b3J9KQogICAgIHsKICAgICAgICAgaWYgKGVycm9yKSB7CiAgICAgICAgICAgICBXSS5UaW1lbGlu ZU1hbmFnZXIuc3ludGhlc2l6ZUltcG9ydEVycm9yKGVycm9yKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VGFiQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRhYkNv bnRlbnRWaWV3LmpzCmluZGV4IDlhOWU2OGU5ZTE5ODUyMjcxNGQ1YWQ2NTljMTZlMTE3MzVlZmJk MGIuLmYwY2M5Y2IyODY0ZGE4NDM4YmRlZTViN2Q3YjkxYzU2MmUyYzY4NjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VGFiQ29udGVu dFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv QXVkaXRUYWJDb250ZW50Vmlldy5qcwpAQCAtMzIsOSArMzIsNiBAQCBXSS5BdWRpdFRhYkNvbnRl bnRWaWV3ID0gY2xhc3MgQXVkaXRUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93 c2VyVGFiQwogICAgICAgICB0aGlzLl9zdGFydFN0b3BTaG9ydGN1dCA9IG5ldyBXSS5LZXlib2Fy ZFNob3J0Y3V0KG51bGwsIFdJLktleWJvYXJkU2hvcnRjdXQuS2V5LlNwYWNlLCB0aGlzLl9oYW5k bGVTcGFjZS5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5fc3RhcnRTdG9wU2hvcnRjdXQuaW1w bGljaXRseVByZXZlbnRzRGVmYXVsdCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9zdGFydFN0b3BT aG9ydGN1dC5kaXNhYmxlZCA9IHRydWU7Ci0KLSAgICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoImRyYWdvdmVyIiwgdGhpcy5faGFuZGxlRHJhZ092ZXIuYmluZCh0aGlzKSk7Ci0g ICAgICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkcm9wIiwgdGhpcy5faGFuZGxl RHJvcC5iaW5kKHRoaXMpKTsKICAgICB9CiAKICAgICAvLyBTdGF0aWMKQEAgLTg2LDYgKzgzLDEx IEBAIFdJLkF1ZGl0VGFiQ29udGVudFZpZXcgPSBjbGFzcyBBdWRpdFRhYkNvbnRlbnRWaWV3IGV4 dGVuZHMgV0kuQ29udGVudEJyb3dzZXJUYWJDCiAgICAgICAgIHN1cGVyLmhpZGRlbigpOwogICAg IH0KIAorICAgIGFzeW5jIGhhbmRsZUZpbGVEcm9wKGZpbGVzKQorICAgIHsKKyAgICAgICAgYXdh aXQgV0kuRmlsZVV0aWxpdGllcy5yZWFkSlNPTihmaWxlcywgKHJlc3VsdCkgPT4gV0kuYXVkaXRN YW5hZ2VyLnByb2Nlc3NKU09OKHJlc3VsdCkpOworICAgIH0KKwogICAgIC8vIFByb3RlY3RlZAog CiAgICAgaW5pdGlhbExheW91dCgpCkBAIC0xMTEsMjUgKzExMyw2IEBAIFdJLkF1ZGl0VGFiQ29u dGVudFZpZXcgPSBjbGFzcyBBdWRpdFRhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJy b3dzZXJUYWJDCiAKICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKICAgICB9Ci0KLSAg ICBfaGFuZGxlRHJhZ092ZXIoZXZlbnQpCi0gICAgewotICAgICAgICBpZiAoZXZlbnQuZGF0YVRy YW5zZmVyLnR5cGVzLmluY2x1ZGVzKCJGaWxlcyIpKQotICAgICAgICAgICAgZXZlbnQucHJldmVu dERlZmF1bHQoKTsKLSAgICB9Ci0KLSAgICBfaGFuZGxlRHJvcChldmVudCkKLSAgICB7Ci0gICAg ICAgIGlmICghZXZlbnQuZGF0YVRyYW5zZmVyLmZpbGVzIHx8ICFldmVudC5kYXRhVHJhbnNmZXIu ZmlsZXMubGVuZ3RoKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGV2ZW50LnByZXZl bnREZWZhdWx0KCk7Ci0KLSAgICAgICAgV0kuRmlsZVV0aWxpdGllcy5yZWFkSlNPTihldmVudC5k YXRhVHJhbnNmZXIuZmlsZXMsIChyZXN1bHQpID0+IFdJLmF1ZGl0TWFuYWdlci5wcm9jZXNzSlNP TihyZXN1bHQpKQotICAgICAgICAudGhlbigoKSA9PiB7Ci0gICAgICAgICAgICBldmVudC5kYXRh VHJhbnNmZXIuY2xlYXJEYXRhKCk7Ci0gICAgICAgIH0pOwotICAgIH0KIH07CiAKIFdJLkF1ZGl0 VGFiQ29udGVudFZpZXcuVHlwZSA9ICJhdWRpdCI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNUYWJDb250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1RhYkNvbnRlbnRW aWV3LmpzCmluZGV4IDU4YTJjZTUwMGNlNjhhMTkxYTI3MmZhZTMzMjBkY2RmYjIzZDEzZTkuLmIw ZmIxMjg2MjUxODMyMTQ1ZDlkMTg3MGQ5NjA2ZTMyYzNkMWFlNmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1RhYkNvbnRlbnRWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZh c1RhYkNvbnRlbnRWaWV3LmpzCkBAIC01Niw5ICs1Niw2IEBAIFdJLkNhbnZhc1RhYkNvbnRlbnRW aWV3ID0gY2xhc3MgQ2FudmFzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3Nl clRhCiAgICAgICAgIHRoaXMuX3JlY29yZFNpbmdsZUZyYW1lU2hvcnRjdXQuaW1wbGljaXRseVBy ZXZlbnRzRGVmYXVsdCA9IGZhbHNlOwogICAgICAgICB0aGlzLl9yZWNvcmRTaW5nbGVGcmFtZVNo b3J0Y3V0LmRpc2FibGVkID0gdHJ1ZTsKIAotICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigiZHJhZ292ZXIiLCB0aGlzLl9oYW5kbGVEcmFnT3Zlci5iaW5kKHRoaXMpKTsKLSAg ICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRyb3AiLCB0aGlzLl9oYW5kbGVE cm9wLmJpbmQodGhpcykpOwotCiAgICAgICAgIFdJLmNhbnZhc01hbmFnZXIuZW5hYmxlKCk7CiAg ICAgfQogCkBAIC0xNDEsNiArMTM4LDExIEBAIFdJLkNhbnZhc1RhYkNvbnRlbnRWaWV3ID0gY2xh c3MgQ2FudmFzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3NlclRhCiAgICAg ICAgIC8vIEZJWE1FOiBpbXBsZW1lbnQgb25jZSA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTc3NjA2 PiBpcyBjb21wbGV0ZS4KICAgICB9CiAKKyAgICBhc3luYyBoYW5kbGVGaWxlRHJvcChmaWxlcykK KyAgICB7CisgICAgICAgIGF3YWl0IFdJLkZpbGVVdGlsaXRpZXMucmVhZEpTT04oZmlsZXMsIChy ZXN1bHQpID0+IFdJLmNhbnZhc01hbmFnZXIucHJvY2Vzc0pTT04ocmVzdWx0KSk7CisgICAgfQor CiAgICAgLy8gUHJvdGVjdGVkCiAKICAgICBpbml0aWFsTGF5b3V0KCkKQEAgLTMwMywyNSArMzA1 LDYgQEAgV0kuQ2FudmFzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNUYWJDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyVGEKIAogICAgICAgICBldmVudC5wcmV2ZW50RGVm YXVsdCgpOwogICAgIH0KLQotICAgIF9oYW5kbGVEcmFnT3ZlcihldmVudCkKLSAgICB7Ci0gICAg ICAgIGlmIChldmVudC5kYXRhVHJhbnNmZXIudHlwZXMuaW5jbHVkZXMoIkZpbGVzIikpCi0gICAg ICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwotICAgIH0KLQotICAgIF9oYW5kbGVEcm9w KGV2ZW50KQotICAgIHsKLSAgICAgICAgaWYgKCFldmVudC5kYXRhVHJhbnNmZXIuZmlsZXMgfHwg IWV2ZW50LmRhdGFUcmFuc2Zlci5maWxlcy5sZW5ndGgpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKLQotICAgICAgICBXSS5GaWxlVXRpbGl0 aWVzLnJlYWRKU09OKGV2ZW50LmRhdGFUcmFuc2Zlci5maWxlcywgKHJlc3VsdCkgPT4gV0kuY2Fu dmFzTWFuYWdlci5wcm9jZXNzSlNPTihyZXN1bHQpKQotICAgICAgICAudGhlbigoKSA9PiB7Ci0g ICAgICAgICAgICBldmVudC5kYXRhVHJhbnNmZXIuY2xlYXJEYXRhKCk7Ci0gICAgICAgIH0pOwot ICAgIH0KIH07CiAKIFdJLkNhbnZhc1RhYkNvbnRlbnRWaWV3LlR5cGUgPSAiY2FudmFzIjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDhkZWE3NzEyMzI2ZjYzNjFl MGRmODJlNTRkYTljMTI1NzRjMGQ1ZmYuLmFlZDVlY2YwODNhOWZmZWVhYzE4NGM0NTNhNDVjNTUy YjljNDAxYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcwpAQCAtMzQz LDYgKzM0MywxMSBAQCBXSS5UaW1lbGluZVRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVU YWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93cwogICAgICAgICByZXR1cm4gcmVw cmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXSS5UaW1lbGluZVJlY29yZGluZzsKICAgICB9CiAK KyAgICBhc3luYyBoYW5kbGVGaWxlRHJvcChmaWxlcykKKyAgICB7CisgICAgICAgIGF3YWl0IFdJ LkZpbGVVdGlsaXRpZXMucmVhZEpTT04oZmlsZXMsIChyZXN1bHQpID0+IFdJLnRpbWVsaW5lTWFu YWdlci5wcm9jZXNzSlNPTihyZXN1bHQpKTsKKyAgICB9CisKICAgICAvLyBQcm90ZWN0ZWQKIAog ICAgIHJlc3RvcmVGcm9tQ29va2llKGNvb2tpZSkK