224651 2021-04-15 23:41:19 -0700 Web Inspector: Uncaught Exception: null is not an object (evaluating 'this._listeners.get') 2021-04-24 15:09:22 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=224652 http://acko.net/ InRadar P2 Normal --- 1 hi hi bburg hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1750953 0 hi 2021-04-15 23:41:19 -0700 # STEPS TO REPRODUCE 1. inspect <http://acko.net> 2. take a single-frame canvas recording Uncaught Exceptions: ----------------------- - null is not an object (evaluating 'this._listeners.get') (at Object.js:83:52) removeEventListener @ Object.js:83:52 ondetach @ ShaderProgramTreeElement.js:66:55 _detach @ TreeElement.js:294:26 removeChildren @ TreeOutline.js:382:26 removeChildren @ FolderizedTreeElement.js:74:29 onpopulate @ CanvasTreeElement.js:75:28 expand @ TreeElement.js:412:28 reveal @ TreeElement.js:488:39 revealAndSelect @ TreeElement.js:551:20 _revealAndSelectRepresentedObject @ ContentBrowserTabContentView.js:307:40 _contentBrowserCurrentContentViewDidChange @ ContentBrowserTabContentView.js:289:47 dispatch @ Object.js:129:35 dispatchEventToListeners @ Object.js:137:17 _currentContentViewDidChange @ ContentBrowser.js:540:38 dispatch @ Object.js:129:35 dispatchEventToListeners @ Object.js:137:17 showBackForwardEntryForIndex @ ContentViewContainer.js:164:38 showContentView @ ContentViewContainer.js:141:42 showRepresentedObject @ ContentBrowserTabContentView.js:218:64 showRepresentedObject @ GraphicsTabContentView.js:108:36 _addRecording @ GraphicsTabContentView.js:262:39 _handleRecordingSavedOrStopped @ GraphicsTabContentView.js:309:27 dispatch @ Object.js:129:35 dispatchEventToListeners @ Object.js:145:21 recordingFinished @ Canvas.js:427:38 recordingFinished @ CanvasManager.js:232:33 recordingFinished @ CanvasObserver.js:62:43 _dispatchEvent @ Connection.js:210:26 dispatch @ Connection.js:79:32 dispatchMessageFromTarget @ TargetManager.js:176:39 dispatchMessageFromTarget @ TargetObserver.js:47:51 _dispatchEvent @ Connection.js:210:26 dispatch @ Connection.js:79:32 dispatch @ InspectorBackend.js:232:52 ? @ MessageDispatcher.js:42:34 Additional Details: cause --> An uncaught exception was thrown while handling event: Canvas.recordingFinished ----------------------- Notes: Inspected URL: http://acko.net/ Loading completed: true Frontend User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Dispatch Source: Protocol Event Protocol Event: {"method":"Canvas.recordingFinished","params":{"canvasId":"canvas:0.6","recording":{"version":1,"type":"canvas-webgl","initialState":{"attributes":{"width":1068,"height":1228},"parameters":[{"alpha":false,"depth":true,"stencil":false,"antialias":true,"premultipliedAlpha":true,"preserveDrawingBuffer":false,"failIfMajorPerformanceCaveat":false}],"content":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABCwAAATMCAYAAABMVhYSAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABA… 1750961 1 426189 hi 2021-04-15 23:52:42 -0700 Created attachment 426189 Patch 1751107 2 426189 bburg 2021-04-16 09:37:03 -0700 Comment on attachment 426189 Patch r=me Sad to be covering up this problem. We need to prioritize fixing the followup, since we now know what the design issue is. 1751131 3 426189 hi 2021-04-16 10:23:08 -0700 Comment on attachment 426189 Patch (In reply to BJ Burg from comment #2) > Sad to be covering up this problem. We need to prioritize fixing the followup, since we now know what the design issue is. Yeah I agree :( I remember making a decision not to add these early-return in r269359 because my thought was "this should never happen as we'd consider it an error", but since then I've seen it be an issue a handful of times, so I'd rather not have that happen to actual developers. 1751160 4 ews-feeder 2021-04-16 11:07:30 -0700 Committed r276146 (236639@main): <https://commits.webkit.org/236639@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426189. 1753946 5 webkit-bug-importer 2021-04-24 15:09:22 -0700 <rdar://problem/77110123> 426189 2021-04-15 23:52:42 -0700 2021-04-16 11:07:31 -0700 Patch 224651.diff text/plain 11712 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGFkMTg4MGMwNmRiZC4uMWJhOTJhMGM2MzBjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAyMS0wNC0xNSAgRGV2 aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog VW5jYXVnaHQgRXhjZXB0aW9uOiBudWxsIGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1YXRpbmcgJ3Ro aXMuX2xpc3RlbmVycy5nZXQnKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjI0NjUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvT2JqZWN0LmpzOgorICAgICAgICAoV0ku T2JqZWN0LnJlbW92ZUV2ZW50TGlzdGVuZXIpOgorICAgICAgICBBZGQgZWFybHktcmV0dXJuIGNo ZWNrcyBqdXN0IGluIGNhc2UgYF9saXN0ZW5lcnNgIG9yIGBsaXN0ZW5lcnNGb3JFdmVudFR5cGVg IGlzIGZhbHN5LiBXaGlsZQorICAgICAgICBpZGVhbGx5IGl0IHdvdWxkIGJlIHRoZSBjYXNlIHRo YXQgdGhlc2Ugd291bGQgbmV2ZXIgYmUgZmFsc3ksIHRoZSBsb2dpYyBvZiBXZWIgSW5zcGVjdG9y IGlzCisgICAgICAgIGNvbXBsZXggYW5kIGZhciByZWFjaGluZywgc28gYmV0dGVyIHNhZmUgdGhh biBzb3JyeS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJlZUVsZW1lbnQuanM6 CisgICAgICAgIChXSS5UcmVlRWxlbWVudC5wcm90b3R5cGUuX2RldGFjaCk6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV0kuQXVk aXRUcmVlRWxlbWVudC5wcm90b3R5cGUub25kZXRhY2gpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvQm9vdHN0cmFwU2NyaXB0VHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXSS5Cb290 c3RyYXBTY3JpcHRUcmVlRWxlbWVudC5wcm90b3R5cGUub25kZXRhY2gpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV0ku QnJlYWtwb2ludFRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmRldGFjaCk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdJLkRPTVRyZWVF bGVtZW50LnByb3RvdHlwZS5vbmRldGFjaCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9GcmFtZVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV0kuRnJhbWVUcmVlRWxlbWVudC5wcm90 b3R5cGUub25kZXRhY2gpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSmF2YVNjcmlw dEJyZWFrcG9pbnRUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdJLkphdmFTY3JpcHRCcmVha3Bv aW50VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZGV0YWNoKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0xvY2FsUmVzb3VyY2VPdmVycmlkZVRyZWVFbGVtZW50LmpzOgorICAgICAgICAo V0kuTG9jYWxSZXNvdXJjZU92ZXJyaWRlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZGV0YWNoKToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRlclByb2dyYW1UcmVlRWxlbWVudC5q czoKKyAgICAgICAgKFdJLlNoYWRlclByb2dyYW1UcmVlRWxlbWVudC5wcm90b3R5cGUub25kZXRh Y2gpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvV2ViU29ja2V0UmVzb3VyY2VUcmVl RWxlbWVudC5qczoKKyAgICAgICAgKFdJLldlYlNvY2tldFJlc291cmNlVHJlZUVsZW1lbnQucHJv dG90eXBlLm9uZGV0YWNoKToKKyAgICAgICAgQWRkIEZJWE1FIGNvbW1lbnRzIHdhcm5pbmcgb2Yg dGhpcyBpc3N1ZSBzbyB0aGF0IGZ1dHVyZSBjaGFuZ2VzIGNhbiB0YWtlIGl0IGludG8gYWNjb3Vu dC4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIyNDY1Mj4gKFdlYiBJbnNwZWN0b3I6 IFRyZWUgT3V0bGluZXM6IGBvbmRldGFjaGAgY2FuIGJlIGNhbGxlZCB3aXRob3V0IGBvbmF0dGFj aGAgZXZlciBiZWluZyBjYWxsZWQpCisKIDIwMjEtMDQtMTMgIEJKIEJ1cmcgIDxiYnVyZ0BhcHBs ZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIHNldHRpbmcgdG8gYWxsb3cgaW5z cGVjdGluZyBXZWIgSW5zcGVjdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL09iamVjdC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvT2JqZWN0LmpzCmluZGV4IGM3Yzg3ODU2NzMyMi4uMjk0MTUwMjE2NmE0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL09i amVjdC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL09i amVjdC5qcwpAQCAtNzgsMTAgKzc4LDE1IEBAIFdJLk9iamVjdCA9IGNsYXNzIFdlYkluc3BlY3Rv ck9iamVjdAogICAgICAgICBjb25zb2xlLmFzc2VydCh0eXBlb2YgbGlzdGVuZXIgPT09ICJmdW5j dGlvbiIsIHRoaXMsIGV2ZW50VHlwZSwgbGlzdGVuZXIsIHRoaXNPYmplY3QpOwogICAgICAgICBj b25zb2xlLmFzc2VydCh0eXBlb2YgdGhpc09iamVjdCA9PT0gIm9iamVjdCIgfHwgd2luZG93Lklu c3BlY3RvclRlc3QgfHwgd2luZG93LlByb3RvY29sVGVzdCwgdGhpcywgZXZlbnRUeXBlLCBsaXN0 ZW5lciwgdGhpc09iamVjdCk7CiAKKyAgICAgICAgaWYgKCF0aGlzLl9saXN0ZW5lcnMpCisgICAg ICAgICAgICByZXR1cm47CisKICAgICAgICAgdGhpc09iamVjdCA/Pz0gdGhpczsKIAogICAgICAg ICBsZXQgbGlzdGVuZXJzRm9yRXZlbnRUeXBlID0gdGhpcy5fbGlzdGVuZXJzLmdldChldmVudFR5 cGUpOwogICAgICAgICBjb25zb2xlLmFzc2VydChsaXN0ZW5lcnNGb3JFdmVudFR5cGUsIHRoaXMs IGV2ZW50VHlwZSwgbGlzdGVuZXIsIHRoaXNPYmplY3QpOworICAgICAgICBpZiAoIWxpc3RlbmVy c0ZvckV2ZW50VHlwZSkKKyAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBsZXQgZGlkRGVs ZXRlID0gZmFsc2U7CiAgICAgICAgIGZvciAobGV0IGRhdGEgb2YgbGlzdGVuZXJzRm9yRXZlbnRU eXBlKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9BdWRpdFRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQXVkaXRUcmVlRWxlbWVudC5qcwppbmRleCA1MmUzOWMzZmRiODcuLjc1ZWIw N2E1NDE1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQXVkaXRUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9BdWRpdFRyZWVFbGVtZW50LmpzCkBAIC05Nyw2ICs5Nyw4IEBAIFdJ LkF1ZGl0VHJlZUVsZW1lbnQgPSBjbGFzcyBBdWRpdFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2Vu ZXJhbFRyZWVFbGVtZW50CiAKICAgICBvbmRldGFjaCgpCiAgICAgeworICAgICAgICAvLyBGSVhN RTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIyNDY1Mj4gKFdlYiBJbnNwZWN0b3I6IFRyZWUgT3V0 bGluZXM6IGBvbmRldGFjaGAgY2FuIGJlIGNhbGxlZCB3aXRob3V0IGBvbmF0dGFjaGAgZXZlciBi ZWluZyBjYWxsZWQpCisKICAgICAgICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmplY3QgaW5zdGFu Y2VvZiBXSS5BdWRpdFRlc3RCYXNlKSB7CiAgICAgICAgICAgICB0aGlzLnJlcHJlc2VudGVkT2Jq ZWN0LnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuQXVkaXRUZXN0QmFzZS5FdmVudC5EaXNhYmxlZENo YW5nZWQsIHRoaXMuX2hhbmRsZVRlc3REaXNhYmxlZENoYW5nZWQsIHRoaXMpOwogICAgICAgICAg ICAgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkF1ZGl0VGVz dEJhc2UuRXZlbnQuUmVzdWx0Q2hhbmdlZCwgdGhpcy5faGFuZGxlVGVzdFJlc3VsdENoYW5nZWQs IHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQm9vdHN0cmFwU2NyaXB0VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Cb290c3RyYXBTY3JpcHRUcmVlRWxlbWVudC5qcwppbmRl eCAyNzY2M2ZlOTk5ZjcuLjQyNzFhMTE3NzIwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm9vdHN0cmFwU2NyaXB0VHJlZUVsZW1lbnQuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm9vdHN0cmFw U2NyaXB0VHJlZUVsZW1lbnQuanMKQEAgLTUyLDYgKzUyLDggQEAgV0kuQm9vdHN0cmFwU2NyaXB0 VHJlZUVsZW1lbnQgPSBjbGFzcyBCb290c3RyYXBTY3JpcHRUcmVlRWxlbWVudCBleHRlbmRzIFdJ LlNjcmkKIAogICAgIG9uZGV0YWNoKCkKICAgICB7CisgICAgICAgIC8vIEZJWE1FOiA8aHR0cHM6 Ly93ZWJraXQub3JnL2IvMjI0NjUyPiAoV2ViIEluc3BlY3RvcjogVHJlZSBPdXRsaW5lczogYG9u ZGV0YWNoYCBjYW4gYmUgY2FsbGVkIHdpdGhvdXQgYG9uYXR0YWNoYCBldmVyIGJlaW5nIGNhbGxl ZCkKKwogICAgICAgICBXSS5OZXR3b3JrTWFuYWdlci5yZW1vdmVFdmVudExpc3RlbmVyKFdJLk5l dHdvcmtNYW5hZ2VyLkV2ZW50LkJvb3RzdHJhcFNjcmlwdEVuYWJsZWRDaGFuZ2VkLCB0aGlzLl9o YW5kbGVOZXR3b3JrTWFuYWdlckJvb3RzdHJhcFNjcmlwdEVuYWJsZWRDaGFuZ2VkLCB0aGlzKTsK IAogICAgICAgICBzdXBlci5vbmRldGFjaCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRyZWVFbGVtZW50LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFRyZWVFbGVt ZW50LmpzCmluZGV4IDg4MGM4ZGI5YjM2Mi4uN2RkOGZjZWNkY2I1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CcmVha3BvaW50VHJlZUVsZW1l bnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJl YWtwb2ludFRyZWVFbGVtZW50LmpzCkBAIC0xMTEsNiArMTExLDggQEAgV0kuQnJlYWtwb2ludFRy ZWVFbGVtZW50ID0gY2xhc3MgQnJlYWtwb2ludFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZXJh bFRyZWVFbGUKIAogICAgIG9uZGV0YWNoKCkKICAgICB7CisgICAgICAgIC8vIEZJWE1FOiA8aHR0 cHM6Ly93ZWJraXQub3JnL2IvMjI0NjUyPiAoV2ViIEluc3BlY3RvcjogVHJlZSBPdXRsaW5lczog YG9uZGV0YWNoYCBjYW4gYmUgY2FsbGVkIHdpdGhvdXQgYG9uYXR0YWNoYCBldmVyIGJlaW5nIGNh bGxlZCkKKwogICAgICAgICBzdXBlci5vbmRldGFjaCgpOwogCiAgICAgICAgIHRoaXMuX2JyZWFr cG9pbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5CcmVha3BvaW50LkV2ZW50LkRpc2FibGVkU3Rh dGVEaWRDaGFuZ2UsIHRoaXMudXBkYXRlU3RhdHVzLCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQu anMKaW5kZXggNzFiM2EzM2FiNzEyLi43ZmE2ZjI3NDg5MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50 LmpzCkBAIC00NTUsNiArNDU1LDggQEAgV0kuRE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVl RWxlbWVudCBleHRlbmRzIFdJLlRyZWVFbGVtZW50CiAKICAgICBvbmRldGFjaCgpCiAgICAgewor ICAgICAgICAvLyBGSVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIyNDY1Mj4gKFdlYiBJbnNw ZWN0b3I6IFRyZWUgT3V0bGluZXM6IGBvbmRldGFjaGAgY2FuIGJlIGNhbGxlZCB3aXRob3V0IGBv bmF0dGFjaGAgZXZlciBiZWluZyBjYWxsZWQpCisKICAgICAgICAgaWYgKHRoaXMucmVwcmVzZW50 ZWRPYmplY3QubGF5b3V0Q29udGV4dFR5cGUgPT09IFdJLkRPTU5vZGUuTGF5b3V0Q29udGV4dFR5 cGUuR3JpZCkgewogICAgICAgICAgICAgV0kub3ZlcmxheU1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0 ZW5lcihXSS5PdmVybGF5TWFuYWdlci5FdmVudC5HcmlkT3ZlcmxheVNob3duLCB0aGlzLl91cGRh dGVHcmlkQmFkZ2VTdGF0dXMsIHRoaXMpOwogICAgICAgICAgICAgV0kub3ZlcmxheU1hbmFnZXIu cmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5PdmVybGF5TWFuYWdlci5FdmVudC5HcmlkT3ZlcmxheUhp ZGRlbiwgdGhpcy5fdXBkYXRlR3JpZEJhZGdlU3RhdHVzLCB0aGlzKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVF bGVtZW50LmpzCmluZGV4IGQzYmM3MGVlNTAxOS4uNWU0ZjNlNjUyMDlmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1l VHJlZUVsZW1lbnQuanMKQEAgLTEyMSw2ICsxMjEsOCBAQCBXSS5GcmFtZVRyZWVFbGVtZW50ID0g Y2xhc3MgRnJhbWVUcmVlRWxlbWVudCBleHRlbmRzIFdJLlJlc291cmNlVHJlZUVsZW1lbnQKIAog ICAgIG9uZGV0YWNoKCkKICAgICB7CisgICAgICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQu b3JnL2IvMjI0NjUyPiAoV2ViIEluc3BlY3RvcjogVHJlZSBPdXRsaW5lczogYG9uZGV0YWNoYCBj YW4gYmUgY2FsbGVkIHdpdGhvdXQgYG9uYXR0YWNoYCBldmVyIGJlaW5nIGNhbGxlZCkKKwogICAg ICAgICBpZiAodGhpcy5saXN0SXRlbUVsZW1lbnQpIHsKICAgICAgICAgICAgIFdJLmNzc01hbmFn ZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5DU1NNYW5hZ2VyLkV2ZW50LlN0eWxlU2hlZXRBZGRl ZCwgdGhpcy5fc3R5bGVTaGVldEFkZGVkLCB0aGlzKTsKICAgICAgICAgICAgIFdJLmNzc01hbmFn ZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5DU1NNYW5hZ2VyLkV2ZW50LlN0eWxlU2hlZXRSZW1v dmVkLCB0aGlzLl9zdHlsZVNoZWV0UmVtb3ZlZCwgdGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9KYXZhU2NyaXB0QnJlYWtwb2ludFRy ZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv SmF2YVNjcmlwdEJyZWFrcG9pbnRUcmVlRWxlbWVudC5qcwppbmRleCBlNDVkYWIzZWZhMmMuLmM5 YjgxMTljMDI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvSmF2YVNjcmlwdEJyZWFrcG9pbnRUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9KYXZhU2NyaXB0QnJlYWtwb2ludFRy ZWVFbGVtZW50LmpzCkBAIC01OSw2ICs1OSw4IEBAIFdJLkphdmFTY3JpcHRCcmVha3BvaW50VHJl ZUVsZW1lbnQgPSBjbGFzcyBKYXZhU2NyaXB0QnJlYWtwb2ludFRyZWVFbGVtZW50IGV4dGVuCiAK ICAgICBvbmRldGFjaCgpCiAgICAgeworICAgICAgICAvLyBGSVhNRTogPGh0dHBzOi8vd2Via2l0 Lm9yZy9iLzIyNDY1Mj4gKFdlYiBJbnNwZWN0b3I6IFRyZWUgT3V0bGluZXM6IGBvbmRldGFjaGAg Y2FuIGJlIGNhbGxlZCB3aXRob3V0IGBvbmF0dGFjaGAgZXZlciBiZWluZyBjYWxsZWQpCisKICAg ICAgICAgaWYgKCF0aGlzLmJyZWFrcG9pbnQuc3BlY2lhbCkKICAgICAgICAgICAgIHRoaXMuYnJl YWtwb2ludC5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkphdmFTY3JpcHRCcmVha3BvaW50LkV2ZW50 LkxvY2F0aW9uRGlkQ2hhbmdlLCB0aGlzLl9icmVha3BvaW50TG9jYXRpb25EaWRDaGFuZ2UsIHRo aXMpOwogICAgICAgICB0aGlzLmJyZWFrcG9pbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5KYXZh U2NyaXB0QnJlYWtwb2ludC5FdmVudC5SZXNvbHZlZFN0YXRlRGlkQ2hhbmdlLCB0aGlzLnVwZGF0 ZVN0YXR1cywgdGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291cmNlT3ZlcnJpZGVUcmVlRWxlbWVudC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvY2FsUmVzb3VyY2VPdmVycmlk ZVRyZWVFbGVtZW50LmpzCmluZGV4IGQ4NGQ0Y2Y1YWJkNi4uN2E3YjUxYTdmMmI0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291 cmNlT3ZlcnJpZGVUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Mb2NhbFJlc291cmNlT3ZlcnJpZGVUcmVlRWxlbWVudC5qcwpAQCAt NTYsNiArNTYsOCBAQCBXSS5Mb2NhbFJlc291cmNlT3ZlcnJpZGVUcmVlRWxlbWVudCA9IGNsYXNz IExvY2FsUmVzb3VyY2VPdmVycmlkZVRyZWVFbGVtZW50IGV4dAogCiAgICAgb25kZXRhY2goKQog ICAgIHsKKyAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMjQ2NTI+IChX ZWIgSW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0 aG91dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQorCiAgICAgICAgIHRoaXMuX2xvY2Fs UmVzb3VyY2VPdmVycmlkZS5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkxvY2FsUmVzb3VyY2VPdmVy cmlkZS5FdmVudC5EaXNhYmxlZENoYW5nZWQsIHRoaXMuX2hhbmRsZUxvY2FsUmVzb3VyY2VPdmVy cmlkZURpc2FibGVkQ2hhbmdlZCwgdGhpcyk7CiAKICAgICAgICAgV0kuRnJhbWUucmVtb3ZlRXZl bnRMaXN0ZW5lcihXSS5GcmFtZS5FdmVudC5NYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMuX2hh bmRsZUZyYW1lTWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRlclByb2dyYW1UcmVlRWxl bWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRl clByb2dyYW1UcmVlRWxlbWVudC5qcwppbmRleCBjMmQzZjc1MzRkZDcuLjc0YmZkYTg0MTM5YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2hh ZGVyUHJvZ3JhbVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1NoYWRlclByb2dyYW1UcmVlRWxlbWVudC5qcwpAQCAtNjAsNiArNjAs OCBAQCBXSS5TaGFkZXJQcm9ncmFtVHJlZUVsZW1lbnQgPSBjbGFzcyBTaGFkZXJQcm9ncmFtVHJl ZUVsZW1lbnQgZXh0ZW5kcyBXSS5HZW5lcmFsVAogCiAgICAgb25kZXRhY2goKQogICAgIHsKKyAg ICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMjQ2NTI+IChXZWIgSW5zcGVj dG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxsZWQgd2l0aG91dCBgb25h dHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQorCiAgICAgICAgIC8vIEZJWE1FOiBhZGQgc3VwcG9y dCBmb3IgZGlzYWJsaW5nL2hpZ2hsaWdodGluZyBXZWJHUFUgc2hhZGVyIHBpcGVsaW5lcy4KICAg ICAgICAgbGV0IGNvbnRleHRUeXBlID0gdGhpcy5yZXByZXNlbnRlZE9iamVjdC5jYW52YXMuY29u dGV4dFR5cGU7CiAgICAgICAgIGlmIChjb250ZXh0VHlwZSA9PT0gV0kuQ2FudmFzLkNvbnRleHRU eXBlLldlYkdMIHx8IGNvbnRleHRUeXBlID09PSBXSS5DYW52YXMuQ29udGV4dFR5cGUuV2ViR0wy KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UcmVlRWxlbWVudC5qcwppbmRleCBmOTU2Yzk1MGFmNDQuLjc3MWI3YWZiZDMxYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZUVsZW1l bnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJl ZUVsZW1lbnQuanMKQEAgLTI5MCw2ICsyOTAsNyBAQCBXSS5UcmVlRWxlbWVudCA9IGNsYXNzIFRy ZWVFbGVtZW50IGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBfZGV0YWNoKCkKICAgICB7CisgICAg ICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjI0NjUyPiAoV2ViIEluc3BlY3Rv cjogVHJlZSBPdXRsaW5lczogYG9uZGV0YWNoYCBjYW4gYmUgY2FsbGVkIHdpdGhvdXQgYG9uYXR0 YWNoYCBldmVyIGJlaW5nIGNhbGxlZCkKICAgICAgICAgaWYgKHRoaXMub25kZXRhY2gpCiAgICAg ICAgICAgICB0aGlzLm9uZGV0YWNoKHRoaXMpOwogICAgICAgICBpZiAodGhpcy5fbGlzdEl0ZW1O b2RlICYmIHRoaXMuX2xpc3RJdGVtTm9kZS5wYXJlbnROb2RlKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvV2ViU29ja2V0UmVzb3VyY2VUcmVl RWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1dl YlNvY2tldFJlc291cmNlVHJlZUVsZW1lbnQuanMKaW5kZXggMWMwY2U4ODMxYzg3Li41NWNlZGZh YzZjMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1dlYlNvY2tldFJlc291cmNlVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvV2ViU29ja2V0UmVzb3VyY2VUcmVlRWxlbWVudC5q cwpAQCAtMzgsNiArMzgsOCBAQCBXSS5XZWJTb2NrZXRSZXNvdXJjZVRyZWVFbGVtZW50ID0gY2xh c3MgV2ViU29ja2V0UmVzb3VyY2VUcmVlRWxlbWVudCBleHRlbmRzIFdJLgogCiAgICAgb25kZXRh Y2goKQogICAgIHsKKyAgICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMjQ2 NTI+IChXZWIgSW5zcGVjdG9yOiBUcmVlIE91dGxpbmVzOiBgb25kZXRhY2hgIGNhbiBiZSBjYWxs ZWQgd2l0aG91dCBgb25hdHRhY2hgIGV2ZXIgYmVpbmcgY2FsbGVkKQorCiAgICAgICAgIHN1cGVy Lm9uZGV0YWNoKCk7CiAKICAgICAgICAgdGhpcy5yZXNvdXJjZS5yZW1vdmVFdmVudExpc3RlbmVy KFdJLldlYlNvY2tldFJlc291cmNlLkV2ZW50LlJlYWR5U3RhdGVDaGFuZ2VkLCB0aGlzLl91cGRh dGVDb25uZWN0aW9uU3RhdHVzLCB0aGlzKTsK