197178 2019-04-22 14:08:13 -0700 Web Inspector: Canvas: no obvious way of switching to the overview when viewing an imported recording 2019-04-23 13:31:09 -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 1529376 0 hi 2019-04-22 14:08:13 -0700 # STEPS TO REPRODUCE: 1. inspect any page with a <canvas> 2. record the <canvas> 3. export the recording 4. import the recording => the only way to get back to the overview is to click on the "Imported Recordings" in the navigation bar above the main content area and select "Overview" 1529378 1 webkit-bug-importer 2019-04-22 14:08:27 -0700 <rdar://problem/50106641> 1529459 2 367995 hi 2019-04-22 16:35:09 -0700 Created attachment 367995 Patch 1529719 3 367995 commit-queue 2019-04-23 13:31:08 -0700 Comment on attachment 367995 Patch Clearing flags on attachment: 367995 Committed r244560: <https://trac.webkit.org/changeset/244560> 1529720 4 commit-queue 2019-04-23 13:31:09 -0700 All reviewed patches have been landed. Closing bug. 367995 2019-04-22 16:35:09 -0700 2019-04-23 13:31:08 -0700 Patch bug-197178-20190422163508.patch text/plain 18175 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGFmYjhjYzM3MmE4NGZiZjdlMGFiZjZmZWNhOWE0 NDY3ZGMwYTdkNWYuLjJmOTVmNDIzMzcxYzBlODFjOTdkNzgwYmUxZTcwMmI2NWY5MmE4ZWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE5LTA0LTIyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD YW52YXM6IG5vIG9idmlvdXMgd2F5IG9mIHN3aXRjaGluZyB0byB0aGUgb3ZlcnZpZXcgd2hlbiB2 aWV3aW5nIGFuIGltcG9ydGVkIHJlY29yZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MTc4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDEw NjY0MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBF eHBhbmQgdGhlIGlkZWEgb2YgImltcG9ydGVkIiByZWNvcmRpbmdzIHRvIGluY2x1ZGUgInNhdmVk IiByZWNvcmRpbmdzLCBvbmVzIHdob3NlCisgICAgICAgIHVuZGVybHlpbmcgPGNhbnZhcz4gd2Fz IGRlc3Ryb3llZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzVGFiQ29u dGVudFZpZXcuanM6CisgICAgICAgIChXSS5DYW52YXNUYWJDb250ZW50Vmlldyk6CisgICAgICAg IChXSS5DYW52YXNUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuYXR0YWNoZWQpOgorICAgICAgICAo V0kuQ2FudmFzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9yZW1vdmVDYW52YXMpOgorICAgICAg ICAoV0kuQ2FudmFzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9hZGRSZWNvcmRpbmcpOgorICAg ICAgICAoV0kuQ2FudmFzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVSZWNvcmRpbmdT YXZlZE9yU3RvcHBlZCk6IEFkZGVkLgorICAgICAgICAoV0kuQ2FudmFzVGFiQ29udGVudFZpZXcu cHJvdG90eXBlLmluaXRpYWxMYXlvdXQpOiBEZWxldGVkLgorICAgICAgICAoV0kuQ2FudmFzVGFi Q29udGVudFZpZXcucHJvdG90eXBlLl9yZWNvcmRpbmdJbXBvcnRlZE9yU3RvcHBlZCk6IERlbGV0 ZWQuCisgICAgICAgIE1ha2UgdGhlICJTYXZlZCBSZWNvcmRpbmdzIiBmb2xkZXIgYSBjaGlsZCBv ZiB0aGUgIk92ZXJ2aWV3IiBzbyB0aGF0IHRoZSAiT3ZlcnZpZXciIHBhdGgKKyAgICAgICAgY29t cG9uZW50IGlzIGFsd2F5cyB2aXNpYmxlL2NsaWNrYWJsZS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkNh bnZhc092ZXJ2aWV3Q29udGVudFZpZXcpOgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250 ZW50Vmlldy5wcm90b3R5cGUuY29udGVudFZpZXdBZGRlZCk6CisgICAgICAgIChXSS5DYW52YXNP dmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlwZS5hdHRhY2hlZCk6CisgICAgICAgIChXSS5DYW52 YXNPdmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlwZS5kZXRhY2hlZCk6CisgICAgICAgIChXSS5D YW52YXNPdmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fYWRkU2F2ZWRSZWNvcmRpbmcpOiBB ZGRlZC4KKyAgICAgICAgKFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcucHJvdG90eXBlLl9o YW5kbGVSZWNvcmRpbmdTYXZlZCk6IEFkZGVkLgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdD b250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRsZVNhdmVkUmVjb3JkaW5nQ2xpY2tlZCk6IEFkZGVk LgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmll dy5jc3M6CisgICAgICAgICguY29udGVudC12aWV3LmNhbnZhcy1vdmVydmlldyAuY29udGVudC12 aWV3LmNhbnZhcy5zYXZlZC1yZWNvcmRpbmdzKTogQWRkZWQuCisgICAgICAgICguY29udGVudC12 aWV3LmNhbnZhcy1vdmVydmlldyAuY29udGVudC12aWV3LmNhbnZhcy5zYXZlZC1yZWNvcmRpbmdz IC50cmVlLW91dGxpbmUpOiBBZGRlZC4KKyAgICAgICAgKC5jb250ZW50LXZpZXcuY2FudmFzLW92 ZXJ2aWV3IC5jb250ZW50LXZpZXcuY2FudmFzLnNhdmVkLXJlY29yZGluZ3MgLnRyZWUtb3V0bGlu ZSA+IC5pdGVtLnJlY29yZGluZyA+IC5pY29uKTogQWRkZWQuCisgICAgICAgIEFkZCBhIGNhcmQg Zm9yICJTYXZlZCBSZWNvcmRpbmdzIiB0aGF0IG1pbWljcyB0aGUgc3R5bGUgb2YgcmVndWxhciBj YW52YXMgY2FyZHMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbnZh c01hbmFnZXIuanM6CisgICAgICAgIChXSS5DYW52YXNNYW5hZ2VyKToKKyAgICAgICAgKFdJLkNh bnZhc01hbmFnZXIucHJvdG90eXBlLmdldCBzYXZlZFJlY29yZGluZ3MpOiBBZGRlZC4KKyAgICAg ICAgKFdJLkNhbnZhc01hbmFnZXIucHJvdG90eXBlLmFzeW5jIHByb2Nlc3NKU09OKToKKyAgICAg ICAgKFdJLkNhbnZhc01hbmFnZXIucHJvdG90eXBlLmRpc2FibGUpOgorICAgICAgICAoV0kuQ2Fu dmFzTWFuYWdlci5wcm90b3R5cGUuX3JlbW92ZUNhbnZhcyk6CisgICAgICAgIChXSS5DYW52YXNN YW5hZ2VyLnByb3RvdHlwZS5nZXQgaW1wb3J0ZWRSZWNvcmRpbmdzKTogRGVsZXRlZC4KKworICAg ICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKwogMjAx OS0wNC0xOSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogVGltZWxpbmVzOiBDUFU6IHJlbW92ZSBleHRyYSBib3JkZXIgdW5kZXIgbGFz dCBzZWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBjNjhlNzA0YmRm ZjQ0YTAzYmUzMmIzMjZjNGQ2OWJmNzI3YTM5Zjc1Li41MWE2ZTg1OGY3MGVlNGI5MTI3MGM5MTI5 Y2Q4YzdmMWEzNGM4MTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTU2 Miw3ICs1NjIsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJJbW1lZGlhdGUgUGF1c2UgUmVxdWVzdGVk Il0gPSAiSW1tZWRpYXRlIFBhdXNlIFJlcXVlc3RlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbXBv cnQiXSA9ICJJbXBvcnQiOwogbG9jYWxpemVkU3RyaW5nc1siSW1wb3J0ZWQiXSA9ICJJbXBvcnRl ZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbXBvcnRlZCAtICVzIl0gPSAiSW1wb3J0ZWQgLSAlcyI7 Ci1sb2NhbGl6ZWRTdHJpbmdzWyJJbXBvcnRlZCBSZWNvcmRpbmdzIl0gPSAiSW1wb3J0ZWQgUmVj b3JkaW5ncyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbXBvcnRlZCBcdTIwMTQgJXMiXSA9ICJJbXBv cnRlZCBcdTIwMTQgJXMiOwogbG9jYWxpemVkU3RyaW5nc1siSW5jb21wbGV0ZSJdID0gIkluY29t cGxldGUiOwogbG9jYWxpemVkU3RyaW5nc1siSW5kZW50IHdpZHRoOiJdID0gIkluZGVudCB3aWR0 aDoiOwpAQCAtODc5LDYgKzg3OCw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIlNhdmUgRmlsZSJdID0g IlNhdmUgRmlsZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTYXZlIEltYWdlIl0gPSAiU2F2ZSBJbWFn ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTYXZlIFNlbGVjdGVkIl0gPSAiU2F2ZSBTZWxlY3RlZCI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJTYXZlIGNvbmZpZ3VyYXRpb24iXSA9ICJTYXZlIGNvbmZpZ3Vy YXRpb24iOworbG9jYWxpemVkU3RyaW5nc1siU2F2ZWQgUmVjb3JkaW5ncyJdID0gIlNhdmVkIFJl Y29yZGluZ3MiOwogbG9jYWxpemVkU3RyaW5nc1siU2F2ZWQgU3RhdGVzIl0gPSAiU2F2ZWQgU3Rh dGVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNjaGVkdWxpbmc6Il0gPSAiU2NoZWR1bGluZzoiOwog bG9jYWxpemVkU3RyaW5nc1siU2NoZW1lIl0gPSAiU2NoZW1lIjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbnZhc01hbmFnZXIu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52 YXNNYW5hZ2VyLmpzCmluZGV4IGE0ODBjMWQwMzlmZDkyMWExOThjYTViNGZmMTZjM2ExMmE2MWY2 MDYuLjg4NzY2Y2U1NDZhMWZiZDk5YWIxZGFjYzgxYmE0NzljM2ZlZDJkMTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbnZhc01h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvQ2FudmFzTWFuYWdlci5qcwpAQCAtMzQsNyArMzQsNyBAQCBXSS5DYW52YXNNYW5hZ2Vy ID0gY2xhc3MgQ2FudmFzTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICB0aGlzLl9l bmFibGVkID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX2NhbnZhc0lkZW50aWZpZXJNYXAgPSBuZXcg TWFwOwogICAgICAgICB0aGlzLl9zaGFkZXJQcm9ncmFtSWRlbnRpZmllck1hcCA9IG5ldyBNYXA7 Ci0gICAgICAgIHRoaXMuX2ltcG9ydGVkUmVjb3JkaW5ncyA9IG5ldyBTZXQ7CisgICAgICAgIHRo aXMuX3NhdmVkUmVjb3JkaW5ncyA9IG5ldyBTZXQ7CiAKICAgICAgICAgV0kuRnJhbWUuYWRkRXZl bnRMaXN0ZW5lcihXSS5GcmFtZS5FdmVudC5NYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMuX21h aW5SZXNvdXJjZURpZENoYW5nZSwgdGhpcyk7CiAgICAgfQpAQCAtNjMsNyArNjMsNyBAQCBXSS5D YW52YXNNYW5hZ2VyID0gY2xhc3MgQ2FudmFzTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogCiAg ICAgLy8gUHVibGljCiAKLSAgICBnZXQgaW1wb3J0ZWRSZWNvcmRpbmdzKCkgeyByZXR1cm4gdGhp cy5faW1wb3J0ZWRSZWNvcmRpbmdzOyB9CisgICAgZ2V0IHNhdmVkUmVjb3JkaW5ncygpIHsgcmV0 dXJuIHRoaXMuX3NhdmVkUmVjb3JkaW5nczsgfQogCiAgICAgZ2V0IGNhbnZhc2VzKCkKICAgICB7 CkBAIC05Niw5ICs5Niw5IEBAIFdJLkNhbnZhc01hbmFnZXIgPSBjbGFzcyBDYW52YXNNYW5hZ2Vy IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICBmaWxlbmFtZSA9IGZpbGVuYW1lLnN1YnN0 cmluZygwLCBleHRlbnNpb25TdGFydCk7CiAgICAgICAgIHJlY29yZGluZy5jcmVhdGVEaXNwbGF5 TmFtZShmaWxlbmFtZSk7CiAKLSAgICAgICAgdGhpcy5faW1wb3J0ZWRSZWNvcmRpbmdzLmFkZChy ZWNvcmRpbmcpOworICAgICAgICB0aGlzLl9zYXZlZFJlY29yZGluZ3MuYWRkKHJlY29yZGluZyk7 CiAKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuQ2FudmFzTWFuYWdl ci5FdmVudC5SZWNvcmRpbmdJbXBvcnRlZCwge3JlY29yZGluZywgaW5pdGlhdGVkQnlVc2VyOiB0 cnVlfSk7CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLkNhbnZhc01h bmFnZXIuRXZlbnQuUmVjb3JkaW5nU2F2ZWQsIHtyZWNvcmRpbmcsIGltcG9ydGVkOiB0cnVlLCBp bml0aWF0ZWRCeVVzZXI6IHRydWV9KTsKICAgICB9CiAKICAgICBlbmFibGUoKQpAQCAtMTIyLDcg KzEyMiw3IEBAIFdJLkNhbnZhc01hbmFnZXIgPSBjbGFzcyBDYW52YXNNYW5hZ2VyIGV4dGVuZHMg V0kuT2JqZWN0CiAKICAgICAgICAgdGhpcy5fY2FudmFzSWRlbnRpZmllck1hcC5jbGVhcigpOwog ICAgICAgICB0aGlzLl9zaGFkZXJQcm9ncmFtSWRlbnRpZmllck1hcC5jbGVhcigpOwotICAgICAg ICB0aGlzLl9pbXBvcnRlZFJlY29yZGluZ3MuY2xlYXIoKTsKKyAgICAgICAgdGhpcy5fc2F2ZWRS ZWNvcmRpbmdzLmNsZWFyKCk7CiAKICAgICAgICAgdGhpcy5fZW5hYmxlZCA9IGZhbHNlOwogICAg IH0KQEAgLTI3Nyw2ICsyNzcsOCBAQCBXSS5DYW52YXNNYW5hZ2VyID0gY2xhc3MgQ2FudmFzTWFu YWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBmb3IgKGxldCByZWNvcmRpbmcgb2YgY2Fu dmFzLnJlY29yZGluZ0NvbGxlY3Rpb24pIHsKICAgICAgICAgICAgIHJlY29yZGluZy5zb3VyY2Ug PSBudWxsOwogICAgICAgICAgICAgcmVjb3JkaW5nLmNyZWF0ZURpc3BsYXlOYW1lKHJlY29yZGlu Zy5kaXNwbGF5TmFtZSk7CisgICAgICAgICAgICB0aGlzLl9zYXZlZFJlY29yZGluZ3MuYWRkKHJl Y29yZGluZyk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5D YW52YXNNYW5hZ2VyLkV2ZW50LlJlY29yZGluZ1NhdmVkLCB7cmVjb3JkaW5nfSk7CiAgICAgICAg IH0KIAogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5DYW52YXNNYW5h Z2VyLkV2ZW50LkNhbnZhc1JlbW92ZWQsIHtjYW52YXN9KTsKQEAgLTMwMSw1ICszMDMsNSBAQCBX SS5DYW52YXNNYW5hZ2VyID0gY2xhc3MgQ2FudmFzTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAog V0kuQ2FudmFzTWFuYWdlci5FdmVudCA9IHsKICAgICBDYW52YXNBZGRlZDogImNhbnZhcy1tYW5h Z2VyLWNhbnZhcy13YXMtYWRkZWQiLAogICAgIENhbnZhc1JlbW92ZWQ6ICJjYW52YXMtbWFuYWdl ci1jYW52YXMtd2FzLXJlbW92ZWQiLAotICAgIFJlY29yZGluZ0ltcG9ydGVkOiAiY2FudmFzLW1h bmFnZXItcmVjb3JkaW5nLWltcG9ydGVkIiwKKyAgICBSZWNvcmRpbmdTYXZlZDogImNhbnZhcy1t YW5hZ2VyLXJlY29yZGluZy1zYXZlZCIsCiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5jc3Mg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmll d0NvbnRlbnRWaWV3LmNzcwppbmRleCA3ODQ0ZDBkMDM4NzBkMjU2NTRiMTgzN2RlZjhlMWUzNWE2 MjFmYjM2Li45ZmI4MmM3MTI1YjczNTk0NDUyNDhkZjNlYzdmMDc1NGI5MDYwZTA1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVy dmlld0NvbnRlbnRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmNzcwpAQCAtMTczLDYgKzE3Mywx OCBAQAogICAgIC13ZWJraXQtcGFkZGluZy1zdGFydDogNHB4OwogfQogCisuY29udGVudC12aWV3 LmNhbnZhcy1vdmVydmlldyAuY29udGVudC12aWV3LmNhbnZhcy5zYXZlZC1yZWNvcmRpbmdzIHsK KyAgICBoZWlnaHQ6IDM0MHB4OworfQorCisuY29udGVudC12aWV3LmNhbnZhcy1vdmVydmlldyAu Y29udGVudC12aWV3LmNhbnZhcy5zYXZlZC1yZWNvcmRpbmdzIC50cmVlLW91dGxpbmUgeworICAg IG92ZXJmbG93LXk6IHNjcm9sbDsKK30KKworLmNvbnRlbnQtdmlldy5jYW52YXMtb3ZlcnZpZXcg LmNvbnRlbnQtdmlldy5jYW52YXMuc2F2ZWQtcmVjb3JkaW5ncyAudHJlZS1vdXRsaW5lID4gLml0 ZW0ucmVjb3JkaW5nID4gLmljb24geworICAgIGNvbnRlbnQ6IHVybCguLi9JbWFnZXMvUmVjb3Jk aW5nLnN2Zyk7Cit9CisKIC5uYXZpZ2F0aW9uLWJhciA+IC5pdGVtLmNhbnZhcy1yZWNvcmRpbmct YXV0by1jYXB0dXJlID4gbGFiZWwgewogICAgIGRpc3BsYXk6IGZsZXg7CiAgICAgYWxpZ24taXRl bXM6IGNlbnRlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmpzCmlu ZGV4IGZkNjRhZTI1Y2ZlZjVlODZmNjVlMDY0ZjRjZGU2ODllNjNiYmQzN2QuLmRlZDNjYjhjMWJl MDBkYmM1ZTNlNWJlODNkNmEwZGUxY2U1ZjBmZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3Zl cnZpZXdDb250ZW50Vmlldy5qcwpAQCAtNzcsNiArNzcsOSBAQCBXSS5DYW52YXNPdmVydmlld0Nv bnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyBleHRlbmRzIFdJLkNv bGxlYwogCiAgICAgICAgIGltcG9ydE5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0ku QnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5faGFuZGxlSW1wb3J0QnV0 dG9uTmF2aWdhdGlvbkl0ZW1DbGlja2VkLCB0aGlzKTsKICAgICAgICAgdGhpcy5faW1wb3J0QnV0 dG9uTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRl bS5FdmVudC5DbGlja2VkLCB0aGlzLl9oYW5kbGVJbXBvcnRCdXR0b25OYXZpZ2F0aW9uSXRlbUNs aWNrZWQsIHRoaXMpOworCisgICAgICAgIHRoaXMuX3NhdmVkUmVjb3JkaW5nc0NvbnRlbnRWaWV3 ID0gbnVsbDsKKyAgICAgICAgdGhpcy5fc2F2ZWRSZWNvcmRpbmdzVHJlZU91dGxpbmUgPSBudWxs OwogICAgIH0KIAogICAgIC8vIFN0YXRpYwpAQCAtMTA3LDYgKzExMCwxMiBAQCBXSS5DYW52YXNP dmVydmlld0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyBleHRl bmRzIFdJLkNvbGxlYwogICAgICAgICBjb250ZW50Vmlldy5lbGVtZW50LmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlZW50ZXIiLCB0aGlzLl9jb250ZW50Vmlld01vdXNlRW50ZXIpOwogICAgICAgICBj b250ZW50Vmlldy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlbGVhdmUiLCB0aGlzLl9j b250ZW50Vmlld01vdXNlTGVhdmUpOwogCisgICAgICAgIGlmICh0aGlzLl9zYXZlZFJlY29yZGlu Z3NDb250ZW50VmlldykgeworICAgICAgICAgICAgLy8gRW5zdXJlIHRoYXQgdGhlIGltcG9ydGVk IHJlY29yZGluZ3MgYXJlIGFsd2F5cyBsYXN0LgorICAgICAgICAgICAgdGhpcy5yZW1vdmVTdWJ2 aWV3KHRoaXMuX3NhdmVkUmVjb3JkaW5nc0NvbnRlbnRWaWV3KTsKKyAgICAgICAgICAgIHRoaXMu YWRkU3Vidmlldyh0aGlzLl9zYXZlZFJlY29yZGluZ3NDb250ZW50Vmlldyk7CisgICAgICAgIH0K KwogICAgICAgICB0aGlzLl91cGRhdGVOYXZpZ2F0aW9uSXRlbXMoKTsKICAgICB9CiAKQEAgLTEy NSwxMCArMTM0LDE5IEBAIFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgPSBjbGFzcyBDYW52 YXNPdmVydmlld0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29sbGVjCiAgICAgICAgIFdJLnNldHRp bmdzLnNob3dJbWFnZUdyaWQuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5n ZWQsIHRoaXMuX3VwZGF0ZVNob3dJbWFnZUdyaWQsIHRoaXMpOwogICAgICAgICBXSS5zZXR0aW5n cy5jYW52YXNSZWNvcmRpbmdBdXRvQ2FwdHVyZUVuYWJsZWQuYWRkRXZlbnRMaXN0ZW5lcihXSS5T ZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX2hhbmRsZUNhbnZhc1JlY29yZGluZ0F1dG9DYXB0 dXJlRW5hYmxlZENoYW5nZWQsIHRoaXMpOwogICAgICAgICBXSS5zZXR0aW5ncy5jYW52YXNSZWNv cmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnQuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2 ZW50LkNoYW5nZWQsIHRoaXMuX2hhbmRsZUNhbnZhc1JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVD b3VudENoYW5nZWQsIHRoaXMpOworCisgICAgICAgIFdJLmNhbnZhc01hbmFnZXIuYWRkRXZlbnRM aXN0ZW5lcihXSS5DYW52YXNNYW5hZ2VyLkV2ZW50LlJlY29yZGluZ1NhdmVkLCB0aGlzLl9oYW5k bGVSZWNvcmRpbmdTYXZlZCwgdGhpcyk7CisKKyAgICAgICAgaWYgKHRoaXMuX3NhdmVkUmVjb3Jk aW5nc1RyZWVPdXRsaW5lKQorICAgICAgICAgICAgdGhpcy5fc2F2ZWRSZWNvcmRpbmdzVHJlZU91 dGxpbmUucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgZm9yIChsZXQgcmVjb3JkaW5nIG9mIFdJ LmNhbnZhc01hbmFnZXIuc2F2ZWRSZWNvcmRpbmdzKQorICAgICAgICAgICAgdGhpcy5fYWRkU2F2 ZWRSZWNvcmRpbmcocmVjb3JkaW5nKTsKICAgICB9CiAKICAgICBkZXRhY2hlZCgpCiAgICAgewor ICAgICAgICBXSS5jYW52YXNNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwg dGhpcyk7CisKICAgICAgICAgV0kuc2V0dGluZ3MuY2FudmFzUmVjb3JkaW5nQXV0b0NhcHR1cmVG cmFtZUNvdW50LnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CiAgICAgICAg IFdJLnNldHRpbmdzLmNhbnZhc1JlY29yZGluZ0F1dG9DYXB0dXJlRW5hYmxlZC5yZW1vdmVFdmVu dExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOwogICAgICAgICBXSS5zZXR0aW5ncy5zaG93SW1h Z2VHcmlkLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CkBAIC0yNjEsNiAr Mjc5LDMyIEBAIFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNPdmVy dmlld0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29sbGVjCiAgICAgICAgIHJldHVybiBmcmFtZUNv dW50OwogICAgIH0KIAorICAgIF9hZGRTYXZlZFJlY29yZGluZyhyZWNvcmRpbmcpCisgICAgewor ICAgICAgICBjb25zb2xlLmFzc2VydCghcmVjb3JkaW5nLnNvdXJjZSk7CisKKyAgICAgICAgaWYg KCF0aGlzLl9zYXZlZFJlY29yZGluZ3NDb250ZW50VmlldykgeworICAgICAgICAgICAgdGhpcy5f c2F2ZWRSZWNvcmRpbmdzQ29udGVudFZpZXcgPSBuZXcgV0kuQ29udGVudFZpZXc7CisgICAgICAg ICAgICB0aGlzLl9zYXZlZFJlY29yZGluZ3NDb250ZW50Vmlldy5lbGVtZW50LmNsYXNzTGlzdC5h ZGQoImNhbnZhcyIsICJzYXZlZC1yZWNvcmRpbmdzIik7CisgICAgICAgICAgICB0aGlzLmFkZFN1 YnZpZXcodGhpcy5fc2F2ZWRSZWNvcmRpbmdzQ29udGVudFZpZXcpOworCisgICAgICAgICAgICBs ZXQgaGVhZGVyID0gdGhpcy5fc2F2ZWRSZWNvcmRpbmdzQ29udGVudFZpZXcuZWxlbWVudC5hcHBl bmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJoZWFkZXIiKSk7CisgICAgICAgICAgICBo ZWFkZXIudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiU2F2ZWQgUmVjb3JkaW5ncyIpOworICAg ICAgICB9CisKKyAgICAgICAgaWYgKCF0aGlzLl9zYXZlZFJlY29yZGluZ3NUcmVlT3V0bGluZSkg eworICAgICAgICAgICAgY29uc3Qgc2VsZWN0YWJsZSA9IGZhbHNlOworICAgICAgICAgICAgdGhp cy5fc2F2ZWRSZWNvcmRpbmdzVHJlZU91dGxpbmUgPSBuZXcgV0kuVHJlZU91dGxpbmUoc2VsZWN0 YWJsZSk7CisgICAgICAgICAgICB0aGlzLl9zYXZlZFJlY29yZGluZ3NUcmVlT3V0bGluZS5hZGRF dmVudExpc3RlbmVyKFdJLlRyZWVPdXRsaW5lLkV2ZW50LkVsZW1lbnRDbGlja2VkLCB0aGlzLl9o YW5kbGVTYXZlZFJlY29yZGluZ0NsaWNrZWQsIHRoaXMpOworICAgICAgICAgICAgdGhpcy5fc2F2 ZWRSZWNvcmRpbmdzQ29udGVudFZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9zYXZlZFJl Y29yZGluZ3NUcmVlT3V0bGluZS5lbGVtZW50KTsKKyAgICAgICAgfQorCisgICAgICAgIGNvbnN0 IHN1YnRpdGxlID0gbnVsbDsKKyAgICAgICAgbGV0IHJlY29yZGluZ1RyZWVFbGVtZW50ID0gbmV3 IFdJLkdlbmVyYWxUcmVlRWxlbWVudChbInJlY29yZGluZyJdLCByZWNvcmRpbmcuZGlzcGxheU5h bWUsIHN1YnRpdGxlLCByZWNvcmRpbmcpOworICAgICAgICByZWNvcmRpbmdUcmVlRWxlbWVudC5z ZWxlY3RhYmxlID0gZmFsc2U7CisgICAgICAgIHRoaXMuX3NhdmVkUmVjb3JkaW5nc1RyZWVPdXRs aW5lLmFwcGVuZENoaWxkKHJlY29yZGluZ1RyZWVFbGVtZW50KTsKKyAgICB9CisKICAgICBfaGFu ZGxlUmVjb3JkaW5nQXV0b0NhcHR1cmVJbnB1dChldmVudCkKICAgICB7CiAgICAgICAgIGxldCBm cmFtZUNvdW50ID0gdGhpcy5fdXBkYXRlUmVjb3JkaW5nQXV0b0NhcHR1cmVJbnB1dEVsZW1lbnRT aXplKCk7CkBAIC0yOTIsNCArMzM2LDE0IEBAIFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcg PSBjbGFzcyBDYW52YXNPdmVydmlld0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29sbGVjCiAgICAg ewogICAgICAgICBXSS5GaWxlVXRpbGl0aWVzLmltcG9ydEpTT04oKHJlc3VsdCkgPT4gV0kuY2Fu dmFzTWFuYWdlci5wcm9jZXNzSlNPTihyZXN1bHQpKTsKICAgICB9CisKKyAgICBfaGFuZGxlUmVj b3JkaW5nU2F2ZWQoZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9hZGRTYXZlZFJlY29yZGlu ZyhldmVudC5kYXRhLnJlY29yZGluZyk7CisgICAgfQorCisgICAgX2hhbmRsZVNhdmVkUmVjb3Jk aW5nQ2xpY2tlZChldmVudCkKKyAgICB7CisgICAgICAgIFdJLnNob3dSZXByZXNlbnRlZE9iamVj dChldmVudC5kYXRhLnRyZWVFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0KTsKKyAgICB9CiB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2Fu dmFzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9DYW52YXNUYWJDb250ZW50Vmlldy5qcwppbmRleCBiMGZiMTI4NjI1MTgzMjE0NWQ5 ZDE4NzBkOTYwNmUzMmMzZDFhZTZjLi5mYjc5YjUzNzE5NTZkZTA4ZmU1MGY1NzRmZmRmZmJhYjY5 OWNiMjNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9DYW52YXNUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNUYWJDb250ZW50Vmlldy5qcwpAQCAtNDQsOSArNDQs OSBAQCBXSS5DYW52YXNUYWJDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc1RhYkNvbnRlbnRWaWV3 IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzZXJUYQogICAgICAgICB0aGlzLl9vdmVydmlld1RyZWVF bGVtZW50ID0gbmV3IFdJLkdlbmVyYWxUcmVlRWxlbWVudCgiY2FudmFzLW92ZXJ2aWV3IiwgV0ku VUlTdHJpbmcoIk92ZXJ2aWV3IiksIG51bGwsIHRoaXMuX2NhbnZhc0NvbGxlY3Rpb24pOwogICAg ICAgICB0aGlzLl9jYW52YXNUcmVlT3V0bGluZS5hcHBlbmRDaGlsZCh0aGlzLl9vdmVydmlld1Ry ZWVFbGVtZW50KTsKIAotICAgICAgICB0aGlzLl9pbXBvcnRlZFJlY29yZGluZ3NUcmVlRWxlbWVu dCA9IG5ldyBXSS5Gb2xkZXJUcmVlRWxlbWVudChXSS5VSVN0cmluZygiSW1wb3J0ZWQgUmVjb3Jk aW5ncyIpLCBXSS5SZWNvcmRpbmdDb2xsZWN0aW9uKTsKLSAgICAgICAgdGhpcy5faW1wb3J0ZWRS ZWNvcmRpbmdzVHJlZUVsZW1lbnQuaGlkZGVuID0gdHJ1ZTsKLSAgICAgICAgdGhpcy5fY2FudmFz VHJlZU91dGxpbmUuYXBwZW5kQ2hpbGQodGhpcy5faW1wb3J0ZWRSZWNvcmRpbmdzVHJlZUVsZW1l bnQpOworICAgICAgICB0aGlzLl9zYXZlZFJlY29yZGluZ3NUcmVlRWxlbWVudCA9IG5ldyBXSS5G b2xkZXJUcmVlRWxlbWVudChXSS5VSVN0cmluZygiU2F2ZWQgUmVjb3JkaW5ncyIpLCBXSS5SZWNv cmRpbmdDb2xsZWN0aW9uKTsKKyAgICAgICAgdGhpcy5fc2F2ZWRSZWNvcmRpbmdzVHJlZUVsZW1l bnQuaGlkZGVuID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fb3ZlcnZpZXdUcmVlRWxlbWVudC5hcHBl bmRDaGlsZCh0aGlzLl9zYXZlZFJlY29yZGluZ3NUcmVlRWxlbWVudCk7CiAKICAgICAgICAgdGhp cy5fcmVjb3JkU2hvcnRjdXQgPSBuZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChudWxsLCBXSS5LZXli b2FyZFNob3J0Y3V0LktleS5TcGFjZSwgdGhpcy5faGFuZGxlU3BhY2UuYmluZCh0aGlzKSk7CiAg ICAgICAgIHRoaXMuX3JlY29yZFNob3J0Y3V0LmltcGxpY2l0bHlQcmV2ZW50c0RlZmF1bHQgPSBm YWxzZTsKQEAgLTE0NSwyNiArMTQ1LDE0IEBAIFdJLkNhbnZhc1RhYkNvbnRlbnRWaWV3ID0gY2xh c3MgQ2FudmFzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3NlclRhCiAKICAg ICAvLyBQcm90ZWN0ZWQKIAotICAgIGluaXRpYWxMYXlvdXQoKQotICAgIHsKLSAgICAgICAgc3Vw ZXIuaW5pdGlhbExheW91dCgpOwotCi0gICAgICAgIGNvbnN0IG9wdGlvbnMgPSB7Ci0gICAgICAg ICAgICBzdXBwcmVzc1Nob3dSZWNvcmRpbmc6IHRydWUsCi0gICAgICAgIH07Ci0KLSAgICAgICAg Zm9yIChsZXQgcmVjb3JkaW5nIG9mIFdJLmNhbnZhc01hbmFnZXIuaW1wb3J0ZWRSZWNvcmRpbmdz KQotICAgICAgICAgICAgdGhpcy5fYWRkUmVjb3JkaW5nKHJlY29yZGluZywgb3B0aW9ucyk7Ci0g ICAgfQotCiAgICAgYXR0YWNoZWQoKQogICAgIHsKICAgICAgICAgc3VwZXIuYXR0YWNoZWQoKTsK IAogICAgICAgICBXSS5jYW52YXNNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ2FudmFzTWFu YWdlci5FdmVudC5DYW52YXNBZGRlZCwgdGhpcy5faGFuZGxlQ2FudmFzQWRkZWQsIHRoaXMpOwog ICAgICAgICBXSS5jYW52YXNNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ2FudmFzTWFuYWdl ci5FdmVudC5DYW52YXNSZW1vdmVkLCB0aGlzLl9oYW5kbGVDYW52YXNSZW1vdmVkLCB0aGlzKTsK LSAgICAgICAgV0kuY2FudmFzTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkNhbnZhc01hbmFn ZXIuRXZlbnQuUmVjb3JkaW5nSW1wb3J0ZWQsIHRoaXMuX3JlY29yZGluZ0ltcG9ydGVkT3JTdG9w cGVkLCB0aGlzKTsKLSAgICAgICAgV0kuQ2FudmFzLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ2FudmFz LkV2ZW50LlJlY29yZGluZ1N0b3BwZWQsIHRoaXMuX3JlY29yZGluZ0ltcG9ydGVkT3JTdG9wcGVk LCB0aGlzKTsKKyAgICAgICAgV0kuY2FudmFzTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLkNh bnZhc01hbmFnZXIuRXZlbnQuUmVjb3JkaW5nU2F2ZWQsIHRoaXMuX2hhbmRsZVJlY29yZGluZ1Nh dmVkT3JTdG9wcGVkLCB0aGlzKTsKKyAgICAgICAgV0kuQ2FudmFzLmFkZEV2ZW50TGlzdGVuZXIo V0kuQ2FudmFzLkV2ZW50LlJlY29yZGluZ1N0b3BwZWQsIHRoaXMuX2hhbmRsZVJlY29yZGluZ1Nh dmVkT3JTdG9wcGVkLCB0aGlzKTsKIAogICAgICAgICBsZXQgY2FudmFzZXMgPSBXSS5jYW52YXNN YW5hZ2VyLmNhbnZhc2VzOwogCkBAIC0xNzcsNiArMTY1LDEwIEBAIFdJLkNhbnZhc1RhYkNvbnRl bnRWaWV3ID0gY2xhc3MgQ2FudmFzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJv d3NlclRhCiAgICAgICAgICAgICBpZiAoIXRoaXMuX2NhbnZhc0NvbGxlY3Rpb24uaGFzKGNhbnZh cykpCiAgICAgICAgICAgICAgICAgdGhpcy5fYWRkQ2FudmFzKGNhbnZhcyk7CiAgICAgICAgIH0K KworICAgICAgICB0aGlzLl9zYXZlZFJlY29yZGluZ3NUcmVlRWxlbWVudC5yZW1vdmVDaGlsZHJl bigpOworICAgICAgICBmb3IgKGxldCByZWNvcmRpbmcgb2YgV0kuY2FudmFzTWFuYWdlci5zYXZl ZFJlY29yZGluZ3MpCisgICAgICAgICAgICB0aGlzLl9hZGRSZWNvcmRpbmcocmVjb3JkaW5nLCB7 c3VwcHJlc3NTaG93UmVjb3JkaW5nOiB0cnVlfSk7CiAgICAgfQogCiAgICAgZGV0YWNoZWQoKQpA QCAtMjEzLDEzICsyMDUsNiBAQCBXSS5DYW52YXNUYWJDb250ZW50VmlldyA9IGNsYXNzIENhbnZh c1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzZXJUYQogCiAgICAgICAgIHRo aXMuX2NhbnZhc0NvbGxlY3Rpb24ucmVtb3ZlKGNhbnZhcyk7CiAKLSAgICAgICAgY29uc3Qgb3B0 aW9ucyA9IHsKLSAgICAgICAgICAgIHN1cHByZXNzU2hvd1JlY29yZGluZzogdHJ1ZSwKLSAgICAg ICAgfTsKLQotICAgICAgICBmb3IgKGxldCByZWNvcmRpbmcgb2YgY2FudmFzLnJlY29yZGluZ0Nv bGxlY3Rpb24pCi0gICAgICAgICAgICB0aGlzLl9hZGRSZWNvcmRpbmcocmVjb3JkaW5nLCBvcHRp b25zKTsKLQogICAgICAgICBsZXQgY3VycmVudENvbnRlbnRWaWV3ID0gdGhpcy5jb250ZW50QnJv d3Nlci5jdXJyZW50Q29udGVudFZpZXc7CiAgICAgICAgIGlmIChjdXJyZW50Q29udGVudFZpZXcg aW5zdGFuY2VvZiBXSS5DYW52YXNDb250ZW50VmlldykKICAgICAgICAgICAgIFdJLnNob3dSZXBy ZXNlbnRlZE9iamVjdCh0aGlzLl9jYW52YXNDb2xsZWN0aW9uKTsKQEAgLTIyOSw2ICsyMTQsOCBA QCBXSS5DYW52YXNUYWJDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc1RhYkNvbnRlbnRWaWV3IGV4 dGVuZHMgV0kuQ29udGVudEJyb3dzZXJUYQogICAgICAgICBsZXQgbmF2aWdhdGlvblNpZGViYXJQ YW5lbCA9IHRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5lbDsKICAgICAgICAgaWYgKG5hdmlnYXRp b25TaWRlYmFyUGFuZWwgaW5zdGFuY2VvZiBXSS5DYW52YXNTaWRlYmFyUGFuZWwgJiYgbmF2aWdh dGlvblNpZGViYXJQYW5lbC52aXNpYmxlKQogICAgICAgICAgICAgbmF2aWdhdGlvblNpZGViYXJQ YW5lbC51cGRhdGVSZXByZXNlbnRlZE9iamVjdHMoKTsKKworICAgICAgICB0aGlzLnNob3dEZXRh aWxzU2lkZWJhclBhbmVscygpOwogICAgIH0KIAogICAgIF9hZGRSZWNvcmRpbmcocmVjb3JkaW5n LCBvcHRpb25zID0ge30pCkBAIC0yMzYsOCArMjIzLDggQEAgV0kuQ2FudmFzVGFiQ29udGVudFZp ZXcgPSBjbGFzcyBDYW52YXNUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2Vy VGEKICAgICAgICAgaWYgKCFyZWNvcmRpbmcuc291cmNlKSB7CiAgICAgICAgICAgICBjb25zdCBz dWJ0aXRsZSA9IG51bGw7CiAgICAgICAgICAgICBsZXQgcmVjb3JkaW5nVHJlZUVsZW1lbnQgPSBu ZXcgV0kuR2VuZXJhbFRyZWVFbGVtZW50KFsicmVjb3JkaW5nIl0sIHJlY29yZGluZy5kaXNwbGF5 TmFtZSwgc3VidGl0bGUsIHJlY29yZGluZyk7Ci0gICAgICAgICAgICB0aGlzLl9pbXBvcnRlZFJl Y29yZGluZ3NUcmVlRWxlbWVudC5oaWRkZW4gPSBmYWxzZTsKLSAgICAgICAgICAgIHRoaXMuX2lt cG9ydGVkUmVjb3JkaW5nc1RyZWVFbGVtZW50LmFwcGVuZENoaWxkKHJlY29yZGluZ1RyZWVFbGVt ZW50KTsKKyAgICAgICAgICAgIHRoaXMuX3NhdmVkUmVjb3JkaW5nc1RyZWVFbGVtZW50LmhpZGRl biA9IGZhbHNlOworICAgICAgICAgICAgdGhpcy5fc2F2ZWRSZWNvcmRpbmdzVHJlZUVsZW1lbnQu YXBwZW5kQ2hpbGQocmVjb3JkaW5nVHJlZUVsZW1lbnQpOwogICAgICAgICB9CiAKICAgICAgICAg aWYgKCFvcHRpb25zLnN1cHByZXNzU2hvd1JlY29yZGluZykKQEAgLTI2OSwxNiArMjU2LDE2IEBA IFdJLkNhbnZhc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzVGFiQ29udGVudFZpZXcgZXh0 ZW5kcyBXSS5Db250ZW50QnJvd3NlclRhCiAgICAgICAgIHRoaXMuc2hvd1JlcHJlc2VudGVkT2Jq ZWN0KHJlcHJlc2VudGVkT2JqZWN0KTsKICAgICB9CiAKLSAgICBfcmVjb3JkaW5nSW1wb3J0ZWRP clN0b3BwZWQoZXZlbnQpCisgICAgX2hhbmRsZVJlY29yZGluZ1NhdmVkT3JTdG9wcGVkKGV2ZW50 KQogICAgIHsKLSAgICAgICAgbGV0IHtyZWNvcmRpbmcsIGluaXRpYXRlZEJ5VXNlcn0gPSBldmVu dC5kYXRhOworICAgICAgICBsZXQge3JlY29yZGluZywgaW5pdGlhdGVkQnlVc2VyLCBpbXBvcnRl ZH0gPSBldmVudC5kYXRhOwogICAgICAgICBpZiAoIXJlY29yZGluZykKICAgICAgICAgICAgIHJl dHVybjsKIAogICAgICAgICBsZXQgb3B0aW9ucyA9IHt9OwogCiAgICAgICAgIC8vIEFsd2F5cyBz aG93IGltcG9ydGVkIHJlY29yZGluZ3MuCi0gICAgICAgIGlmIChyZWNvcmRpbmcuc291cmNlKQor ICAgICAgICBpZiAocmVjb3JkaW5nLnNvdXJjZSB8fCAhaW1wb3J0ZWQpCiAgICAgICAgICAgICBv cHRpb25zLnN1cHByZXNzU2hvd1JlY29yZGluZyA9ICFpbml0aWF0ZWRCeVVzZXIgfHwgdGhpcy5j b250ZW50QnJvd3Nlci5jdXJyZW50UmVwcmVzZW50ZWRPYmplY3RzLnNvbWUoKHJlcHJlc2VudGVk T2JqZWN0KSA9PiByZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdJLlJlY29yZGluZyk7CiAK ICAgICAgICAgdGhpcy5fYWRkUmVjb3JkaW5nKHJlY29yZGluZywgb3B0aW9ucyk7Cg==