158513 2016-06-07 20:13:15 -0700 Web Inspector: DOMTreeOutline selection areas should be created and updated lazily 2016-06-08 16:02:47 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 156250 1 bburg bburg bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1200303 0 bburg 2016-06-07 20:13:15 -0700 In ToT, we 1) create a selection area that covers possibly multiple lines of a DOMTreeOutline 2) delete, recreate, and update the selection area's height whenever an attribute is updated (causes a forced layout) 3) update the selection area whenever expanding, collapsing, attaching, detaching, hovering, or selecting a DOM tree element These things are bad. We should only make selection areas if needed to provide a multiline hover effect or current selection. 1200304 1 webkit-bug-importer 2016-06-07 20:15:32 -0700 <rdar://problem/26689646> 1200556 2 280828 bburg 2016-06-08 13:18:57 -0700 Created attachment 280828 Proposed Fix 1200657 3 280828 commit-queue 2016-06-08 16:02:43 -0700 Comment on attachment 280828 Proposed Fix Clearing flags on attachment: 280828 Committed r201840: <http://trac.webkit.org/changeset/201840> 1200658 4 commit-queue 2016-06-08 16:02:47 -0700 All reviewed patches have been landed. Closing bug. 280828 2016-06-08 13:18:57 -0700 2016-06-08 16:02:43 -0700 Proposed Fix bug-158513-20160608132024.patch text/plain 17952 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxNzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw YWU4ZmUxYWFlNmViNjlmNDY1OTkxNGMyNmY3MjNkY2M4OGZkY2JjLi4yOTAyYjM0N2FiZWQ0MzI3 YmNlZTIyNzY3NjZiMzNjY2Q3ZDgzYjVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw5MiBAQAorMjAxNi0wNi0wOCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBET01UcmVlT3V0bGluZSBzZWxlY3Rpb24gYXJlYXMgc2hv dWxkIGJlIGNyZWF0ZWQgYW5kIHVwZGF0ZWQgbGF6aWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTg1MTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzI2Njg5NjQ2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFNlbGVjdGlvbiBhcmVhcyBmb3IgRE9NVHJlZUVsZW1lbnRzIGFyZSB1c2VkIGZvciBzZXZl cmFsIHRoaW5nczogZHJhZyBtYXJrZXJzLAorICAgICAgICBlbGVtZW50IGhvdmVyIHN0eWxlcywg ZWxlbWVudCBzZWxlY3Rpb24gc3R5bGVzLCBhbmQgc2hvd2luZyBmb3JjZWQgcHNldWRvIHN0YXRl cworICAgICAgICBmb3IgYW4gZWxlbWVudC4gRm9ydHVuYXRlbHkgaXQncyBlYXN5IHRvIHRlbGwg d2hlbiBhbnkgb2YgdGhlc2UgdGhpbmdzIGlzIG5lY2Vzc2FyeS4KKworICAgICAgICBDaGFuZ2Ug RE9NVHJlZU91dGxpbmUgYW5kIERPTVRyZWVFbGVtZW50IHNvIHRoZXkgZG9uJ3QgY3JlYXRlIHNl bGVjdGlvbiBhcmVhcworICAgICAgICB1bmxlc3MgdGhleSBhcmUgbmVlZGVkIGZvciBvbmUgb2Yg dGhlc2UgdGFza3MuIFRoaXMgc2lnbmlmaWNhbnRseSByZWR1Y2VzCisgICAgICAgIGZvcmNlZCBs YXlvdXRzIHRoYXQgYXJlIHJlcXVpcmVkIHRvIHVwZGF0ZSB0aGUgc2VsZWN0aW9uIGFyZWEgaGVp Z2h0IGluIGNhc2UgdGhlCisgICAgICAgIGVsZW1lbnQgaGFzIG5ldyBhdHRyaWJ1dGVzIHRoYXQg Y2F1c2UgdGhlIHRhZyB0byBiZWNvbWUgbW9yZSBvciBsZXNzIHdyYXBwZWQuCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5zZXQgaG92ZXJlZCk6CisgICAgICAgIE1v ZGVybml6ZSB0aGlzIG1ldGhvZCBhIGJpdC4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRy ZWVFbGVtZW50LnByb3RvdHlwZS51cGRhdGVTZWxlY3Rpb25BcmVhKToKKyAgICAgICAgSWYgYSBz ZWxlY3Rpb24gYXJlYSBpcyBub3QgbmVjZXNzYXJ5LCBkb24ndCBjcmVhdGUgb25lLgorICAgICAg ICBJZiBvbmUgZXhpc3RzIGFuZCBpdCdzIG5vdCBuZWVkZWQsIHRoZW4gcmVtb3ZlIGl0LgorCisg ICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoKToK KyAgICAgICAgUmVtb3ZlIHJlZHVuZGFudCBjYWxscyB0byB1cGRhdGVTZWxlY3Rpb24oKS4gVGhp cyBpcyBhbHJlYWR5IGNhbGxlZCBpbgorICAgICAgICB1cGRhdGVUaXRsZSgpLgorCisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0KToKKyAgICAg ICAgQXNrIHRoZSBET01UcmVlT3V0bGluZSB0byB1cGRhdGUgdGhlIHNlbGVjdGlvbiByYXRoZXIg dGhhbiBmb3JjaW5nIHRoZQorICAgICAgICBlbGVtZW50IHRvIGRvIGl0LiBUaGlzIGlzIGNvbnNp c3RlbnQgd2l0aCBvdGhlciB1cGRhdGVzIHRvIHVzZXIgc2VsZWN0aW9uLgorCisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLl9pbnNlcnRJbkxhc3RBdHRyaWJ1 dGVQb3NpdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90 eXBlLl9zdGFydEVkaXRpbmdBc0hUTUwuZGlzcG9zZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLl9zdGFydEVkaXRpbmdBc0hUTUwpOgorICAgICAgICBV c2UgcmVuYW1lZCBtZXRob2QuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVu dC5wcm90b3R5cGUudXBkYXRlVGl0bGUpOgorICAgICAgICBBZGQgYSBjb21tZW50IHRvIGV4cGxh aW4gd2h5IHRoZSBzZWxlY3Rpb24gYXJlYSBpcyBudWxsZWQgb3V0IGhlcmUuCisKKyAgICAgICAg KFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUuZ2V0IHBzZXVkb0NsYXNzZXNF bmFibGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUu X25vZGVQc2V1ZG9DbGFzc2VzRGlkQ2hhbmdlKToKKyAgICAgICAgVXBkYXRlIHRoZSBzZWxlY3Rp b24gYXJlYSBpbiBjYXNlIG9uZSBkb2VzIG5vdCBleGlzdCBmb3IgdGhpcyB0cmVlIGVsZW1lbnQu CisgICAgICAgIFRoZSBpbmRpY2F0b3IgZm9yIGZvcmNlZCBwc2V1ZG8gY2xhc3NlcyBpcyBhIHBz ZXVkbyBlbGVtZW50IG9mIHRoZSBzZWxlY3Rpb24gYXJlYS4KKworICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS51cGRhdGVTZWxlY3Rpb24pOiBSZW5hbWVkLgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmV4cGFuZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uY29sbGFw c2UpOgorICAgICAgICBSZW1vdmUgcmVkdW5kYW50IGNhbGxzIHRvIHVwZGF0ZVNlbGVjdGlvbigp LiBUaGlzIGlzIGFscmVhZHkgY2FsbGVkIGluCisgICAgICAgIHVwZGF0ZVRpdGxlKCkuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzczoKKyAgICAgICAg KC50cmVlLW91dGxpbmUuZG9tKToKKyAgICAgICAgKC50cmVlLW91dGxpbmUuZG9tIGxpLmhvdmVy ZWQ6bm90KC5zZWxlY3RlZCkgLnNlbGVjdGlvbi1hcmVhKToKKyAgICAgICAgKC50cmVlLW91dGxp bmUuZG9tIGxpIC5zZWxlY3Rpb24tYXJlYSk6CisgICAgICAgICgudHJlZS1vdXRsaW5lLmRvbSBs aS5zZWxlY3RlZCAuc2VsZWN0aW9uLWFyZWEpOgorICAgICAgICAoLnRyZWUtb3V0bGluZS5kb20g bGkuZWxlbWVudHMtZHJhZy1vdmVyIC5zZWxlY3Rpb24tYXJlYSk6CisgICAgICAgICgudHJlZS1v dXRsaW5lLmRvbTpmb2N1cyBsaS5zZWxlY3RlZCAuc2VsZWN0aW9uLWFyZWEpOgorICAgICAgICAo LnRyZWUtb3V0bGluZS5kb20gbGkucHNldWRvLWNsYXNzLWVuYWJsZWQgPiAuc2VsZWN0aW9uLWFy ZWE6OmJlZm9yZSk6CisgICAgICAgICgudHJlZS1vdXRsaW5lLmRvbTpmb2N1cyBsaS5zZWxlY3Rl ZC5wc2V1ZG8tY2xhc3MtZW5hYmxlZCA+IC5zZWxlY3Rpb24tYXJlYTo6YmVmb3JlKToKKyAgICAg ICAgKC50cmVlLW91dGxpbmUuZG9tIGxpLmhvdmVyZWQ6bm90KC5zZWxlY3RlZCkgLnNlbGVjdGlv bik6IERlbGV0ZWQuCisgICAgICAgICgudHJlZS1vdXRsaW5lLmRvbSBsaSAuc2VsZWN0aW9uKTog RGVsZXRlZC4KKyAgICAgICAgKC50cmVlLW91dGxpbmUuZG9tIGxpLnNlbGVjdGVkIC5zZWxlY3Rp b24pOiBEZWxldGVkLgorICAgICAgICAoLnRyZWUtb3V0bGluZS5kb20gbGkuZWxlbWVudHMtZHJh Zy1vdmVyIC5zZWxlY3Rpb24pOiBEZWxldGVkLgorICAgICAgICAoLnRyZWUtb3V0bGluZS5kb206 Zm9jdXMgbGkuc2VsZWN0ZWQgLnNlbGVjdGlvbik6IERlbGV0ZWQuCisgICAgICAgICgudHJlZS1v dXRsaW5lLmRvbSBsaS5wc2V1ZG8tY2xhc3MtZW5hYmxlZCA+IC5zZWxlY3Rpb246OmJlZm9yZSk6 IERlbGV0ZWQuCisgICAgICAgICgudHJlZS1vdXRsaW5lLmRvbTpmb2N1cyBsaS5zZWxlY3RlZC5w c2V1ZG8tY2xhc3MtZW5hYmxlZCA+IC5zZWxlY3Rpb246OmJlZm9yZSk6IERlbGV0ZWQuCisgICAg ICAgIFJlbmFtZSB0aGUgc2VsZWN0b3IgdG8gYmUgbGVzcyBhbWJpZ3VvdXMuCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTVRyZWVPdXRsaW5lLnByb3RvdHlwZS51cGRhdGVTZWxlY3Rpb24pOiBTaW1wbGlm eS4gVGhlIGNhbGwKKyAgICAgICAgdG8gdXBkYXRlIHRoZSBzZWxlY3Rpb24gYXJlYSB3aWxsIGJh aWwgb3V0IGlmIHRoZXJlIGlzIG5vdGhpbmcgdG8gYmUgZG9uZS4KKworICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTVRyZWVPdXRsaW5lLnByb3RvdHlwZS5maW5kVHJlZUVsZW1lbnQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lLnByb3RvdHlwZS5fb25tb3VzZW1vdmUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lLnByb3RvdHlwZS5fb25tb3VzZW91 dCk6CisgICAgICAgIENsZWFuIHVwIGFuZCB1c2UgbGV0IGFuZCBhcnJvdyBmdW5jdGlvbnMuCisK KyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlT3V0bGluZS5wcm90b3R5cGUuX29uZHJhZ292 ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lLnByb3RvdHlwZS5fY2xl YXJEcmFnT3ZlclRyZWVFbGVtZW50TWFya2VyKToKKyAgICAgICAgQ2xlYXIgdGhlIGRyYWdnaW5n IGVsZW1lbnQgYmVmb3JlIHVwZGF0aW5nIHRoZSBzZWxlY3Rpb24gYXJlYSBzaW5jZSBpdCBsb29r cyBhdAorICAgICAgICB0aGUgZHJhZ2dpbmcgZWxlbWVudCB0byBkZXRlcm1pbmUgd2hldGhlciBh bnl0aGluZyBuZWVkcyB0byBiZSBkb25lLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9Gb3JtYXR0ZWRWYWx1ZS5jc3M6CisgICAgICAgICguZm9ybWF0dGVkLW5vZGUgPiAudHJlZS1v dXRsaW5lLmRvbSBsaS5ob3ZlcmVkOm5vdCguc2VsZWN0ZWQpIC5zZWxlY3Rpb24tYXJlYSk6Cisg ICAgICAgICguZm9ybWF0dGVkLW5vZGUgPiAudHJlZS1vdXRsaW5lLmRvbSBsaS5ob3ZlcmVkOm5v dCguc2VsZWN0ZWQpIC5zZWxlY3Rpb24pOiBEZWxldGVkLgorICAgICAgICBSZW5hbWUgdGhlIHNl bGVjdG9yIHRvIGJlIGxlc3MgYW1iaWd1b3VzLgorCiAyMDE2LTA2LTA3ICBCcmlhbiBCdXJnICA8 YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlZHVjZSB0aW1lciBj aHVybiB3aGVuIHByb2Nlc3NpbmcgbWFueSBET00uYXR0cmlidXRlTW9kaWZpZWQgbWVzc2FnZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RP TVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRE9NVHJlZUVsZW1lbnQuanMKaW5kZXggNzQ0YWJiMjY2Y2FkNzZlM2Y2ZjBhZmRiMGNiYTRm ODQ0ZTU0MjBhZS4uZmEyOTRhNWZjMWZhZmU4NzAyOTI5MmRkNzlmN2UxMjQwMTI0ZmM3MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJl ZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRE9NVHJlZUVsZW1lbnQuanMKQEAgLTE0NCwyMCArMTQ0LDE2IEBAIFdlYkluc3BlY3Rvci5E T01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9y LlRyZWVFbGVtCiAgICAgICAgIHJldHVybiB0aGlzLl9ob3ZlcmVkOwogICAgIH0KIAotICAgIHNl dCBob3ZlcmVkKHgpCisgICAgc2V0IGhvdmVyZWQodmFsdWUpCiAgICAgewotICAgICAgICBpZiAo dGhpcy5faG92ZXJlZCA9PT0geCkKKyAgICAgICAgaWYgKHRoaXMuX2hvdmVyZWQgPT09IHZhbHVl KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX2hvdmVyZWQgPSB4OworICAg ICAgICB0aGlzLl9ob3ZlcmVkID0gdmFsdWU7CiAKICAgICAgICAgaWYgKHRoaXMubGlzdEl0ZW1F bGVtZW50KSB7Ci0gICAgICAgICAgICBpZiAoeCkgewotICAgICAgICAgICAgICAgIHRoaXMudXBk YXRlU2VsZWN0aW9uKCk7Ci0gICAgICAgICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQuY2xh c3NMaXN0LmFkZCgiaG92ZXJlZCIpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAg ICAgICB0aGlzLmxpc3RJdGVtRWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKCJob3ZlcmVkIik7Ci0g ICAgICAgICAgICB9CisgICAgICAgICAgICB0aGlzLmxpc3RJdGVtRWxlbWVudC5jbGFzc0xpc3Qu dG9nZ2xlKCJob3ZlcmVkIiwgdGhpcy5faG92ZXJlZCk7CisgICAgICAgICAgICB0aGlzLnVwZGF0 ZVNlbGVjdGlvbkFyZWEoKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMjY1LDI3ICsyNjEsMzYg QEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZUVsZW0KICAgICAgICAgV2ViSW5zcGVjdG9yLlJlbW90ZU9i amVjdC5yZXNvbHZlTm9kZShub2RlLCAiIiwgcmVzb2x2ZWROb2RlLmJpbmQodGhpcykpOwogICAg IH0KIAotICAgIHVwZGF0ZVNlbGVjdGlvbigpCisgICAgdXBkYXRlU2VsZWN0aW9uQXJlYSgpCiAg ICAgewotICAgICAgICB2YXIgbGlzdEl0ZW1FbGVtZW50ID0gdGhpcy5saXN0SXRlbUVsZW1lbnQ7 CisgICAgICAgIGxldCBsaXN0SXRlbUVsZW1lbnQgPSB0aGlzLmxpc3RJdGVtRWxlbWVudDsKICAg ICAgICAgaWYgKCFsaXN0SXRlbUVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAg ICAgaWYgKCF0aGlzLnNlbGVjdGlvbkVsZW1lbnQpIHsKLSAgICAgICAgICAgIHRoaXMuc2VsZWN0 aW9uRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICAgICAg dGhpcy5zZWxlY3Rpb25FbGVtZW50LmNsYXNzTmFtZSA9ICJzZWxlY3Rpb24gc2VsZWN0ZWQiOwot ICAgICAgICAgICAgbGlzdEl0ZW1FbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLnNlbGVjdGlvbkVs ZW1lbnQsIGxpc3RJdGVtRWxlbWVudC5maXJzdENoaWxkKTsKKyAgICAgICAgLy8gSWYgdGhlcmUn cyBubyByZWFzb24gdG8gaGF2ZSBhIHNlbGVjdGlvbiBhcmVhLCByZW1vdmUgdGhlIERPTSBlbGVt ZW50LgorICAgICAgICBsZXQgaW5kaWNhdGVzVHJlZU91dGxpbmVTdGF0ZSA9IHRoaXMudHJlZU91 dGxpbmUgJiYgKHRoaXMudHJlZU91dGxpbmUuZHJhZ092ZXJUcmVlRWxlbWVudCA9PT0gdGhpcyB8 fCB0aGlzLnRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQgPT09IHRoaXMpOworICAgICAg ICBpZiAoIXRoaXMuaG92ZXJlZCAmJiAhdGhpcy5wc2V1ZG9DbGFzc2VzRW5hYmxlZCAmJiAhaW5k aWNhdGVzVHJlZU91dGxpbmVTdGF0ZSkgeworICAgICAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGlv bkVsZW1lbnQpIHsKKyAgICAgICAgICAgICAgICB0aGlzLl9zZWxlY3Rpb25FbGVtZW50LnJlbW92 ZSgpOworICAgICAgICAgICAgICAgIHRoaXMuX3NlbGVjdGlvbkVsZW1lbnQgPSBudWxsOworICAg ICAgICAgICAgfQorCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBp ZiAoIXRoaXMuX3NlbGVjdGlvbkVsZW1lbnQpIHsKKyAgICAgICAgICAgIHRoaXMuX3NlbGVjdGlv bkVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgICAgIHRo aXMuX3NlbGVjdGlvbkVsZW1lbnQuY2xhc3NOYW1lID0gInNlbGVjdGlvbi1hcmVhIjsKKyAgICAg ICAgICAgIGxpc3RJdGVtRWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5fc2VsZWN0aW9uRWxlbWVu dCwgbGlzdEl0ZW1FbGVtZW50LmZpcnN0Q2hpbGQpOwogICAgICAgICB9CiAKLSAgICAgICAgdGhp cy5zZWxlY3Rpb25FbGVtZW50LnN0eWxlLmhlaWdodCA9IGxpc3RJdGVtRWxlbWVudC5vZmZzZXRI ZWlnaHQgKyAicHgiOworICAgICAgICB0aGlzLl9zZWxlY3Rpb25FbGVtZW50LnN0eWxlLmhlaWdo dCA9IGxpc3RJdGVtRWxlbWVudC5vZmZzZXRIZWlnaHQgKyAicHgiOwogICAgIH0KIAogICAgIG9u YXR0YWNoKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9ob3ZlcmVkKSB7Ci0gICAgICAgICAg ICB0aGlzLnVwZGF0ZVNlbGVjdGlvbigpOworICAgICAgICBpZiAodGhpcy5ob3ZlcmVkKQogICAg ICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaG92ZXJlZCIpOwot ICAgICAgICB9CiAKICAgICAgICAgdGhpcy51cGRhdGVUaXRsZSgpOwogCkBAIC00ODcsNyArNDky LDYgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQg ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZUVsZW0KICAgICAgICAgICAgIHJldHVybjsKIAogICAg ICAgICB0aGlzLnVwZGF0ZVRpdGxlKCk7Ci0gICAgICAgIHRoaXMudHJlZU91dGxpbmUudXBkYXRl U2VsZWN0aW9uKCk7CiAgICAgfQogCiAgICAgb25jb2xsYXBzZSgpCkBAIC00OTYsNyArNTAwLDYg QEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZUVsZW0KICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAg ICB0aGlzLnVwZGF0ZVRpdGxlKCk7Ci0gICAgICAgIHRoaXMudHJlZU91dGxpbmUudXBkYXRlU2Vs ZWN0aW9uKCk7CiAgICAgfQogCiAgICAgb25yZXZlYWwoKQpAQCAtNTE2LDcgKzUxOSw3IEBAIFdl Ykluc3BlY3Rvci5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50IGV4dGVuZHMg V2ViSW5zcGVjdG9yLlRyZWVFbGVtCiAgICAgICAgIHRoaXMudHJlZU91dGxpbmUuc2VsZWN0RE9N Tm9kZSh0aGlzLnJlcHJlc2VudGVkT2JqZWN0LCBzZWxlY3RlZEJ5VXNlcik7CiAgICAgICAgIGlm IChzZWxlY3RlZEJ5VXNlcikKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5kb21UcmVlTWFuYWdl ci5oaWdobGlnaHRET01Ob2RlKHRoaXMucmVwcmVzZW50ZWRPYmplY3QuaWQpOwotICAgICAgICB0 aGlzLnVwZGF0ZVNlbGVjdGlvbigpOworICAgICAgICB0aGlzLnRyZWVPdXRsaW5lLnVwZGF0ZVNl bGVjdGlvbigpOwogICAgICAgICB0aGlzLnRyZWVPdXRsaW5lLnN1cHByZXNzUmV2ZWFsQW5kU2Vs ZWN0ID0gZmFsc2U7CiAgICAgfQogCkBAIC01OTEsNyArNTk0LDcgQEAgV2ViSW5zcGVjdG9yLkRP TVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu VHJlZUVsZW0KICAgICAgICAgICAgIHRhZy5hcHBlbmQoIjwiICsgbm9kZU5hbWUsIG5vZGUsICI+ Iik7CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLnVwZGF0ZVNlbGVjdGlvbigpOworICAgICAg ICB0aGlzLnVwZGF0ZVNlbGVjdGlvbkFyZWEoKTsKICAgICB9CiAKICAgICBfc3RhcnRFZGl0aW5n VGFyZ2V0KGV2ZW50VGFyZ2V0KQpAQCAtODU3LDcgKzg2MCw3IEBAIFdlYkluc3BlY3Rvci5ET01U cmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRy ZWVFbGVtCiAgICAgICAgIC8vIEFwcGVuZCBlZGl0b3IuCiAgICAgICAgIHRoaXMubGlzdEl0ZW1F bGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2h0bWxFZGl0RWxlbWVudCk7CiAKLSAgICAgICAgdGhp cy51cGRhdGVTZWxlY3Rpb24oKTsKKyAgICAgICAgdGhpcy51cGRhdGVTZWxlY3Rpb25BcmVhKCk7 CiAKICAgICAgICAgZnVuY3Rpb24gY29tbWl0KCkKICAgICAgICAgewpAQCAtODgyLDcgKzg4NSw3 IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50IGV4 dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVFbGVtCiAgICAgICAgICAgICAgICAgY2hpbGQgPSBjaGls ZC5uZXh0U2libGluZzsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgdGhpcy51cGRhdGVT ZWxlY3Rpb24oKTsKKyAgICAgICAgICAgIHRoaXMudXBkYXRlU2VsZWN0aW9uQXJlYSgpOwogICAg ICAgICB9CiAKICAgICAgICAgdmFyIGNvbmZpZyA9IG5ldyBXZWJJbnNwZWN0b3IuRWRpdGluZ0Nv bmZpZyhjb21taXQuYmluZCh0aGlzKSwgZGlzcG9zZS5iaW5kKHRoaXMpKTsKQEAgLTEwNzYsOCAr MTA3OSwxMCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVlRWxl bWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQogICAgICAgICAgICAgdGhpcy5faGln aGxpZ2h0UmVzdWx0ID0gdW5kZWZpbmVkOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5zZWxl Y3Rpb25FbGVtZW50ID0gbnVsbDsKLSAgICAgICAgdGhpcy51cGRhdGVTZWxlY3Rpb24oKTsKKyAg ICAgICAgLy8gU2V0dGluZyB0aGlzLnRpdGxlIHdpbGwgaW1wbGljaXRseSByZW1vdmUgYWxsIGNo aWxkcmVuLiBDbGVhciB0aGUKKyAgICAgICAgLy8gc2VsZWN0aW9uIGVsZW1lbnQgc28gdGhhdCB3 ZSBwcm9wZXJseSByZWNyZWF0ZSBpdCBpZiBuZWNlc3NhcnkuCisgICAgICAgIHRoaXMuX3NlbGVj dGlvbkVsZW1lbnQgPSBudWxsOworICAgICAgICB0aGlzLnVwZGF0ZVNlbGVjdGlvbkFyZWEoKTsK ICAgICAgICAgdGhpcy5faGlnaGxpZ2h0U2VhcmNoUmVzdWx0cygpOwogICAgIH0KIApAQCAtMTUy MSwxMSArMTUyNiwxNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01U cmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQogICAgICAgICB9CiAgICAg fQogCisgICAgZ2V0IHBzZXVkb0NsYXNzZXNFbmFibGVkKCkKKyAgICB7CisgICAgICAgIHJldHVy biAhIXRoaXMucmVwcmVzZW50ZWRPYmplY3QuZW5hYmxlZFBzZXVkb0NsYXNzZXMubGVuZ3RoOwor ICAgIH0KKwogICAgIF9ub2RlUHNldWRvQ2xhc3Nlc0RpZENoYW5nZShldmVudCkKICAgICB7CiAg ICAgICAgIGlmICh0aGlzLl9lbGVtZW50Q2xvc2VUYWcpCiAgICAgICAgICAgICByZXR1cm47CiAK KyAgICAgICAgdGhpcy51cGRhdGVTZWxlY3Rpb25BcmVhKCk7CiAgICAgICAgIHRoaXMuX2xpc3RJ dGVtTm9kZS5jbGFzc0xpc3QudG9nZ2xlKCJwc2V1ZG8tY2xhc3MtZW5hYmxlZCIsICEhdGhpcy5y ZXByZXNlbnRlZE9iamVjdC5lbmFibGVkUHNldWRvQ2xhc3Nlcy5sZW5ndGgpOwogICAgIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N VHJlZU91dGxpbmUuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRE9NVHJlZU91dGxpbmUuY3NzCmluZGV4IDJhNjMwZjUwNmI2OTgxOTVkOTczM2JiZTc0NzY1 YzJjNWE3MzY4NjYuLjcyZDhiNmE4YTY1YmU3MzQ1NjI3YzU4NjUzOGY1NjIzOWU4NGFiMjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRy ZWVPdXRsaW5lLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9ET01UcmVlT3V0bGluZS5jc3MKQEAgLTM0LDE2ICszNCwxNiBAQAogCiAgICAgbGlzdC1z dHlsZS10eXBlOiBub25lOwogCi0gLyogTmVlZGVkIHRvIG1ha2UgdGhlIG5lZ2F0aXZlIHotaW5k ZXggb24gLnNlbGVjdGlvbiB3b3Jrcy4gT3RoZXJ3aXNlIHRoZSBiYWNrZ3JvdW5kLWNvbG9yIGZy b20gLnN5bnRheC1oaWdobGlnaHRlZCBoaWRlcyB0aGUgc2VsZWN0aW9uLiAqLworIC8qIE5lZWRl ZCB0byBtYWtlIHRoZSBuZWdhdGl2ZSB6LWluZGV4IG9uIC5zZWxlY3Rpb24tYXJlYSB3b3Jrcy4g T3RoZXJ3aXNlIHRoZSBiYWNrZ3JvdW5kLWNvbG9yIGZyb20gLnN5bnRheC1oaWdobGlnaHRlZCBo aWRlcyB0aGUgc2VsZWN0aW9uLiAqLwogICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50 ICFpbXBvcnRhbnQ7CiAgICAgY29sb3I6IGJsYWNrOwogfQogCi0udHJlZS1vdXRsaW5lLmRvbSBs aS5ob3ZlcmVkOm5vdCguc2VsZWN0ZWQpIC5zZWxlY3Rpb24geworLnRyZWUtb3V0bGluZS5kb20g bGkuaG92ZXJlZDpub3QoLnNlbGVjdGVkKSAuc2VsZWN0aW9uLWFyZWEgewogICAgIGJhY2tncm91 bmQtY29sb3I6IGhzbGEoMjA5LCAxMDAlLCA0OSUsIDAuMSk7CiB9CiAKLS50cmVlLW91dGxpbmUu ZG9tIGxpIC5zZWxlY3Rpb24geworLnRyZWUtb3V0bGluZS5kb20gbGkgLnNlbGVjdGlvbi1hcmVh IHsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgbGVmdDogMDsKICAgICByaWdodDogMDsK QEAgLTUxLDE2ICs1MSwxNiBAQAogICAgIHotaW5kZXg6IDEwOwogfQogCi0udHJlZS1vdXRsaW5l LmRvbSBsaS5zZWxlY3RlZCAuc2VsZWN0aW9uIHsKKy50cmVlLW91dGxpbmUuZG9tIGxpLnNlbGVj dGVkIC5zZWxlY3Rpb24tYXJlYSB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDAlLCA4 MyUpOwogfQogCi0udHJlZS1vdXRsaW5lLmRvbSBsaS5lbGVtZW50cy1kcmFnLW92ZXIgLnNlbGVj dGlvbiB7CisudHJlZS1vdXRsaW5lLmRvbSBsaS5lbGVtZW50cy1kcmFnLW92ZXIgLnNlbGVjdGlv bi1hcmVhIHsKICAgICBtYXJnaW4tdG9wOiAtMnB4OwogICAgIGJvcmRlci10b3A6IDJweCBzb2xp ZCBoc2woMjA5LCAxMDAlLCA0OSUpOwogfQogCi0udHJlZS1vdXRsaW5lLmRvbTpmb2N1cyBsaS5z ZWxlY3RlZCAuc2VsZWN0aW9uIHsKKy50cmVlLW91dGxpbmUuZG9tOmZvY3VzIGxpLnNlbGVjdGVk IC5zZWxlY3Rpb24tYXJlYSB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDIwOSwgMTAwJSwg NDklKTsKIH0KIApAQCAtMTA5LDcgKzEwOSw3IEBACiAgICAgd29yZC13cmFwOiBicmVhay13b3Jk OwogfQogCi0udHJlZS1vdXRsaW5lLmRvbSBsaS5wc2V1ZG8tY2xhc3MtZW5hYmxlZCA+IC5zZWxl Y3Rpb246OmJlZm9yZSB7CisudHJlZS1vdXRsaW5lLmRvbSBsaS5wc2V1ZG8tY2xhc3MtZW5hYmxl ZCA+IC5zZWxlY3Rpb24tYXJlYTo6YmVmb3JlIHsKICAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7 CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIHRvcDogNHB4OwpAQCAtMTI5LDcgKzEyOSw3 IEBACiAgICAgY29sb3I6IHdoaXRlOwogfQogCi0udHJlZS1vdXRsaW5lLmRvbTpmb2N1cyBsaS5z ZWxlY3RlZC5wc2V1ZG8tY2xhc3MtZW5hYmxlZCA+IC5zZWxlY3Rpb246OmJlZm9yZSB7CisudHJl ZS1vdXRsaW5lLmRvbTpmb2N1cyBsaS5zZWxlY3RlZC5wc2V1ZG8tY2xhc3MtZW5hYmxlZCA+IC5z ZWxlY3Rpb24tYXJlYTo6YmVmb3JlIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBoc2woMCwgMTAw JSwgMTAwJSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanMKaW5kZXggN2RjNDc1MzllZjAxM2Y2 YzJjMjRhOTg0OTNkNjIwZDFkMmIxMjY5Zi4uNTU5NDU5YTJmOGZlYzVhOWRmOWRiZWFlM2M1YzY3 OGEzNjNjMTJjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanMKQEAgLTE4OSwxMCArMTg5LDEyIEBA IFdlYkluc3BlY3Rvci5ET01UcmVlT3V0bGluZSA9IGNsYXNzIERPTVRyZWVPdXRsaW5lIGV4dGVu ZHMgV2ViSW5zcGVjdG9yLlRyZWVPdXRsCiAKICAgICB1cGRhdGVTZWxlY3Rpb24oKQogICAgIHsK LSAgICAgICAgaWYgKCF0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQpCi0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIHZhciBlbGVtZW50ID0gdGhpcy50cmVlT3V0bGluZS5zZWxlY3RlZFRyZWVF bGVtZW50OwotICAgICAgICBlbGVtZW50LnVwZGF0ZVNlbGVjdGlvbigpOworICAgICAgICAvLyBU aGlzIHdpbGwgbWlzcyB1cGRhdGluZyBzZWxlY3Rpb24gYXJlYXMgdXNlZCBmb3IgdGhlIGhvdmVy ZWQgdHJlZSBlbGVtZW50IGFuZAorICAgICAgICAvLyBhbmQgdGhvc2UgdXNlZCB0byBzaG93IGZv cmNlZCBwc2V1ZG8gY2xhc3MgaW5kaWNhdG9ycywgYnV0IHRoaXMgc2hvdWxkIGJlIG9rYXkuCisg ICAgICAgIC8vIFRoZSBob3ZlcmVkIGVsZW1lbnQgd2lsbCB1cGRhdGUgd2hlbiB1c2VyIG1vdmVz IHRoZSBtb3VzZSwgYW5kIGluZGljYXRvcnMgZG9uJ3QgbmVlZCB0aGUKKyAgICAgICAgLy8gc2Vs ZWN0aW9uIGFyZWEgaGVpZ2h0IHRvIGJlIGFjY3VyYXRlIHNpbmNlIHRoZXkgdXNlIDo6YmVmb3Jl IHRvIHBsYWNlIHRoZSBpbmRpY2F0b3IuCisgICAgICAgIGlmICh0aGlzLnNlbGVjdGVkVHJlZUVs ZW1lbnQpCisgICAgICAgICAgICB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQudXBkYXRlU2VsZWN0 aW9uQXJlYSgpOwogICAgIH0KIAogICAgIF9zZWxlY3RlZE5vZGVDaGFuZ2VkKCkKQEAgLTIwMiwx NyArMjA0LDkgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lID0gY2xhc3MgRE9NVHJlZU91 dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZU91dGwKIAogICAgIGZpbmRUcmVlRWxlbWVu dChub2RlKQogICAgIHsKLSAgICAgICAgZnVuY3Rpb24gaXNBbmNlc3Rvck5vZGUoYW5jZXN0b3Is IG5vZGUpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiBhbmNlc3Rvci5pc0FuY2VzdG9y KG5vZGUpOwotICAgICAgICB9Ci0KLSAgICAgICAgZnVuY3Rpb24gcGFyZW50Tm9kZShub2RlKQot ICAgICAgICB7Ci0gICAgICAgICAgICByZXR1cm4gbm9kZS5wYXJlbnROb2RlOwotICAgICAgICB9 Ci0KLSAgICAgICAgdmFyIHRyZWVFbGVtZW50ID0gc3VwZXIuZmluZFRyZWVFbGVtZW50KG5vZGUs IGlzQW5jZXN0b3JOb2RlLCBwYXJlbnROb2RlKTsKKyAgICAgICAgbGV0IGlzQW5jZXN0b3JOb2Rl ID0gKGFuY2VzdG9yLCBub2RlKSA9PiBhbmNlc3Rvci5pc0FuY2VzdG9yKG5vZGUpOworICAgICAg ICBsZXQgcGFyZW50Tm9kZSA9IChub2RlKSA9PiBub2RlLnBhcmVudE5vZGU7CisgICAgICAgIGxl dCB0cmVlRWxlbWVudCA9IHN1cGVyLmZpbmRUcmVlRWxlbWVudChub2RlLCBpc0FuY2VzdG9yTm9k ZSwgcGFyZW50Tm9kZSk7CiAgICAgICAgIGlmICghdHJlZUVsZW1lbnQgJiYgbm9kZS5ub2RlVHlw ZSgpID09PSBOb2RlLlRFWFRfTk9ERSkgewogICAgICAgICAgICAgLy8gVGhlIHRleHQgbm9kZSBt aWdodCBoYXZlIGJlZW4gaW5saW5lZCBpZiBpdCB3YXMgc2hvcnQsIHNvIHRyeSB0byBmaW5kIHRo ZSBwYXJlbnQgZWxlbWVudC4KICAgICAgICAgICAgIHRyZWVFbGVtZW50ID0gc3VwZXIuZmluZFRy ZWVFbGVtZW50KG5vZGUucGFyZW50Tm9kZSwgaXNBbmNlc3Rvck5vZGUsIHBhcmVudE5vZGUpOwpA QCAtMzQxLDcgKzMzNSw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlT3V0bGluZSA9IGNsYXNzIERP TVRyZWVPdXRsaW5lIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVPdXRsCiAKICAgICAgICAgaWYg KHRoaXMuX3ByZXZpb3VzSG92ZXJlZEVsZW1lbnQpIHsKICAgICAgICAgICAgIHRoaXMuX3ByZXZp b3VzSG92ZXJlZEVsZW1lbnQuaG92ZXJlZCA9IGZhbHNlOwotICAgICAgICAgICAgZGVsZXRlIHRo aXMuX3ByZXZpb3VzSG92ZXJlZEVsZW1lbnQ7CisgICAgICAgICAgICB0aGlzLl9wcmV2aW91c0hv dmVyZWRFbGVtZW50ID0gbnVsbDsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChlbGVtZW50KSB7 CkBAIC0zNjQsNyArMzU4LDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lID0gY2xhc3Mg RE9NVHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZU91dGwKIAogICAgICAgICBp ZiAodGhpcy5fcHJldmlvdXNIb3ZlcmVkRWxlbWVudCkgewogICAgICAgICAgICAgdGhpcy5fcHJl dmlvdXNIb3ZlcmVkRWxlbWVudC5ob3ZlcmVkID0gZmFsc2U7Ci0gICAgICAgICAgICBkZWxldGUg dGhpcy5fcHJldmlvdXNIb3ZlcmVkRWxlbWVudDsKKyAgICAgICAgICAgIHRoaXMuX3ByZXZpb3Vz SG92ZXJlZEVsZW1lbnQgPSBudWxsOwogICAgICAgICB9CiAKICAgICAgICAgV2ViSW5zcGVjdG9y LmRvbVRyZWVNYW5hZ2VyLmhpZGVET01Ob2RlSGlnaGxpZ2h0KCk7CkBAIC00MDcsOSArNDAxLDEw IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlT3V0bGluZSA9IGNsYXNzIERPTVRyZWVPdXRsaW5lIGV4 dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVPdXRsCiAgICAgICAgICAgICBub2RlID0gbm9kZS5wYXJl bnROb2RlOwogICAgICAgICB9CiAKLSAgICAgICAgdHJlZUVsZW1lbnQudXBkYXRlU2VsZWN0aW9u KCk7CisgICAgICAgIHRoaXMuZHJhZ092ZXJUcmVlRWxlbWVudCA9IHRyZWVFbGVtZW50OwogICAg ICAgICB0cmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiZWxlbWVudHMt ZHJhZy1vdmVyIik7Ci0gICAgICAgIHRoaXMuX2RyYWdPdmVyVHJlZUVsZW1lbnQgPSB0cmVlRWxl bWVudDsKKyAgICAgICAgdHJlZUVsZW1lbnQudXBkYXRlU2VsZWN0aW9uQXJlYSgpOworCiAgICAg ICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CiAgICAgICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5k cm9wRWZmZWN0ID0gIm1vdmUiOwogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC00ODEsMTAgKzQ3 NiwxMiBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU91dGxpbmUgPSBjbGFzcyBET01UcmVlT3V0bGlu ZSBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlT3V0bAogCiAgICAgX2NsZWFyRHJhZ092ZXJUcmVl RWxlbWVudE1hcmtlcigpCiAgICAgewotICAgICAgICBpZiAodGhpcy5fZHJhZ092ZXJUcmVlRWxl bWVudCkgewotICAgICAgICAgICAgdGhpcy5fZHJhZ092ZXJUcmVlRWxlbWVudC51cGRhdGVTZWxl Y3Rpb24oKTsKLSAgICAgICAgICAgIHRoaXMuX2RyYWdPdmVyVHJlZUVsZW1lbnQubGlzdEl0ZW1F bGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoImVsZW1lbnRzLWRyYWctb3ZlciIpOwotICAgICAgICAg ICAgZGVsZXRlIHRoaXMuX2RyYWdPdmVyVHJlZUVsZW1lbnQ7CisgICAgICAgIGlmICh0aGlzLmRy YWdPdmVyVHJlZUVsZW1lbnQpIHsKKyAgICAgICAgICAgIGxldCBlbGVtZW50ID0gdGhpcy5kcmFn T3ZlclRyZWVFbGVtZW50OworICAgICAgICAgICAgdGhpcy5kcmFnT3ZlclRyZWVFbGVtZW50ID0g bnVsbDsKKworICAgICAgICAgICAgZWxlbWVudC5saXN0SXRlbUVsZW1lbnQuY2xhc3NMaXN0LnJl bW92ZSgiZWxlbWVudHMtZHJhZy1vdmVyIik7CisgICAgICAgICAgICBlbGVtZW50LnVwZGF0ZVNl bGVjdGlvbkFyZWEoKTsKICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9ybWF0dGVkVmFsdWUuY3NzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9ybWF0dGVkVmFsdWUuY3Nz CmluZGV4IDE1MTUyZTFhNDBkN2U5ZTYzNmFlYWNjYzhiNjdlYTA0MzFkM2I3M2UuLjI5ODE2OThl MDlkNTNkNjdhODhmZTJjZmRiMjBkMzE0ZWJkNDQ1ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zvcm1hdHRlZFZhbHVlLmNzcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb3JtYXR0ZWRWYWx1ZS5j c3MKQEAgLTc2LDcgKzc2LDcgQEAKICAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lICFpbXBv cnRhbnQ7CiB9CiAKLS5mb3JtYXR0ZWQtbm9kZSA+IC50cmVlLW91dGxpbmUuZG9tIGxpLmhvdmVy ZWQ6bm90KC5zZWxlY3RlZCkgLnNlbGVjdGlvbiB7CisuZm9ybWF0dGVkLW5vZGUgPiAudHJlZS1v dXRsaW5lLmRvbSBsaS5ob3ZlcmVkOm5vdCguc2VsZWN0ZWQpIC5zZWxlY3Rpb24tYXJlYSB7CiAg ICAgZGlzcGxheTogYmxvY2s7CiAgICAgbGVmdDogLTFweDsKICAgICByaWdodDogLTJweDsK