173983 2017-06-29 12:50:31 -0700 Web Inspector: Provide a way for creating a new tab but not making it immediately selected 2017-06-29 19:25:07 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=173807 P2 Normal --- 1 hi hi commit-queue inspector-bugzilla-changes joepeck mattbaker oldest_to_newest 1324053 0 hi 2017-06-29 12:50:31 -0700 This would be useful for creating background tabs, such as if multiple recordings are captured at once. 1324069 1 314157 hi 2017-06-29 13:17:26 -0700 Created attachment 314157 Patch 1324080 2 mattbaker 2017-06-29 13:51:07 -0700 I think we should discuss this as a team before moving foreard. I'm not convinced having a tab "per recording" for canvases is a good idea. 1324089 3 hi 2017-06-29 14:06:36 -0700 (In reply to Matt Baker from comment #2) > I think we should discuss this as a team before moving foreard. I'm not > convinced having a tab "per recording" for canvases is a good idea. This is unrelated to this change. All this change does is allow tabs to be created and not immediately selected. What you described is not made possible by this change. 1324098 4 mattbaker 2017-06-29 14:23:55 -0700 (In reply to Devin Rousso from comment #3) > (In reply to Matt Baker from comment #2) > > I think we should discuss this as a team before moving foreard. I'm not > > convinced having a tab "per recording" for canvases is a good idea. > > This is unrelated to this change. All this change does is allow tabs to be > created and not immediately selected. What you described is not made > possible by this change. I should have looked more closely. Your initial description made me think it had to do with multiple tabs per recording. If this isn't being used yet, it should probably wait (at least until a bug can be added to "Blocks"). 1324154 5 314157 joepeck 2017-06-29 16:51:39 -0700 Comment on attachment 314157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314157&action=review > Source/WebInspectorUI/UserInterface/Base/Main.js:-1123 > - if (representedObject instanceof WebInspector.Collection) > - return WebInspector.CollectionContentView; Why is this getting removed? 1324157 6 314157 joepeck 2017-06-29 16:53:11 -0700 Comment on attachment 314157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314157&action=review >> Source/WebInspectorUI/UserInterface/Base/Main.js:-1123 >> - return WebInspector.CollectionContentView; > > Why is this getting removed? r=me, but this deserves a comment in the ChangeLog. It looks like it is just bad code, but its not in line with the rest of the patch so it deserves a specific comment. 1324223 7 314204 hi 2017-06-29 18:47:16 -0700 Created attachment 314204 Patch 1324239 8 314204 commit-queue 2017-06-29 19:25:05 -0700 Comment on attachment 314204 Patch Clearing flags on attachment: 314204 Committed r218984: <http://trac.webkit.org/changeset/218984> 1324240 9 commit-queue 2017-06-29 19:25:07 -0700 All reviewed patches have been landed. Closing bug. 314157 2017-06-29 13:17:26 -0700 2017-06-29 18:47:16 -0700 Patch 173983.diff text/plain 14978 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlZGMzZDdkNzFjLi5iODg1YmUwODI1NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTctMDYtMjkgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFBy b3ZpZGUgYSB3YXkgZm9yIGNyZWF0aW5nIGEgbmV3IHRhYiBidXQgbm90IG1ha2luZyBpdCBpbW1l ZGlhdGVseSBzZWxlY3RlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTczOTgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5jb250ZW50TG9hZGVkKToKKyAgICAgICAgV2ViSW5zcGVjdG9yLl9vcGVuRGVmYXVsdFRh YgorICAgICAgICAoV2ViSW5zcGVjdG9yLl90cnlUb1Jlc3RvcmVQZW5kaW5nVGFicyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3Iuc2hvd05ld1RhYlRhYik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Y3JlYXRlTmV3VGFiV2l0aFR5cGUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGFi QmFyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkJhcik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGFiQmFyLnByb3RvdHlwZS5hZGRUYWJCYXJJdGVtKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UYWJCYXIucHJvdG90eXBlLmluc2VydFRhYkJhckl0ZW0pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRhYkJhci5wcm90b3R5cGUucmVtb3ZlVGFiQmFySXRlbSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGFiQmFyLnByb3RvdHlwZS5faGFuZGxlQ2xpY2spOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRhYkJhci5wcm90b3R5cGUuX2hhbmRsZU5ld1RhYkNsaWNrKToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dzZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGFiQnJvd3Nlci5wcm90b3R5cGUuYWRkVGFiRm9yQ29udGVudFZpZXcpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRhYkJyb3dzZXIucHJvdG90eXBlLnNob3dUYWJGb3JDb250ZW50Vmlldyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQnJvd3Nlci5wcm90b3R5cGUuY2xvc2VUYWJGb3JDb250 ZW50Vmlldyk6CisKIDIwMTctMDYtMjggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluc3RydW1lbnQgYWN0aXZlIHBpeGVsIG1lbW9y eSB1c2VkIGJ5IGNhbnZhc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL01haW4uanMKaW5kZXggYTlmNmIyMTViYTUuLmFkMzgwZTI1YjFlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC00 NzQsNyArNDc0LDcgQEAgV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAg ICAgICAgIGxldCB0YWJDb250ZW50VmlldyA9IHRoaXMuX2NyZWF0ZVRhYkNvbnRlbnRWaWV3Rm9y VHlwZSh0YWJUeXBlKTsKICAgICAgICAgaWYgKCF0YWJDb250ZW50VmlldykKICAgICAgICAgICAg IGNvbnRpbnVlOwotICAgICAgICB0aGlzLnRhYkJyb3dzZXIuYWRkVGFiRm9yQ29udGVudFZpZXco dGFiQ29udGVudFZpZXcsIHRydWUpOworICAgICAgICB0aGlzLnRhYkJyb3dzZXIuYWRkVGFiRm9y Q29udGVudFZpZXcodGFiQ29udGVudFZpZXcsIHtzdXBwcmVzc0FuaW1hdGlvbnM6IHRydWV9KTsK ICAgICB9CiAKICAgICB0aGlzLl9yZXN0b3JlQ29va2llRm9yT3BlblRhYnMoV2ViSW5zcGVjdG9y LlN0YXRlUmVzdG9yYXRpb25UeXBlLkxvYWQpOwpAQCAtNDg1LDcgKzQ4NSw3IEBAIFdlYkluc3Bl Y3Rvci5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogICAgICAgICB0aGlzLnRhYkJhci5zZWxl Y3RlZFRhYkJhckl0ZW0gPSAwOwogCiAgICAgaWYgKCF0aGlzLnRhYkJhci5ub3JtYWxUYWJDb3Vu dCkKLSAgICAgICAgdGhpcy5zaG93TmV3VGFiVGFiKCk7CisgICAgICAgIHRoaXMuc2hvd05ld1Rh YlRhYih7c3VwcHJlc3NBbmltYXRpb25zOiB0cnVlfSk7CiAKICAgICAvLyBMaXN0ZW4gdG8gdGhl IGV2ZW50cyBhZnRlciByZXN0b3JpbmcgdGhlIHNhdmVkIHRhYnMgdG8gYXZvaWQgcmVjdXJzaW9u LgogICAgIHRoaXMudGFiQmFyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRhYkJhci5F dmVudC5UYWJCYXJJdGVtQWRkZWQsIHRoaXMuX3JlbWVtYmVyT3BlblRhYnMsIHRoaXMpOwpAQCAt NTg5LDcgKzU4OSw3IEBAIFdlYkluc3BlY3Rvci5fcmVtZW1iZXJPcGVuVGFicyA9IGZ1bmN0aW9u KCkKIAogV2ViSW5zcGVjdG9yLl9vcGVuRGVmYXVsdFRhYiA9IGZ1bmN0aW9uKGV2ZW50KQogewot ICAgIHRoaXMuc2hvd05ld1RhYlRhYigpOworICAgIHRoaXMuc2hvd05ld1RhYlRhYih7c3VwcHJl c3NBbmltYXRpb25zOiB0cnVlfSk7CiB9OwogCiBXZWJJbnNwZWN0b3IuX3Nob3dTZXR0aW5nc1Rh YiA9IGZ1bmN0aW9uKGV2ZW50KQpAQCAtNjEwLDcgKzYxMCwxMCBAQCBXZWJJbnNwZWN0b3IuX3Ry eVRvUmVzdG9yZVBlbmRpbmdUYWJzID0gZnVuY3Rpb24oKQogICAgICAgICBpZiAoIXRhYkNvbnRl bnRWaWV3KQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgdGhpcy50YWJCcm93c2Vy LmFkZFRhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3LCB0cnVlLCBpbmRleCk7CisgICAg ICAgIHRoaXMudGFiQnJvd3Nlci5hZGRUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50Vmlldywg eworICAgICAgICAgICAgc3VwcHJlc3NBbmltYXRpb25zOiB0cnVlLAorICAgICAgICAgICAgaW5z ZXJ0aW9uSW5kZXg6IGluZGV4LAorICAgICAgICB9KTsKIAogICAgICAgICB0YWJDb250ZW50Vmll dy5yZXN0b3JlU3RhdGVGcm9tQ29va2llKFdlYkluc3BlY3Rvci5TdGF0ZVJlc3RvcmF0aW9uVHlw ZS5Mb2FkKTsKICAgICB9CkBAIC02MjAsNyArNjIzLDcgQEAgV2ViSW5zcGVjdG9yLl90cnlUb1Jl c3RvcmVQZW5kaW5nVGFicyA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnRhYkJyb3dzZXIudGFiQmFy LnVwZGF0ZU5ld1RhYlRhYkJhckl0ZW1TdGF0ZSgpOwogfTsKIAotV2ViSW5zcGVjdG9yLnNob3dO ZXdUYWJUYWIgPSBmdW5jdGlvbihzaG91bGRBbmltYXRlKQorV2ViSW5zcGVjdG9yLnNob3dOZXdU YWJUYWIgPSBmdW5jdGlvbihvcHRpb25zKQogewogICAgIGlmICghdGhpcy5pc05ld1RhYldpdGhU eXBlQWxsb3dlZChXZWJJbnNwZWN0b3IuTmV3VGFiQ29udGVudFZpZXcuVHlwZSkpCiAgICAgICAg IHJldHVybjsKQEAgLTYyOCw3ICs2MzEsNyBAQCBXZWJJbnNwZWN0b3Iuc2hvd05ld1RhYlRhYiA9 IGZ1bmN0aW9uKHNob3VsZEFuaW1hdGUpCiAgICAgbGV0IHRhYkNvbnRlbnRWaWV3ID0gdGhpcy50 YWJCcm93c2VyLmJlc3RUYWJDb250ZW50Vmlld0ZvckNsYXNzKFdlYkluc3BlY3Rvci5OZXdUYWJD b250ZW50Vmlldyk7CiAgICAgaWYgKCF0YWJDb250ZW50VmlldykKICAgICAgICAgdGFiQ29udGVu dFZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLk5ld1RhYkNvbnRlbnRWaWV3OwotICAgIHRoaXMudGFi QnJvd3Nlci5zaG93VGFiRm9yQ29udGVudFZpZXcodGFiQ29udGVudFZpZXcsICFzaG91bGRBbmlt YXRlKTsKKyAgICB0aGlzLnRhYkJyb3dzZXIuc2hvd1RhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRl bnRWaWV3LCBvcHRpb25zKTsKIH07CiAKIFdlYkluc3BlY3Rvci5pc05ld1RhYldpdGhUeXBlQWxs b3dlZCA9IGZ1bmN0aW9uKHRhYlR5cGUpCkBAIC02NjYsMTEgKzY2OSwxMyBAQCBXZWJJbnNwZWN0 b3IuY3JlYXRlTmV3VGFiV2l0aFR5cGUgPSBmdW5jdGlvbih0YWJUeXBlLCBvcHRpb25zID0ge30p CiAKICAgICBsZXQgdGFiQ29udGVudFZpZXcgPSB0aGlzLl9jcmVhdGVUYWJDb250ZW50Vmlld0Zv clR5cGUodGFiVHlwZSk7CiAgICAgY29uc3Qgc3VwcHJlc3NBbmltYXRpb25zID0gdHJ1ZTsKLSAg ICBsZXQgaW5zZXJ0aW9uSW5kZXggPSByZWZlcmVuY2VkVmlldyA/IHRoaXMudGFiQmFyLnRhYkJh ckl0ZW1zLmluZGV4T2YocmVmZXJlbmNlZFZpZXcudGFiQmFySXRlbSkgOiB1bmRlZmluZWQ7Ci0g ICAgdGhpcy50YWJCcm93c2VyLmFkZFRhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3LCBz dXBwcmVzc0FuaW1hdGlvbnMsIGluc2VydGlvbkluZGV4KTsKKyAgICB0aGlzLnRhYkJyb3dzZXIu YWRkVGFiRm9yQ29udGVudFZpZXcodGFiQ29udGVudFZpZXcsIHsKKyAgICAgICAgc3VwcHJlc3NB bmltYXRpb25zLAorICAgICAgICBpbnNlcnRpb25JbmRleDogcmVmZXJlbmNlZFZpZXcgPyB0aGlz LnRhYkJhci50YWJCYXJJdGVtcy5pbmRleE9mKHJlZmVyZW5jZWRWaWV3LnRhYkJhckl0ZW0pIDog dW5kZWZpbmVkLAorICAgIH0pOwogCiAgICAgaWYgKHNob3VsZFJlcGxhY2VUYWIpCi0gICAgICAg IHRoaXMudGFiQnJvd3Nlci5jbG9zZVRhYkZvckNvbnRlbnRWaWV3KHJlZmVyZW5jZWRWaWV3LCBz dXBwcmVzc0FuaW1hdGlvbnMpOworICAgICAgICB0aGlzLnRhYkJyb3dzZXIuY2xvc2VUYWJGb3JD b250ZW50VmlldyhyZWZlcmVuY2VkVmlldywge3N1cHByZXNzQW5pbWF0aW9uc30pOwogCiAgICAg aWYgKHNob3VsZFNob3dOZXdUYWIpCiAgICAgICAgIHRoaXMudGFiQnJvd3Nlci5zaG93VGFiRm9y Q29udGVudFZpZXcodGFiQ29udGVudFZpZXcpOwpAQCAtMTExOSw5ICsxMTI0LDYgQEAgV2ViSW5z cGVjdG9yLnRhYkNvbnRlbnRWaWV3Q2xhc3NGb3JSZXByZXNlbnRlZE9iamVjdCA9IGZ1bmN0aW9u KHJlcHJlc2VudGVkT2JqZWMKICAgICAgICAgcmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuSW5kZXhlZERhdGFiYXNlT2JqZWN0U3RvcmVJbmRleCkKICAgICAgICAgcmV0 dXJuIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNUYWJDb250ZW50VmlldzsKIAotICAgIGlmIChyZXBy ZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Db2xsZWN0aW9uKQotICAgICAg ICByZXR1cm4gV2ViSW5zcGVjdG9yLkNvbGxlY3Rpb25Db250ZW50VmlldzsKLQogICAgIHJldHVy biBudWxsOwogfTsKIApAQCAtMTE1MSw3ICsxMTUzLDcgQEAgV2ViSW5zcGVjdG9yLnNob3dSZXBy ZXNlbnRlZE9iamVjdCA9IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0LCBjb29raWUsIG9wdGlv bnMKICAgICBpZiAoIXRhYkNvbnRlbnRWaWV3KQogICAgICAgICByZXR1cm47CiAKLSAgICB0aGlz LnRhYkJyb3dzZXIuc2hvd1RhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3KTsKKyAgICB0 aGlzLnRhYkJyb3dzZXIuc2hvd1RhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3LCBvcHRp b25zKTsKICAgICB0YWJDb250ZW50Vmlldy5zaG93UmVwcmVzZW50ZWRPYmplY3QocmVwcmVzZW50 ZWRPYmplY3QsIGNvb2tpZSk7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanMKaW5kZXggZjM1NTRmM2EzNDAuLjcwOTEzMzFh YWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UYWJCYXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGFiQmFyLmpzCkBAIC00NCwxMiArNDQsMTIgQEAgV2ViSW5zcGVjdG9yLlRhYkJhciA9IGNs YXNzIFRhYkJhciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICAgICAgdGhp cy5hZGRUYWJCYXJJdGVtKHRhYkJhckl0ZW0pOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5h ZGRUYWJCYXJJdGVtKFdlYkluc3BlY3Rvci5zZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnRhYkJhckl0 ZW0sIHRydWUpOworICAgICAgICB0aGlzLmFkZFRhYkJhckl0ZW0oV2ViSW5zcGVjdG9yLnNldHRp bmdzVGFiQ29udGVudFZpZXcudGFiQmFySXRlbSwge3N1cHByZXNzQW5pbWF0aW9uczogdHJ1ZX0p OwogCiAgICAgICAgIHRoaXMuX25ld1RhYlRhYkJhckl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLlBp bm5lZFRhYkJhckl0ZW0oIkltYWdlcy9OZXdUYWJQbHVzLnN2ZyIsIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiQ3JlYXRlIGEgbmV3IHRhYiIpKTsKICAgICAgICAgdGhpcy5fbmV3VGFiVGFiQmFySXRl bS5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZW50ZXIiLCB0aGlzLl9oYW5kbGVOZXdU YWJNb3VzZUVudGVyLmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLl9uZXdUYWJUYWJCYXJJdGVt LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9oYW5kbGVOZXdUYWJDbGlj ay5iaW5kKHRoaXMpKTsKLSAgICAgICAgdGhpcy5hZGRUYWJCYXJJdGVtKHRoaXMuX25ld1RhYlRh YkJhckl0ZW0sIHRydWUpOworICAgICAgICB0aGlzLmFkZFRhYkJhckl0ZW0odGhpcy5fbmV3VGFi VGFiQmFySXRlbSwge3N1cHByZXNzQW5pbWF0aW9uczogdHJ1ZX0pOwogICAgIH0KIAogICAgIC8v IFB1YmxpYwpAQCAtNjIsMjYgKzYyLDI2IEBAIFdlYkluc3BlY3Rvci5UYWJCYXIgPSBjbGFzcyBU YWJCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0aGlzLl9uZXdUYWJUYWJC YXJJdGVtLmRpc2FibGVkID0gbmV3VGFiRXhpc3RzOwogICAgIH0KIAotICAgIGFkZFRhYkJhckl0 ZW0odGFiQmFySXRlbSwgZG9Ob3RBbmltYXRlKQorICAgIGFkZFRhYkJhckl0ZW0odGFiQmFySXRl bSwgb3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuaW5zZXJ0VGFiQmFy SXRlbSh0YWJCYXJJdGVtLCB0aGlzLl90YWJCYXJJdGVtcy5sZW5ndGgsIGRvTm90QW5pbWF0ZSk7 CisgICAgICAgIHJldHVybiB0aGlzLmluc2VydFRhYkJhckl0ZW0odGFiQmFySXRlbSwgdGhpcy5f dGFiQmFySXRlbXMubGVuZ3RoLCBvcHRpb25zKTsKICAgICB9CiAKLSAgICBpbnNlcnRUYWJCYXJJ dGVtKHRhYkJhckl0ZW0sIGluZGV4LCBkb05vdEFuaW1hdGUpCisgICAgaW5zZXJ0VGFiQmFySXRl bSh0YWJCYXJJdGVtLCBpbmRleCwgb3B0aW9ucyA9IHt9KQogICAgIHsKICAgICAgICAgY29uc29s ZS5hc3NlcnQodGFiQmFySXRlbSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5UYWJCYXJJdGVtKTsK ICAgICAgICAgaWYgKCEodGFiQmFySXRlbSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5UYWJCYXJJ dGVtKSkKICAgICAgICAgICAgIHJldHVybiBudWxsOwogCiAgICAgICAgIGlmICh0YWJCYXJJdGVt LnBhcmVudFRhYkJhciA9PT0gdGhpcykKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAg IHJldHVybiBudWxsOwogCiAgICAgICAgIGlmICh0aGlzLl90YWJBbmltYXRlZENsb3NlZFNpbmNl TW91c2VFbnRlcikgewogICAgICAgICAgICAgLy8gRGVsYXkgYWRkaW5nIHRoZSBuZXcgdGFiIHVu dGlsIHdlIGNhbiBleHBhbmQgdGhlIHRhYnMgYWZ0ZXIgYSBjbG9zZWQgdGFiLgogICAgICAgICAg ICAgdGhpcy5fZmluaXNoRXhwYW5kaW5nVGFic0FmdGVyQ2xvc2UoKS50aGVuKCgpID0+IHsKLSAg ICAgICAgICAgICAgICB0aGlzLmluc2VydFRhYkJhckl0ZW0odGFiQmFySXRlbSwgaW5kZXgsIGRv Tm90QW5pbWF0ZSk7CisgICAgICAgICAgICAgICAgdGhpcy5pbnNlcnRUYWJCYXJJdGVtKHRhYkJh ckl0ZW0sIGluZGV4LCBvcHRpb25zKTsKICAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAo dGFiQmFySXRlbS5wYXJlbnRUYWJCYXIpCkBAIC05MywxMSArOTMsMTEgQEAgV2ViSW5zcGVjdG9y LlRhYkJhciA9IGNsYXNzIFRhYkJhciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAKICAgICAg ICAgaWYgKHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuY29udGFpbnMoImFuaW1hdGluZyIpKSB7CiAg ICAgICAgICAgICByZXF1ZXN0QW5pbWF0aW9uRnJhbWUocmVtb3ZlU3R5bGVzLmJpbmQodGhpcykp OwotICAgICAgICAgICAgZG9Ob3RBbmltYXRlID0gdHJ1ZTsKKyAgICAgICAgICAgIG9wdGlvbnMu c3VwcHJlc3NBbmltYXRpb25zID0gdHJ1ZTsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBiZWZv cmVUYWJTaXplc0FuZFBvc2l0aW9uczsKLSAgICAgICAgaWYgKCFkb05vdEFuaW1hdGUpCisgICAg ICAgIGlmICghb3B0aW9ucy5zdXBwcmVzc0FuaW1hdGlvbnMpCiAgICAgICAgICAgICBiZWZvcmVU YWJTaXplc0FuZFBvc2l0aW9ucyA9IHRoaXMuX3JlY29yZFRhYkJhckl0ZW1TaXplc0FuZFBvc2l0 aW9ucygpOwogCiAgICAgICAgIHRoaXMuX3RhYkJhckl0ZW1zLnNwbGljZShpbmRleCwgMCwgdGFi QmFySXRlbSk7CkBAIC0xMzgsNyArMTM4LDcgQEAgV2ViSW5zcGVjdG9yLlRhYkJhciA9IGNsYXNz IFRhYkJhciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICB0aGlzLmVsZW1l bnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigid2Via2l0VHJhbnNpdGlvbkVuZCIsIHJlbW92ZVN0eWxl c0xpc3RlbmVyKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmICghZG9Ob3RBbmltYXRlKSB7Cisg ICAgICAgIGlmICghb3B0aW9ucy5zdXBwcmVzc0FuaW1hdGlvbnMpIHsKICAgICAgICAgICAgIHZh ciBhZnRlclRhYlNpemVzQW5kUG9zaXRpb25zID0gdGhpcy5fcmVjb3JkVGFiQmFySXRlbVNpemVz QW5kUG9zaXRpb25zKCk7CiAKICAgICAgICAgICAgIHRoaXMudXBkYXRlTGF5b3V0KCk7CkBAIC0x NzEsNyArMTcxLDcgQEAgV2ViSW5zcGVjdG9yLlRhYkJhciA9IGNsYXNzIFRhYkJhciBleHRlbmRz IFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIHJldHVybiB0YWJCYXJJdGVtOwogICAgIH0KIAot ICAgIHJlbW92ZVRhYkJhckl0ZW0odGFiQmFySXRlbU9ySW5kZXgsIGRvTm90QW5pbWF0ZSwgZG9O b3RFeHBhbmQpCisgICAgcmVtb3ZlVGFiQmFySXRlbSh0YWJCYXJJdGVtT3JJbmRleCwgb3B0aW9u cyA9IHt9KQogICAgIHsKICAgICAgICAgbGV0IHRhYkJhckl0ZW0gPSB0aGlzLl9maW5kVGFiQmFy SXRlbSh0YWJCYXJJdGVtT3JJbmRleCk7CiAgICAgICAgIGlmICghdGFiQmFySXRlbSB8fCB0YWJC YXJJdGVtIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlBpbm5lZFRhYkJhckl0ZW0pCkBAIC0xOTAs MTEgKzE5MCwxMSBAQCBXZWJJbnNwZWN0b3IuVGFiQmFyID0gY2xhc3MgVGFiQmFyIGV4dGVuZHMg V2ViSW5zcGVjdG9yLlZpZXcKIAogICAgICAgICBpZiAodGhpcy5lbGVtZW50LmNsYXNzTGlzdC5j b250YWlucygiYW5pbWF0aW5nIikpIHsKICAgICAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFt ZShyZW1vdmVTdHlsZXMuYmluZCh0aGlzKSk7Ci0gICAgICAgICAgICBkb05vdEFuaW1hdGUgPSB0 cnVlOworICAgICAgICAgICAgb3B0aW9ucy5zdXBwcmVzc0FuaW1hdGlvbnMgPSB0cnVlOwogICAg ICAgICB9CiAKICAgICAgICAgdmFyIGJlZm9yZVRhYlNpemVzQW5kUG9zaXRpb25zOwotICAgICAg ICBpZiAoIWRvTm90QW5pbWF0ZSkKKyAgICAgICAgaWYgKCFvcHRpb25zLnN1cHByZXNzQW5pbWF0 aW9ucykKICAgICAgICAgICAgIGJlZm9yZVRhYlNpemVzQW5kUG9zaXRpb25zID0gdGhpcy5fcmVj b3JkVGFiQmFySXRlbVNpemVzQW5kUG9zaXRpb25zKCk7CiAKICAgICAgICAgLy8gU3VidHJhY3Qg MSBmcm9tIG5vcm1hbFRhYkNvdW50IHNpbmNlIGFycmF5cyBiZWdpbiBpbmRleGluZyBhdCAwLgpA QCAtMjA4LDEwICsyMDgsMTAgQEAgV2ViSW5zcGVjdG9yLlRhYkJhciA9IGNsYXNzIFRhYkJhciBl eHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAKICAgICAgICAgY29uc3Qgc2hvdWxkT3BlbkRlZmF1 bHRUYWIgPSAhdGFiQmFySXRlbS5pc0RlZmF1bHRUYWIgJiYgIXRoaXMubm9ybWFsVGFiQ291bnQ7 CiAgICAgICAgIGlmIChzaG91bGRPcGVuRGVmYXVsdFRhYikKLSAgICAgICAgICAgIGRvTm90QW5p bWF0ZSA9IHRydWU7CisgICAgICAgICAgICBvcHRpb25zLnN1cHByZXNzQW5pbWF0aW9ucyA9IHRy dWU7CiAKLSAgICAgICAgaWYgKCFoYXNNb3JlVGhhbk9uZU5vcm1hbFRhYiB8fCB3YXNMYXN0Tm9y bWFsVGFiIHx8ICFkb05vdEV4cGFuZCkgewotICAgICAgICAgICAgaWYgKCFkb05vdEFuaW1hdGUp IHsKKyAgICAgICAgaWYgKCFoYXNNb3JlVGhhbk9uZU5vcm1hbFRhYiB8fCB3YXNMYXN0Tm9ybWFs VGFiIHx8ICFvcHRpb25zLnN1cHByZXNzRXhwYW5zaW9uKSB7CisgICAgICAgICAgICBpZiAoIW9w dGlvbnMuc3VwcHJlc3NBbmltYXRpb25zKSB7CiAgICAgICAgICAgICAgICAgdGhpcy5fdGFiQW5p bWF0ZWRDbG9zZWRTaW5jZU1vdXNlRW50ZXIgPSB0cnVlOwogICAgICAgICAgICAgICAgIHRoaXMu X2ZpbmlzaEV4cGFuZGluZ1RhYnNBZnRlckNsb3NlKGJlZm9yZVRhYlNpemVzQW5kUG9zaXRpb25z KTsKICAgICAgICAgICAgIH0gZWxzZQpAQCAtMjgwLDcgKzI4MCw3IEBAIFdlYkluc3BlY3Rvci5U YWJCYXIgPSBjbGFzcyBUYWJCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICAg ICAgdGhpcy5lbGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoIndlYmtpdFRyYW5zaXRpb25FbmQi LCByZW1vdmVTdHlsZXNMaXN0ZW5lcik7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIWRvTm90 QW5pbWF0ZSkgeworICAgICAgICBpZiAoIW9wdGlvbnMuc3VwcHJlc3NBbmltYXRpb25zKSB7CiAg ICAgICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgic3RhdGljLWxheW91dCIpOwog CiAgICAgICAgICAgICB0aGlzLl90YWJBbmltYXRlZENsb3NlZFNpbmNlTW91c2VFbnRlciA9IHRy dWU7CkBAIC02MTUsNyArNjE1LDcgQEAgV2ViSW5zcGVjdG9yLlRhYkJhciA9IGNsYXNzIFRhYkJh ciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCiAg ICAgICAgICAgICBpZiAoIWV2ZW50LmFsdEtleSkgewotICAgICAgICAgICAgICAgIHRoaXMucmVt b3ZlVGFiQmFySXRlbSh0YWJCYXJJdGVtLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgICAgICAgICAg dGhpcy5yZW1vdmVUYWJCYXJJdGVtKHRhYkJhckl0ZW0sIHtzdXBwcmVzc0V4cGFuc2lvbjogdHJ1 ZX0pOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIApAQCAtNzUyLDgg Kzc1Miw3IEBAIFdlYkluc3BlY3Rvci5UYWJCYXIgPSBjbGFzcyBUYWJCYXIgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuVmlldwogCiAgICAgX2hhbmRsZU5ld1RhYkNsaWNrKGV2ZW50KQogICAgIHsKLSAg ICAgICAgY29uc3Qgc2hvdWxkQW5pbWF0ZSA9IHRydWU7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5z aG93TmV3VGFiVGFiKHNob3VsZEFuaW1hdGUpOworICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd05l d1RhYlRhYigpOwogICAgIH0KIAogICAgIF9oYW5kbGVOZXdUYWJNb3VzZUVudGVyKGV2ZW50KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFi QnJvd3Nlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rh YkJyb3dzZXIuanMKaW5kZXggYWIxOWQ2NGQ5N2UuLjI1N2NjNWZjYmRhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dzZXIu anMKQEAgLTEzNiw3ICsxMzYsNyBAQCBXZWJJbnNwZWN0b3IuVGFiQnJvd3NlciA9IGNsYXNzIFRh YkJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICByZXR1cm4gbnVsbDsK ICAgICB9CiAKLSAgICBhZGRUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50VmlldywgZG9Ob3RB bmltYXRlLCBpbnNlcnRpb25JbmRleCkKKyAgICBhZGRUYWJGb3JDb250ZW50Vmlldyh0YWJDb250 ZW50Vmlldywgb3B0aW9ucyA9IHt9KQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGFi Q29udGVudFZpZXcgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcpOwogICAg ICAgICBpZiAoISh0YWJDb250ZW50VmlldyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5UYWJDb250 ZW50VmlldykpCkBAIC0xNjMsMTAgKzE2MywxMCBAQCBXZWJJbnNwZWN0b3IuVGFiQnJvd3NlciA9 IGNsYXNzIFRhYkJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICBlbHNl CiAgICAgICAgICAgICB0aGlzLl9yZWNlbnRUYWJDb250ZW50Vmlld3MucHVzaCh0YWJDb250ZW50 Vmlldyk7CiAKLSAgICAgICAgaWYgKHR5cGVvZiBpbnNlcnRpb25JbmRleCA9PT0gIm51bWJlciIp Ci0gICAgICAgICAgICB0aGlzLl90YWJCYXIuaW5zZXJ0VGFiQmFySXRlbSh0YWJCYXJJdGVtLCBp bnNlcnRpb25JbmRleCwgZG9Ob3RBbmltYXRlKTsKKyAgICAgICAgaWYgKHR5cGVvZiBvcHRpb25z Lmluc2VydGlvbkluZGV4ID09PSAibnVtYmVyIikKKyAgICAgICAgICAgIHRoaXMuX3RhYkJhci5p bnNlcnRUYWJCYXJJdGVtKHRhYkJhckl0ZW0sIG9wdGlvbnMuaW5zZXJ0aW9uSW5kZXgsIG9wdGlv bnMpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLl90YWJCYXIuYWRkVGFiQmFySXRl bSh0YWJCYXJJdGVtLCBkb05vdEFuaW1hdGUpOworICAgICAgICAgICAgdGhpcy5fdGFiQmFyLmFk ZFRhYkJhckl0ZW0odGFiQmFySXRlbSwgb3B0aW9ucyk7CiAKICAgICAgICAgY29uc29sZS5hc3Nl cnQodGhpcy5fcmVjZW50VGFiQ29udGVudFZpZXdzLmxlbmd0aCA9PT0gdGhpcy5fdGFiQmFyLm5v cm1hbFRhYkNvdW50KTsKICAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuc2VsZWN0ZWRUYWJD b250ZW50VmlldyB8fCB0aGlzLnNlbGVjdGVkVGFiQ29udGVudFZpZXcgPT09IHRoaXMuX3JlY2Vu dFRhYkNvbnRlbnRWaWV3c1swXSk7CkBAIC0xNzQsMTIgKzE3NCwxMyBAQCBXZWJJbnNwZWN0b3Iu VGFiQnJvd3NlciA9IGNsYXNzIFRhYkJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwog ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBzaG93VGFiRm9yQ29udGVudFZpZXco dGFiQ29udGVudFZpZXcsIGRvTm90QW5pbWF0ZSwgaW5zZXJ0aW9uSW5kZXgpCisgICAgc2hvd1Rh YkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3LCBvcHRpb25zID0ge30pCiAgICAgewotICAg ICAgICBpZiAoIXRoaXMuYWRkVGFiRm9yQ29udGVudFZpZXcodGFiQ29udGVudFZpZXcsIGRvTm90 QW5pbWF0ZSwgaW5zZXJ0aW9uSW5kZXgpKQorICAgICAgICBpZiAoIXRoaXMuYWRkVGFiRm9yQ29u dGVudFZpZXcodGFiQ29udGVudFZpZXcsIG9wdGlvbnMpKQogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgICAgIHRoaXMuX3RhYkJhci5zZWxlY3RlZFRhYkJhckl0ZW0gPSB0YWJDb250 ZW50Vmlldy50YWJCYXJJdGVtOworICAgICAgICBpZiAoIW9wdGlvbnMuc3VwcHJlc3NTZWxlY3Rp b24pCisgICAgICAgICAgICB0aGlzLl90YWJCYXIuc2VsZWN0ZWRUYWJCYXJJdGVtID0gdGFiQ29u dGVudFZpZXcudGFiQmFySXRlbTsKIAogICAgICAgICAvLyBGSVhNRTogdGhpcyBpcyBhIHdvcmth cm91bmQgZm9yIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNTE4NzY+LgogICAgICAgICAvLyBXaXRo b3V0IHRoaXMgZXh0cmEgY2FsbCwgd2UgbWlnaHQgbmV2ZXIgbGF5IG91dCB0aGUgY2hpbGQgdGFi CkBAIC0xOTEsNyArMTkyLDcgQEAgV2ViSW5zcGVjdG9yLlRhYkJyb3dzZXIgPSBjbGFzcyBUYWJC cm93c2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQogCi0gICAgY2xvc2VUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50VmlldywgZG9Ob3RB bmltYXRlKQorICAgIGNsb3NlVGFiRm9yQ29udGVudFZpZXcodGFiQ29udGVudFZpZXcsIG9wdGlv bnMgPSB7fSkKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRhYkNvbnRlbnRWaWV3IGlu c3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRhYkNvbnRlbnRWaWV3KTsKICAgICAgICAgaWYgKCEodGFi Q29udGVudFZpZXcgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuVGFiQ29udGVudFZpZXcpKQpAQCAt MjA0LDcgKzIwNSw3IEBAIFdlYkluc3BlY3Rvci5UYWJCcm93c2VyID0gY2xhc3MgVGFiQnJvd3Nl ciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIGlmICh0YWJDb250ZW50Vmlldy50 YWJCYXJJdGVtLnBhcmVudFRhYkJhciAhPT0gdGhpcy5fdGFiQmFyKQogICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgICAgIHRoaXMuX3RhYkJhci5yZW1vdmVUYWJCYXJJdGVtKHRhYkNv bnRlbnRWaWV3LnRhYkJhckl0ZW0sIGRvTm90QW5pbWF0ZSk7CisgICAgICAgIHRoaXMuX3RhYkJh ci5yZW1vdmVUYWJCYXJJdGVtKHRhYkNvbnRlbnRWaWV3LnRhYkJhckl0ZW0sIG9wdGlvbnMpOwog CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3JlY2VudFRhYkNvbnRlbnRWaWV3cy5sZW5n dGggPT09IHRoaXMuX3RhYkJhci5ub3JtYWxUYWJDb3VudCk7CiAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KCF0aGlzLnNlbGVjdGVkVGFiQ29udGVudFZpZXcgfHwgdGhpcy5zZWxlY3RlZFRhYkNvbnRl bnRWaWV3ID09PSB0aGlzLl9yZWNlbnRUYWJDb250ZW50Vmlld3NbMF0pOwo= 314204 2017-06-29 18:47:16 -0700 2017-06-29 19:25:05 -0700 Patch 173983.diff text/plain 15276 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlZGMzZDdkNzFjLi4yY2E5NjViMmVjMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTctMDYtMjkgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFBy b3ZpZGUgYSB3YXkgZm9yIGNyZWF0aW5nIGEgbmV3IHRhYiBidXQgbm90IG1ha2luZyBpdCBpbW1l ZGlhdGVseSBzZWxlY3RlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTczOTgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UYWJCYXIuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGFiQmFyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJCYXIucHJvdG90eXBl LmFkZFRhYkJhckl0ZW0pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkJhci5wcm90b3R5cGUu aW5zZXJ0VGFiQmFySXRlbSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQmFyLnByb3RvdHlw ZS5yZW1vdmVUYWJCYXJJdGVtKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJCYXIucHJvdG90 eXBlLl9oYW5kbGVDbGljayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQmFyLnByb3RvdHlw ZS5faGFuZGxlTmV3VGFiQ2xpY2spOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGFi QnJvd3Nlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJCcm93c2VyLnByb3RvdHlwZS5h ZGRUYWJGb3JDb250ZW50Vmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiQnJvd3Nlci5w cm90b3R5cGUuc2hvd1RhYkZvckNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U YWJCcm93c2VyLnByb3RvdHlwZS5jbG9zZVRhYkZvckNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5jb250ZW50 TG9hZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5fb3BlbkRlZmF1bHRUYWIpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLl90cnlUb1Jlc3RvcmVQZW5kaW5nVGFicyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3Iuc2hvd05ld1RhYlRhYik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuY3JlYXRlTmV3 VGFiV2l0aFR5cGUpOgorICAgICAgICBBZGQgYG9wdGlvbnNgIGRpY3Rpb25hcmllcyBpbnN0ZWFk IG9mIG9wdGlvbmFsIHBhcmFtZXRlcnMuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci50YWJDb250 ZW50Vmlld0NsYXNzRm9yUmVwcmVzZW50ZWRPYmplY3QpOgorICAgICAgICBEcml2ZS1ieSBmaXg6 IHJlbW92ZSBpbmNvcnJlY3QgcGxhY2VtZW50IG9mIFdlYkluc3BlY3Rvci5Db2xsZWN0aW9uIGNo ZWNrLiBUaGlzIGZ1bmN0aW9uCisgICAgICAgIGRldGVybWluZXMgVGFiQ29udGVudFZpZXcgY2xh c3Nlcywgbm90IENvbnRlbnRWaWV3LgorCiAyMDE3LTA2LTI4ICBEZXZpbiBSb3Vzc28gIDxkcm91 c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnN0cnVtZW50IGFjdGl2 ZSBwaXhlbCBtZW1vcnkgdXNlZCBieSBjYW52YXNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IGE5ZjZiMjE1YmE1Li5hZDM4MGUy NWIxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv TWFpbi5qcwpAQCAtNDc0LDcgKzQ3NCw3IEBAIFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkID0g ZnVuY3Rpb24oKQogICAgICAgICBsZXQgdGFiQ29udGVudFZpZXcgPSB0aGlzLl9jcmVhdGVUYWJD b250ZW50Vmlld0ZvclR5cGUodGFiVHlwZSk7CiAgICAgICAgIGlmICghdGFiQ29udGVudFZpZXcp CiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgdGhpcy50YWJCcm93c2VyLmFkZFRhYkZv ckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3LCB0cnVlKTsKKyAgICAgICAgdGhpcy50YWJCcm93 c2VyLmFkZFRhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3LCB7c3VwcHJlc3NBbmltYXRp b25zOiB0cnVlfSk7CiAgICAgfQogCiAgICAgdGhpcy5fcmVzdG9yZUNvb2tpZUZvck9wZW5UYWJz KFdlYkluc3BlY3Rvci5TdGF0ZVJlc3RvcmF0aW9uVHlwZS5Mb2FkKTsKQEAgLTQ4NSw3ICs0ODUs NyBAQCBXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCA9IGZ1bmN0aW9uKCkKICAgICAgICAgdGhp cy50YWJCYXIuc2VsZWN0ZWRUYWJCYXJJdGVtID0gMDsKIAogICAgIGlmICghdGhpcy50YWJCYXIu bm9ybWFsVGFiQ291bnQpCi0gICAgICAgIHRoaXMuc2hvd05ld1RhYlRhYigpOworICAgICAgICB0 aGlzLnNob3dOZXdUYWJUYWIoe3N1cHByZXNzQW5pbWF0aW9uczogdHJ1ZX0pOwogCiAgICAgLy8g TGlzdGVuIHRvIHRoZSBldmVudHMgYWZ0ZXIgcmVzdG9yaW5nIHRoZSBzYXZlZCB0YWJzIHRvIGF2 b2lkIHJlY3Vyc2lvbi4KICAgICB0aGlzLnRhYkJhci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5UYWJCYXIuRXZlbnQuVGFiQmFySXRlbUFkZGVkLCB0aGlzLl9yZW1lbWJlck9wZW5UYWJz LCB0aGlzKTsKQEAgLTU4OSw3ICs1ODksNyBAQCBXZWJJbnNwZWN0b3IuX3JlbWVtYmVyT3BlblRh YnMgPSBmdW5jdGlvbigpCiAKIFdlYkluc3BlY3Rvci5fb3BlbkRlZmF1bHRUYWIgPSBmdW5jdGlv bihldmVudCkKIHsKLSAgICB0aGlzLnNob3dOZXdUYWJUYWIoKTsKKyAgICB0aGlzLnNob3dOZXdU YWJUYWIoe3N1cHByZXNzQW5pbWF0aW9uczogdHJ1ZX0pOwogfTsKIAogV2ViSW5zcGVjdG9yLl9z aG93U2V0dGluZ3NUYWIgPSBmdW5jdGlvbihldmVudCkKQEAgLTYxMCw3ICs2MTAsMTAgQEAgV2Vi SW5zcGVjdG9yLl90cnlUb1Jlc3RvcmVQZW5kaW5nVGFicyA9IGZ1bmN0aW9uKCkKICAgICAgICAg aWYgKCF0YWJDb250ZW50VmlldykKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIHRo aXMudGFiQnJvd3Nlci5hZGRUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50VmlldywgdHJ1ZSwg aW5kZXgpOworICAgICAgICB0aGlzLnRhYkJyb3dzZXIuYWRkVGFiRm9yQ29udGVudFZpZXcodGFi Q29udGVudFZpZXcsIHsKKyAgICAgICAgICAgIHN1cHByZXNzQW5pbWF0aW9uczogdHJ1ZSwKKyAg ICAgICAgICAgIGluc2VydGlvbkluZGV4OiBpbmRleCwKKyAgICAgICAgfSk7CiAKICAgICAgICAg dGFiQ29udGVudFZpZXcucmVzdG9yZVN0YXRlRnJvbUNvb2tpZShXZWJJbnNwZWN0b3IuU3RhdGVS ZXN0b3JhdGlvblR5cGUuTG9hZCk7CiAgICAgfQpAQCAtNjIwLDcgKzYyMyw3IEBAIFdlYkluc3Bl Y3Rvci5fdHJ5VG9SZXN0b3JlUGVuZGluZ1RhYnMgPSBmdW5jdGlvbigpCiAgICAgdGhpcy50YWJC cm93c2VyLnRhYkJhci51cGRhdGVOZXdUYWJUYWJCYXJJdGVtU3RhdGUoKTsKIH07CiAKLVdlYklu c3BlY3Rvci5zaG93TmV3VGFiVGFiID0gZnVuY3Rpb24oc2hvdWxkQW5pbWF0ZSkKK1dlYkluc3Bl Y3Rvci5zaG93TmV3VGFiVGFiID0gZnVuY3Rpb24ob3B0aW9ucykKIHsKICAgICBpZiAoIXRoaXMu aXNOZXdUYWJXaXRoVHlwZUFsbG93ZWQoV2ViSW5zcGVjdG9yLk5ld1RhYkNvbnRlbnRWaWV3LlR5 cGUpKQogICAgICAgICByZXR1cm47CkBAIC02MjgsNyArNjMxLDcgQEAgV2ViSW5zcGVjdG9yLnNo b3dOZXdUYWJUYWIgPSBmdW5jdGlvbihzaG91bGRBbmltYXRlKQogICAgIGxldCB0YWJDb250ZW50 VmlldyA9IHRoaXMudGFiQnJvd3Nlci5iZXN0VGFiQ29udGVudFZpZXdGb3JDbGFzcyhXZWJJbnNw ZWN0b3IuTmV3VGFiQ29udGVudFZpZXcpOwogICAgIGlmICghdGFiQ29udGVudFZpZXcpCiAgICAg ICAgIHRhYkNvbnRlbnRWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5OZXdUYWJDb250ZW50VmlldzsK LSAgICB0aGlzLnRhYkJyb3dzZXIuc2hvd1RhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3 LCAhc2hvdWxkQW5pbWF0ZSk7CisgICAgdGhpcy50YWJCcm93c2VyLnNob3dUYWJGb3JDb250ZW50 Vmlldyh0YWJDb250ZW50Vmlldywgb3B0aW9ucyk7CiB9OwogCiBXZWJJbnNwZWN0b3IuaXNOZXdU YWJXaXRoVHlwZUFsbG93ZWQgPSBmdW5jdGlvbih0YWJUeXBlKQpAQCAtNjY2LDExICs2NjksMTMg QEAgV2ViSW5zcGVjdG9yLmNyZWF0ZU5ld1RhYldpdGhUeXBlID0gZnVuY3Rpb24odGFiVHlwZSwg b3B0aW9ucyA9IHt9KQogCiAgICAgbGV0IHRhYkNvbnRlbnRWaWV3ID0gdGhpcy5fY3JlYXRlVGFi Q29udGVudFZpZXdGb3JUeXBlKHRhYlR5cGUpOwogICAgIGNvbnN0IHN1cHByZXNzQW5pbWF0aW9u cyA9IHRydWU7Ci0gICAgbGV0IGluc2VydGlvbkluZGV4ID0gcmVmZXJlbmNlZFZpZXcgPyB0aGlz LnRhYkJhci50YWJCYXJJdGVtcy5pbmRleE9mKHJlZmVyZW5jZWRWaWV3LnRhYkJhckl0ZW0pIDog dW5kZWZpbmVkOwotICAgIHRoaXMudGFiQnJvd3Nlci5hZGRUYWJGb3JDb250ZW50Vmlldyh0YWJD b250ZW50Vmlldywgc3VwcHJlc3NBbmltYXRpb25zLCBpbnNlcnRpb25JbmRleCk7CisgICAgdGhp cy50YWJCcm93c2VyLmFkZFRhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3LCB7CisgICAg ICAgIHN1cHByZXNzQW5pbWF0aW9ucywKKyAgICAgICAgaW5zZXJ0aW9uSW5kZXg6IHJlZmVyZW5j ZWRWaWV3ID8gdGhpcy50YWJCYXIudGFiQmFySXRlbXMuaW5kZXhPZihyZWZlcmVuY2VkVmlldy50 YWJCYXJJdGVtKSA6IHVuZGVmaW5lZCwKKyAgICB9KTsKIAogICAgIGlmIChzaG91bGRSZXBsYWNl VGFiKQotICAgICAgICB0aGlzLnRhYkJyb3dzZXIuY2xvc2VUYWJGb3JDb250ZW50VmlldyhyZWZl cmVuY2VkVmlldywgc3VwcHJlc3NBbmltYXRpb25zKTsKKyAgICAgICAgdGhpcy50YWJCcm93c2Vy LmNsb3NlVGFiRm9yQ29udGVudFZpZXcocmVmZXJlbmNlZFZpZXcsIHtzdXBwcmVzc0FuaW1hdGlv bnN9KTsKIAogICAgIGlmIChzaG91bGRTaG93TmV3VGFiKQogICAgICAgICB0aGlzLnRhYkJyb3dz ZXIuc2hvd1RhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3KTsKQEAgLTExMTksOSArMTEy NCw2IEBAIFdlYkluc3BlY3Rvci50YWJDb250ZW50Vmlld0NsYXNzRm9yUmVwcmVzZW50ZWRPYmpl Y3QgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjCiAgICAgICAgIHJlcHJlc2VudGVkT2JqZWN0 IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkluZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlSW5kZXgp CiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzVGFiQ29udGVudFZpZXc7CiAK LSAgICBpZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuQ29sbGVj dGlvbikKLSAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5Db2xsZWN0aW9uQ29udGVudFZpZXc7 Ci0KICAgICByZXR1cm4gbnVsbDsKIH07CiAKQEAgLTExNTEsNyArMTE1Myw3IEBAIFdlYkluc3Bl Y3Rvci5zaG93UmVwcmVzZW50ZWRPYmplY3QgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCwg Y29va2llLCBvcHRpb25zCiAgICAgaWYgKCF0YWJDb250ZW50VmlldykKICAgICAgICAgcmV0dXJu OwogCi0gICAgdGhpcy50YWJCcm93c2VyLnNob3dUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50 Vmlldyk7CisgICAgdGhpcy50YWJCcm93c2VyLnNob3dUYWJGb3JDb250ZW50Vmlldyh0YWJDb250 ZW50Vmlldywgb3B0aW9ucyk7CiAgICAgdGFiQ29udGVudFZpZXcuc2hvd1JlcHJlc2VudGVkT2Jq ZWN0KHJlcHJlc2VudGVkT2JqZWN0LCBjb29raWUpOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFyLmpzCmluZGV4IGYzNTU0ZjNh MzQwLi43MDkxMzMxYWFhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGFiQmFyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RhYkJhci5qcwpAQCAtNDQsMTIgKzQ0LDEyIEBAIFdlYkluc3BlY3Rv ci5UYWJCYXIgPSBjbGFzcyBUYWJCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAg ICAgICAgICAgIHRoaXMuYWRkVGFiQmFySXRlbSh0YWJCYXJJdGVtKTsKICAgICAgICAgfQogCi0g ICAgICAgIHRoaXMuYWRkVGFiQmFySXRlbShXZWJJbnNwZWN0b3Iuc2V0dGluZ3NUYWJDb250ZW50 Vmlldy50YWJCYXJJdGVtLCB0cnVlKTsKKyAgICAgICAgdGhpcy5hZGRUYWJCYXJJdGVtKFdlYklu c3BlY3Rvci5zZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnRhYkJhckl0ZW0sIHtzdXBwcmVzc0FuaW1h dGlvbnM6IHRydWV9KTsKIAogICAgICAgICB0aGlzLl9uZXdUYWJUYWJCYXJJdGVtID0gbmV3IFdl Ykluc3BlY3Rvci5QaW5uZWRUYWJCYXJJdGVtKCJJbWFnZXMvTmV3VGFiUGx1cy5zdmciLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkNyZWF0ZSBhIG5ldyB0YWIiKSk7CiAgICAgICAgIHRoaXMuX25l d1RhYlRhYkJhckl0ZW0uZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWVudGVyIiwgdGhp cy5faGFuZGxlTmV3VGFiTW91c2VFbnRlci5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5fbmV3 VGFiVGFiQmFySXRlbS5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5faGFu ZGxlTmV3VGFiQ2xpY2suYmluZCh0aGlzKSk7Ci0gICAgICAgIHRoaXMuYWRkVGFiQmFySXRlbSh0 aGlzLl9uZXdUYWJUYWJCYXJJdGVtLCB0cnVlKTsKKyAgICAgICAgdGhpcy5hZGRUYWJCYXJJdGVt KHRoaXMuX25ld1RhYlRhYkJhckl0ZW0sIHtzdXBwcmVzc0FuaW1hdGlvbnM6IHRydWV9KTsKICAg ICB9CiAKICAgICAvLyBQdWJsaWMKQEAgLTYyLDI2ICs2MiwyNiBAQCBXZWJJbnNwZWN0b3IuVGFi QmFyID0gY2xhc3MgVGFiQmFyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAgdGhp cy5fbmV3VGFiVGFiQmFySXRlbS5kaXNhYmxlZCA9IG5ld1RhYkV4aXN0czsKICAgICB9CiAKLSAg ICBhZGRUYWJCYXJJdGVtKHRhYkJhckl0ZW0sIGRvTm90QW5pbWF0ZSkKKyAgICBhZGRUYWJCYXJJ dGVtKHRhYkJhckl0ZW0sIG9wdGlvbnMgPSB7fSkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlz Lmluc2VydFRhYkJhckl0ZW0odGFiQmFySXRlbSwgdGhpcy5fdGFiQmFySXRlbXMubGVuZ3RoLCBk b05vdEFuaW1hdGUpOworICAgICAgICByZXR1cm4gdGhpcy5pbnNlcnRUYWJCYXJJdGVtKHRhYkJh ckl0ZW0sIHRoaXMuX3RhYkJhckl0ZW1zLmxlbmd0aCwgb3B0aW9ucyk7CiAgICAgfQogCi0gICAg aW5zZXJ0VGFiQmFySXRlbSh0YWJCYXJJdGVtLCBpbmRleCwgZG9Ob3RBbmltYXRlKQorICAgIGlu c2VydFRhYkJhckl0ZW0odGFiQmFySXRlbSwgaW5kZXgsIG9wdGlvbnMgPSB7fSkKICAgICB7CiAg ICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRhYkJhckl0ZW0gaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3Iu VGFiQmFySXRlbSk7CiAgICAgICAgIGlmICghKHRhYkJhckl0ZW0gaW5zdGFuY2VvZiBXZWJJbnNw ZWN0b3IuVGFiQmFySXRlbSkpCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAogICAgICAgICBp ZiAodGFiQmFySXRlbS5wYXJlbnRUYWJCYXIgPT09IHRoaXMpCi0gICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAogICAgICAgICBpZiAodGhpcy5fdGFiQW5pbWF0 ZWRDbG9zZWRTaW5jZU1vdXNlRW50ZXIpIHsKICAgICAgICAgICAgIC8vIERlbGF5IGFkZGluZyB0 aGUgbmV3IHRhYiB1bnRpbCB3ZSBjYW4gZXhwYW5kIHRoZSB0YWJzIGFmdGVyIGEgY2xvc2VkIHRh Yi4KICAgICAgICAgICAgIHRoaXMuX2ZpbmlzaEV4cGFuZGluZ1RhYnNBZnRlckNsb3NlKCkudGhl bigoKSA9PiB7Ci0gICAgICAgICAgICAgICAgdGhpcy5pbnNlcnRUYWJCYXJJdGVtKHRhYkJhckl0 ZW0sIGluZGV4LCBkb05vdEFuaW1hdGUpOworICAgICAgICAgICAgICAgIHRoaXMuaW5zZXJ0VGFi QmFySXRlbSh0YWJCYXJJdGVtLCBpbmRleCwgb3B0aW9ucyk7CiAgICAgICAgICAgICB9KTsKLSAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBudWxsOwogICAgICAgICB9CiAK ICAgICAgICAgaWYgKHRhYkJhckl0ZW0ucGFyZW50VGFiQmFyKQpAQCAtOTMsMTEgKzkzLDExIEBA IFdlYkluc3BlY3Rvci5UYWJCYXIgPSBjbGFzcyBUYWJCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu VmlldwogCiAgICAgICAgIGlmICh0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmNvbnRhaW5zKCJhbmlt YXRpbmciKSkgewogICAgICAgICAgICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1lKHJlbW92ZVN0eWxl cy5iaW5kKHRoaXMpKTsKLSAgICAgICAgICAgIGRvTm90QW5pbWF0ZSA9IHRydWU7CisgICAgICAg ICAgICBvcHRpb25zLnN1cHByZXNzQW5pbWF0aW9ucyA9IHRydWU7CiAgICAgICAgIH0KIAogICAg ICAgICB2YXIgYmVmb3JlVGFiU2l6ZXNBbmRQb3NpdGlvbnM7Ci0gICAgICAgIGlmICghZG9Ob3RB bmltYXRlKQorICAgICAgICBpZiAoIW9wdGlvbnMuc3VwcHJlc3NBbmltYXRpb25zKQogICAgICAg ICAgICAgYmVmb3JlVGFiU2l6ZXNBbmRQb3NpdGlvbnMgPSB0aGlzLl9yZWNvcmRUYWJCYXJJdGVt U2l6ZXNBbmRQb3NpdGlvbnMoKTsKIAogICAgICAgICB0aGlzLl90YWJCYXJJdGVtcy5zcGxpY2Uo aW5kZXgsIDAsIHRhYkJhckl0ZW0pOwpAQCAtMTM4LDcgKzEzOCw3IEBAIFdlYkluc3BlY3Rvci5U YWJCYXIgPSBjbGFzcyBUYWJCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICAg ICAgdGhpcy5lbGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoIndlYmtpdFRyYW5zaXRpb25FbmQi LCByZW1vdmVTdHlsZXNMaXN0ZW5lcik7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIWRvTm90 QW5pbWF0ZSkgeworICAgICAgICBpZiAoIW9wdGlvbnMuc3VwcHJlc3NBbmltYXRpb25zKSB7CiAg ICAgICAgICAgICB2YXIgYWZ0ZXJUYWJTaXplc0FuZFBvc2l0aW9ucyA9IHRoaXMuX3JlY29yZFRh YkJhckl0ZW1TaXplc0FuZFBvc2l0aW9ucygpOwogCiAgICAgICAgICAgICB0aGlzLnVwZGF0ZUxh eW91dCgpOwpAQCAtMTcxLDcgKzE3MSw3IEBAIFdlYkluc3BlY3Rvci5UYWJCYXIgPSBjbGFzcyBU YWJCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICByZXR1cm4gdGFiQmFySXRl bTsKICAgICB9CiAKLSAgICByZW1vdmVUYWJCYXJJdGVtKHRhYkJhckl0ZW1PckluZGV4LCBkb05v dEFuaW1hdGUsIGRvTm90RXhwYW5kKQorICAgIHJlbW92ZVRhYkJhckl0ZW0odGFiQmFySXRlbU9y SW5kZXgsIG9wdGlvbnMgPSB7fSkKICAgICB7CiAgICAgICAgIGxldCB0YWJCYXJJdGVtID0gdGhp cy5fZmluZFRhYkJhckl0ZW0odGFiQmFySXRlbU9ySW5kZXgpOwogICAgICAgICBpZiAoIXRhYkJh ckl0ZW0gfHwgdGFiQmFySXRlbSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5QaW5uZWRUYWJCYXJJ dGVtKQpAQCAtMTkwLDExICsxOTAsMTEgQEAgV2ViSW5zcGVjdG9yLlRhYkJhciA9IGNsYXNzIFRh YkJhciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAKICAgICAgICAgaWYgKHRoaXMuZWxlbWVu dC5jbGFzc0xpc3QuY29udGFpbnMoImFuaW1hdGluZyIpKSB7CiAgICAgICAgICAgICByZXF1ZXN0 QW5pbWF0aW9uRnJhbWUocmVtb3ZlU3R5bGVzLmJpbmQodGhpcykpOwotICAgICAgICAgICAgZG9O b3RBbmltYXRlID0gdHJ1ZTsKKyAgICAgICAgICAgIG9wdGlvbnMuc3VwcHJlc3NBbmltYXRpb25z ID0gdHJ1ZTsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBiZWZvcmVUYWJTaXplc0FuZFBvc2l0 aW9uczsKLSAgICAgICAgaWYgKCFkb05vdEFuaW1hdGUpCisgICAgICAgIGlmICghb3B0aW9ucy5z dXBwcmVzc0FuaW1hdGlvbnMpCiAgICAgICAgICAgICBiZWZvcmVUYWJTaXplc0FuZFBvc2l0aW9u cyA9IHRoaXMuX3JlY29yZFRhYkJhckl0ZW1TaXplc0FuZFBvc2l0aW9ucygpOwogCiAgICAgICAg IC8vIFN1YnRyYWN0IDEgZnJvbSBub3JtYWxUYWJDb3VudCBzaW5jZSBhcnJheXMgYmVnaW4gaW5k ZXhpbmcgYXQgMC4KQEAgLTIwOCwxMCArMjA4LDEwIEBAIFdlYkluc3BlY3Rvci5UYWJCYXIgPSBj bGFzcyBUYWJCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogCiAgICAgICAgIGNvbnN0IHNo b3VsZE9wZW5EZWZhdWx0VGFiID0gIXRhYkJhckl0ZW0uaXNEZWZhdWx0VGFiICYmICF0aGlzLm5v cm1hbFRhYkNvdW50OwogICAgICAgICBpZiAoc2hvdWxkT3BlbkRlZmF1bHRUYWIpCi0gICAgICAg ICAgICBkb05vdEFuaW1hdGUgPSB0cnVlOworICAgICAgICAgICAgb3B0aW9ucy5zdXBwcmVzc0Fu aW1hdGlvbnMgPSB0cnVlOwogCi0gICAgICAgIGlmICghaGFzTW9yZVRoYW5PbmVOb3JtYWxUYWIg fHwgd2FzTGFzdE5vcm1hbFRhYiB8fCAhZG9Ob3RFeHBhbmQpIHsKLSAgICAgICAgICAgIGlmICgh ZG9Ob3RBbmltYXRlKSB7CisgICAgICAgIGlmICghaGFzTW9yZVRoYW5PbmVOb3JtYWxUYWIgfHwg d2FzTGFzdE5vcm1hbFRhYiB8fCAhb3B0aW9ucy5zdXBwcmVzc0V4cGFuc2lvbikgeworICAgICAg ICAgICAgaWYgKCFvcHRpb25zLnN1cHByZXNzQW5pbWF0aW9ucykgewogICAgICAgICAgICAgICAg IHRoaXMuX3RhYkFuaW1hdGVkQ2xvc2VkU2luY2VNb3VzZUVudGVyID0gdHJ1ZTsKICAgICAgICAg ICAgICAgICB0aGlzLl9maW5pc2hFeHBhbmRpbmdUYWJzQWZ0ZXJDbG9zZShiZWZvcmVUYWJTaXpl c0FuZFBvc2l0aW9ucyk7CiAgICAgICAgICAgICB9IGVsc2UKQEAgLTI4MCw3ICsyODAsNyBAQCBX ZWJJbnNwZWN0b3IuVGFiQmFyID0gY2xhc3MgVGFiQmFyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZp ZXcKICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJ3ZWJraXRU cmFuc2l0aW9uRW5kIiwgcmVtb3ZlU3R5bGVzTGlzdGVuZXIpOwogICAgICAgICB9CiAKLSAgICAg ICAgaWYgKCFkb05vdEFuaW1hdGUpIHsKKyAgICAgICAgaWYgKCFvcHRpb25zLnN1cHByZXNzQW5p bWF0aW9ucykgewogICAgICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInN0YXRp Yy1sYXlvdXQiKTsKIAogICAgICAgICAgICAgdGhpcy5fdGFiQW5pbWF0ZWRDbG9zZWRTaW5jZU1v dXNlRW50ZXIgPSB0cnVlOwpAQCAtNjE1LDcgKzYxNSw3IEBAIFdlYkluc3BlY3Rvci5UYWJCYXIg PSBjbGFzcyBUYWJCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICAgICAgICAg IHJldHVybjsKIAogICAgICAgICAgICAgaWYgKCFldmVudC5hbHRLZXkpIHsKLSAgICAgICAgICAg ICAgICB0aGlzLnJlbW92ZVRhYkJhckl0ZW0odGFiQmFySXRlbSwgZmFsc2UsIHRydWUpOworICAg ICAgICAgICAgICAgIHRoaXMucmVtb3ZlVGFiQmFySXRlbSh0YWJCYXJJdGVtLCB7c3VwcHJlc3NF eHBhbnNpb246IHRydWV9KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9 CiAKQEAgLTc1Miw4ICs3NTIsNyBAQCBXZWJJbnNwZWN0b3IuVGFiQmFyID0gY2xhc3MgVGFiQmFy IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKIAogICAgIF9oYW5kbGVOZXdUYWJDbGljayhldmVu dCkKICAgICB7Ci0gICAgICAgIGNvbnN0IHNob3VsZEFuaW1hdGUgPSB0cnVlOwotICAgICAgICBX ZWJJbnNwZWN0b3Iuc2hvd05ld1RhYlRhYihzaG91bGRBbmltYXRlKTsKKyAgICAgICAgV2ViSW5z cGVjdG9yLnNob3dOZXdUYWJUYWIoKTsKICAgICB9CiAKICAgICBfaGFuZGxlTmV3VGFiTW91c2VF bnRlcihldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RhYkJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzCmluZGV4IGFiMTlkNjRkOTdlLi4yNTdjYzVmY2JkYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFi QnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UYWJCcm93c2VyLmpzCkBAIC0xMzYsNyArMTM2LDcgQEAgV2ViSW5zcGVjdG9yLlRhYkJyb3dz ZXIgPSBjbGFzcyBUYWJCcm93c2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAgICAg cmV0dXJuIG51bGw7CiAgICAgfQogCi0gICAgYWRkVGFiRm9yQ29udGVudFZpZXcodGFiQ29udGVu dFZpZXcsIGRvTm90QW5pbWF0ZSwgaW5zZXJ0aW9uSW5kZXgpCisgICAgYWRkVGFiRm9yQ29udGVu dFZpZXcodGFiQ29udGVudFZpZXcsIG9wdGlvbnMgPSB7fSkKICAgICB7CiAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHRhYkNvbnRlbnRWaWV3IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRhYkNvbnRl bnRWaWV3KTsKICAgICAgICAgaWYgKCEodGFiQ29udGVudFZpZXcgaW5zdGFuY2VvZiBXZWJJbnNw ZWN0b3IuVGFiQ29udGVudFZpZXcpKQpAQCAtMTYzLDEwICsxNjMsMTAgQEAgV2ViSW5zcGVjdG9y LlRhYkJyb3dzZXIgPSBjbGFzcyBUYWJCcm93c2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcK ICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5fcmVjZW50VGFiQ29udGVudFZpZXdzLnB1 c2godGFiQ29udGVudFZpZXcpOwogCi0gICAgICAgIGlmICh0eXBlb2YgaW5zZXJ0aW9uSW5kZXgg PT09ICJudW1iZXIiKQotICAgICAgICAgICAgdGhpcy5fdGFiQmFyLmluc2VydFRhYkJhckl0ZW0o dGFiQmFySXRlbSwgaW5zZXJ0aW9uSW5kZXgsIGRvTm90QW5pbWF0ZSk7CisgICAgICAgIGlmICh0 eXBlb2Ygb3B0aW9ucy5pbnNlcnRpb25JbmRleCA9PT0gIm51bWJlciIpCisgICAgICAgICAgICB0 aGlzLl90YWJCYXIuaW5zZXJ0VGFiQmFySXRlbSh0YWJCYXJJdGVtLCBvcHRpb25zLmluc2VydGlv bkluZGV4LCBvcHRpb25zKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fdGFiQmFy LmFkZFRhYkJhckl0ZW0odGFiQmFySXRlbSwgZG9Ob3RBbmltYXRlKTsKKyAgICAgICAgICAgIHRo aXMuX3RhYkJhci5hZGRUYWJCYXJJdGVtKHRhYkJhckl0ZW0sIG9wdGlvbnMpOwogCiAgICAgICAg IGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3JlY2VudFRhYkNvbnRlbnRWaWV3cy5sZW5ndGggPT09IHRo aXMuX3RhYkJhci5ub3JtYWxUYWJDb3VudCk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlz LnNlbGVjdGVkVGFiQ29udGVudFZpZXcgfHwgdGhpcy5zZWxlY3RlZFRhYkNvbnRlbnRWaWV3ID09 PSB0aGlzLl9yZWNlbnRUYWJDb250ZW50Vmlld3NbMF0pOwpAQCAtMTc0LDEyICsxNzQsMTMgQEAg V2ViSW5zcGVjdG9yLlRhYkJyb3dzZXIgPSBjbGFzcyBUYWJCcm93c2VyIGV4dGVuZHMgV2ViSW5z cGVjdG9yLlZpZXcKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgc2hvd1RhYkZv ckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3LCBkb05vdEFuaW1hdGUsIGluc2VydGlvbkluZGV4 KQorICAgIHNob3dUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50Vmlldywgb3B0aW9ucyA9IHt9 KQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLmFkZFRhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRl bnRWaWV3LCBkb05vdEFuaW1hdGUsIGluc2VydGlvbkluZGV4KSkKKyAgICAgICAgaWYgKCF0aGlz LmFkZFRhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3LCBvcHRpb25zKSkKICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICB0aGlzLl90YWJCYXIuc2VsZWN0ZWRUYWJCYXJJ dGVtID0gdGFiQ29udGVudFZpZXcudGFiQmFySXRlbTsKKyAgICAgICAgaWYgKCFvcHRpb25zLnN1 cHByZXNzU2VsZWN0aW9uKQorICAgICAgICAgICAgdGhpcy5fdGFiQmFyLnNlbGVjdGVkVGFiQmFy SXRlbSA9IHRhYkNvbnRlbnRWaWV3LnRhYkJhckl0ZW07CiAKICAgICAgICAgLy8gRklYTUU6IHRo aXMgaXMgYSB3b3JrYXJvdW5kIGZvciA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTUxODc2Pi4KICAg ICAgICAgLy8gV2l0aG91dCB0aGlzIGV4dHJhIGNhbGwsIHdlIG1pZ2h0IG5ldmVyIGxheSBvdXQg dGhlIGNoaWxkIHRhYgpAQCAtMTkxLDcgKzE5Miw3IEBAIFdlYkluc3BlY3Rvci5UYWJCcm93c2Vy ID0gY2xhc3MgVGFiQnJvd3NlciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgICAgIHJl dHVybiB0cnVlOwogICAgIH0KIAotICAgIGNsb3NlVGFiRm9yQ29udGVudFZpZXcodGFiQ29udGVu dFZpZXcsIGRvTm90QW5pbWF0ZSkKKyAgICBjbG9zZVRhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRl bnRWaWV3LCBvcHRpb25zID0ge30pCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCh0YWJD b250ZW50VmlldyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5UYWJDb250ZW50Vmlldyk7CiAgICAg ICAgIGlmICghKHRhYkNvbnRlbnRWaWV3IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRhYkNvbnRl bnRWaWV3KSkKQEAgLTIwNCw3ICsyMDUsNyBAQCBXZWJJbnNwZWN0b3IuVGFiQnJvd3NlciA9IGNs YXNzIFRhYkJyb3dzZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICBpZiAodGFi Q29udGVudFZpZXcudGFiQmFySXRlbS5wYXJlbnRUYWJCYXIgIT09IHRoaXMuX3RhYkJhcikKICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICB0aGlzLl90YWJCYXIucmVtb3ZlVGFi QmFySXRlbSh0YWJDb250ZW50Vmlldy50YWJCYXJJdGVtLCBkb05vdEFuaW1hdGUpOworICAgICAg ICB0aGlzLl90YWJCYXIucmVtb3ZlVGFiQmFySXRlbSh0YWJDb250ZW50Vmlldy50YWJCYXJJdGVt LCBvcHRpb25zKTsKIAogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9yZWNlbnRUYWJDb250 ZW50Vmlld3MubGVuZ3RoID09PSB0aGlzLl90YWJCYXIubm9ybWFsVGFiQ291bnQpOwogICAgICAg ICBjb25zb2xlLmFzc2VydCghdGhpcy5zZWxlY3RlZFRhYkNvbnRlbnRWaWV3IHx8IHRoaXMuc2Vs ZWN0ZWRUYWJDb250ZW50VmlldyA9PT0gdGhpcy5fcmVjZW50VGFiQ29udGVudFZpZXdzWzBdKTsK