222171 2021-02-19 07:50:50 -0800 Web Inspector: Remove settings UI for CSS Grid overlay 2021-03-01 07:11:55 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED WONTFIX InRadar P2 Normal --- 221556 1 rcaliman rcaliman ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1731332 0 rcaliman 2021-02-19 07:50:50 -0800 This is essentially reverting changes added in Bug 221556. After demo to internal audience, we were prompted to rethink how to expose grid overlay settings to users in such a way as to not overwhelm them. 1731336 1 420967 rcaliman 2021-02-19 07:57:33 -0800 Created attachment 420967 Patch 1733757 2 webkit-bug-importer 2021-02-26 07:51:12 -0800 <rdar://problem/74790076> 1734405 3 rcaliman 2021-03-01 07:11:55 -0800 We're keeping grid overlay settings. 420967 2021-02-19 07:57:33 -0800 2021-02-19 09:35:43 -0800 Patch bug-222171-20210219165732.patch text/plain 11486 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDBmNDJmMTFlYzA5Y2NkNDVkZjM1YWE5ZWFhZjll MDg1YmRkYWE1NDMuLmNiZWI1MzBhOGE3Zjg3YzQ0M2NmNzk0ZjI4ZmUxNDM2NDk2ZWE2NzggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAyLTE5ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZW1vdmUgc2V0dGluZ3MgVUkgZm9yIENTUyBHcmlkIG92ZXJsYXkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjE3MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBzZXR0aW5ncyBVSSB0byBj b25maWd1cmUgQ1NTIGdyaWQgb3ZlcmxheXMuCisgICAgICAgIERlZmF1bHQgYWxsIG9wdGlvbnMg dG8gdHJ1ZSBzbyB0aGF0LCBpZiBsaW5lIG5hbWVzIG9yIGFyZWEgbmFtZXMgYXJlIGRlZmluZWQs CisgICAgICAgIHRoZXkgd2lsbCBiZSBzaG93biBpbiB0aGUgb3ZlcmxheSBieSBkZWZhdWx0Lgor CisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvT3ZlcmxheU1hbmFnZXIuanM6CisgICAgICAgIChXSS5PdmVy bGF5TWFuYWdlcik6CisgICAgICAgIChXSS5PdmVybGF5TWFuYWdlci5wcm90b3R5cGUuc2hvd0dy aWRPdmVybGF5KToKKyAgICAgICAgKFdJLk92ZXJsYXlNYW5hZ2VyLnByb3RvdHlwZS5faGFuZGxl TGF5b3V0Q29udGV4dFR5cGVDaGFuZ2VkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0NTU0dyaWRTZWN0aW9uLmNzczoKKyAgICAgICAgKC5jc3MtZ3JpZC1zZWN0aW9uIC5ub2RlLWxp bmspOgorICAgICAgICAoLmNzcy1ncmlkLXNlY3Rpb24gLmhlYWRpbmcpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvQ1NTR3JpZFNlY3Rpb24uanM6CisgICAgICAgIChXSS5DU1NHcmlk U2VjdGlvbi5wcm90b3R5cGUuaW5pdGlhbExheW91dCk6CisKIDIwMjEtMDItMTggIE5pa2l0YSBW YXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog RWxlbWVudHM6IHNob3cgYmFkZ2VzIGZvciBDU1MgR3JpZCBjb250YWluZXIgZWxlbWVudHMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xv Y2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9l bi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGEyMDM2OThkNDQ5MjFkYzc3MTYzZmM2 MTQ1ODJhMDc0NmM3NDU4YWUuLmQ1MjIyOWUzNzZhMGZhMGU3N2Q4MTJiNTZlNTU1YWYwYzI4NmRl MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtMTAzMyw4ICsxMDMzLDYg QEAgbG9jYWxpemVkU3RyaW5nc1siUERGIl0gPSAiUERGIjsKIGxvY2FsaXplZFN0cmluZ3NbIlBO RyJdID0gIlBORyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYWdlIl0gPSAiUGFnZSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJQYWdlIElzc3VlIl0gPSAiUGFnZSBJc3N1ZSI7Ci0vKiBIZWFkaW5nIGZvciBs aXN0IG9mIGdyaWQgb3ZlcmxheSBzZXR0aW5ncyAqLwotbG9jYWxpemVkU3RyaW5nc1siUGFnZSBP dmVybGF5IFNldHRpbmdzIEAgTGF5b3V0IFBhbmVsIFNlY3Rpb24gSGVhZGVyIl0gPSAiR3JpZCBP dmVybGF5IFNldHRpbmdzIjsKIC8qIEhlYWRpbmcgZm9yIGxpc3Qgb2YgZ3JpZCBub2RlcyAqLwog bG9jYWxpemVkU3RyaW5nc1siUGFnZSBPdmVybGF5cyBAIExheW91dCBTaWRlYmFyIFNlY3Rpb24g SGVhZGVyIl0gPSAiR3JpZCBPdmVybGF5cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJQYWdlIG5hdmln YXRlZCBhdCAlcyJdID0gIlBhZ2UgbmF2aWdhdGVkIGF0ICVzIjsKQEAgLTEzMTUsMjggKzEzMTMs MTggQEAgbG9jYWxpemVkU3RyaW5nc1siU2hvdyBSZW1haW5pbmcgKCVkKSJdID0gIlNob3cgUmVt YWluaW5nICglZCkiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBTY29wZSBDaGFpbiBvbiBwYXVz ZSJdID0gIlNob3cgU2NvcGUgQ2hhaW4gb24gcGF1c2UiOwogbG9jYWxpemVkU3RyaW5nc1siU2hv dyBhbGwgYWN0aW9ucyJdID0gIlNob3cgYWxsIGFjdGlvbnMiOwogbG9jYWxpemVkU3RyaW5nc1si U2hvdyBhbGwgcmVzb3VyY2VzIl0gPSAiU2hvdyBhbGwgcmVzb3VyY2VzIjsKLS8qIExhYmVsIGZv ciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBhcmVhIG5hbWVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92 ZXJsYXlzICovCi1sb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGFyZWEgbmFtZXMgQCBMYXllcnMgUGFu ZWwgR3JpZCBPdmVybGF5IFNldHRpbmciXSA9ICJTaG93IGFyZWEgbmFtZXMiOwogbG9jYWxpemVk U3RyaW5nc1siU2hvdyBjb21wb3NpdGluZyBib3JkZXJzIl0gPSAiU2hvdyBjb21wb3NpdGluZyBi b3JkZXJzIjsKLS8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBleHRlbmRlZCBsaW5l cyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyAqLwotbG9jYWxpemVkU3RyaW5nc1siU2hv dyBleHRlbmRlZCBsaW5lcyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkgU2V0dGluZyJdID0g IlNob3cgZXh0ZW5kZWQgbGluZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBmdWxsIGNlcnRp ZmljYXRlIl0gPSAiU2hvdyBmdWxsIGNlcnRpZmljYXRlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNo b3cgaGlkZGVuIHRhYnMiXSA9ICJTaG93IGhpZGRlbiB0YWJzIjsKIC8qIFNldHRpbmdzIHRhYiBj aGVja2JveCBsYWJlbCBmb3Igd2hldGhlciB0aGUgaW5kZXBlbmRlbnQgc3R5bGVzIHNpZGViYXIg c2hvdWxkIGJlIHNob3duICovCiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGluZGVwZW5kZW50IFN0 eWxlcyBzaWRlYmFyIEAgU2V0dGluZ3MgRWxlbWVudHMgUGFuZSJdID0gIlNob3cgaW5kZXBlbmRl bnQgU3R5bGVzIHNpZGViYXIiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBqdW1wIHRvIGVmZmVj dGl2ZSBwcm9wZXJ0eSBidXR0b24iXSA9ICJTaG93IGp1bXAgdG8gZWZmZWN0aXZlIHByb3BlcnR5 IGJ1dHRvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IGp1bXAgdG8gdmFyaWFibGUgZGVjbGFy YXRpb24gYnV0dG9uIl0gPSAiU2hvdyBqdW1wIHRvIHZhcmlhYmxlIGRlY2xhcmF0aW9uIGJ1dHRv biI7Ci0vKiBMYWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBuYW1lcyBzZXR0aW5n IGZvciBDU1MgZ3JpZCBvdmVybGF5cyAqLwotbG9jYWxpemVkU3RyaW5nc1siU2hvdyBsaW5lIG5h bWVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAiU2hvdyBsaW5lIG5h bWVzIjsKLS8qIExhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBsaW5lIG51bWJlcnMgc2V0 dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMgKi8KLWxvY2FsaXplZFN0cmluZ3NbIlNob3cgbGlu ZSBudW1iZXJzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIl0gPSAiU2hvdyBs aW5lIG51bWJlcnMiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBvbmx5IGZvciBzZWxlY3RlZCBu b2RlIl0gPSAiU2hvdyBvbmx5IGZvciBzZWxlY3RlZCBub2RlIjsKIGxvY2FsaXplZFN0cmluZ3Nb IlNob3cgcGFnZSBydWxlcnMgYW5kIG5vZGUgYm9yZGVyIGxpbmVzIl0gPSAiU2hvdyBwYWdlIHJ1 bGVycyBhbmQgbm9kZSBib3JkZXIgbGluZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBydWxl cnMiXSA9ICJTaG93IHJ1bGVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IHRoZSBkZXRhaWxz IHNpZGViYXIgKCVzKSJdID0gIlNob3cgdGhlIGRldGFpbHMgc2lkZWJhciAoJXMpIjsKIGxvY2Fs aXplZFN0cmluZ3NbIlNob3cgdGhlIG5hdmlnYXRpb24gc2lkZWJhciAoJXMpIl0gPSAiU2hvdyB0 aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiOwotLyogTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dn bGUgdGhlIHRyYWNrIHNpemVzIHNldHRpbmcgZm9yIENTUyBncmlkIG92ZXJsYXlzICovCi1sb2Nh bGl6ZWRTdHJpbmdzWyJTaG93IHRyYWNrIHNpemVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3Zlcmxh eSBTZXR0aW5nIl0gPSAiU2hvdyB0cmFjayBzaXplcyI7CiAvKiBTZXR0aW5ncyB0YWIgY2hlY2ti b3ggbGFiZWwgZm9yIHdoZXRoZXIgdGhlIHRyYW5zcGFyZW5jeSBncmlkIGlzIHNob3duIGJ5IGRl ZmF1bHQgKi8KIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQgKHNldHRp bmdzIGxhYmVsKSJdID0gIlNob3cgdHJhbnNwYXJlbmN5IGdyaWQiOwogLyogVG9vbHRpcCBmb3Ig c2hvd2luZyB0aGUgY2hlY2tlcmVkIHRyYW5zcGFyZW5jeSBncmlkIHVuZGVyIGltYWdlcyBhbmQg Y2FudmFzZXMgKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0Jhc2UvU2V0dGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvU2V0dGluZy5qcwppbmRleCA1ZjM3ZDkzNzM4ZDUzOTJlYmM5YjVlZDgzMmI1NzU3ODM2 OThlZjA1Li43YWNlZTBlMjM3MmFlOGE1Zjk3ZjRkN2VlMGU4N2JkMDM1OTcxZjU0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpz CkBAIC0xOTcsMTEgKzE5Nyw2IEBAIFdJLnNldHRpbmdzID0gewogICAgIGVuYWJsZUVsZW1lbnRz VGFiSW5kZXBlbmRlbnRTdHlsZXNEZXRhaWxzU2lkZWJhclBhbmVsOiBuZXcgV0kuU2V0dGluZygi ZWxlbWVudHMtdGFiLWluZGVwZW5kZW50LXN0eWxlcy1kZXRhaWxzLXBhbmVsIiwgdHJ1ZSksCiAg ICAgZW5hYmxlTGluZVdyYXBwaW5nOiBuZXcgV0kuU2V0dGluZygiZW5hYmxlLWxpbmUtd3JhcHBp bmciLCB0cnVlKSwKICAgICBmcm9udGVuZEFwcGVhcmFuY2U6IG5ldyBXSS5TZXR0aW5nKCJmcm9u dGVuZC1hcHBlYXJhbmNlIiwgInN5c3RlbSIpLAotICAgIGdyaWRPdmVybGF5U2hvd0FyZWFOYW1l czogbmV3IFdJLlNldHRpbmcoImdyaWQtb3ZlcmxheS1zaG93LWFyZWEtbmFtZXMiLCBmYWxzZSks Ci0gICAgZ3JpZE92ZXJsYXlTaG93RXh0ZW5kZWRHcmlkTGluZXM6IG5ldyBXSS5TZXR0aW5nKCJn cmlkLW92ZXJsYXktc2hvdy1leHRlbmRlZC1ncmlkLWxpbmVzIiwgZmFsc2UpLAotICAgIGdyaWRP dmVybGF5U2hvd0xpbmVOYW1lczogbmV3IFdJLlNldHRpbmcoImdyaWQtb3ZlcmxheS1zaG93LWxp bmUtbmFtZXMiLCBmYWxzZSksCi0gICAgZ3JpZE92ZXJsYXlTaG93TGluZU51bWJlcnM6IG5ldyBX SS5TZXR0aW5nKCJncmlkLW92ZXJsYXktc2hvdy1saW5lLW51bWJlcnMiLCBmYWxzZSksCi0gICAg Z3JpZE92ZXJsYXlTaG93VHJhY2tTaXplczogbmV3IFdJLlNldHRpbmcoImdyaWQtb3ZlcmxheS1z aG93LXRyYWNrLXNpemVzIiwgZmFsc2UpLAogICAgIGdyb3VwTWVkaWFSZXF1ZXN0c0J5RE9NTm9k ZTogbmV3IFdJLlNldHRpbmcoImdyb3VwLW1lZGlhLXJlcXVlc3RzLWJ5LWRvbS1ub2RlIiwgV0ku U2V0dGluZy5taWdyYXRlVmFsdWUoImdyb3VwLWJ5LWRvbS1ub2RlIikgfHwgZmFsc2UpLAogICAg IGluZGVudFVuaXQ6IG5ldyBXSS5TZXR0aW5nKCJpbmRlbnQtdW5pdCIsIDQpLAogICAgIGluZGVu dFdpdGhUYWJzOiBuZXcgV0kuU2V0dGluZygiaW5kZW50LXdpdGgtdGFicyIsIGZhbHNlKSwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L092ZXJsYXlNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Q29udHJvbGxlcnMvT3ZlcmxheU1hbmFnZXIuanMKaW5kZXggNDc2Zjc3ZTMwMmIxM2Q0MmIxNzIy YTZjNzAxYWViNGU1YzhjOGM1Yy4uMTFhNWU4ZTY3OWY0ZTY5YjQ2YjlmN2E2ZWZhZTY1ZDhiZDEz Zjk2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvT3ZlcmxheU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvT3ZlcmxheU1hbmFnZXIuanMKQEAgLTMwLDEyICszMCw2 IEBAIFdJLk92ZXJsYXlNYW5hZ2VyID0gY2xhc3MgT3ZlcmxheU1hbmFnZXIgZXh0ZW5kcyBXSS5P YmplY3QKICAgICAgICAgc3VwZXIoKTsKIAogICAgICAgICB0aGlzLl9ncmlkT3ZlcmxheUZvck5v ZGVNYXAgPSBuZXcgTWFwOwotCi0gICAgICAgIFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd0V4 dGVuZGVkR3JpZExpbmVzLmFkZEV2ZW50TGlzdGVuZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2Vk LCB0aGlzLl9oYW5kbGVHcmlkU2V0dGluZ0NoYW5nZWQsIHRoaXMpOwotICAgICAgICBXSS5zZXR0 aW5ncy5ncmlkT3ZlcmxheVNob3dMaW5lTmFtZXMuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5n LkV2ZW50LkNoYW5nZWQsIHRoaXMuX2hhbmRsZUdyaWRTZXR0aW5nQ2hhbmdlZCwgdGhpcyk7Ci0g ICAgICAgIFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd0xpbmVOdW1iZXJzLmFkZEV2ZW50TGlz dGVuZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCB0aGlzLl9oYW5kbGVHcmlkU2V0dGluZ0No YW5nZWQsIHRoaXMpOwotICAgICAgICBXSS5zZXR0aW5ncy5ncmlkT3ZlcmxheVNob3dUcmFja1Np emVzLmFkZEV2ZW50TGlzdGVuZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCB0aGlzLl9oYW5k bGVHcmlkU2V0dGluZ0NoYW5nZWQsIHRoaXMpOwotICAgICAgICBXSS5zZXR0aW5ncy5ncmlkT3Zl cmxheVNob3dBcmVhTmFtZXMuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5n ZWQsIHRoaXMuX2hhbmRsZUdyaWRTZXR0aW5nQ2hhbmdlZCwgdGhpcyk7CiAgICAgfQogCiAgICAg Ly8gUHVibGljCkBAIC02MSwxMSArNTUsMTEgQEAgV0kuT3ZlcmxheU1hbmFnZXIgPSBjbGFzcyBP dmVybGF5TWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBsZXQgY29tbWFuZEFyZ3Vt ZW50cyA9IHsKICAgICAgICAgICAgIG5vZGVJZDogZG9tTm9kZS5pZCwKICAgICAgICAgICAgIGdy aWRDb2xvcjogY29sb3IudG9Qcm90b2NvbCgpLAotICAgICAgICAgICAgc2hvd0xpbmVOYW1lczog V0kuc2V0dGluZ3MuZ3JpZE92ZXJsYXlTaG93TGluZU5hbWVzLnZhbHVlLAotICAgICAgICAgICAg c2hvd0xpbmVOdW1iZXJzOiBXSS5zZXR0aW5ncy5ncmlkT3ZlcmxheVNob3dMaW5lTnVtYmVycy52 YWx1ZSwKLSAgICAgICAgICAgIHNob3dFeHRlbmRlZEdyaWRMaW5lczogV0kuc2V0dGluZ3MuZ3Jp ZE92ZXJsYXlTaG93RXh0ZW5kZWRHcmlkTGluZXMudmFsdWUsCi0gICAgICAgICAgICBzaG93VHJh Y2tTaXplczogV0kuc2V0dGluZ3MuZ3JpZE92ZXJsYXlTaG93VHJhY2tTaXplcy52YWx1ZSwKLSAg ICAgICAgICAgIHNob3dBcmVhTmFtZXM6IFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd0FyZWFO YW1lcy52YWx1ZSwKKyAgICAgICAgICAgIHNob3dMaW5lTmFtZXM6IHRydWUsCisgICAgICAgICAg ICBzaG93TGluZU51bWJlcnM6IHRydWUsCisgICAgICAgICAgICBzaG93RXh0ZW5kZWRHcmlkTGlu ZXM6IHRydWUsCisgICAgICAgICAgICBzaG93VHJhY2tTaXplczogdHJ1ZSwKKyAgICAgICAgICAg IHNob3dBcmVhTmFtZXM6IHRydWUsCiAgICAgICAgIH07CiAgICAgICAgIHRhcmdldC5ET01BZ2Vu dC5zaG93R3JpZE92ZXJsYXkuaW52b2tlKGNvbW1hbmRBcmd1bWVudHMpOwogCkBAIC0xMjEsMTQg KzExNSw2IEBAIFdJLk92ZXJsYXlNYW5hZ2VyID0gY2xhc3MgT3ZlcmxheU1hbmFnZXIgZXh0ZW5k cyBXSS5PYmplY3QKICAgICAgICAgbGV0IG92ZXJsYXkgPSB0aGlzLl9ncmlkT3ZlcmxheUZvck5v ZGVNYXAudGFrZShkb21Ob2RlKTsKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoV0kuT3ZlcmxheU1hbmFnZXIuRXZlbnQuR3JpZE92ZXJsYXlIaWRkZW4sIG92ZXJsYXkpOwog ICAgIH0KLQotICAgIF9oYW5kbGVHcmlkU2V0dGluZ0NoYW5nZWQoZXZlbnQpCi0gICAgewotICAg ICAgICBmb3IgKGxldCBbZG9tTm9kZSwgb3ZlcmxheV0gb2YgdGhpcy5fZ3JpZE92ZXJsYXlGb3JO b2RlTWFwKSB7Ci0gICAgICAgICAgICAvLyBSZWZyZXNoIGFsbCBzaG93biBvdmVybGF5cy4gTGF0 ZXN0IHNldHRpbmdzIHZhbHVlcyB3aWxsIGJlIHVzZWQuCi0gICAgICAgICAgICB0aGlzLnNob3dH cmlkT3ZlcmxheShkb21Ob2RlLCB7Y29sb3I6IG92ZXJsYXkuY29sb3J9KTsKLSAgICAgICAgfQot ICAgIH0KIH07CiAKIFdJLk92ZXJsYXlNYW5hZ2VyLkV2ZW50ID0gewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTR3JpZFNlY3Rpb24uY3Nz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTR3JpZFNlY3Rp b24uY3NzCmluZGV4IGE2YzI5NmM2MTE3MTk5NTM3ZDVjYmIwMTliMTI3NzFkZTViZmI2NWYuLjQy Mjk2ODE3OTZkZGY3N2U4MWI1OThlNTA4OTU4N2I5NTg2ZTJmMDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU0dyaWRTZWN0aW9uLmNzcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NHcmlkU2Vj dGlvbi5jc3MKQEAgLTIzLDEyICsyMywxMSBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgogICovCiAKLS5jc3MtZ3JpZC1zZWN0aW9uIC5ub2RlLWxpbmssCi0uY3NzLWdyaWQt c2VjdGlvbiAuZWRpdG9yLWdyb3VwID4gLmVkaXRvciA+IGxhYmVsIHsKKy5jc3MtZ3JpZC1zZWN0 aW9uIC5ub2RlLWxpbmsgewogICAgIG1hcmdpbi1pbmxpbmU6IDVweDsKIH0KIAotLmNzcy1ncmlk LXNlY3Rpb24gOmlzKC5oZWFkaW5nLCAudGl0bGUpIHsKKy5jc3MtZ3JpZC1zZWN0aW9uIC5oZWFk aW5nIHsKICAgICBmb250LXNpemU6IDExcHg7CiAgICAgbWFyZ2luLXRvcDogMTBweDsKICAgICBt YXJnaW4tYm90dG9tOiA1cHg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9DU1NHcmlkU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU0dyaWRTZWN0aW9uLmpzCmluZGV4IDg2ZDRlZDYxMTZi YzVmNjIwY2I1YjkyMjEwNmRiZTA1ODdmMGI3OTQuLmZlZjkxY2RlMzgxNzA4MzUxYTUwOGM5NTk1 ZWMzMzM5M2FlMjIzMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NTU0dyaWRTZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU0dyaWRTZWN0aW9uLmpzCkBAIC03MywxNSArNzMsNiBA QCBXSS5DU1NHcmlkU2VjdGlvbiA9IGNsYXNzIENTU0dyaWRTZWN0aW9uIGV4dGVuZHMgV0kuVmll dwogCiAgICAgICAgIHRoaXMuX2xpc3RFbGVtZW50ID0gdGhpcy5lbGVtZW50LmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInVsIikpOwogICAgICAgICB0aGlzLl9saXN0RWxlbWVu dC5jbGFzc0xpc3QuYWRkKCJub2RlLWxpbmstbGlzdCIpOwotCi0gICAgICAgIGxldCBzZXR0aW5n c0dyb3VwID0gbmV3IFdJLlNldHRpbmdzR3JvdXAoV0kuVUlTdHJpbmcoIkdyaWQgT3ZlcmxheSBT ZXR0aW5ncyIsICJQYWdlIE92ZXJsYXkgU2V0dGluZ3MgQCBMYXlvdXQgUGFuZWwgU2VjdGlvbiBI ZWFkZXIiLCAiSGVhZGluZyBmb3IgbGlzdCBvZiBncmlkIG92ZXJsYXkgc2V0dGluZ3MiKSk7Ci0g ICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmQoc2V0dGluZ3NHcm91cC5lbGVtZW50KTsKLQotICAg ICAgICBzZXR0aW5nc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZ3JpZE92ZXJsYXlTaG93 TGluZU51bWJlcnMsIFdJLlVJU3RyaW5nKCJTaG93IGxpbmUgbnVtYmVycyIsICJTaG93IGxpbmUg bnVtYmVycyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkgU2V0dGluZyIsICJMYWJlbCBmb3Ig b3B0aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBudW1iZXJzIHNldHRpbmcgZm9yIENTUyBncmlkIG92 ZXJsYXlzIikpOwotICAgICAgICBzZXR0aW5nc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3Mu Z3JpZE92ZXJsYXlTaG93TGluZU5hbWVzLCBXSS5VSVN0cmluZygiU2hvdyBsaW5lIG5hbWVzIiwg IlNob3cgbGluZSBuYW1lcyBAIExheWVycyBQYW5lbCBHcmlkIE92ZXJsYXkgU2V0dGluZyIsICJM YWJlbCBmb3Igb3B0aW9uIHRvIHRvZ2dsZSB0aGUgbGluZSBuYW1lcyBzZXR0aW5nIGZvciBDU1Mg Z3JpZCBvdmVybGF5cyIpKTsKLSAgICAgICAgc2V0dGluZ3NHcm91cC5hZGRTZXR0aW5nKFdJLnNl dHRpbmdzLmdyaWRPdmVybGF5U2hvd0V4dGVuZGVkR3JpZExpbmVzLCBXSS5VSVN0cmluZygiU2hv dyBleHRlbmRlZCBsaW5lcyIsICJTaG93IGV4dGVuZGVkIGxpbmVzIEAgTGF5ZXJzIFBhbmVsIEdy aWQgT3ZlcmxheSBTZXR0aW5nIiwgIkxhYmVsIGZvciBvcHRpb24gdG8gdG9nZ2xlIHRoZSBleHRl bmRlZCBsaW5lcyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5cyIpKTsKLSAgICAgICAgc2V0 dGluZ3NHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmdyaWRPdmVybGF5U2hvd0FyZWFOYW1l cywgV0kuVUlTdHJpbmcoIlNob3cgYXJlYSBuYW1lcyIsICJTaG93IGFyZWEgbmFtZXMgQCBMYXll cnMgUGFuZWwgR3JpZCBPdmVybGF5IFNldHRpbmciLCAiTGFiZWwgZm9yIG9wdGlvbiB0byB0b2dn bGUgdGhlIGFyZWEgbmFtZXMgc2V0dGluZyBmb3IgQ1NTIGdyaWQgb3ZlcmxheXMiKSk7Ci0gICAg ICAgIHNldHRpbmdzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5ncmlkT3ZlcmxheVNob3dU cmFja1NpemVzLCBXSS5VSVN0cmluZygiU2hvdyB0cmFjayBzaXplcyIsICJTaG93IHRyYWNrIHNp emVzIEAgTGF5ZXJzIFBhbmVsIEdyaWQgT3ZlcmxheSBTZXR0aW5nIiwgIkxhYmVsIGZvciBvcHRp b24gdG8gdG9nZ2xlIHRoZSB0cmFjayBzaXplcyBzZXR0aW5nIGZvciBDU1MgZ3JpZCBvdmVybGF5 cyIpKTsKICAgICB9CiAKICAgICBsYXlvdXQoKQo=