162525 2016-09-23 17:37:10 -0700 Web Inspector: Box Model values not updated when DOM node styles change 2016-09-26 17:09:19 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1233069 0 mattbaker 2016-09-23 17:37:10 -0700 Summary: Box Model values not updated when DOM node styles change. This is due to the change notification not being forwarded to the Box Model section by its parent sidebar. Steps to Reproduce: 1. Inspect any DOM element 2. Elements tab > Styles sidebar > Box Model 3. Change node's margin/border/padding properties from within the editor => DOM node is updated after committing changes in the editor, but Box Model is not 1233071 1 289726 mattbaker 2016-09-23 17:44:52 -0700 Created attachment 289726 Patch 1233073 2 webkit-bug-importer 2016-09-23 17:45:15 -0700 <rdar://problem/28458747> 1233656 3 289726 bburg 2016-09-26 16:47:44 -0700 Comment on attachment 289726 Patch r=me 1233668 4 289726 commit-queue 2016-09-26 17:09:15 -0700 Comment on attachment 289726 Patch Clearing flags on attachment: 289726 Committed r206406: <http://trac.webkit.org/changeset/206406> 1233669 5 commit-queue 2016-09-26 17:09:19 -0700 All reviewed patches have been landed. Closing bug. 289726 2016-09-23 17:44:52 -0700 2016-09-26 17:09:15 -0700 Patch bug-162525-20160923174200.patch text/plain 10461 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2MzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi NDQwZGI1NTMxNGEzZDhiMDIzOGQ4MGYyNzI5OTFhNGVmNTBmZWNjLi4wN2Y5NzNiZTllMWRiZWEx Mzc4N2JjNzcyNjAzN2I5YTE5ODhlYzdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxNi0wOS0yMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQm94IE1vZGVsIHZhbHVlcyBub3QgdXBkYXRlZCB3 aGVuIERPTSBub2RlIHN0eWxlcyBjaGFuZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2MjUyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZSBCb3ggTW9kZWwgc2VjdGlvbiBzaG91bGQgcmVmcmVzaCBp dHNlbGYgd2hlbiB0aGUgc2VsZWN0ZWQgbm9kZSdzCisgICAgICAgIGNvbXB1dGVkIHN0eWxlIGNo YW5nZXMuIFRoaXMgaXMgbmVjZXNzYXJ5IHNpbmNlIHRoZSBTdHlsZXMgc2lkZWJhcgorICAgICAg ICBkb2Vzbid0IGFsd2F5cyByZWZyZXNoIGl0cyBzZWN0aW9ucyBvbiBub2RlIGNoYW5nZXMuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5wcm90 b3R5cGUuc2V0IG5vZGVTdHlsZXMpOgorICAgICAgICBSZWZyZXNoIG1ldHJpY3Mgd2hlbmV2ZXIg dGhlIGNvbXB1dGVkIHN0eWxlIGNoYW5nZXMuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Cb3hN b2RlbERldGFpbHNTZWN0aW9uUm93LnByb3RvdHlwZS5fZ2V0Qm94KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LnByb3RvdHlwZS5fZ2V0Q29tcG9uZW50 U3VmZml4KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93 LnByb3RvdHlwZS5fdXBkYXRlTWV0cmljcy5jcmVhdGVWYWx1ZUVsZW1lbnQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cucHJvdG90eXBlLl91cGRhdGVN ZXRyaWNzLmNyZWF0ZUJveFBhcnRFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Cb3hN b2RlbERldGFpbHNTZWN0aW9uUm93LnByb3RvdHlwZS5fdXBkYXRlTWV0cmljcy5jcmVhdGVDb250 ZW50QXJlYUVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJveE1vZGVsRGV0YWlsc1Nl Y3Rpb25Sb3cucHJvdG90eXBlLl91cGRhdGVNZXRyaWNzKToKKyAgICAgICAgRHJpdmUtYnkgY2xl YW51cCB0byBtYWtlIHRoaXMgbGFyZ2UgZnVuY3Rpb24gZWFzaWVyIHRvIHJlYWQuCisgICAgICAg IChXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdy5wcm90b3R5cGUuX3VwZGF0 ZU1ldHJpY3MuY3JlYXRlRWxlbWVudCk6IERlbGV0ZWQuCisgICAgICAgIFJlbmFtZWQgY3JlYXRl VmFsdWVFbGVtZW50LgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJveE1vZGVsRGV0YWlsc1NlY3Rp b25Sb3cucHJvdG90eXBlLl91cGRhdGVNZXRyaWNzLmNyZWF0ZUNvbnRlbnRBcmVhV2lkdGhFbGVt ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Cb3hNb2RlbERldGFpbHNTZWN0 aW9uUm93LnByb3RvdHlwZS5fdXBkYXRlTWV0cmljcy5jcmVhdGVDb250ZW50QXJlYUhlaWdodEVs ZW1lbnQpOiBEZWxldGVkLgorICAgICAgICBDb21iaW5lZCB0aGVzZSBpbnRvIGEgc2luZ2xlIGZ1 bmN0aW9uIHRha2luZyBhIHByb3BlcnR5IG5hbWUgKHdpZHRoIG9yIGhlaWdodCkuCisKIDIwMTYt MDktMjEgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IEltcHJvdmUgb3V0cHV0IG9mIFRlc3RIYXJuZXNzLmV4cGVjdCogZmFpbHVyZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Jv eE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93LmpzCmluZGV4IDZlNjgyNTll YjEyYjdkMzJlZGY1YTg0MTQwY2QyMDZiMTE3M2RlZDUuLmFjNWQyZTAwNjZhNzQ4NjQwNjlmZDQ4 MjUwNWVlZmJhMDNkNTViNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0JveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQm94TW9kZWxEZXRhaWxzU2VjdGlv blJvdy5qcwpAQCAtNDMsNyArNDMsMTIgQEAgV2ViSW5zcGVjdG9yLkJveE1vZGVsRGV0YWlsc1Nl Y3Rpb25Sb3cgPSBjbGFzcyBCb3hNb2RlbERldGFpbHNTZWN0aW9uUm93IGV4dGVuZHMKIAogICAg IHNldCBub2RlU3R5bGVzKG5vZGVTdHlsZXMpCiAgICAgeworICAgICAgICBpZiAodGhpcy5fbm9k ZVN0eWxlcyAmJiB0aGlzLl9ub2RlU3R5bGVzLmNvbXB1dGVkU3R5bGUpCisgICAgICAgICAgICB0 aGlzLl9ub2RlU3R5bGVzLmNvbXB1dGVkU3R5bGUucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbi5FdmVudC5Qcm9wZXJ0aWVzQ2hhbmdlZCwgdGhpcy5f cmVmcmVzaCwgdGhpcyk7CisKICAgICAgICAgdGhpcy5fbm9kZVN0eWxlcyA9IG5vZGVTdHlsZXM7 CisgICAgICAgIGlmICh0aGlzLl9ub2RlU3R5bGVzICYmIHRoaXMuX25vZGVTdHlsZXMuY29tcHV0 ZWRTdHlsZSkKKyAgICAgICAgICAgIHRoaXMuX25vZGVTdHlsZXMuY29tcHV0ZWRTdHlsZS5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uLkV2ZW50LlByb3Bl cnRpZXNDaGFuZ2VkLCB0aGlzLl9yZWZyZXNoLCB0aGlzKTsKIAogICAgICAgICB0aGlzLl9yZWZy ZXNoKCk7CiAgICAgfQpAQCAtNjcsNyArNzIsNyBAQCBXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRh aWxzU2VjdGlvblJvdyA9IGNsYXNzIEJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cgZXh0ZW5kcwog CiAgICAgX2dldEJveChjb21wdXRlZFN0eWxlLCBjb21wb25lbnROYW1lKQogICAgIHsKLSAgICAg ICAgdmFyIHN1ZmZpeCA9IGNvbXBvbmVudE5hbWUgPT09ICJib3JkZXIiID8gIi13aWR0aCIgOiAi IjsKKyAgICAgICAgdmFyIHN1ZmZpeCA9IHRoaXMuX2dldENvbXBvbmVudFN1ZmZpeChjb21wb25l bnROYW1lKTsKICAgICAgICAgdmFyIGxlZnQgPSB0aGlzLl9nZXRQcm9wZXJ0eVZhbHVlQXNQeChj b21wdXRlZFN0eWxlLCBjb21wb25lbnROYW1lICsgIi1sZWZ0IiArIHN1ZmZpeCk7CiAgICAgICAg IHZhciB0b3AgPSB0aGlzLl9nZXRQcm9wZXJ0eVZhbHVlQXNQeChjb21wdXRlZFN0eWxlLCBjb21w b25lbnROYW1lICsgIi10b3AiICsgc3VmZml4KTsKICAgICAgICAgdmFyIHJpZ2h0ID0gdGhpcy5f Z2V0UHJvcGVydHlWYWx1ZUFzUHgoY29tcHV0ZWRTdHlsZSwgY29tcG9uZW50TmFtZSArICItcmln aHQiICsgc3VmZml4KTsKQEAgLTc1LDYgKzgwLDExIEBAIFdlYkluc3BlY3Rvci5Cb3hNb2RlbERl dGFpbHNTZWN0aW9uUm93ID0gY2xhc3MgQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdyBleHRlbmRz CiAgICAgICAgIHJldHVybiB7bGVmdCwgdG9wLCByaWdodCwgYm90dG9tfTsKICAgICB9CiAKKyAg ICBfZ2V0Q29tcG9uZW50U3VmZml4KGNvbXBvbmVudE5hbWUpCisgICAgeworICAgICAgICByZXR1 cm4gY29tcG9uZW50TmFtZSA9PT0gImJvcmRlciIgPyAiLXdpZHRoIiA6ICIiOworICAgIH0KKwog ICAgIF9oaWdobGlnaHRET01Ob2RlKHNob3dIaWdobGlnaHQsIG1vZGUsIGV2ZW50KQogICAgIHsK ICAgICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CkBAIC0xMDMsMTMgKzExMywxMCBAQCBX ZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdyA9IGNsYXNzIEJveE1vZGVsRGV0 YWlsc1NlY3Rpb25Sb3cgZXh0ZW5kcwogCiAgICAgX3VwZGF0ZU1ldHJpY3MoKQogICAgIHsKLSAg ICAgICAgLy8gVXBkYXRpbmcgd2l0aCBjb21wdXRlZCBzdHlsZS4KICAgICAgICAgdmFyIG1ldHJp Y3NFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0KLSAgICAgICAgdmFy IHNlbGYgPSB0aGlzOwogICAgICAgICB2YXIgc3R5bGUgPSB0aGlzLl9ub2RlU3R5bGVzLmNvbXB1 dGVkU3R5bGU7CiAKLSAgICAgICAgZnVuY3Rpb24gY3JlYXRlRWxlbWVudCh0eXBlLCB2YWx1ZSwg bmFtZSwgcHJvcGVydHlOYW1lLCBzdHlsZSkKKyAgICAgICAgZnVuY3Rpb24gY3JlYXRlVmFsdWVF bGVtZW50KHR5cGUsIHZhbHVlLCBuYW1lLCBwcm9wZXJ0eU5hbWUpCiAgICAgICAgIHsKICAgICAg ICAgICAgIC8vIENoZWNrIGlmIHRoZSB2YWx1ZSBpcyBhIGZsb2F0IGFuZCB3aGV0aGVyIGl0IHNo b3VsZCBiZSByb3VuZGVkLgogICAgICAgICAgICAgbGV0IGZsb2F0VmFsdWUgPSBwYXJzZUZsb2F0 KHZhbHVlKTsKQEAgLTEyNiw4ICsxMzMsOSBAQCBXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRhaWxz U2VjdGlvblJvdyA9IGNsYXNzIEJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cgZXh0ZW5kcwogICAg ICAgICAgICAgcmV0dXJuIGVsZW1lbnQ7CiAgICAgICAgIH0KIAotICAgICAgICBmdW5jdGlvbiBj cmVhdGVCb3hQYXJ0RWxlbWVudChzdHlsZSwgbmFtZSwgc2lkZSwgc3VmZml4KQorICAgICAgICBm dW5jdGlvbiBjcmVhdGVCb3hQYXJ0RWxlbWVudChuYW1lLCBzaWRlKQogICAgICAgICB7CisgICAg ICAgICAgICBsZXQgc3VmZml4ID0gdGhpcy5fZ2V0Q29tcG9uZW50U3VmZml4KG5hbWUpOwogICAg ICAgICAgICAgbGV0IHByb3BlcnR5TmFtZSA9IChuYW1lICE9PSAicG9zaXRpb24iID8gbmFtZSAr ICItIiA6ICIiKSArIHNpZGUgKyBzdWZmaXg7CiAgICAgICAgICAgICBsZXQgdmFsdWUgPSBzdHls ZS5wcm9wZXJ0eUZvck5hbWUocHJvcGVydHlOYW1lKS52YWx1ZTsKICAgICAgICAgICAgIGlmICh2 YWx1ZSA9PT0gIiIgfHwgKG5hbWUgIT09ICJwb3NpdGlvbiIgJiYgdmFsdWUgPT09ICIwcHgiKSB8 fCAobmFtZSA9PT0gInBvc2l0aW9uIiAmJiB2YWx1ZSA9PT0gImF1dG8iKSkKQEAgLTEzNSwzNSAr MTQzLDI1IEBAIFdlYkluc3BlY3Rvci5Cb3hNb2RlbERldGFpbHNTZWN0aW9uUm93ID0gY2xhc3Mg Qm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdyBleHRlbmRzCiAgICAgICAgICAgICBlbHNlCiAgICAg ICAgICAgICAgICAgdmFsdWUgPSB2YWx1ZS5yZXBsYWNlKC9weCQvLCAiIik7CiAKLSAgICAgICAg ICAgIGxldCBlbGVtZW50ID0gY3JlYXRlRWxlbWVudC5jYWxsKHRoaXMsICJkaXYiLCB2YWx1ZSwg bmFtZSwgcHJvcGVydHlOYW1lLCBzdHlsZSk7CisgICAgICAgICAgICBsZXQgZWxlbWVudCA9IGNy ZWF0ZVZhbHVlRWxlbWVudC5jYWxsKHRoaXMsICJkaXYiLCB2YWx1ZSwgbmFtZSwgcHJvcGVydHlO YW1lKTsKICAgICAgICAgICAgIGVsZW1lbnQuY2xhc3NOYW1lID0gc2lkZTsKICAgICAgICAgICAg IHJldHVybiBlbGVtZW50OwogICAgICAgICB9CiAKLSAgICAgICAgZnVuY3Rpb24gY3JlYXRlQ29u dGVudEFyZWFXaWR0aEVsZW1lbnQoc3R5bGUpCisgICAgICAgIGZ1bmN0aW9uIGNyZWF0ZUNvbnRl bnRBcmVhRWxlbWVudChuYW1lKQogICAgICAgICB7Ci0gICAgICAgICAgICB2YXIgd2lkdGggPSBz dHlsZS5wcm9wZXJ0eUZvck5hbWUoIndpZHRoIikudmFsdWUucmVwbGFjZSgvcHgkLywgIiIpOwot ICAgICAgICAgICAgaWYgKHN0eWxlLnByb3BlcnR5Rm9yTmFtZSgiYm94LXNpemluZyIpLnZhbHVl ID09PSAiYm9yZGVyLWJveCIpIHsKLSAgICAgICAgICAgICAgICB2YXIgYm9yZGVyQm94ID0gc2Vs Zi5fZ2V0Qm94KHN0eWxlLCAiYm9yZGVyIik7Ci0gICAgICAgICAgICAgICAgdmFyIHBhZGRpbmdC b3ggPSBzZWxmLl9nZXRCb3goc3R5bGUsICJwYWRkaW5nIik7CisgICAgICAgICAgICBjb25zb2xl LmFzc2VydChuYW1lID09PSAid2lkdGgiIHx8IG5hbWUgPT09ICJoZWlnaHQiKTsKIAotICAgICAg ICAgICAgICAgIHdpZHRoID0gd2lkdGggLSBib3JkZXJCb3gubGVmdCAtIGJvcmRlckJveC5yaWdo dCAtIHBhZGRpbmdCb3gubGVmdCAtIHBhZGRpbmdCb3gucmlnaHQ7Ci0gICAgICAgICAgICB9Ci0K LSAgICAgICAgICAgIHJldHVybiBjcmVhdGVFbGVtZW50LmNhbGwodGhpcywgInNwYW4iLCB3aWR0 aCwgIndpZHRoIiwgIndpZHRoIiwgc3R5bGUpOwotICAgICAgICB9Ci0KLSAgICAgICAgZnVuY3Rp b24gY3JlYXRlQ29udGVudEFyZWFIZWlnaHRFbGVtZW50KHN0eWxlKQotICAgICAgICB7Ci0gICAg ICAgICAgICB2YXIgaGVpZ2h0ID0gc3R5bGUucHJvcGVydHlGb3JOYW1lKCJoZWlnaHQiKS52YWx1 ZS5yZXBsYWNlKC9weCQvLCAiIik7CisgICAgICAgICAgICBsZXQgc2l6ZSA9IHN0eWxlLnByb3Bl cnR5Rm9yTmFtZShuYW1lKS52YWx1ZS5yZXBsYWNlKC9weCQvLCAiIik7CiAgICAgICAgICAgICBp ZiAoc3R5bGUucHJvcGVydHlGb3JOYW1lKCJib3gtc2l6aW5nIikudmFsdWUgPT09ICJib3JkZXIt Ym94IikgewotICAgICAgICAgICAgICAgIHZhciBib3JkZXJCb3ggPSBzZWxmLl9nZXRCb3goc3R5 bGUsICJib3JkZXIiKTsKLSAgICAgICAgICAgICAgICB2YXIgcGFkZGluZ0JveCA9IHNlbGYuX2dl dEJveChzdHlsZSwgInBhZGRpbmciKTsKKyAgICAgICAgICAgICAgICBsZXQgYm9yZGVyQm94ID0g dGhpcy5fZ2V0Qm94KHN0eWxlLCAiYm9yZGVyIik7CisgICAgICAgICAgICAgICAgbGV0IHBhZGRp bmdCb3ggPSB0aGlzLl9nZXRCb3goc3R5bGUsICJwYWRkaW5nIik7CiAKLSAgICAgICAgICAgICAg ICBoZWlnaHQgPSBoZWlnaHQgLSBib3JkZXJCb3gudG9wIC0gYm9yZGVyQm94LmJvdHRvbSAtIHBh ZGRpbmdCb3gudG9wIC0gcGFkZGluZ0JveC5ib3R0b207CisgICAgICAgICAgICAgICAgbGV0IFtz aWRlLCBvcHBvc2l0ZVNpZGVdID0gbmFtZSA9PT0gIndpZHRoIiA/IFsibGVmdCIsICJyaWdodCJd IDogWyJ0b3AiLCAiYm90dG9tIl07CisgICAgICAgICAgICAgICAgc2l6ZSA9IHNpemUgLSBib3Jk ZXJCb3hbc2lkZV0gLSBib3JkZXJCb3hbb3Bwb3NpdGVTaWRlXSAtIHBhZGRpbmdCb3hbc2lkZV0g LSBwYWRkaW5nQm94W29wcG9zaXRlU2lkZV07CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAg IHJldHVybiBjcmVhdGVFbGVtZW50LmNhbGwodGhpcywgInNwYW4iLCBoZWlnaHQsICJoZWlnaHQi LCAiaGVpZ2h0Iiwgc3R5bGUpOworICAgICAgICAgICAgcmV0dXJuIGNyZWF0ZVZhbHVlRWxlbWVu dC5jYWxsKHRoaXMsICJzcGFuIiwgc2l6ZSwgbmFtZSwgbmFtZSk7CiAgICAgICAgIH0KIAogICAg ICAgICAvLyBEaXNwbGF5IHR5cGVzIGZvciB3aGljaCBtYXJnaW4gaXMgaWdub3JlZC4KQEAgLTE5 Myw3ICsxOTEsNiBAQCBXZWJJbnNwZWN0b3IuQm94TW9kZWxEZXRhaWxzU2VjdGlvblJvdyA9IGNs YXNzIEJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cgZXh0ZW5kcwogICAgICAgICB9OwogCiAgICAg ICAgIHRoaXMuX2JveEVsZW1lbnRzID0gW107Ci0gICAgICAgIHZhciBib3hlcyA9IFsiY29udGVu dCIsICJwYWRkaW5nIiwgImJvcmRlciIsICJtYXJnaW4iLCAicG9zaXRpb24iXTsKIAogICAgICAg ICBpZiAoIXN0eWxlLmhhc1Byb3BlcnRpZXMoKSkgewogICAgICAgICAgICAgdGhpcy5zaG93RW1w dHlNZXNzYWdlKCk7CkBAIC0yMDEsOSArMTk4LDcgQEAgV2ViSW5zcGVjdG9yLkJveE1vZGVsRGV0 YWlsc1NlY3Rpb25Sb3cgPSBjbGFzcyBCb3hNb2RlbERldGFpbHNTZWN0aW9uUm93IGV4dGVuZHMK ICAgICAgICAgfQogCiAgICAgICAgIHZhciBwcmV2aW91c0JveCA9IG51bGw7Ci0gICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgYm94ZXMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciBu YW1lID0gYm94ZXNbaV07Ci0KKyAgICAgICAgZm9yIChsZXQgbmFtZSBvZiBbImNvbnRlbnQiLCAi cGFkZGluZyIsICJib3JkZXIiLCAibWFyZ2luIiwgInBvc2l0aW9uIl0pIHsKICAgICAgICAgICAg IGlmIChuYW1lID09PSAibWFyZ2luIiAmJiBub01hcmdpbkRpc3BsYXlUeXBlW3N0eWxlLnByb3Bl cnR5Rm9yTmFtZSgiZGlzcGxheSIpLnZhbHVlXSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgICAgIGlmIChuYW1lID09PSAicGFkZGluZyIgJiYgbm9QYWRkaW5nRGlzcGxheVR5 cGVbc3R5bGUucHJvcGVydHlGb3JOYW1lKCJkaXNwbGF5IikudmFsdWVdKQpAQCAtMjE4LDI3ICsy MTMsMjUgQEAgV2ViSW5zcGVjdG9yLkJveE1vZGVsRGV0YWlsc1NlY3Rpb25Sb3cgPSBjbGFzcyBC b3hNb2RlbERldGFpbHNTZWN0aW9uUm93IGV4dGVuZHMKICAgICAgICAgICAgIHRoaXMuX2JveEVs ZW1lbnRzLnB1c2goYm94RWxlbWVudCk7CiAKICAgICAgICAgICAgIGlmIChuYW1lID09PSAiY29u dGVudCIpIHsKLSAgICAgICAgICAgICAgICB2YXIgd2lkdGhFbGVtZW50ID0gY3JlYXRlQ29udGVu dEFyZWFXaWR0aEVsZW1lbnQuY2FsbCh0aGlzLCBzdHlsZSk7Ci0gICAgICAgICAgICAgICAgdmFy IGhlaWdodEVsZW1lbnQgPSBjcmVhdGVDb250ZW50QXJlYUhlaWdodEVsZW1lbnQuY2FsbCh0aGlz LCBzdHlsZSk7CisgICAgICAgICAgICAgICAgbGV0IHdpZHRoRWxlbWVudCA9IGNyZWF0ZUNvbnRl bnRBcmVhRWxlbWVudC5jYWxsKHRoaXMsICJ3aWR0aCIpOworICAgICAgICAgICAgICAgIGxldCBo ZWlnaHRFbGVtZW50ID0gY3JlYXRlQ29udGVudEFyZWFFbGVtZW50LmNhbGwodGhpcywgImhlaWdo dCIpOwogICAgICAgICAgICAgICAgIGJveEVsZW1lbnQuYXBwZW5kKHdpZHRoRWxlbWVudCwgIiBc dTAwRDcgIiwgaGVpZ2h0RWxlbWVudCk7CiAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgICAgIHZhciBzdWZmaXggPSBuYW1lID09PSAiYm9yZGVyIiA/ICItd2lkdGgiIDogIiI7Ci0K ICAgICAgICAgICAgICAgICB2YXIgbGFiZWxFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CiAgICAgICAgICAgICAgICAgbGFiZWxFbGVtZW50LmNsYXNzTmFtZSA9ICJsYWJl bCI7Ci0gICAgICAgICAgICAgICAgbGFiZWxFbGVtZW50LnRleHRDb250ZW50ID0gYm94ZXNbaV07 CisgICAgICAgICAgICAgICAgbGFiZWxFbGVtZW50LnRleHRDb250ZW50ID0gbmFtZTsKICAgICAg ICAgICAgICAgICBib3hFbGVtZW50LmFwcGVuZENoaWxkKGxhYmVsRWxlbWVudCk7CiAKLSAgICAg ICAgICAgICAgICBib3hFbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZUJveFBhcnRFbGVtZW50LmNh bGwodGhpcywgc3R5bGUsIG5hbWUsICJ0b3AiLCBzdWZmaXgpKTsKKyAgICAgICAgICAgICAgICBi b3hFbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0ZUJveFBhcnRFbGVtZW50LmNhbGwodGhpcywgbmFt ZSwgInRvcCIpKTsKICAgICAgICAgICAgICAgICBib3hFbGVtZW50LmFwcGVuZENoaWxkKGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoImJyIikpOwotICAgICAgICAgICAgICAgIGJveEVsZW1lbnQuYXBw ZW5kQ2hpbGQoY3JlYXRlQm94UGFydEVsZW1lbnQuY2FsbCh0aGlzLCBzdHlsZSwgbmFtZSwgImxl ZnQiLCBzdWZmaXgpKTsKKyAgICAgICAgICAgICAgICBib3hFbGVtZW50LmFwcGVuZENoaWxkKGNy ZWF0ZUJveFBhcnRFbGVtZW50LmNhbGwodGhpcywgbmFtZSwgImxlZnQiKSk7CiAKICAgICAgICAg ICAgICAgICBpZiAocHJldmlvdXNCb3gpCiAgICAgICAgICAgICAgICAgICAgIGJveEVsZW1lbnQu YXBwZW5kQ2hpbGQocHJldmlvdXNCb3gpOwogCi0gICAgICAgICAgICAgICAgYm94RWxlbWVudC5h cHBlbmRDaGlsZChjcmVhdGVCb3hQYXJ0RWxlbWVudC5jYWxsKHRoaXMsIHN0eWxlLCBuYW1lLCAi cmlnaHQiLCBzdWZmaXgpKTsKKyAgICAgICAgICAgICAgICBib3hFbGVtZW50LmFwcGVuZENoaWxk KGNyZWF0ZUJveFBhcnRFbGVtZW50LmNhbGwodGhpcywgbmFtZSwgInJpZ2h0IikpOwogICAgICAg ICAgICAgICAgIGJveEVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi YnIiKSk7Ci0gICAgICAgICAgICAgICAgYm94RWxlbWVudC5hcHBlbmRDaGlsZChjcmVhdGVCb3hQ YXJ0RWxlbWVudC5jYWxsKHRoaXMsIHN0eWxlLCBuYW1lLCAiYm90dG9tIiwgc3VmZml4KSk7Cisg ICAgICAgICAgICAgICAgYm94RWxlbWVudC5hcHBlbmRDaGlsZChjcmVhdGVCb3hQYXJ0RWxlbWVu dC5jYWxsKHRoaXMsIG5hbWUsICJib3R0b20iKSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAg ICAgIHByZXZpb3VzQm94ID0gYm94RWxlbWVudDsK