205199 2019-12-12 21:47:12 -0800 Web Inspector: Elements: remove the "Show/Hide Shadow DOM" navigation item 2019-12-18 12:07:23 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1598253 0 hi 2019-12-12 21:47:12 -0800 There's really no good reason to hide shadow DOM, especially for non-user-agent shadow trees. The user has full control over whether to expand/collapse shadow trees (and their hosts), so having a setting that entirely removes the shadow trees from view throughout Web Inspector seems overkill. 1598256 1 385577 hi 2019-12-12 21:49:30 -0800 Created attachment 385577 Patch 1599907 2 385577 commit-queue 2019-12-18 12:06:26 -0800 Comment on attachment 385577 Patch Clearing flags on attachment: 385577 Committed r253706: <https://trac.webkit.org/changeset/253706> 1599908 3 commit-queue 2019-12-18 12:06:28 -0800 All reviewed patches have been landed. Closing bug. 1599910 4 webkit-bug-importer 2019-12-18 12:07:23 -0800 <rdar://problem/58052506> 385577 2019-12-12 21:49:30 -0800 2019-12-18 12:06:26 -0800 Patch 205199.diff text/plain 15538 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRlNGI2NzY4Mjk0Li45OTY3OTY4OGQyZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQgQEAKKzIwMTktMTItMTIgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVs ZW1lbnRzOiByZW1vdmUgdGhlICJTaG93L0hpZGUgU2hhZG93IERPTSIgbmF2aWdhdGlvbiBpdGVt CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUxOTkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSdz IHJlYWxseSBubyBnb29kIHJlYXNvbiB0byBoaWRlIHNoYWRvdyBET00sIGVzcGVjaWFsbHkgZm9y IG5vbi11c2VyLWFnZW50IHNoYWRvdyB0cmVlcy4KKyAgICAgICAgVGhlIHVzZXIgaGFzIGZ1bGwg Y29udHJvbCBvdmVyIHdoZXRoZXIgdG8gZXhwYW5kL2NvbGxhcHNlIHNoYWRvdyB0cmVlcyAoYW5k IHRoZWlyIGhvc3RzKSwgc28KKyAgICAgICAgaGF2aW5nIGEgc2V0dGluZyB0aGF0IGVudGlyZWx5 IHJlbW92ZXMgdGhlIHNoYWRvdyB0cmVlcyBmcm9tIHZpZXcgdGhyb3VnaG91dCBXZWIgSW5zcGVj dG9yCisgICAgICAgIHNlZW1zIG92ZXJraWxsLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9C YXNlL1NldHRpbmcuanM6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2Rl LmpzOgorICAgICAgICAoV0kuRE9NTm9kZSk6CisgICAgICAgIChXSS5ET01Ob2RlLnByb3RvdHlw ZS5nZXQgbmV4dFNpYmxpbmcpOgorICAgICAgICAoV0kuRE9NTm9kZS5wcm90b3R5cGUuZ2V0IHBy ZXZpb3VzU2libGluZyk6CisgICAgICAgIChXSS5ET01Ob2RlLnByb3RvdHlwZS5nZXQgY2hpbGRy ZW4pOgorICAgICAgICAoV0kuRE9NTm9kZS5wcm90b3R5cGUuZ2V0IGNoaWxkTm9kZUNvdW50KToK KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzOgor ICAgICAgICAoV0kuRE9NVHJlZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLkRPTVRyZWVDb250 ZW50Vmlldy5wcm90b3R5cGUuZ2V0IG5hdmlnYXRpb25JdGVtcyk6CisgICAgICAgIChXSS5ET01U cmVlQ29udGVudFZpZXcucHJvdG90eXBlLmNsb3NlZCk6CisgICAgICAgIChXSS5ET01UcmVlQ29u dGVudFZpZXcucHJvdG90eXBlLl9zaG93U2hhZG93RE9NU2V0dGluZ0NoYW5nZWQpOiBEZWxldGVk LgorICAgICAgICAoV0kuRE9NVHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fdG9nZ2xlU2hvd3NT aGFkb3dET01TZXR0aW5nKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvRE9NVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXSS5ET01UcmVlT3V0bGluZS5wcm90b3R5 cGUuY2xvc2UpOgorICAgICAgICAoV0kuRE9NVHJlZU91dGxpbmUucHJvdG90eXBlLl9yZXZlYWxB bmRTZWxlY3ROb2RlKToKKyAgICAgICAgKFdJLkRPTVRyZWVPdXRsaW5lLnByb3RvdHlwZS5fc2hv d1NoYWRvd0RPTVNldHRpbmdDaGFuZ2VkKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJ LkxheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLmluaXRpYWxMYXlvdXQpOgor ICAgICAgICAoV0kuTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX3VwZGF0 ZURpc3BsYXlXaXRoTGF5ZXJzKToKKyAgICAgICAgKFdJLkxheWVyVHJlZURldGFpbHNTaWRlYmFy UGFuZWwucHJvdG90eXBlLl9zaG93U2hhZG93RE9NU2V0dGluZ0NoYW5nZWQpOiBEZWxldGVkLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9JbWFnZXMvU2hhZG93RE9NLnN2ZzogUmVtb3ZlZC4K KyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisK IDIwMTktMTItMTIgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogRXJyb3I6IENhbid0IG1ha2UgYSBDb250ZW50VmlldyBmb3Ig YW4gdW5rbm93biByZXByZXNlbnRlZE9iamVjdCBvZiB0eXBlOiBDYWxsRnJhbWUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXpl ZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGU1MTk1NmE0NDg5Li43YTc0N2E2OTQ5MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC02MDgsNyArNjA4LDYgQEAgbG9jYWxp emVkU3RyaW5nc1siSGlkZSBFbGVtZW50cyJdID0gIkhpZGUgRWxlbWVudHMiOwogbG9jYWxpemVk U3RyaW5nc1siSGlkZSBQYXRoIl0gPSAiSGlkZSBQYXRoIjsKIGxvY2FsaXplZFN0cmluZ3NbIkhp ZGUgY29tcG9zaXRpbmcgYm9yZGVycyJdID0gIkhpZGUgY29tcG9zaXRpbmcgYm9yZGVycyI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJIaWRlIHJ1bGVycyJdID0gIkhpZGUgcnVsZXJzIjsKLWxvY2FsaXpl ZFN0cmluZ3NbIkhpZGUgc2hhZG93IERPTSBub2RlcyJdID0gIkhpZGUgc2hhZG93IERPTSBub2Rl cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJIaWRlIHRoZSBkZXRhaWxzIHNpZGViYXIgKCVzKSJdID0g IkhpZGUgdGhlIGRldGFpbHMgc2lkZWJhciAoJXMpIjsKIGxvY2FsaXplZFN0cmluZ3NbIkhpZGUg dGhlIG5hdmlnYXRpb24gc2lkZWJhciAoJXMpIl0gPSAiSGlkZSB0aGUgbmF2aWdhdGlvbiBzaWRl YmFyICglcykiOwogbG9jYWxpemVkU3RyaW5nc1siSGlkZSB0cmFuc3BhcmVuY3kgZ3JpZCJdID0g IkhpZGUgdHJhbnNwYXJlbmN5IGdyaWQiOwpAQCAtMTA3NCw3ICsxMDczLDYgQEAgbG9jYWxpemVk U3RyaW5nc1siU2hvdyBwYWdlIGxvYWQgdGltaW5nIl0gPSAiU2hvdyBwYWdlIGxvYWQgdGltaW5n IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgcGFnZSByZXNvdXJjZXMiXSA9ICJTaG93IHBhZ2Ug cmVzb3VyY2VzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgcGFnZSBydWxlcnMgYW5kIG5vZGUg Ym9yZGVyIGxpbmVzIl0gPSAiU2hvdyBwYWdlIHJ1bGVycyBhbmQgbm9kZSBib3JkZXIgbGluZXMi OwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBydWxlcnMiXSA9ICJTaG93IHJ1bGVycyI7Ci1sb2Nh bGl6ZWRTdHJpbmdzWyJTaG93IHNoYWRvdyBET00gbm9kZXMiXSA9ICJTaG93IHNoYWRvdyBET00g bm9kZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyB0aGUgZGV0YWlscyBzaWRlYmFyICglcyki XSA9ICJTaG93IHRoZSBkZXRhaWxzIHNpZGViYXIgKCVzKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJT aG93IHRoZSBuYXZpZ2F0aW9uIHNpZGViYXIgKCVzKSJdID0gIlNob3cgdGhlIG5hdmlnYXRpb24g c2lkZWJhciAoJXMpIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQi XSA9ICJTaG93IHRyYW5zcGFyZW5jeSBncmlkIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcwppbmRleCA3ZWNiNzg4YjdmYi4uYzNk OTU4NDI3ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvU2V0dGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1NldHRpbmcuanMKQEAgLTIxMCw3ICsyMTAsNiBAQCBXSS5zZXR0aW5ncyA9IHsKICAg ICBzaG93UnVsZXJzOiBuZXcgV0kuU2V0dGluZygic2hvdy1ydWxlcnMiLCBmYWxzZSksCiAgICAg c2hvd1J1bGVyc0R1cmluZ0VsZW1lbnRTZWxlY3Rpb246IG5ldyBXSS5TZXR0aW5nKCJzaG93LXJ1 bGVycy1kdXJpbmctZWxlbWVudC1zZWxlY3Rpb24iLCB0cnVlKSwKICAgICBzaG93U2NvcGVDaGFp bk9uUGF1c2U6IG5ldyBXSS5TZXR0aW5nKCJzaG93LXNjb3BlLWNoYWluLXNpZGViYXIiLCB0cnVl KSwKLSAgICBzaG93U2hhZG93RE9NOiBuZXcgV0kuU2V0dGluZygic2hvdy1zaGFkb3ctZG9tIiwg dHJ1ZSksCiAgICAgc2hvd1doaXRlc3BhY2VDaGFyYWN0ZXJzOiBuZXcgV0kuU2V0dGluZygic2hv dy13aGl0ZXNwYWNlLWNoYXJhY3RlcnMiLCBmYWxzZSksCiAgICAgdGFiU2l6ZTogbmV3IFdJLlNl dHRpbmcoInRhYi1zaXplIiwgNCksCiAgICAgdGltZWxpbmVzQXV0b1N0b3A6IG5ldyBXSS5TZXR0 aW5nKCJ0aW1lbGluZXMtYXV0by1zdG9wIiwgdHJ1ZSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvU2hhZG93RE9NLnN2ZyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9TaGFkb3dET00uc3ZnCmRlbGV0ZWQg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCA3ZmMyNDBhNzM0YS4uMDAwMDAwMDAwMDAKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL1NoYWRvd0RPTS5zdmcKKysr IC9kZXYvbnVsbApAQCAtMSw4ICswLDAgQEAKLTw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9 InV0Zi04Ij8+Ci08IS0tIENvcHlyaWdodCDCqSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4gLS0+Ci08c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgaWQ9 InJvb3QiIHZlcnNpb249IjEuMSIgdmlld0JveD0iMCAwIDEzIDEzIj4KLSAgICA8cGF0aCBmaWxs PSJub25lIiBzdHJva2U9ImN1cnJlbnRDb2xvciIgc3Ryb2tlLWxpbmVjYXA9InNxdWFyZSIgZD0i TSAzLjUgMC41IEwgMC41IDYuNSBMIDMuNSAxMi41Ii8+Ci0gICAgPHBhdGggZmlsbD0ibm9uZSIg c3Ryb2tlPSJjdXJyZW50Q29sb3IiIHN0cm9rZS1saW5lY2FwPSJzcXVhcmUiIG9wYWNpdHk9IjAu NSIgZD0iTSA5LjUgMTIuNSBMIDEyLjUgNi41IEwgOS41IDAuNSIvPgotICAgIDxwYXRoIGZpbGw9 Im5vbmUiIHN0cm9rZT0iY3VycmVudENvbG9yIiBzdHJva2UtbGluZWNhcD0ic3F1YXJlIiBvcGFj aXR5PSIwLjUiIGQ9Ik0gNS41IDAuNSBMIDIuNSA2LjUgTCA1LjUgMTIuNSIvPgotICAgIDxwYXRo IGZpbGw9Im5vbmUiIHN0cm9rZT0iY3VycmVudENvbG9yIiBzdHJva2UtbGluZWNhcD0ic3F1YXJl IiBkPSJNIDcuNSAxMi41IEwgMTAuNSA2LjUgTCA3LjUgMC41Ii8+Ci08L3N2Zz4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanMK aW5kZXggMjNkOWI2ZGY0MzguLjBjYjlmNWZmODYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcwpAQCAtNzgsOCArNzgs NiBAQCBXSS5ET01Ob2RlID0gY2xhc3MgRE9NTm9kZSBleHRlbmRzIFdJLk9iamVjdAogCiAgICAg ICAgIHRoaXMuX2NoaWxkTm9kZUNvdW50ID0gcGF5bG9hZC5jaGlsZE5vZGVDb3VudDsKICAgICAg ICAgdGhpcy5fY2hpbGRyZW4gPSBudWxsOwotICAgICAgICB0aGlzLl9maWx0ZXJlZENoaWxkcmVu ID0gbnVsbDsKLSAgICAgICAgdGhpcy5fZmlsdGVyZWRDaGlsZHJlbk5lZWRzVXBkYXRpbmcgPSB0 cnVlOwogCiAgICAgICAgIHRoaXMuX25leHRTaWJsaW5nID0gbnVsbDsKICAgICAgICAgdGhpcy5f cHJldmlvdXNTaWJsaW5nID0gbnVsbDsKQEAgLTE5Miw2ICsxOTAsOSBAQCBXSS5ET01Ob2RlID0g Y2xhc3MgRE9NTm9kZSBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgZ2V0IGRlc3Ryb3llZCgpIHsg cmV0dXJuIHRoaXMuX2Rlc3Ryb3llZDsgfQogICAgIGdldCBmcmFtZSgpIHsgcmV0dXJuIHRoaXMu X2ZyYW1lOyB9CisgICAgZ2V0IG5leHRTaWJsaW5nKCkgeyByZXR1cm4gdGhpcy5fbmV4dFNpYmxp bmc7IH0KKyAgICBnZXQgcHJldmlvdXNTaWJsaW5nKCkgeyByZXR1cm4gdGhpcy5fcHJldmlvdXNT aWJsaW5nOyB9CisgICAgZ2V0IGNoaWxkcmVuKCkgeyByZXR1cm4gdGhpcy5fY2hpbGRyZW47IH0K ICAgICBnZXQgZG9tRXZlbnRzKCkgeyByZXR1cm4gdGhpcy5fZG9tRXZlbnRzOyB9CiAgICAgZ2V0 IHBvd2VyRWZmaWNpZW50UGxheWJhY2tSYW5nZXMoKSB7IHJldHVybiB0aGlzLl9wb3dlckVmZmlj aWVudFBsYXliYWNrUmFuZ2VzOyB9CiAKQEAgLTIwNywyNCArMjA4LDYgQEAgV0kuRE9NTm9kZSA9 IGNsYXNzIERPTU5vZGUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KIAotICAgIGdldCBjaGlsZHJlbigpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMuX2No aWxkcmVuKQotICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0KLSAgICAgICAgaWYgKFdJLnNldHRp bmdzLnNob3dTaGFkb3dET00udmFsdWUpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5fY2hpbGRy ZW47Ci0KLSAgICAgICAgaWYgKHRoaXMuX2ZpbHRlcmVkQ2hpbGRyZW5OZWVkc1VwZGF0aW5nKSB7 Ci0gICAgICAgICAgICB0aGlzLl9maWx0ZXJlZENoaWxkcmVuTmVlZHNVcGRhdGluZyA9IGZhbHNl OwotICAgICAgICAgICAgdGhpcy5fZmlsdGVyZWRDaGlsZHJlbiA9IHRoaXMuX2NoaWxkcmVuLmZp bHRlcihmdW5jdGlvbihub2RlKSB7Ci0gICAgICAgICAgICAgICAgcmV0dXJuICFub2RlLl9pc0lu U2hhZG93VHJlZTsKLSAgICAgICAgICAgIH0pOwotICAgICAgICB9Ci0KLSAgICAgICAgcmV0dXJu IHRoaXMuX2ZpbHRlcmVkQ2hpbGRyZW47Ci0gICAgfQotCiAgICAgZ2V0IGZpcnN0Q2hpbGQoKQog ICAgIHsKICAgICAgICAgdmFyIGNoaWxkcmVuID0gdGhpcy5jaGlsZHJlbjsKQEAgLTI0NSw0NCAr MjI4LDEzIEBAIFdJLkRPTU5vZGUgPSBjbGFzcyBET01Ob2RlIGV4dGVuZHMgV0kuT2JqZWN0CiAg ICAgICAgIHJldHVybiBudWxsOwogICAgIH0KIAotICAgIGdldCBuZXh0U2libGluZygpCi0gICAg ewotICAgICAgICBpZiAoV0kuc2V0dGluZ3Muc2hvd1NoYWRvd0RPTS52YWx1ZSkKLSAgICAgICAg ICAgIHJldHVybiB0aGlzLl9uZXh0U2libGluZzsKLQotICAgICAgICB2YXIgbm9kZSA9IHRoaXMu X25leHRTaWJsaW5nOwotICAgICAgICB3aGlsZSAobm9kZSkgewotICAgICAgICAgICAgaWYgKCFu b2RlLl9pc0luU2hhZG93VHJlZSkKLSAgICAgICAgICAgICAgICByZXR1cm4gbm9kZTsKLSAgICAg ICAgICAgIG5vZGUgPSBub2RlLl9uZXh0U2libGluZzsKLSAgICAgICAgfQotICAgICAgICByZXR1 cm4gbnVsbDsKLSAgICB9Ci0KLSAgICBnZXQgcHJldmlvdXNTaWJsaW5nKCkKLSAgICB7Ci0gICAg ICAgIGlmIChXSS5zZXR0aW5ncy5zaG93U2hhZG93RE9NLnZhbHVlKQotICAgICAgICAgICAgcmV0 dXJuIHRoaXMuX3ByZXZpb3VzU2libGluZzsKLQotICAgICAgICB2YXIgbm9kZSA9IHRoaXMuX3By ZXZpb3VzU2libGluZzsKLSAgICAgICAgd2hpbGUgKG5vZGUpIHsKLSAgICAgICAgICAgIGlmICgh bm9kZS5faXNJblNoYWRvd1RyZWUpCi0gICAgICAgICAgICAgICAgcmV0dXJuIG5vZGU7Ci0gICAg ICAgICAgICBub2RlID0gbm9kZS5fcHJldmlvdXNTaWJsaW5nOwotICAgICAgICB9Ci0gICAgICAg IHJldHVybiBudWxsOwotICAgIH0KLQogICAgIGdldCBjaGlsZE5vZGVDb3VudCgpCiAgICAgewog ICAgICAgICB2YXIgY2hpbGRyZW4gPSB0aGlzLmNoaWxkcmVuOwogICAgICAgICBpZiAoY2hpbGRy ZW4pCiAgICAgICAgICAgICByZXR1cm4gY2hpbGRyZW4ubGVuZ3RoOwogCi0gICAgICAgIGlmIChX SS5zZXR0aW5ncy5zaG93U2hhZG93RE9NLnZhbHVlKQotICAgICAgICAgICAgcmV0dXJuIHRoaXMu X2NoaWxkTm9kZUNvdW50ICsgdGhpcy5fc2hhZG93Um9vdHMubGVuZ3RoOwotCi0gICAgICAgIHJl dHVybiB0aGlzLl9jaGlsZE5vZGVDb3VudDsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NoaWxkTm9k ZUNvdW50ICsgdGhpcy5fc2hhZG93Um9vdHMubGVuZ3RoOwogICAgIH0KIAogICAgIHNldCBjaGls ZE5vZGVDb3VudChjb3VudCkKQEAgLTEwMTgsOCArOTcwLDYgQEAgV0kuRE9NTm9kZSA9IGNsYXNz IERPTU5vZGUgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgIF9yZW51bWJlcigpCiAgICAgewotICAg ICAgICB0aGlzLl9maWx0ZXJlZENoaWxkcmVuTmVlZHNVcGRhdGluZyA9IHRydWU7Ci0KICAgICAg ICAgdmFyIGNoaWxkTm9kZUNvdW50ID0gdGhpcy5fY2hpbGRyZW4ubGVuZ3RoOwogICAgICAgICBp ZiAoY2hpbGROb2RlQ291bnQgPT09IDApCiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01U cmVlQ29udGVudFZpZXcuanMKaW5kZXggMTMwZGM3ODgxZGIuLmJhZjdhMTc3N2NlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29u dGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCkBAIC02MywxMiArNjMsNiBAQCBXSS5ET01UcmVlQ29u dGVudFZpZXcgPSBjbGFzcyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50Vmll dwogICAgICAgICB0aGlzLl9wYWludEZsYXNoaW5nQnV0dG9uTmF2aWdhdGlvbkl0ZW0uYWN0aXZh dGVkID0gdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtLmVuYWJsZWQgJiYg V0kuc2V0dGluZ3Muc2hvd1BhaW50UmVjdHMudmFsdWU7CiAgICAgICAgIHRoaXMuX3BhaW50Rmxh c2hpbmdCdXR0b25OYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0 aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OwogCi0gICAgICAgIFdJLnNldHRpbmdzLnNo b3dTaGFkb3dET00uYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRo aXMuX3Nob3dTaGFkb3dET01TZXR0aW5nQ2hhbmdlZCwgdGhpcyk7Ci0gICAgICAgIHRoaXMuX3No b3dzU2hhZG93RE9NQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25O YXZpZ2F0aW9uSXRlbSgic2hvd3Mtc2hhZG93LURPTSIsIFdJLlVJU3RyaW5nKCJTaG93IHNoYWRv dyBET00gbm9kZXMiKSwgV0kuVUlTdHJpbmcoIkhpZGUgc2hhZG93IERPTSBub2RlcyIpLCAiSW1h Z2VzL1NoYWRvd0RPTS5zdmciLCAxMywgMTMpOwotICAgICAgICB0aGlzLl9zaG93c1NoYWRvd0RP TUJ1dHRvbk5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlv bkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fdG9nZ2xlU2hvd3NTaGFkb3dET01TZXR0aW5nLCB0 aGlzKTsKLSAgICAgICAgdGhpcy5fc2hvd3NTaGFkb3dET01CdXR0b25OYXZpZ2F0aW9uSXRlbS52 aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHku TG93OwotICAgICAgICB0aGlzLl9zaG93U2hhZG93RE9NU2V0dGluZ0NoYW5nZWQoKTsKLQogICAg ICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiZG9tLXRyZWUiKTsKICAgICAgICAgdGhp cy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VXYXNDbGlja2Vk LmJpbmQodGhpcyksIGZhbHNlKTsKIApAQCAtMTIxLDcgKzExNSw2IEBAIFdJLkRPTVRyZWVDb250 ZW50VmlldyA9IGNsYXNzIERPTVRyZWVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3 CiAgICAgICAgICAgICB0aGlzLl9mb3JjZUFwcGVhcmFuY2VCdXR0b25OYXZpZ2F0aW9uSXRlbSwK ICAgICAgICAgICAgIHRoaXMuX2NvbXBvc2l0aW5nQm9yZGVyc0J1dHRvbk5hdmlnYXRpb25JdGVt LAogICAgICAgICAgICAgdGhpcy5fcGFpbnRGbGFzaGluZ0J1dHRvbk5hdmlnYXRpb25JdGVtLAot ICAgICAgICAgICAgdGhpcy5fc2hvd3NTaGFkb3dET01CdXR0b25OYXZpZ2F0aW9uSXRlbSwKICAg ICAgICAgXTsKICAgICB9CiAKQEAgLTE3NSw3ICsxNjgsNiBAQCBXSS5ET01UcmVlQ29udGVudFZp ZXcgPSBjbGFzcyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAg ICAgICBzdXBlci5jbG9zZWQoKTsKIAogICAgICAgICBXSS5zZXR0aW5ncy5zaG93UGFpbnRSZWN0 cy5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOwotICAgICAgICBXSS5zZXR0 aW5ncy5zaG93U2hhZG93RE9NLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7 CiAgICAgICAgIFdJLnNldHRpbmdzLnNob3dSdWxlcnMucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxs LCBudWxsLCB0aGlzKTsKICAgICAgICAgV0kuZGVidWdnZXJNYW5hZ2VyLnJlbW92ZUV2ZW50TGlz dGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CiAgICAgICAgIFdJLmRvbU1hbmFnZXIucmVtb3ZlRXZl bnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKQEAgLTYzNCwxNiArNjI2LDYgQEAgV0kuRE9N VHJlZUNvbnRlbnRWaWV3ID0gY2xhc3MgRE9NVHJlZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29u dGVudFZpZXcKICAgICAgICAgfQogICAgIH0KIAotICAgIF9zaG93U2hhZG93RE9NU2V0dGluZ0No YW5nZWQoZXZlbnQpCi0gICAgewotICAgICAgICB0aGlzLl9zaG93c1NoYWRvd0RPTUJ1dHRvbk5h dmlnYXRpb25JdGVtLmFjdGl2YXRlZCA9IFdJLnNldHRpbmdzLnNob3dTaGFkb3dET00udmFsdWU7 Ci0gICAgfQotCi0gICAgX3RvZ2dsZVNob3dzU2hhZG93RE9NU2V0dGluZyhldmVudCkKLSAgICB7 Ci0gICAgICAgIFdJLnNldHRpbmdzLnNob3dTaGFkb3dET00udmFsdWUgPSAhV0kuc2V0dGluZ3Mu c2hvd1NoYWRvd0RPTS52YWx1ZTsKLSAgICB9Ci0KICAgICBfc2hvd1ByaW50U3R5bGVzQ2hhbmdl ZCgpCiAgICAgewogICAgICAgICB0aGlzLl9zaG93UHJpbnRTdHlsZXNCdXR0b25OYXZpZ2F0aW9u SXRlbS5hY3RpdmF0ZWQgPSBXSS5wcmludFN0eWxlc0VuYWJsZWQ7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5l LmpzCmluZGV4IGZlYWM0NWNhMmRhLi5kOTFlMTU5NDE5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUu anMKQEAgLTYwLDggKzYwLDYgQEAgV0kuRE9NVHJlZU91dGxpbmUgPSBjbGFzcyBET01UcmVlT3V0 bGluZSBleHRlbmRzIFdJLlRyZWVPdXRsaW5lCiAgICAgICAgIHRoaXMuX2hpZGVFbGVtZW50c0tl eWJvYXJkU2hvcnRjdXQgPSBuZXcgV0kuS2V5Ym9hcmRTaG9ydGN1dChudWxsLCAiSCIsIHRoaXMu X2hpZGVFbGVtZW50cy5iaW5kKHRoaXMpLCB0aGlzLmVsZW1lbnQpOwogICAgICAgICB0aGlzLl9o aWRlRWxlbWVudHNLZXlib2FyZFNob3J0Y3V0LmltcGxpY2l0bHlQcmV2ZW50c0RlZmF1bHQgPSBm YWxzZTsKIAotICAgICAgICBXSS5zZXR0aW5ncy5zaG93U2hhZG93RE9NLmFkZEV2ZW50TGlzdGVu ZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCB0aGlzLl9zaG93U2hhZG93RE9NU2V0dGluZ0No YW5nZWQsIHRoaXMpOwotCiAgICAgICAgIGlmIChzaG93SW5zcGVjdGVkTm9kZSkKICAgICAgICAg ICAgIFdJLmRvbU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5ET01NYW5hZ2VyLkV2ZW50Lklu c3BlY3RlZE5vZGVDaGFuZ2VkLCB0aGlzLl9oYW5kbGVJbnNwZWN0ZWROb2RlQ2hhbmdlZCwgdGhp cyk7CiAgICAgfQpAQCAtNzUsOCArNzMsNiBAQCBXSS5ET01UcmVlT3V0bGluZSA9IGNsYXNzIERP TVRyZWVPdXRsaW5lIGV4dGVuZHMgV0kuVHJlZU91dGxpbmUKIAogICAgIGNsb3NlKCkKICAgICB7 Ci0gICAgICAgIFdJLnNldHRpbmdzLnNob3dTaGFkb3dET00ucmVtb3ZlRXZlbnRMaXN0ZW5lcihu dWxsLCBudWxsLCB0aGlzKTsKLQogICAgICAgICBpZiAodGhpcy5fZWxlbWVudHNUcmVlVXBkYXRl cikgewogICAgICAgICAgICAgdGhpcy5fZWxlbWVudHNUcmVlVXBkYXRlci5jbG9zZSgpOwogICAg ICAgICAgICAgdGhpcy5fZWxlbWVudHNUcmVlVXBkYXRlciA9IG51bGw7CkBAIC00MjcsMTMgKzQy Myw2IEBAIFdJLkRPTVRyZWVPdXRsaW5lID0gY2xhc3MgRE9NVHJlZU91dGxpbmUgZXh0ZW5kcyBX SS5UcmVlT3V0bGluZQogICAgICAgICBpZiAoIW5vZGUgfHwgdGhpcy5fc3VwcHJlc3NSZXZlYWxB bmRTZWxlY3QpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKCFXSS5zZXR0aW5n cy5zaG93U2hhZG93RE9NLnZhbHVlKSB7Ci0gICAgICAgICAgICB3aGlsZSAobm9kZSAmJiBub2Rl LmlzSW5TaGFkb3dUcmVlKCkpCi0gICAgICAgICAgICAgICAgbm9kZSA9IG5vZGUucGFyZW50Tm9k ZTsKLSAgICAgICAgICAgIGlmICghbm9kZSkKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIH0KLQogICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLmNyZWF0ZVRyZWVFbGVtZW50 Rm9yKG5vZGUpOwogICAgICAgICBpZiAoIXRyZWVFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJu OwpAQCAtNjUxLDIzICs2NDAsNiBAQCBXSS5ET01UcmVlT3V0bGluZSA9IGNsYXNzIERPTVRyZWVP dXRsaW5lIGV4dGVuZHMgV0kuVHJlZU91dGxpbmUKICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnRz VHJlZVVwZGF0ZXIuX3VwZGF0ZU1vZGlmaWVkTm9kZXMoKTsKICAgICB9CiAKLSAgICBfc2hvd1No YWRvd0RPTVNldHRpbmdDaGFuZ2VkKGV2ZW50KQotICAgIHsKLSAgICAgICAgdmFyIG5vZGVUb1Nl bGVjdCA9IHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudCA/IHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVu dC5yZXByZXNlbnRlZE9iamVjdCA6IG51bGw7Ci0gICAgICAgIHdoaWxlIChub2RlVG9TZWxlY3Qp IHsKLSAgICAgICAgICAgIGlmICghbm9kZVRvU2VsZWN0LmlzSW5TaGFkb3dUcmVlKCkpCi0gICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBub2RlVG9TZWxlY3QgPSBub2RlVG9TZWxl Y3QucGFyZW50Tm9kZTsKLSAgICAgICAgfQotCi0gICAgICAgIHRoaXMuY2hpbGRyZW4uZm9yRWFj aChmdW5jdGlvbihjaGlsZCkgewotICAgICAgICAgICAgY2hpbGQudXBkYXRlQ2hpbGRyZW4odHJ1 ZSk7Ci0gICAgICAgIH0pOwotCi0gICAgICAgIGlmIChub2RlVG9TZWxlY3QpCi0gICAgICAgICAg ICB0aGlzLnNlbGVjdERPTU5vZGUobm9kZVRvU2VsZWN0KTsKLSAgICB9Ci0KICAgICBfaGFuZGxl SW5zcGVjdGVkTm9kZUNoYW5nZWQoZXZlbnQpCiAgICAgewogICAgICAgICBsZXQge2xhc3RJbnNw ZWN0ZWROb2RlfSA9IGV2ZW50LmRhdGE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWls c1NpZGViYXJQYW5lbC5qcwppbmRleCA5MWJhNjA4OGNhMS4uOTQ3OWZiMmM4ZDYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJlZURl dGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtNjUsOCArNjUs NiBAQCBXSS5MYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgTGF5ZXJUcmVlRGV0 YWlsc1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLgogICAgIHsKICAgICAgICAgc3VwZXIuaW5pdGlh bExheW91dCgpOwogCi0gICAgICAgIFdJLnNldHRpbmdzLnNob3dTaGFkb3dET00uYWRkRXZlbnRM aXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIHRoaXMuX3Nob3dTaGFkb3dET01TZXR0 aW5nQ2hhbmdlZCwgdGhpcyk7Ci0KICAgICAgICAgdGhpcy5fYnVpbGRMYXllckluZm9TZWN0aW9u KCk7CiAgICAgICAgIHRoaXMuX2J1aWxkRGF0YUdyaWRTZWN0aW9uKCk7CiAgICAgICAgIHRoaXMu X2J1aWxkQm90dG9tQmFyKCk7CkBAIC0xMDIsMTIgKzEwMCw2IEBAIFdJLkxheWVyVHJlZURldGFp bHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBMYXllclRyZWVEZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVu ZHMgV0kuCiAgICAgICAgIHRoaXMubmVlZHNMYXlvdXQoKTsKICAgICB9CiAKLSAgICBfc2hvd1No YWRvd0RPTVNldHRpbmdDaGFuZ2VkKGV2ZW50KQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuc2Vs ZWN0ZWQpCi0gICAgICAgICAgICB0aGlzLl91cGRhdGVEaXNwbGF5V2l0aExheWVycyh0aGlzLl9s YXllckZvck5vZGUsIHRoaXMuX3VuZmlsdGVyZWRDaGlsZExheWVycyk7Ci0gICAgfQotCiAgICAg X2J1aWxkTGF5ZXJJbmZvU2VjdGlvbigpCiAgICAgewogICAgICAgICB2YXIgcm93cyA9IHRoaXMu X2xheWVySW5mb1Jvd3MgPSB7fTsKQEAgLTI0MywxMiArMjM1LDYgQEAgV0kuTGF5ZXJUcmVlRGV0 YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIExheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwgZXh0 ZW5kcyBXSS4KIAogICAgIF91cGRhdGVEaXNwbGF5V2l0aExheWVycyhsYXllckZvck5vZGUsIGNo aWxkTGF5ZXJzKQogICAgIHsKLSAgICAgICAgaWYgKCFXSS5zZXR0aW5ncy5zaG93U2hhZG93RE9N LnZhbHVlKSB7Ci0gICAgICAgICAgICBjaGlsZExheWVycyA9IGNoaWxkTGF5ZXJzLmZpbHRlcihm dW5jdGlvbihsYXllcikgewotICAgICAgICAgICAgICAgIHJldHVybiAhbGF5ZXIuaXNJblNoYWRv d1RyZWU7Ci0gICAgICAgICAgICB9KTsKLSAgICAgICAgfQotCiAgICAgICAgIHRoaXMuX3VwZGF0 ZUxheWVySW5mb1NlY3Rpb24obGF5ZXJGb3JOb2RlKTsKICAgICAgICAgdGhpcy5fdXBkYXRlRGF0 YUdyaWQobGF5ZXJGb3JOb2RlLCBjaGlsZExheWVycyk7CiAgICAgICAgIHRoaXMuX3VwZGF0ZU1l dHJpY3MobGF5ZXJGb3JOb2RlLCBjaGlsZExheWVycyk7Cg==