203917 2019-11-06 13:52:16 -0800 Web Inspector: Local Resource Overrides: automatically show a file picker when attempting to create an override for non-text resources 2019-11-07 12:19:16 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1587901 0 hi 2019-11-06 13:52:16 -0800 Since there's no way to edit non-text resources (e.g. images, fonts, etc.), we should instead ask for the user to upload a new file before creating the override. 1587906 1 382960 hi 2019-11-06 14:15:58 -0800 Created attachment 382960 Patch 1588342 2 382960 commit-queue 2019-11-07 12:18:06 -0800 Comment on attachment 382960 Patch Clearing flags on attachment: 382960 Committed r252200: <https://trac.webkit.org/changeset/252200> 1588343 3 commit-queue 2019-11-07 12:18:07 -0800 All reviewed patches have been landed. Closing bug. 1588345 4 webkit-bug-importer 2019-11-07 12:19:16 -0800 <rdar://problem/56992773> 382960 2019-11-06 14:15:58 -0800 2019-11-07 12:18:06 -0800 Patch bug-203917-20191106141557.patch text/plain 12088 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQ4MjRkOWM3ZWVjMzQ4MTk3ZmJmNGU0N2Q1MzVj NWNlMDE5Y2E3OGEuLmIxYTBkMmU0N2I0M2M2NDk4NGNhNGU0YTM5ZjA0NTJiMjE0NmEwNmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTExLTA2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBM b2NhbCBSZXNvdXJjZSBPdmVycmlkZXM6IGF1dG9tYXRpY2FsbHkgc2hvdyBhIGZpbGUgcGlja2Vy IHdoZW4gYXR0ZW1wdGluZyB0byBjcmVhdGUgYW4gb3ZlcnJpZGUgZm9yIG5vbi10ZXh0IHJlc291 cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAz OTE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2lu Y2UgdGhlcmUncyBubyB3YXkgdG8gZWRpdCBub24tdGV4dCByZXNvdXJjZXMgKGUuZy4gaW1hZ2Vz LCBmb250cywgZXRjLikgaW4gV2ViIEluc3BlY3RvciwKKyAgICAgICAgd2hlbiBjcmVhdGluZyBh IGxvY2FsIG92ZXJyaWRlIGZvciBub24tdGV4dCByZXNvdXJjZXMsIGRlZmF1bHQgdG8gc2hvd2lu ZyBhIGZpbGUgcGlja2VyIGFuZAorICAgICAgICBjcmVhdGluZyBhIGxvY2FsIG92ZXJyaWRlIGZy b20gdGhlIGNvbnRlbnQgYW5kIE1JTUUgdHlwZSBvZiB3aGF0ZXZlciBmaWxlIGlzIGNob3Nlbi4K KworICAgICAgICBTdGlsbCBwcm92aWRlIGEgd2F5IChzaGlmdC1jbGljaykgdG8gY3JlYXRlIGEg bG9jYWwgb3ZlcnJpZGUgZm9yIG5vbi10ZXh0IHJlc291cmNlcyBmcm9tIHRoZQorICAgICAgICBy ZXNvdXJjZSdzIGNvbnRlbnRzLCBhcyB0aGF0IGNhbiBiZSB1c2VmdWwgaWYgdGhlIHVzZXIganVz dCB3YW50cyB0byBjaGFuZ2Ugc29tZSBoZWFkZXJzLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9Nb2RlbHMvUmVzb3VyY2UuanM6CisgICAgICAgIChXSS5SZXNvdXJjZS5wcm90b3R5cGUuYXN5 bmMgY3JlYXRlTG9jYWxSZXNvdXJjZU92ZXJyaWRlKToKKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlJlc291cmNlQ29u dGVudFZpZXcpOgorICAgICAgICAoV0kuUmVzb3VyY2VDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0 IGNyZWF0ZUxvY2FsUmVzb3VyY2VPdmVycmlkZVRvb2x0aXApOiBBZGRlZC4KKyAgICAgICAgKFdJ LlJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLnJlcXVlc3RMb2NhbFJlc291cmNlT3ZlcnJp ZGVJbml0aWFsQ29udGVudCk6IEFkZGVkLgorICAgICAgICAoV0kuUmVzb3VyY2VDb250ZW50Vmll dy5wcm90b3R5cGUuYXN5bmMgX2dldENvbnRlbnRGb3JMb2NhbFJlc291cmNlT3ZlcnJpZGVGcm9t RmlsZSk6IEFkZGVkLgorICAgICAgICAoV0kuUmVzb3VyY2VDb250ZW50Vmlldy5wcm90b3R5cGUu X2hhbmRsZUNyZWF0ZUxvY2FsUmVzb3VyY2VPdmVycmlkZSk6CisgICAgICAgIChXSS5SZXNvdXJj ZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxlSW1wb3J0TG9jYWxSZXNvdXJjZU92ZXJyaWRl KToKKyAgICAgICAgKFdJLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmxvY2FsUmVzb3Vy Y2VPdmVycmlkZUluaXRpYWxDb250ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdJLlJlc291cmNl Q29udGVudFZpZXcucHJvdG90eXBlLmFzeW5jIF9oYW5kbGVDcmVhdGVMb2NhbFJlc291cmNlT3Zl cnJpZGUpOiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVz b3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlRleHRSZXNvdXJjZUNvbnRlbnRWaWV3 LnByb3RvdHlwZS5nZXQgY3JlYXRlTG9jYWxSZXNvdXJjZU92ZXJyaWRlVG9vbHRpcCk6IEFkZGVk LgorICAgICAgICAoV0kuVGV4dFJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLnJlcXVlc3RM b2NhbFJlc291cmNlT3ZlcnJpZGVJbml0aWFsQ29udGVudCk6IEFkZGVkLgorICAgICAgICAoV0ku VGV4dFJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmxvY2FsUmVzb3VyY2VPdmVycmlkZUlu aXRpYWxDb250ZW50KTogRGVsZXRlZC4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHBy b2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKwogMjAxOS0xMS0wNCAgRGV2aW4gUm91c3NvICA8ZHJv dXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogIlRvZ2dsZSBWaXNpYmls aXR5IiBkb2VzIG5vdCB3b3JrIGZvciBlbGVtZW50IGluc2lkZSBTaGFkb3cgRE9NCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHBy b2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBkMWJjN2E4YjI1ODQyMTM1NTUzZTljZTU0NmVj OGE1MjMwZGJhMjQzLi43OGJlNWMwZWNlMzljZjA3ODJkOWE2YWUwZDU2ZjUxOTE1MjZjNDBjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRp b25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTI1MCw2ICsyNTAsOCBAQCBsb2Nh bGl6ZWRTdHJpbmdzWyJDbGVhciBzYW1wbGVzIl0gPSAiQ2xlYXIgc2FtcGxlcyI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJDbGVhciB3YXRjaCBleHByZXNzaW9ucyJdID0gIkNsZWFyIHdhdGNoIGV4cHJl c3Npb25zIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsaWNrIExpc3RlbmVyIl0gPSAiQ2xpY2sgTGlz dGVuZXIiOwogbG9jYWxpemVkU3RyaW5nc1siQ2xpY2sgdG8gY2xvc2UgdGhpcyB0YWIiXSA9ICJD bGljayB0byBjbG9zZSB0aGlzIHRhYiI7Citsb2NhbGl6ZWRTdHJpbmdzWyJDbGljayB0byBjcmVh dGUgYSBMb2NhbCBPdmVycmlkZSBmcm9tIHRoaXMgY29udGVudCJdID0gIkNsaWNrIHRvIGNyZWF0 ZSBhIExvY2FsIE92ZXJyaWRlIGZyb20gdGhpcyBjb250ZW50IjsKK2xvY2FsaXplZFN0cmluZ3Nb IkNsaWNrIHRvIGltcG9ydCBhIGZpbGUgYW5kIGNyZWF0ZSBhIExvY2FsIE92ZXJyaWRlXG5TaGlm dC1jbGljayB0byBjcmVhdGUgYSBMb2NhbCBPdmVycmlkZSBmcm9tIHRoaXMgY29udGVudCJdID0g IkNsaWNrIHRvIGltcG9ydCBhIGZpbGUgYW5kIGNyZWF0ZSBhIExvY2FsIE92ZXJyaWRlXG5TaGlm dC1jbGljayB0byBjcmVhdGUgYSBMb2NhbCBPdmVycmlkZSBmcm9tIHRoaXMgY29udGVudCI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJDbGljayB0byBzZWxlY3QgYSBjb2xvclxuU2hpZnQtY2xpY2sgdG8g c3dpdGNoIGNvbG9yIGZvcm1hdHMiXSA9ICJDbGljayB0byBzZWxlY3QgYSBjb2xvclxuU2hpZnQt Y2xpY2sgdG8gc3dpdGNoIGNvbG9yIGZvcm1hdHMiOwogbG9jYWxpemVkU3RyaW5nc1siQ2xpY2sg dG8gdmlldyB2YXJpYWJsZSB2YWx1ZVxuU2hpZnQtY2xpY2sgdG8gcmVwbGFjZSB2YXJpYWJsZSB3 aXRoIHZhbHVlIl0gPSAiQ2xpY2sgdG8gdmlldyB2YXJpYWJsZSB2YWx1ZVxuU2hpZnQtY2xpY2sg dG8gcmVwbGFjZSB2YXJpYWJsZSB3aXRoIHZhbHVlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsaWNr YWJsZSJdID0gIkNsaWNrYWJsZSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanMKaW5kZXggZWM1NzllY2ExYjkwYmNjODM0 ZmYxYWM2ZjEyNTNlMmU4Y2Q1NmMxOC4uM2JmODAwNTY4MGNmYWNiNDc5ZTEwMjViMDZhZjViZGU2 ODYyODI1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL1Jlc291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9SZXNvdXJjZS5qcwpAQCAtMTA1OCwxOSArMTA1OCwxOCBAQCBXSS5SZXNvdXJj ZSA9IGNsYXNzIFJlc291cmNlIGV4dGVuZHMgV0kuU291cmNlQ29kZQogICAgICAgICBjb29raWVb V0kuUmVzb3VyY2UuTWFpblJlc291cmNlQ29va2llS2V5XSA9IHRoaXMuaXNNYWluUmVzb3VyY2Uo KTsKICAgICB9CiAKLSAgICBhc3luYyBjcmVhdGVMb2NhbFJlc291cmNlT3ZlcnJpZGUoe2luaXRp YWxDb250ZW50fSA9IHt9KQorICAgIGFzeW5jIGNyZWF0ZUxvY2FsUmVzb3VyY2VPdmVycmlkZSh7 aW5pdGlhbE1JTUVUeXBlLCBpbml0aWFsQmFzZTY0RW5jb2RlZCwgaW5pdGlhbENvbnRlbnR9ID0g e30pCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5pc0xvY2FsUmVzb3VyY2VP dmVycmlkZSk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KFdJLk5ldHdvcmtNYW5hZ2VyLnN1cHBv cnRzTG9jYWxSZXNvdXJjZU92ZXJyaWRlcygpKTsKIAogICAgICAgICBsZXQge3Jhd0NvbnRlbnQs IHJhd0Jhc2U2NEVuY29kZWR9ID0gYXdhaXQgdGhpcy5yZXF1ZXN0Q29udGVudCgpOwotICAgICAg ICBsZXQgY29udGVudCA9IGluaXRpYWxDb250ZW50ICE9PSB1bmRlZmluZWQgPyBpbml0aWFsQ29u dGVudCA6IHJhd0NvbnRlbnQ7CiAKICAgICAgICAgcmV0dXJuIFdJLkxvY2FsUmVzb3VyY2VPdmVy cmlkZS5jcmVhdGUoewogICAgICAgICAgICAgdXJsOiB0aGlzLnVybCwKLSAgICAgICAgICAgIG1p bWVUeXBlOiB0aGlzLm1pbWVUeXBlLAotICAgICAgICAgICAgY29udGVudCwKLSAgICAgICAgICAg IGJhc2U2NEVuY29kZWQ6IHJhd0Jhc2U2NEVuY29kZWQsCisgICAgICAgICAgICBtaW1lVHlwZTog aW5pdGlhbE1JTUVUeXBlICE9PSB1bmRlZmluZWQgPyBpbml0aWFsTUlNRVR5cGUgOiB0aGlzLm1p bWVUeXBlLAorICAgICAgICAgICAgY29udGVudDogaW5pdGlhbENvbnRlbnQgIT09IHVuZGVmaW5l ZCA/IGluaXRpYWxDb250ZW50IDogcmF3Q29udGVudCwKKyAgICAgICAgICAgIGJhc2U2NEVuY29k ZWQ6IGluaXRpYWxCYXNlNjRFbmNvZGVkICE9PSB1bmRlZmluZWQgPyBpbml0aWFsQmFzZTY0RW5j b2RlZCA6IHJhd0Jhc2U2NEVuY29kZWQsCiAgICAgICAgICAgICBzdGF0dXNDb2RlOiB0aGlzLnN0 YXR1c0NvZGUsCiAgICAgICAgICAgICBzdGF0dXNUZXh0OiB0aGlzLnN0YXR1c1RleHQsCiAgICAg ICAgICAgICBoZWFkZXJzOiB0aGlzLnJlc3BvbnNlSGVhZGVycywKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNv bnRlbnRWaWV3LmpzCmluZGV4IDJlN2IyY2UyNWVjODA1Mzg4Y2Q5MjdmZmNmNjI3NzcxN2Y4NjM3 NTIuLjkwZTY0OGI1ZGNiM2ZmYmNiNWM1Nzc5ZWE2OTllNWMzOWNmZGNkMGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVu dFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UmVzb3VyY2VDb250ZW50Vmlldy5qcwpAQCAtNzcsNyArNzcsNyBAQCBXSS5SZXNvdXJjZUNvbnRl bnRWaWV3ID0gY2xhc3MgUmVzb3VyY2VDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3 CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIHRoaXMuX2xvY2FsUmVzb3Vy Y2VPdmVycmlkZUJhbm5lclZpZXcgPSBuZXcgV0kuTG9jYWxSZXNvdXJjZU92ZXJyaWRlV2Fybmlu Z1ZpZXcocmVzb3VyY2UpOwogCi0gICAgICAgICAgICAgICAgdGhpcy5fY3JlYXRlTG9jYWxSZXNv dXJjZU92ZXJyaWRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQnV0dG9uTmF2aWdhdGlv bkl0ZW0oImNyZWF0ZS1sb2NhbC1yZXNvdXJjZS1vdmVycmlkZSIsIFdJLlVJU3RyaW5nKCJDcmVh dGUgTG9jYWwgT3ZlcnJpZGUiKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRlbU5ldHdvcmtPdmVycmlk ZS5zdmciLCAxMywgMTQpOworICAgICAgICAgICAgICAgIHRoaXMuX2NyZWF0ZUxvY2FsUmVzb3Vy Y2VPdmVycmlkZUJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkJ1dHRvbk5hdmlnYXRpb25J dGVtKCJjcmVhdGUtbG9jYWwtcmVzb3VyY2Utb3ZlcnJpZGUiLCB0aGlzLmNyZWF0ZUxvY2FsUmVz b3VyY2VPdmVycmlkZVRvb2x0aXAsICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1OZXR3b3JrT3ZlcnJp ZGUuc3ZnIiwgMTMsIDE0KTsKICAgICAgICAgICAgICAgICB0aGlzLl9jcmVhdGVMb2NhbFJlc291 cmNlT3ZlcnJpZGVCdXR0b25OYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkJ1dHRv bk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2hhbmRsZUNyZWF0ZUxvY2FsUmVz b3VyY2VPdmVycmlkZSwgdGhpcyk7CiAgICAgICAgICAgICAgICAgdGhpcy5fY3JlYXRlTG9jYWxS ZXNvdXJjZU92ZXJyaWRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IGZhbHNlOyAvLyBF bmFibGVkIHdoZW4gdGhlIGNvbnRlbnQgaXMgYXZhaWxhYmxlLgogICAgICAgICAgICAgICAgIHRo aXMuX2NyZWF0ZUxvY2FsUmVzb3VyY2VPdmVycmlkZUJ1dHRvbk5hdmlnYXRpb25JdGVtLnZpc2li aWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7 CkBAIC0xMjIsMTAgKzEyMiwyNiBAQCBXSS5SZXNvdXJjZUNvbnRlbnRWaWV3ID0gY2xhc3MgUmVz b3VyY2VDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIHRocm93IFdJ Lk5vdEltcGxlbWVudGVkRXJyb3Iuc3ViY2xhc3NNdXN0T3ZlcnJpZGUoKTsKICAgICB9CiAKLSAg ICBsb2NhbFJlc291cmNlT3ZlcnJpZGVJbml0aWFsQ29udGVudCgpCisgICAgZ2V0IGNyZWF0ZUxv Y2FsUmVzb3VyY2VPdmVycmlkZVRvb2x0aXAoKQogICAgIHsKLSAgICAgICAgLy8gSW1wbGVtZW50 ZWQgYnkgc3ViY2xhc3NlcyBpZiBuZWVkZWQuCi0gICAgICAgIHJldHVybiB7fTsKKyAgICAgICAg cmV0dXJuIFdJLlVJU3RyaW5nKCJDbGljayB0byBpbXBvcnQgYSBmaWxlIGFuZCBjcmVhdGUgYSBM b2NhbCBPdmVycmlkZVxuU2hpZnQtY2xpY2sgdG8gY3JlYXRlIGEgTG9jYWwgT3ZlcnJpZGUgZnJv bSB0aGlzIGNvbnRlbnQiKTsKKyAgICB9CisKKyAgICByZXF1ZXN0TG9jYWxSZXNvdXJjZU92ZXJy aWRlSW5pdGlhbENvbnRlbnQoY2FsbGJhY2spCisgICAgeworICAgICAgICAvLyBPdmVycmlkZGVu IGJ5IHN1YmNsYXNzZXMgaWYgbmVlZGVkLgorCisgICAgICAgIFdJLkZpbGVVdGlsaXRpZXMuaW1w b3J0KGFzeW5jIChmaWxlTGlzdCkgPT4geworICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoZmls ZUxpc3QubGVuZ3RoID09PSAxKTsKKworICAgICAgICAgICAgdGhpcy5fZ2V0Q29udGVudEZvckxv Y2FsUmVzb3VyY2VPdmVycmlkZUZyb21GaWxlKGZpbGVMaXN0WzBdLCAoe21pbWVUeXBlLCBiYXNl NjRFbmNvZGVkLCBjb250ZW50fSkgPT4geworICAgICAgICAgICAgICAgIGNhbGxiYWNrKHsKKyAg ICAgICAgICAgICAgICAgICAgaW5pdGlhbE1JTUVUeXBlOiBtaW1lVHlwZSwKKyAgICAgICAgICAg ICAgICAgICAgaW5pdGlhbEJhc2U2NEVuY29kZWQ6IGJhc2U2NEVuY29kZWQsCisgICAgICAgICAg ICAgICAgICAgIGluaXRpYWxDb250ZW50OiBjb250ZW50LAorICAgICAgICAgICAgICAgIH0pOwor ICAgICAgICAgICAgfSk7CisgICAgICAgIH0pOwogICAgIH0KIAogICAgIHNob3dHZW5lcmljTm9D b250ZW50TWVzc2FnZSgpCkBAIC0yMzAsMTIgKzI0NiwzOCBAQCBXSS5SZXNvdXJjZUNvbnRlbnRW aWV3ID0gY2xhc3MgUmVzb3VyY2VDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAg ICAgICAgIHRoaXMuYWRkSXNzdWUoaXNzdWUpOwogICAgIH0KIAotICAgIGFzeW5jIF9oYW5kbGVD cmVhdGVMb2NhbFJlc291cmNlT3ZlcnJpZGUoZXZlbnQpCisgICAgYXN5bmMgX2dldENvbnRlbnRG b3JMb2NhbFJlc291cmNlT3ZlcnJpZGVGcm9tRmlsZShmaWxlLCBjYWxsYmFjaykKICAgICB7Ci0g ICAgICAgIGxldCBpbml0aWFsQ29udGVudCA9IHRoaXMubG9jYWxSZXNvdXJjZU92ZXJyaWRlSW5p dGlhbENvbnRlbnQoKTsKLSAgICAgICAgbGV0IGxvY2FsUmVzb3VyY2VPdmVycmlkZSA9IGF3YWl0 IHRoaXMuX3Jlc291cmNlLmNyZWF0ZUxvY2FsUmVzb3VyY2VPdmVycmlkZShpbml0aWFsQ29udGVu dCk7Ci0gICAgICAgIFdJLm5ldHdvcmtNYW5hZ2VyLmFkZExvY2FsUmVzb3VyY2VPdmVycmlkZShs b2NhbFJlc291cmNlT3ZlcnJpZGUpOwotICAgICAgICBXSS5zaG93TG9jYWxSZXNvdXJjZU92ZXJy aWRlKGxvY2FsUmVzb3VyY2VPdmVycmlkZSk7CisgICAgICAgIGxldCBpbml0aWFsTUlNRVR5cGUg PSBmaWxlLnR5cGUgfHwgV0kubWltZVR5cGVGb3JGaWxlRXh0ZW5zaW9uKFdJLmZpbGVFeHRlbnNp b25Gb3JGaWxlbmFtZShmaWxlLm5hbWUpKTsKKyAgICAgICAgaWYgKFdJLnNob3VsZFRyZWF0TUlN RVR5cGVBc1RleHQoaW5pdGlhbE1JTUVUeXBlKSkgeworICAgICAgICAgICAgYXdhaXQgV0kuRmls ZVV0aWxpdGllcy5yZWFkVGV4dChmaWxlLCBhc3luYyAoe3RleHR9KSA9PiB7CisgICAgICAgICAg ICAgICAgYXdhaXQgY2FsbGJhY2soeworICAgICAgICAgICAgICAgICAgICBtaW1lVHlwZTogaW5p dGlhbE1JTUVUeXBlLAorICAgICAgICAgICAgICAgICAgICBiYXNlNjRFbmNvZGVkOiBmYWxzZSwK KyAgICAgICAgICAgICAgICAgICAgY29udGVudDogdGV4dCwKKyAgICAgICAgICAgICAgICB9KTsK KyAgICAgICAgICAgIH0pOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgYXdhaXQgV0ku RmlsZVV0aWxpdGllcy5yZWFkRGF0YShmaWxlLCBhc3luYyAoe21pbWVUeXBlLCBiYXNlNjRFbmNv ZGVkLCBjb250ZW50fSkgPT4geworICAgICAgICAgICAgICAgIGF3YWl0IGNhbGxiYWNrKHttaW1l VHlwZSwgYmFzZTY0RW5jb2RlZCwgY29udGVudH0pOworICAgICAgICAgICAgfSk7CisgICAgICAg IH0KKyAgICB9CisKKyAgICBfaGFuZGxlQ3JlYXRlTG9jYWxSZXNvdXJjZU92ZXJyaWRlKGV2ZW50 KQorICAgIHsKKyAgICAgICAgbGV0IHtuYXRpdmVFdmVudH0gPSBldmVudC5kYXRhOworCisgICAg ICAgIGxldCBjcmVhdGVMb2NhbFJlc291cmNlT3ZlcnJpZGUgPSBhc3luYyAoaW5pdGlhbENvbnRl bnQpID0+IHsKKyAgICAgICAgICAgIGxldCBsb2NhbFJlc291cmNlT3ZlcnJpZGUgPSBhd2FpdCB0 aGlzLl9yZXNvdXJjZS5jcmVhdGVMb2NhbFJlc291cmNlT3ZlcnJpZGUoaW5pdGlhbENvbnRlbnQp OworICAgICAgICAgICAgV0kubmV0d29ya01hbmFnZXIuYWRkTG9jYWxSZXNvdXJjZU92ZXJyaWRl KGxvY2FsUmVzb3VyY2VPdmVycmlkZSk7CisgICAgICAgICAgICBXSS5zaG93TG9jYWxSZXNvdXJj ZU92ZXJyaWRlKGxvY2FsUmVzb3VyY2VPdmVycmlkZSk7CisgICAgICAgIH07CisKKyAgICAgICAg aWYgKG5hdGl2ZUV2ZW50LnNoaWZ0S2V5KQorICAgICAgICAgICAgY3JlYXRlTG9jYWxSZXNvdXJj ZU92ZXJyaWRlKHt9KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5yZXF1ZXN0TG9j YWxSZXNvdXJjZU92ZXJyaWRlSW5pdGlhbENvbnRlbnQoY3JlYXRlTG9jYWxSZXNvdXJjZU92ZXJy aWRlKTsKICAgICB9CiAKICAgICBfaGFuZGxlSW1wb3J0TG9jYWxSZXNvdXJjZU92ZXJyaWRlKGV2 ZW50KQpAQCAtMjQ5LDE4ICsyOTEsOSBAQCBXSS5SZXNvdXJjZUNvbnRlbnRWaWV3ID0gY2xhc3Mg UmVzb3VyY2VDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgICAgICBj b25zb2xlLmFzc2VydChsb2NhbFJlc291cmNlT3ZlcnJpZGUpOwogCiAgICAgICAgICAgICBsZXQg cmV2aXNpb24gPSBsb2NhbFJlc291cmNlT3ZlcnJpZGUubG9jYWxSZXNvdXJjZS5jdXJyZW50UmV2 aXNpb247Ci0KLSAgICAgICAgICAgIGxldCBmaWxlID0gZmlsZUxpc3RbMF07Ci0gICAgICAgICAg ICBsZXQgbWltZVR5cGUgPSBmaWxlLnR5cGUgfHwgV0kubWltZVR5cGVGb3JGaWxlRXh0ZW5zaW9u KFdJLmZpbGVFeHRlbnNpb25Gb3JGaWxlbmFtZShmaWxlLm5hbWUpKTsKLSAgICAgICAgICAgIGlm IChXSS5zaG91bGRUcmVhdE1JTUVUeXBlQXNUZXh0KG1pbWVUeXBlKSkgewotICAgICAgICAgICAg ICAgIGF3YWl0IFdJLkZpbGVVdGlsaXRpZXMucmVhZFRleHQoZmlsZSwgKHt0ZXh0fSkgPT4gewot ICAgICAgICAgICAgICAgICAgICByZXZpc2lvbi51cGRhdGVSZXZpc2lvbkNvbnRlbnQodGV4dCwg e2Jhc2U2NEVuY29kZWQ6IGZhbHNlLCBtaW1lVHlwZX0pOwotICAgICAgICAgICAgICAgIH0pOwot ICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBhd2FpdCBXSS5GaWxlVXRpbGl0 aWVzLnJlYWREYXRhKGZpbGUsICh7ZGF0YVVSTCwgbWltZVR5cGUsIGJhc2U2NEVuY29kZWQsIGNv bnRlbnR9KSA9PiB7Ci0gICAgICAgICAgICAgICAgICAgIHJldmlzaW9uLnVwZGF0ZVJldmlzaW9u Q29udGVudChjb250ZW50LCB7YmFzZTY0RW5jb2RlZCwgbWltZVR5cGV9KTsKLSAgICAgICAgICAg ICAgICB9KTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGF3YWl0IHRoaXMuX2dldENvbnRl bnRGb3JMb2NhbFJlc291cmNlT3ZlcnJpZGVGcm9tRmlsZShmaWxlTGlzdFswXSwgKHttaW1lVHlw ZSwgYmFzZTY0RW5jb2RlZCwgY29udGVudH0pID0+IHsKKyAgICAgICAgICAgICAgICByZXZpc2lv bi51cGRhdGVSZXZpc2lvbkNvbnRlbnQoY29udGVudCwge2Jhc2U2NEVuY29kZWQsIG1pbWVUeXBl fSk7CisgICAgICAgICAgICB9KTsKIAogICAgICAgICAgICAgaWYgKCF0aGlzLnNob3dpbmdMb2Nh bFJlc291cmNlT3ZlcnJpZGUpCiAgICAgICAgICAgICAgICAgV0kuc2hvd0xvY2FsUmVzb3VyY2VP dmVycmlkZShsb2NhbFJlc291cmNlT3ZlcnJpZGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJlc291cmNlQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VD b250ZW50Vmlldy5qcwppbmRleCBkZWMyNDA4MDRkMTA4MzRlMWQ5NmY1NDM1ZGQ5ODE1MzEwN2U3 YjAyLi5lOWIwNTI5ZGIyZmFlM2NiYWJhYjFlY2YzZDYwNjkzM2MzN2RmZDUxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VD b250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5qcwpAQCAtMTQ0LDkgKzE0NCwxNCBAQCBXSS5U ZXh0UmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFRleHRSZXNvdXJjZUNvbnRlbnRWaWV3IGV4 dGVuZHMgV0kuUmVzb3VyY2VDbwogICAgICAgICAvLyBEbyBub3RoaW5nLgogICAgIH0KIAotICAg IGxvY2FsUmVzb3VyY2VPdmVycmlkZUluaXRpYWxDb250ZW50KCkKKyAgICBnZXQgY3JlYXRlTG9j YWxSZXNvdXJjZU92ZXJyaWRlVG9vbHRpcCgpCiAgICAgewotICAgICAgICByZXR1cm4ge2luaXRp YWxDb250ZW50OiB0aGlzLl90ZXh0RWRpdG9yLnN0cmluZ307CisgICAgICAgIHJldHVybiBXSS5V SVN0cmluZygiQ2xpY2sgdG8gY3JlYXRlIGEgTG9jYWwgT3ZlcnJpZGUgZnJvbSB0aGlzIGNvbnRl bnQiKTsKKyAgICB9CisKKyAgICByZXF1ZXN0TG9jYWxSZXNvdXJjZU92ZXJyaWRlSW5pdGlhbENv bnRlbnQoY2FsbGJhY2spCisgICAgeworICAgICAgICBjYWxsYmFjayh7aW5pdGlhbENvbnRlbnQ6 IHRoaXMuX3RleHRFZGl0b3Iuc3RyaW5nfSk7CiAgICAgfQogCiAgICAgZ2V0IHN1cHBvcnRzU2F2 ZSgpCg==