178711 2017-10-23 22:55:22 -0700 Web Inspector: remove canvases from Resources and experimental setting/UI 2017-10-24 14:08:48 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 177606 175485 1 hi hi bburg commit-queue inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1363586 0 hi 2017-10-23 22:55:22 -0700 The Canvas tab is now able to entirely replace the old Resource/Recording tab UI. We can remove it and the flag that controls the Canvas tab. 1363595 1 324650 hi 2017-10-23 23:41:36 -0700 Created attachment 324650 Patch 1363843 2 webkit-bug-importer 2017-10-24 13:12:43 -0700 <rdar://problem/35157502> 1363849 3 324650 bburg 2017-10-24 13:16:06 -0700 Comment on attachment 324650 Patch r=me 1363881 4 324650 hi 2017-10-24 14:07:20 -0700 Comment on attachment 324650 Patch Will land manually. 1363883 5 hi 2017-10-24 14:08:48 -0700 Committed r223920: <https://trac.webkit.org/changeset/223920> 324650 2017-10-23 23:41:36 -0700 2017-10-24 14:07:20 -0700 Patch 178711.diff text/plain 17260 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNlNjA5M2IwYmU1Li5mNDU4NDNmZDMyOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMTctMTAtMjMgIERldmlu IFJvdXNzbyAgPHdlYmtpdEBkZXZpbnJvdXNzby5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogcmVtb3ZlIGNhbnZhc2VzIGZyb20gUmVzb3VyY2VzIGFuZCBleHBlcmltZW50YWwgc2V0dGlu Zy9VSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4 NzExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdJLnRhYkNvbnRlbnRWaWV3Q2xh c3NGb3JSZXByZXNlbnRlZE9iamVjdCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL1Nl dHRpbmcuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52YXNNYW5h Z2VyLmpzOgorICAgICAgICAoV0kuQ2FudmFzTWFuYWdlci5wcm90b3R5cGUuY2FudmFzQWRkZWQp OgorICAgICAgICAoV0kuQ2FudmFzTWFuYWdlci5wcm90b3R5cGUuY2FudmFzUmVtb3ZlZCk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvQ2FudmFzLmpzOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvTW9kZWxzL0ZyYW1lLmpzOgorICAgICAgICAoV0kuRnJhbWUpOgorICAgICAgICAo V0kuRnJhbWUucHJvdG90eXBlLmdldCBleHRyYVNjcmlwdENvbGxlY3Rpb24pOgorICAgICAgICAo V0kuRnJhbWUucHJvdG90eXBlLmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChXSS5G cmFtZS5wcm90b3R5cGUuZ2V0IGNhbnZhc0NvbGxlY3Rpb24pOiBEZWxldGVkLgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChX SS5DYW52YXNUYWJDb250ZW50Vmlldy5pc1RhYkFsbG93ZWQpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvRnJhbWVUcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdJLkZyYW1lVHJlZUVs ZW1lbnQpOgorICAgICAgICAoV0kuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUub25hdHRhY2gp OgorICAgICAgICAoV0kuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUub25kZXRhY2gpOgorICAg ICAgICAoV0kuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUub25wb3B1bGF0ZSk6CisgICAgICAg IChXSS5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fc3R5bGVTaGVldEFkZGVkKToKKyAgICAg ICAgKFdJLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlLl9jYW52YXNXYXNBZGRlZCk6IERlbGV0 ZWQuCisgICAgICAgIChXSS5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fY2FudmFzV2FzUmVt b3ZlZCk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNp ZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLlJlc291cmNlU2lkZWJhclBhbmVsKToKKyAgICAg ICAgKFdJLlJlc291cmNlU2lkZWJhclBhbmVsLnByb3RvdHlwZS5tYXRjaFRyZWVFbGVtZW50QWdh aW5zdEN1c3RvbUZpbHRlcnMubWF0Y2gpOgorICAgICAgICAoV0kuUmVzb3VyY2VTaWRlYmFyUGFu ZWwucHJvdG90eXBlLm1hdGNoVHJlZUVsZW1lbnRBZ2FpbnN0Q3VzdG9tRmlsdGVycyk6CisgICAg ICAgIChXSS5SZXNvdXJjZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuX3RyZWVTZWxlY3Rpb25EaWRD aGFuZ2UpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VzVGFiQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXSS5SZXNvdXJjZXNUYWJDb250ZW50Vmlldyk6CisgICAgICAg IChXSS5SZXNvdXJjZXNUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuY2FuU2hvd1JlcHJlc2VudGVk T2JqZWN0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5f Y3JlYXRlRXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3KToKKwogMjAxNy0xMC0yMyAgTmlraXRhIFZh c2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBT dHlsZXMgUmVkZXNpZ246IElubGluZSB3aWRnZXRzIGRvbid0IGhpZGUgd2hlbiBzdGFydGluZyBl ZGl0aW5nIGJ5IHRhYmJpbmcgZnJvbSBwcm9wZXJ0eSBuYW1lCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggMmY4N2RiMzQzNWYuLjNj ZjkzMTg0YTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9NYWluLmpzCkBAIC0xMDg2LDggKzEwODYsNyBAQCBXSS50YWJDb250ZW50Vmlld0NsYXNz Rm9yUmVwcmVzZW50ZWRPYmplY3QgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkKICAgICAg ICAgfHwgcmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXSS5SZXNvdXJjZQogICAgICAgICB8 fCByZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdJLlNjcmlwdAogICAgICAgICB8fCByZXBy ZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdJLkNTU1N0eWxlU2hlZXQKLSAgICAgICAgfHwgcmVw cmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXSS5DYW52YXMKLSAgICAgICAgfHwgcmVwcmVzZW50 ZWRPYmplY3QgaW5zdGFuY2VvZiBXSS5TaGFkZXJQcm9ncmFtKQorICAgICAgICB8fCAocmVwcmVz ZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXSS5Db2xsZWN0aW9uICYmICEocmVwcmVzZW50ZWRPYmpl Y3QgaW5zdGFuY2VvZiBXSS5DYW52YXNDb2xsZWN0aW9uKSkpCiAgICAgICAgIHJldHVybiBXSS5S ZXNvdXJjZXNUYWJDb250ZW50VmlldzsKIAogICAgIC8vIEZJWE1FOiBNb3ZlIHRoZXNlIHRvIGEg U3RvcmFnZSB0YWIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL1NldHRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1NldHRpbmcuanMKaW5kZXggODVmODYwMmRkZTIuLjIzOTRmYzM2MzBhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpz CkBAIC0xMjYsOCArMTI2LDYgQEAgV0kuc2V0dGluZ3MgPSB7CiAgICAgc2VsZWN0ZWROZXR3b3Jr RGV0YWlsQ29udGVudFZpZXdJZGVudGlmaWVyOiBuZXcgV0kuU2V0dGluZygibmV0d29yay1kZXRh aWwtY29udGVudC12aWV3LWlkZW50aWZpZXIiLCAicHJldmlldyIpLAogCiAgICAgLy8gRXhwZXJp bWVudGFsCi0gICAgZXhwZXJpbWVudGFsU2hvd0NhbnZhc0NvbnRleHRzSW5SZXNvdXJjZXM6IG5l dyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtc2hvdy1jYW52YXMtY29udGV4dHMtaW4tcmVzb3Vy Y2VzIiwgZmFsc2UpLAogICAgIGV4cGVyaW1lbnRhbFNwcmVhZHNoZWV0U3R5bGVFZGl0b3I6IG5l dyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtc3ByZWFkc2hlZXQtc3R5bGUtZWRpdG9yIiwgZmFs c2UpLAotICAgIGV4cGVyaW1lbnRhbEVuYWJsZUNhbnZhc1RhYjogbmV3IFdJLlNldHRpbmcoImV4 cGVyaW1lbnRhbC1lbmFibGUtY2FudmFzLXRhYiIsIGZhbHNlKSwKICAgICBleHBlcmltZW50YWxF bmFibGVMYXllcnNUYWI6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtZW5hYmxlLWxheWVy cy10YWIiLCBmYWxzZSksCiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FudmFzTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbnZhc01hbmFnZXIuanMKaW5kZXgg NWM5MGZiYTQ1NTIuLjYzYTA2NGQ0MTM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52YXNNYW5hZ2VyLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbnZhc01hbmFnZXIu anMKQEAgLTk5LDggKzk5LDYgQEAgV0kuQ2FudmFzTWFuYWdlciA9IGNsYXNzIENhbnZhc01hbmFn ZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgbGV0IGNhbnZhcyA9IFdJLkNhbnZhcy5mcm9t UGF5bG9hZChjYW52YXNQYXlsb2FkKTsKICAgICAgICAgdGhpcy5fY2FudmFzSWRlbnRpZmllck1h cC5zZXQoY2FudmFzLmlkZW50aWZpZXIsIGNhbnZhcyk7CiAKLSAgICAgICAgY2FudmFzLmZyYW1l LmNhbnZhc0NvbGxlY3Rpb24uYWRkKGNhbnZhcyk7Ci0KICAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV0kuQ2FudmFzTWFuYWdlci5FdmVudC5DYW52YXNXYXNBZGRlZCwge2Nh bnZhc30pOwogICAgIH0KIApAQCAtMTE4LDggKzExNiw2IEBAIFdJLkNhbnZhc01hbmFnZXIgPSBj bGFzcyBDYW52YXNNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICB0aGlzLl9k aXNwYXRjaFNoYWRlclByb2dyYW1SZW1vdmVkKHByb2dyYW0pOwogICAgICAgICB9CiAKLSAgICAg ICAgY2FudmFzLmZyYW1lLmNhbnZhc0NvbGxlY3Rpb24ucmVtb3ZlKGNhbnZhcyk7Ci0KICAgICAg ICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuQ2FudmFzTWFuYWdlci5FdmVudC5D YW52YXNXYXNSZW1vdmVkLCB7Y2FudmFzfSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ2FudmFzLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NhbnZhcy5qcwppbmRleCBkOThmZjQ3 ZTMyYS4uNjhjZDY1NzkwZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9DYW52YXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL0NhbnZhcy5qcwpAQCAtMjkyLDggKzI5Miw2IEBAIFdJLkNhbnZh cy5Db250ZXh0VHlwZSA9IHsKICAgICBXZWJHUFU6ICJ3ZWJncHUiLAogfTsKIAotV0kuQ2FudmFz LlJlc291cmNlU2lkZWJhclR5cGUgPSAicmVzb3VyY2UtdHlwZS1jYW52YXMiOwotCiBXSS5DYW52 YXMuRXZlbnQgPSB7CiAgICAgTWVtb3J5Q2hhbmdlZDogImNhbnZhcy1tZW1vcnktY2hhbmdlZCIs CiAgICAgQ1NTQ2FudmFzQ2xpZW50Tm9kZXNDaGFuZ2VkOiAiY2FudmFzLWNzcy1jYW52YXMtY2xp ZW50LW5vZGVzLWNoYW5nZWQiLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL0ZyYW1lLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvTW9kZWxzL0ZyYW1lLmpzCmluZGV4IGFhNGM4OGQ3ZjdkLi40MjVkYTg0NjkwYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0Zy YW1lLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9G cmFtZS5qcwpAQCAtMzksNyArMzksNiBAQCBXSS5GcmFtZSA9IGNsYXNzIEZyYW1lIGV4dGVuZHMg V0kuT2JqZWN0CiAgICAgICAgIHRoaXMuX3Jlc291cmNlQ29sbGVjdGlvbiA9IG5ldyBXSS5SZXNv dXJjZUNvbGxlY3Rpb247CiAgICAgICAgIHRoaXMuX3Byb3Zpc2lvbmFsUmVzb3VyY2VDb2xsZWN0 aW9uID0gbmV3IFdJLlJlc291cmNlQ29sbGVjdGlvbjsKICAgICAgICAgdGhpcy5fZXh0cmFTY3Jp cHRDb2xsZWN0aW9uID0gbmV3IFdJLkNvbGxlY3Rpb24oV0kuQ29sbGVjdGlvbi5UeXBlVmVyaWZp ZXIuU2NyaXB0KTsKLSAgICAgICAgdGhpcy5fY2FudmFzQ29sbGVjdGlvbiA9IG5ldyBXSS5Db2xs ZWN0aW9uKFdJLkNvbGxlY3Rpb24uVHlwZVZlcmlmaWVyLkNhbnZhcyk7CiAKICAgICAgICAgdGhp cy5fY2hpbGRGcmFtZUNvbGxlY3Rpb24gPSBuZXcgV0kuQ29sbGVjdGlvbihXSS5Db2xsZWN0aW9u LlR5cGVWZXJpZmllci5GcmFtZSk7CiAgICAgICAgIHRoaXMuX2NoaWxkRnJhbWVJZGVudGlmaWVy TWFwID0gbmV3IE1hcDsKQEAgLTU5LDcgKzU4LDYgQEAgV0kuRnJhbWUgPSBjbGFzcyBGcmFtZSBl eHRlbmRzIFdJLk9iamVjdAogCiAgICAgZ2V0IHJlc291cmNlQ29sbGVjdGlvbigpIHsgcmV0dXJu IHRoaXMuX3Jlc291cmNlQ29sbGVjdGlvbjsgfQogICAgIGdldCBleHRyYVNjcmlwdENvbGxlY3Rp b24oKSB7IHJldHVybiB0aGlzLl9leHRyYVNjcmlwdENvbGxlY3Rpb247IH0KLSAgICBnZXQgY2Fu dmFzQ29sbGVjdGlvbigpIHsgcmV0dXJuIHRoaXMuX2NhbnZhc0NvbGxlY3Rpb247IH0KICAgICBn ZXQgY2hpbGRGcmFtZUNvbGxlY3Rpb24oKSB7IHJldHVybiB0aGlzLl9jaGlsZEZyYW1lQ29sbGVj dGlvbjsgfQogCiAgICAgaW5pdGlhbGl6ZShuYW1lLCBzZWN1cml0eU9yaWdpbiwgbG9hZGVySWRl bnRpZmllciwgbWFpblJlc291cmNlKQpAQCAtMTM1LDcgKzEzMyw2IEBAIFdJLkZyYW1lID0gY2xh c3MgRnJhbWUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5fcmVzb3VyY2VDb2xsZWN0 aW9uID0gdGhpcy5fcHJvdmlzaW9uYWxSZXNvdXJjZUNvbGxlY3Rpb247CiAgICAgICAgIHRoaXMu X3Byb3Zpc2lvbmFsUmVzb3VyY2VDb2xsZWN0aW9uID0gbmV3IFdJLlJlc291cmNlQ29sbGVjdGlv bjsKICAgICAgICAgdGhpcy5fZXh0cmFTY3JpcHRDb2xsZWN0aW9uLmNsZWFyKCk7Ci0gICAgICAg IHRoaXMuX2NhbnZhc0NvbGxlY3Rpb24uY2xlYXIoKTsKIAogICAgICAgICB0aGlzLmNsZWFyRXhl Y3V0aW9uQ29udGV4dHModHJ1ZSk7CiAgICAgICAgIHRoaXMuY2xlYXJQcm92aXNpb25hbExvYWQo dHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9DYW52YXNUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0NhbnZhc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDczNjRlYjNmZDI3 Li5kODUxNjhlZjMxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ2FudmFzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzVGFiQ29udGVudFZpZXcuanMKQEAgLTU2 LDggKzU2LDcgQEAgV0kuQ2FudmFzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNUYWJDb250 ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyVGEKIAogICAgIHN0YXRpYyBpc1RhYkFs bG93ZWQoKQogICAgIHsKLSAgICAgICAgLy8gRklYTUU6IHJlbW92ZSBleHBlcmltZW50YWwgc2V0 dGluZyBjaGVjayBvbmNlIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNzU0ODU+IGlzIGNvbXBsZXRl LgotICAgICAgICByZXR1cm4gISF3aW5kb3cuQ2FudmFzQWdlbnQgJiYgV0kuc2V0dGluZ3MuZXhw ZXJpbWVudGFsRW5hYmxlQ2FudmFzVGFiLnZhbHVlOworICAgICAgICByZXR1cm4gISF3aW5kb3cu Q2FudmFzQWdlbnQ7CiAgICAgfQogCiAgICAgLy8gUHVibGljCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZVRyZWVFbGVtZW50LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVUcmVlRWxlbWVu dC5qcwppbmRleCA5YzllMDUxMDgzZS4uYzczZWFiOTkzYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lVHJlZUVsZW1lbnQuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVUcmVlRWxl bWVudC5qcwpAQCAtNDgsOSArNDgsNiBAQCBXSS5GcmFtZVRyZWVFbGVtZW50ID0gY2xhc3MgRnJh bWVUcmVlRWxlbWVudCBleHRlbmRzIFdJLlJlc291cmNlVHJlZUVsZW1lbnQKICAgICAgICAgdGhp cy5yZWdpc3RlckZvbGRlcml6ZVNldHRpbmdzKCJmcmFtZXMiLCBXSS5VSVN0cmluZygiRnJhbWVz IiksIHRoaXMuX2ZyYW1lLmNoaWxkRnJhbWVDb2xsZWN0aW9uLCBXSS5GcmFtZVRyZWVFbGVtZW50 KTsKICAgICAgICAgdGhpcy5yZWdpc3RlckZvbGRlcml6ZVNldHRpbmdzKCJleHRyYS1zY3JpcHRz IiwgV0kuVUlTdHJpbmcoIkV4dHJhIFNjcmlwdHMiKSwgdGhpcy5fZnJhbWUuZXh0cmFTY3JpcHRD b2xsZWN0aW9uLCBXSS5TY3JpcHRUcmVlRWxlbWVudCk7CiAKLSAgICAgICAgaWYgKHdpbmRvdy5D YW52YXNBZ2VudCAmJiBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxTaG93Q2FudmFzQ29udGV4dHNJ blJlc291cmNlcy52YWx1ZSkKLSAgICAgICAgICAgIHRoaXMucmVnaXN0ZXJGb2xkZXJpemVTZXR0 aW5ncygiY2FudmFzZXMiLCBXSS5VSVN0cmluZygiQ2FudmFzZXMiKSwgdGhpcy5fZnJhbWUuY2Fu dmFzQ29sbGVjdGlvbiwgV0kuQ2FudmFzVHJlZUVsZW1lbnQpOwotCiAgICAgICAgIGZ1bmN0aW9u IGZvcndhcmRpbmdDb25zdHJ1Y3RvcihyZXByZXNlbnRlZE9iamVjdCwgLi4uZXh0cmFBcmd1bWVu dHMpIHsKICAgICAgICAgICAgIGlmIChyZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdJLkNT U1N0eWxlU2hlZXQpCiAgICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBXSS5DU1NTdHlsZVNoZWV0 VHJlZUVsZW1lbnQocmVwcmVzZW50ZWRPYmplY3QsIC4uLmV4dHJhQXJndW1lbnRzKTsKQEAgLTEx OSwyMiArMTE2LDEyIEBAIFdJLkZyYW1lVHJlZUVsZW1lbnQgPSBjbGFzcyBGcmFtZVRyZWVFbGVt ZW50IGV4dGVuZHMgV0kuUmVzb3VyY2VUcmVlRWxlbWVudAogICAgICAgICBXSS5HZW5lcmFsVHJl ZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoLmNhbGwodGhpcyk7CiAKICAgICAgICAgV0kuY3Nz U3R5bGVNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ1NTU3R5bGVNYW5hZ2VyLkV2ZW50LlN0 eWxlU2hlZXRBZGRlZCwgdGhpcy5fc3R5bGVTaGVldEFkZGVkLCB0aGlzKTsKLQotICAgICAgICBp ZiAod2luZG93LkNhbnZhc0FnZW50ICYmIFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbFNob3dDYW52 YXNDb250ZXh0c0luUmVzb3VyY2VzLnZhbHVlKSB7Ci0gICAgICAgICAgICB0aGlzLl9mcmFtZS5j YW52YXNDb2xsZWN0aW9uLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ29sbGVjdGlvbi5FdmVudC5JdGVt QWRkZWQsIHRoaXMuX2NhbnZhc1dhc0FkZGVkLCB0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX2Zy YW1lLmNhbnZhc0NvbGxlY3Rpb24uYWRkRXZlbnRMaXN0ZW5lcihXSS5Db2xsZWN0aW9uLkV2ZW50 Lkl0ZW1SZW1vdmVkLCB0aGlzLl9jYW52YXNXYXNSZW1vdmVkLCB0aGlzKTsKLSAgICAgICAgfQog ICAgIH0KIAogICAgIG9uZGV0YWNoKCkKICAgICB7CiAgICAgICAgIFdJLmNzc1N0eWxlTWFuYWdl ci5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkNTU1N0eWxlTWFuYWdlci5FdmVudC5TdHlsZVNoZWV0 QWRkZWQsIHRoaXMuX3N0eWxlU2hlZXRBZGRlZCwgdGhpcyk7CiAKLSAgICAgICAgaWYgKHdpbmRv dy5DYW52YXNBZ2VudCAmJiBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxTaG93Q2FudmFzQ29udGV4 dHNJblJlc291cmNlcy52YWx1ZSkgewotICAgICAgICAgICAgdGhpcy5fZnJhbWUuY2FudmFzQ29s bGVjdGlvbi5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkNvbGxlY3Rpb24uRXZlbnQuSXRlbUFkZGVk LCB0aGlzLl9jYW52YXNXYXNBZGRlZCwgdGhpcyk7Ci0gICAgICAgICAgICB0aGlzLl9mcmFtZS5j YW52YXNDb2xsZWN0aW9uLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuQ29sbGVjdGlvbi5FdmVudC5J dGVtUmVtb3ZlZCwgdGhpcy5fY2FudmFzV2FzUmVtb3ZlZCwgdGhpcyk7Ci0gICAgICAgIH0KLQog ICAgICAgICBzdXBlci5vbmRldGFjaCgpOwogICAgIH0KIApAQCAtMTkxLDExICsxNzgsNiBAQCBX SS5GcmFtZVRyZWVFbGVtZW50ID0gY2xhc3MgRnJhbWVUcmVlRWxlbWVudCBleHRlbmRzIFdJLlJl c291cmNlVHJlZUVsZW1lbnQKICAgICAgICAgICAgICAgICB0aGlzLmFkZENoaWxkRm9yUmVwcmVz ZW50ZWRPYmplY3QoZXh0cmFTY3JpcHQpOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKHdpbmRv dy5DYW52YXNBZ2VudCAmJiBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxTaG93Q2FudmFzQ29udGV4 dHNJblJlc291cmNlcy52YWx1ZSkgewotICAgICAgICAgICAgZm9yIChsZXQgY2FudmFzIG9mIHRo aXMuX2ZyYW1lLmNhbnZhc0NvbGxlY3Rpb24uaXRlbXMpCi0gICAgICAgICAgICAgICAgdGhpcy5h ZGRDaGlsZEZvclJlcHJlc2VudGVkT2JqZWN0KGNhbnZhcyk7Ci0gICAgICAgIH0KLQogICAgICAg ICBjb25zdCBkb05vdENyZWF0ZUlmTWlzc2luZyA9IHRydWU7CiAgICAgICAgIFdJLmNzc1N0eWxl TWFuYWdlci5wcmVmZXJyZWRJbnNwZWN0b3JTdHlsZVNoZWV0Rm9yRnJhbWUodGhpcy5fZnJhbWUs IHRoaXMuYWRkUmVwcmVzZW50ZWRPYmplY3RUb05ld0NoaWxkUXVldWUuYmluZCh0aGlzKSwgZG9O b3RDcmVhdGVJZk1pc3NpbmcpOwogICAgIH0KQEAgLTI3MiwxNCArMjU0LDQgQEAgV0kuRnJhbWVU cmVlRWxlbWVudCA9IGNsYXNzIEZyYW1lVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5SZXNvdXJjZVRy ZWVFbGVtZW50CiAKICAgICAgICAgdGhpcy5hZGRSZXByZXNlbnRlZE9iamVjdFRvTmV3Q2hpbGRR dWV1ZShldmVudC5kYXRhLnN0eWxlU2hlZXQpOwogICAgIH0KLQotICAgIF9jYW52YXNXYXNBZGRl ZChldmVudCkKLSAgICB7Ci0gICAgICAgIHRoaXMuYWRkUmVwcmVzZW50ZWRPYmplY3RUb05ld0No aWxkUXVldWUoZXZlbnQuZGF0YS5pdGVtKTsKLSAgICB9Ci0KLSAgICBfY2FudmFzV2FzUmVtb3Zl ZChldmVudCkKLSAgICB7Ci0gICAgICAgIHRoaXMucmVtb3ZlQ2hpbGRGb3JSZXByZXNlbnRlZE9i amVjdChldmVudC5kYXRhLml0ZW0pOwotICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lkZWJh clBhbmVsLmpzCmluZGV4IGY0ZTY1OWRjYjJiLi45MjQ1MGJmMmYyZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFu ZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVz b3VyY2VTaWRlYmFyUGFuZWwuanMKQEAgLTQ4LDEyICs0OCw2IEBAIFdJLlJlc291cmNlU2lkZWJh clBhbmVsID0gY2xhc3MgUmVzb3VyY2VTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9u U2lkZWJhCiAgICAgICAgICAgICBzY29wZUJhckl0ZW1zLnB1c2goc2NvcGVCYXJJdGVtKTsKICAg ICAgICAgfQogCi0gICAgICAgIGlmICh3aW5kb3cuQ2FudmFzQWdlbnQgJiYgV0kuc2V0dGluZ3Mu ZXhwZXJpbWVudGFsU2hvd0NhbnZhc0NvbnRleHRzSW5SZXNvdXJjZXMudmFsdWUpIHsKLSAgICAg ICAgICAgIGxldCBjYW52YXNlc1Njb3BlQmFySXRlbSA9IG5ldyBXSS5TY29wZUJhckl0ZW0oc2Nv cGVJdGVtUHJlZml4ICsgV0kuQ2FudmFzLlJlc291cmNlU2lkZWJhclR5cGUsIFdJLlVJU3RyaW5n KCJDYW52YXNlcyIpKTsKLSAgICAgICAgICAgIGNhbnZhc2VzU2NvcGVCYXJJdGVtW1dJLlJlc291 cmNlU2lkZWJhclBhbmVsLlJlc291cmNlVHlwZVN5bWJvbF0gPSBXSS5DYW52YXMuUmVzb3VyY2VT aWRlYmFyVHlwZTsKLSAgICAgICAgICAgIHNjb3BlQmFySXRlbXMuaW5zZXJ0QXRJbmRleChjYW52 YXNlc1Njb3BlQmFySXRlbSwgc2NvcGVCYXJJdGVtcy5sZW5ndGggLSAxKTsKLSAgICAgICAgfQot CiAgICAgICAgIHRoaXMuX3Njb3BlQmFyID0gbmV3IFdJLlNjb3BlQmFyKCJyZXNvdXJjZS1zaWRl YmFyLXNjb3BlLWJhciIsIHNjb3BlQmFySXRlbXMsIHNjb3BlQmFySXRlbXNbMF0sIHRydWUpOwog ICAgICAgICB0aGlzLl9zY29wZUJhci5hZGRFdmVudExpc3RlbmVyKFdJLlNjb3BlQmFyLkV2ZW50 LlNlbGVjdGlvbkNoYW5nZWQsIHRoaXMuX3Njb3BlQmFyU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlz KTsKIApAQCAtMjM2LDkgKzIzMCw2IEBAIFdJLlJlc291cmNlU2lkZWJhclBhbmVsID0gY2xhc3Mg UmVzb3VyY2VTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhCiAgICAgICAg ICAgICBpZiAodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXSS5TY3JpcHRUcmVlRWxlbWVudCkKICAg ICAgICAgICAgICAgICByZXR1cm4gc2VsZWN0ZWRTY29wZUJhckl0ZW1bV0kuUmVzb3VyY2VTaWRl YmFyUGFuZWwuUmVzb3VyY2VUeXBlU3ltYm9sXSA9PT0gV0kuUmVzb3VyY2UuVHlwZS5TY3JpcHQ7 CiAKLSAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdJLkNhbnZhc1RyZWVF bGVtZW50IHx8IHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV0kuU2hhZGVyUHJvZ3JhbVRyZWVFbGVt ZW50KQotICAgICAgICAgICAgICAgIHJldHVybiBzZWxlY3RlZFNjb3BlQmFySXRlbVtXSS5SZXNv dXJjZVNpZGViYXJQYW5lbC5SZXNvdXJjZVR5cGVTeW1ib2xdID09PSBXSS5DYW52YXMuUmVzb3Vy Y2VTaWRlYmFyVHlwZTsKLQogICAgICAgICAgICAgaWYgKHRyZWVFbGVtZW50IGluc3RhbmNlb2Yg V0kuQ1NTU3R5bGVTaGVldFRyZWVFbGVtZW50KQogICAgICAgICAgICAgICAgIHJldHVybiBzZWxl Y3RlZFNjb3BlQmFySXRlbVtXSS5SZXNvdXJjZVNpZGViYXJQYW5lbC5SZXNvdXJjZVR5cGVTeW1i b2xdID09PSBXSS5SZXNvdXJjZS5UeXBlLlN0eWxlc2hlZXQ7CiAKQEAgLTQ2NCw5ICs0NTUsNyBA QCBXSS5SZXNvdXJjZVNpZGViYXJQYW5lbCA9IGNsYXNzIFJlc291cmNlU2lkZWJhclBhbmVsIGV4 dGVuZHMgV0kuTmF2aWdhdGlvblNpZGViYQogICAgICAgICBpZiAodHJlZUVsZW1lbnQgaW5zdGFu Y2VvZiBXSS5Gb2xkZXJUcmVlRWxlbWVudAogICAgICAgICAgICAgfHwgdHJlZUVsZW1lbnQgaW5z dGFuY2VvZiBXSS5SZXNvdXJjZVRyZWVFbGVtZW50CiAgICAgICAgICAgICB8fCB0cmVlRWxlbWVu dCBpbnN0YW5jZW9mIFdJLlNjcmlwdFRyZWVFbGVtZW50Ci0gICAgICAgICAgICB8fCB0cmVlRWxl bWVudCBpbnN0YW5jZW9mIFdJLkNTU1N0eWxlU2hlZXRUcmVlRWxlbWVudAotICAgICAgICAgICAg fHwgdHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXSS5DYW52YXNUcmVlRWxlbWVudAotICAgICAgICAg ICAgfHwgdHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXSS5TaGFkZXJQcm9ncmFtVHJlZUVsZW1lbnQp IHsKKyAgICAgICAgICAgIHx8IHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV0kuQ1NTU3R5bGVTaGVl dFRyZWVFbGVtZW50KSB7CiAgICAgICAgICAgICBjb25zdCBjb29raWUgPSBudWxsOwogICAgICAg ICAgICAgY29uc3Qgb3B0aW9ucyA9IHsKICAgICAgICAgICAgICAgICBpZ25vcmVOZXR3b3JrVGFi OiB0cnVlLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmVzb3VyY2VzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZXNUYWJDb250ZW50Vmlldy5qcwppbmRleCBlZWMw NzYzODA0ZS4uMzMxNGM2NDg0YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlc1RhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlc1RhYkNvbnRlbnRW aWV3LmpzCkBAIC0yOSwxMSArMjksNyBAQCBXSS5SZXNvdXJjZXNUYWJDb250ZW50VmlldyA9IGNs YXNzIFJlc291cmNlc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJybwogICAgIHsK ICAgICAgICAgbGV0IHtpbWFnZSwgdGl0bGV9ID0gV0kuUmVzb3VyY2VzVGFiQ29udGVudFZpZXcu dGFiSW5mbygpOwogICAgICAgICBsZXQgdGFiQmFySXRlbSA9IG5ldyBXSS5HZW5lcmFsVGFiQmFy SXRlbShpbWFnZSwgdGl0bGUpOwotICAgICAgICBsZXQgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0 cnVjdG9ycyA9IFtXSS5SZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwsIFdJLlByb2JlRGV0YWls c1NpZGViYXJQYW5lbF07Ci0KLSAgICAgICAgaWYgKHdpbmRvdy5DYW52YXNBZ2VudCAmJiBXSS5z ZXR0aW5ncy5leHBlcmltZW50YWxTaG93Q2FudmFzQ29udGV4dHNJblJlc291cmNlcy52YWx1ZSkK LSAgICAgICAgICAgIGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMucHVzaChXSS5DYW52 YXNEZXRhaWxzU2lkZWJhclBhbmVsKTsKLQorICAgICAgICBjb25zdCBkZXRhaWxzU2lkZWJhclBh bmVsQ29uc3RydWN0b3JzID0gW1dJLlJlc291cmNlRGV0YWlsc1NpZGViYXJQYW5lbCwgV0kuUHJv YmVEZXRhaWxzU2lkZWJhclBhbmVsXTsKICAgICAgICAgc3VwZXIoaWRlbnRpZmllciB8fCAicmVz b3VyY2VzIiwgInJlc291cmNlcyIsIHRhYkJhckl0ZW0sIFdJLlJlc291cmNlU2lkZWJhclBhbmVs LCBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzKTsKICAgICB9CiAKQEAgLTYzLDkgKzU5 LDcgQEAgV0kuUmVzb3VyY2VzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBSZXNvdXJjZXNUYWJDb250 ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm8KICAgICAgICAgICAgIHx8IHJlcHJlc2VudGVk T2JqZWN0IGluc3RhbmNlb2YgV0kuUmVzb3VyY2UKICAgICAgICAgICAgIHx8IHJlcHJlc2VudGVk T2JqZWN0IGluc3RhbmNlb2YgV0kuU2NyaXB0CiAgICAgICAgICAgICB8fCByZXByZXNlbnRlZE9i amVjdCBpbnN0YW5jZW9mIFdJLkNTU1N0eWxlU2hlZXQKLSAgICAgICAgICAgIHx8IHJlcHJlc2Vu dGVkT2JqZWN0IGluc3RhbmNlb2YgV0kuQ2FudmFzCi0gICAgICAgICAgICB8fCByZXByZXNlbnRl ZE9iamVjdCBpbnN0YW5jZW9mIFdJLlNoYWRlclByb2dyYW0KLSAgICAgICAgICAgIHx8IHJlcHJl c2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV0kuQ29sbGVjdGlvbjsKKyAgICAgICAgICAgIHx8IChy ZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdJLkNvbGxlY3Rpb24gJiYgIShyZXByZXNlbnRl ZE9iamVjdCBpbnN0YW5jZW9mIFdJLkNhbnZhc0NvbGxlY3Rpb24pKTsKICAgICB9CiB9OwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0 aW5nc1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwppbmRleCA5ZTAxZGQ1MzFhYy4uMzhj NGQ1NDBlOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMjM5 LDEzICsyMzksNiBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NU YWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogCiAgICAgICAgIGxldCBleHBl cmltZW50YWxTZXR0aW5nc1ZpZXcgPSBuZXcgV0kuU2V0dGluZ3NWaWV3KCJleHBlcmltZW50YWwi LCBXSS5VSVN0cmluZygiRXhwZXJpbWVudGFsIikpOwogCi0gICAgICAgIGlmICh3aW5kb3cuQ2Fu dmFzQWdlbnQpIHsKLSAgICAgICAgICAgIGxldCBjYW52YXNTZXR0aW5nc0dyb3VwID0gZXhwZXJp bWVudGFsU2V0dGluZ3NWaWV3LmFkZEdyb3VwKFdJLlVJU3RyaW5nKCJDYW52YXM6IikpOwotICAg ICAgICAgICAgY2FudmFzU2V0dGluZ3NHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmV4cGVy aW1lbnRhbEVuYWJsZUNhbnZhc1RhYiwgV0kuVUlTdHJpbmcoIkVuYWJsZSBDYW52YXMgVGFiIikp OwotICAgICAgICAgICAgY2FudmFzU2V0dGluZ3NHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdz LmV4cGVyaW1lbnRhbFNob3dDYW52YXNDb250ZXh0c0luUmVzb3VyY2VzLCBXSS5VSVN0cmluZygi U2hvdyBDb250ZXh0cyBpbiBSZXNvdXJjZXMgVGFiIikpOwotICAgICAgICAgICAgZXhwZXJpbWVu dGFsU2V0dGluZ3NWaWV3LmFkZFNlcGFyYXRvcigpOwotICAgICAgICB9Ci0KICAgICAgICAgaWYg KHdpbmRvdy5DU1NBZ2VudCkgewogICAgICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3 LmFkZFNldHRpbmcoV0kuVUlTdHJpbmcoIlN0eWxlcyBQYW5lbDoiKSwgV0kuc2V0dGluZ3MuZXhw ZXJpbWVudGFsU3ByZWFkc2hlZXRTdHlsZUVkaXRvciwgV0kuVUlTdHJpbmcoIlNwcmVhZHNoZWV0 IFN0eWxlIEVkaXRvciIpKTsKICAgICAgICAgICAgIGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5h ZGRTZXBhcmF0b3IoKTsKQEAgLTI3MCwxMCArMjYzLDggQEAgV0kuU2V0dGluZ3NUYWJDb250ZW50 VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50 VmkKICAgICAgICAgICAgIH0pOwogICAgICAgICB9CiAKLSAgICAgICAgbGlzdGVuRm9yQ2hhbmdl KFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbFNob3dDYW52YXNDb250ZXh0c0luUmVzb3VyY2VzKTsK ICAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbFNwcmVhZHNo ZWV0U3R5bGVFZGl0b3IpOwogICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhw ZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFiKTsKLSAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNl dHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUNhbnZhc1RhYik7CiAKICAgICAgICAgdGhpcy5hZGRT ZXR0aW5nc1ZpZXcoZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3KTsKICAgICB9Cg==