198804 2019-06-12 14:27:35 -0700 Web Inspector: Settings: indent type and size settings aren't respected everywhere 2019-06-13 19:12:18 -0700 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 1544230 0 hi 2019-06-12 14:27:35 -0700 # STEPS TO REPRODUCE: 1. open Web Inspector 2. go to the Settings tab 3. change the "Prefer indent using" to "Spaces" 4. focus the Console prompt and press ⇥ (tab) => a tab character is inserted, instead of some spaces 1544340 1 372017 hi 2019-06-12 21:27:04 -0700 Created attachment 372017 Patch 1544658 2 372017 commit-queue 2019-06-13 19:11:22 -0700 Comment on attachment 372017 Patch Clearing flags on attachment: 372017 Committed r246419: <https://trac.webkit.org/changeset/246419> 1544659 3 commit-queue 2019-06-13 19:11:24 -0700 All reviewed patches have been landed. Closing bug. 1544660 4 webkit-bug-importer 2019-06-13 19:12:18 -0700 <rdar://problem/51731930> 372017 2019-06-12 21:27:04 -0700 2019-06-13 19:11:22 -0700 Patch bug-198804-20190612212703.patch text/plain 13243 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGVhZWNhZTE1YmI1MWIzNGYyODAwZGM2YjU0YmU3 MjEzM2FkNzM2MGUuLmYxYWRhMWE5MmQyYjlmN2FlYTQwMWZiZmIyNzFhZWUzNTE2MzY5NTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE5LTA2LTEyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT ZXR0aW5nczogaW5kZW50IHR5cGUgYW5kIHNpemUgc2V0dGluZ3MgYXJlbid0IHJlc3BlY3RlZCBl dmVyeXdoZXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTg4MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckVkaXRvci5qczoKKyAgICAgICAgKFdJ LkNvZGVNaXJyb3JFZGl0b3IuY3JlYXRlKToKKyAgICAgICAgV2hlbiBjcmVhdGluZyBhIGBDb2Rl TWlycm9yYCBpbnN0YW5jZSwgZGVmYXVsdCB0byB1c2luZyB0aGUgZ2xvYmFsIGBTZXR0aW5nYHMg YXMgdGhlIG9wdGlvbnMuCisgICAgICAgIElmIGFuIG92ZXJyaWRlIGlzIHNwZWNpZmllZCBpbiBg b3B0aW9uc2AsIGl0IHdpbGwgdGFrZSBwcmVjZWRlbmNlIGFuZCB0aGUgYENvZGVNaXJyb3JgIHdp bGwKKyAgICAgICAgaWdub3JlIGFueSBjaGFuZ2VzIHRvIHRoZSBgU2V0dGluZ2AgYXMgd2VsbC4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5qczoKKyAgICAgICAg KFdJLlRleHRFZGl0b3IpOgorICAgICAgICAoV0kuVGV4dEVkaXRvci5wcm90b3R5cGUuY2xvc2Up OiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRlc3RDYXNl Q29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5BdWRpdFRlc3RDYXNlQ29udGVudFZpZXcucHJv dG90eXBlLmxheW91dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9CcmVha3BvaW50 QWN0aW9uVmlldy5qczoKKyAgICAgICAgKFdJLkJyZWFrcG9pbnRBY3Rpb25WaWV3LnByb3RvdHlw ZS5fdXBkYXRlQm9keSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlUHJv bXB0LmpzOgorICAgICAgICAoV0kuQ29uc29sZVByb21wdCk6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJ LlNjb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fYWRkV2F0Y2hFeHByZXNz aW9uQnV0dG9uQ2xpY2tlZCk6CisgICAgICAgIFJlbW92ZSBvdmVycmlkZXMgdGhhdCBhcmVuJ3Qg bmVjZXNzYXJ5IGZvciBgQ29kZU1pcnJvcmAgdG8gZml0IGluIHRoZSBjb250YWluZXIgZWxlbWVu dDoKKyAgICAgICAgIC0gYHNob3dXaGl0ZXNwYWNlQ2hhcmFjdGVyc2AKKyAgICAgICAgIC0gYGlu ZGVudFdpdGhUYWJzYAorICAgICAgICAgLSBgaW5kZW50VW5pdGAKKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanM6CisgICAgICAgIChXSS5Tb3Vy Y2VDb2RlVGV4dEVkaXRvci5wcm90b3R5cGUuY2xvc2UpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvU2hhZGVyUHJvZ3JhbUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuU2hhZGVy UHJvZ3JhbUNvbnRlbnRWaWV3LnByb3RvdHlwZS5jbG9zZWQpOiBEZWxldGVkLgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvVGV4dENvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuVGV4 dENvbnRlbnRWaWV3LnByb3RvdHlwZS5jbG9zZWQpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVGV4dFJlc291cmNlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5U ZXh0UmVzb3VyY2VDb250ZW50Vmlldy5wcm90b3R5cGUuY2xvc2VkKToKKyAgICAgICAgRGVsZXRl IHRoZSBsb2dpYyBmb3IgcmVtb3ZpbmcgZXZlbnQgbGlzdGVuZXJzIGZyb20gZ2xvYmFsIGBTZXR0 aW5nYCwgYXMgaXQgZGlkbid0IHdvcmsKKyAgICAgICAgYW55d2F5cywgc2luY2Ugbm9uZSBvZiB0 aGUgZXZlbnQgbGlzdGVuZXJzIHdlcmUgYWRkZWQgdXNpbmcgYSBgdGhpc09iamVjdGAuCisKIDIw MTktMDYtMTAgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IFRpbWVsaW5lczogaW1wb3J0ZWQgcmVjb3JkaW5ncyBkbyBub3QgaGF2ZSBK YXZhU2NyaXB0IGNhbGwgdHJlZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VGVzdENhc2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VGVzdENhc2VDb250ZW50Vmll dy5qcwppbmRleCA0ODY4NmNkYWNmMTFhNTlmZGRjZGZkNzljOTkxZWJhNzczNTAzMTZjLi4xNjgw Mjg4MjQ5OTk5MTdiZGE0NzM4ZTU5ZDdjYjI5NmExMjM3Yzk0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRlc3RDYXNlQ29udGVudFZp ZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVk aXRUZXN0Q2FzZUNvbnRlbnRWaWV3LmpzCkBAIC0yMTcsNyArMjE3LDYgQEAgV0kuQXVkaXRUZXN0 Q2FzZUNvbnRlbnRWaWV3ID0gY2xhc3MgQXVkaXRUZXN0Q2FzZUNvbnRlbnRWaWV3IGV4dGVuZHMg V0kuQXVkaXRUZXMKICAgICAgICAgICAgICAgICAgICAgICAgIG1vZGU6ICJjc3MiLAogICAgICAg ICAgICAgICAgICAgICAgICAgcmVhZE9ubHk6IHRydWUsCiAgICAgICAgICAgICAgICAgICAgICAg ICBsaW5lV3JhcHBpbmc6IHRydWUsCi0gICAgICAgICAgICAgICAgICAgICAgICBzaG93V2hpdGVz cGFjZUNoYXJhY3RlcnM6IFdJLnNldHRpbmdzLnNob3dXaGl0ZXNwYWNlQ2hhcmFjdGVycy52YWx1 ZSwKICAgICAgICAgICAgICAgICAgICAgICAgIHN0eWxlU2VsZWN0ZWRUZXh0OiB0cnVlLAogICAg ICAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgICAgICAgICAgY29kZU1pcnJvci5zZXRW YWx1ZShkb21Ob2RlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0JyZWFrcG9pbnRBY3Rpb25WaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludEFjdGlvblZpZXcuanMKaW5kZXggODZl MjYwYTQ5MzY4YzA0OGI2M2YzNjE1YjI4ZDQ0MGVlYTQ0ODEzMC4uMzVhZTc5NTU5Y2I4ZjNlZDVj ODgwOTNmZWRmOTdhMDQ5NGJjNzUzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludEFjdGlvblZpZXcuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludEFjdGlvblZpZXcu anMKQEAgLTE1OCw4ICsxNTgsNiBAQCBXSS5CcmVha3BvaW50QWN0aW9uVmlldyA9IGNsYXNzIEJy ZWFrcG9pbnRBY3Rpb25WaWV3IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICB0aGlzLl9j b2RlTWlycm9yID0gV0kuQ29kZU1pcnJvckVkaXRvci5jcmVhdGUoZWRpdG9yRWxlbWVudCwgewog ICAgICAgICAgICAgICAgIGxpbmVXcmFwcGluZzogdHJ1ZSwKICAgICAgICAgICAgICAgICBtb2Rl OiAidGV4dC9qYXZhc2NyaXB0IiwKLSAgICAgICAgICAgICAgICBpbmRlbnRXaXRoVGFiczogdHJ1 ZSwKLSAgICAgICAgICAgICAgICBpbmRlbnRVbml0OiA0LAogICAgICAgICAgICAgICAgIG1hdGNo QnJhY2tldHM6IHRydWUsCiAgICAgICAgICAgICAgICAgdmFsdWU6IHRoaXMuX2FjdGlvbi5kYXRh IHx8ICIiLAogICAgICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yRWRpdG9yLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckVkaXRvci5qcwppbmRleCBm NDUzY2M3MThkZWVjMzc4NzA0OWY5YjliYjRlZjNmYzc0Yzc0YTI2Li5lNDQ1ZGQzMTU2YjIwOWQ0 MDEyMzhiOGE5YjE4ZDFiZDk1NzFhZjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yRWRpdG9yLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JFZGl0b3IuanMKQEAg LTMzLDcgKzMzLDI5IEBAIFdJLkNvZGVNaXJyb3JFZGl0b3IgPSBjbGFzcyBDb2RlTWlycm9yRWRp dG9yCiAgICAgICAgIGVsZW1lbnQuc2V0QXR0cmlidXRlKCJkaXIiLCAibHRyIik7CiAgICAgICAg IGVsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgicmVhZC1vbmx5Iiwgb3B0aW9ucy5yZWFkT25seSk7 CiAKLSAgICAgICAgbGV0IGNvZGVNaXJyb3IgPSBuZXcgQ29kZU1pcnJvcihlbGVtZW50LCBvcHRp b25zKTsKKyAgICAgICAgbGV0IGNvZGVNaXJyb3IgPSBuZXcgQ29kZU1pcnJvcihlbGVtZW50LCB7 CisgICAgICAgICAgICAvLyBUaGVzZSB2YWx1ZXMgd2lsbCBiZSBvdmVycmlkZGVuIGJ5IGFueSB2 YWx1ZSB3aXRoIHRoZSBzYW1lIGtleSBpbiBgb3B0aW9uc2AuCisgICAgICAgICAgICBpbmRlbnRX aXRoVGFiczogV0kuc2V0dGluZ3MuaW5kZW50V2l0aFRhYnMudmFsdWUsCisgICAgICAgICAgICBp bmRlbnRVbml0OiBXSS5zZXR0aW5ncy5pbmRlbnRVbml0LnZhbHVlLAorICAgICAgICAgICAgdGFi U2l6ZTogV0kuc2V0dGluZ3MudGFiU2l6ZS52YWx1ZSwKKyAgICAgICAgICAgIGxpbmVXcmFwcGlu ZzogV0kuc2V0dGluZ3MuZW5hYmxlTGluZVdyYXBwaW5nLnZhbHVlLAorICAgICAgICAgICAgc2hv d1doaXRlc3BhY2VDaGFyYWN0ZXJzOiBXSS5zZXR0aW5ncy5zaG93V2hpdGVzcGFjZUNoYXJhY3Rl cnMudmFsdWUsCisgICAgICAgICAgICAuLi5vcHRpb25zLAorICAgICAgICB9KTsKKworICAgICAg ICBmdW5jdGlvbiBsaXN0ZW5Gb3JDaGFuZ2Uoc2V0dGluZywgY29kZU1pcnJvck9wdGlvbikgewor ICAgICAgICAgICAgaWYgKG9wdGlvbnNbY29kZU1pcnJvck9wdGlvbl0gIT09IHVuZGVmaW5lZCkK KyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIHNldHRpbmcuYWRkRXZlbnRM aXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIChldmVudCkgPT4geworICAgICAgICAg ICAgICAgIGNvZGVNaXJyb3Iuc2V0T3B0aW9uKGNvZGVNaXJyb3JPcHRpb24sIHNldHRpbmcudmFs dWUpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICAgICAgbGlzdGVuRm9yQ2hhbmdl KFdJLnNldHRpbmdzLmluZGVudFdpdGhUYWJzLCAiaW5kZW50V2l0aFRhYnMiKTsKKyAgICAgICAg bGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmluZGVudFVuaXQsICJpbmRlbnRVbml0Iik7Cisg ICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy50YWJTaXplLCAidGFiU2l6ZSIpOwor ICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZW5hYmxlTGluZVdyYXBwaW5nLCAi bGluZVdyYXBwaW5nIik7CisgICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5zaG93 V2hpdGVzcGFjZUNoYXJhY3RlcnMsICJzaG93V2hpdGVzcGFjZUNoYXJhY3RlcnMiKTsKIAogICAg ICAgICAvLyBPdmVycmlkZSBzb21lIE1hYyBzcGVjaWZpYyBrZXliaW5kaW5ncy4KICAgICAgICAg aWYgKFdJLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlUHJvbXB0LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZVByb21wdC5qcwppbmRl eCA1NDljYWI0ZmRiODI4MzRmMzY0OWZmNTM5Zjg2MDZjODk2YTA3MGFmLi44MGZhY2E2YWQ1ZGIy ZGI4NTU3MzM3YmU1MTUzNDU2NTUyM2UyODgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlUHJvbXB0LmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVQcm9tcHQuanMKQEAgLTQw LDggKzQwLDYgQEAgV0kuQ29uc29sZVByb21wdCA9IGNsYXNzIENvbnNvbGVQcm9tcHQgZXh0ZW5k cyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX2NvZGVNaXJyb3IgPSBXSS5Db2RlTWlycm9yRWRpdG9y LmNyZWF0ZSh0aGlzLmVsZW1lbnQsIHsKICAgICAgICAgICAgIGxpbmVXcmFwcGluZzogdHJ1ZSwK ICAgICAgICAgICAgIG1vZGU6IHtuYW1lOiBtaW1lVHlwZSwgZ2xvYmFsVmFyczogdHJ1ZX0sCi0g ICAgICAgICAgICBpbmRlbnRXaXRoVGFiczogdHJ1ZSwKLSAgICAgICAgICAgIGluZGVudFVuaXQ6 IDQsCiAgICAgICAgICAgICBtYXRjaEJyYWNrZXRzOiB0cnVlCiAgICAgICAgIH0pOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUNo YWluRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Njb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IDIyNmEy Njk3ZTdlOTkyYjY4MTE2M2FjZTk1YzM4ZmY5ODNhYzQ5ZTQuLmViMmZmNmZjNmE5MmNkYzE0MTdk MDlkODIyYTViZDgwZTlhZWMyMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njb3BlQ2hhaW5EZXRh aWxzU2lkZWJhclBhbmVsLmpzCkBAIC0zNjQsOCArMzY0LDYgQEAgV0kuU2NvcGVDaGFpbkRldGFp bHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbCBleHRl bmRzIFcKICAgICAgICAgdGhpcy5fY29kZU1pcnJvciA9IFdJLkNvZGVNaXJyb3JFZGl0b3IuY3Jl YXRlKGVkaXRvckVsZW1lbnQsIHsKICAgICAgICAgICAgIGxpbmVXcmFwcGluZzogdHJ1ZSwKICAg ICAgICAgICAgIG1vZGU6ICJ0ZXh0L2phdmFzY3JpcHQiLAotICAgICAgICAgICAgaW5kZW50V2l0 aFRhYnM6IHRydWUsCi0gICAgICAgICAgICBpbmRlbnRVbml0OiA0LAogICAgICAgICAgICAgbWF0 Y2hCcmFja2V0czogdHJ1ZSwKICAgICAgICAgICAgIHZhbHVlOiAiIiwKICAgICAgICAgfSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TaGFk ZXJQcm9ncmFtQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TaGFkZXJQcm9ncmFtQ29udGVudFZpZXcuanMKaW5kZXggN2U4ZGE4Mjg3NDFi M2Q3YmUyNTE1YmNkNGM2ZWE5MzczOTBjNGM0Yy4uZGQ5MjU0ZWQ1YmVlMDA4NTZlMjMyYTUyZmYw YjcyZDViOTIzNDM4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2hhZGVyUHJvZ3JhbUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NoYWRlclByb2dyYW1Db250ZW50Vmlldy5q cwpAQCAtOTksMTQgKzk5LDYgQEAgV0kuU2hhZGVyUHJvZ3JhbUNvbnRlbnRWaWV3ID0gY2xhc3Mg U2hhZGVyUHJvZ3JhbUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFYKICAgICAgICAgc3Vw ZXIuaGlkZGVuKCk7CiAgICAgfQogCi0gICAgY2xvc2VkKCkKLSAgICB7Ci0gICAgICAgIHRoaXMu X3ZlcnRleEVkaXRvci5jbG9zZSgpOwotICAgICAgICB0aGlzLl9mcmFnbWVudEVkaXRvci5jbG9z ZSgpOwotCi0gICAgICAgIHN1cGVyLmNsb3NlZCgpOwotICAgIH0KLQogICAgIGdldCBzdXBwb3J0 c1NhdmUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVU ZXh0RWRpdG9yLmpzCmluZGV4IDllZTlkZjRhNjI5MzRlMjMwZTM2ZDE1YjA4N2E2Zjk1NThkODE2 NmUuLmJlOGNhMTVlNWE2YzdkZTI4Y2Q3ZGNhYjJkMjA5NmQ3ZTQ0NDFiZWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0 RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzCkBAIC0xNjUsOCArMTY1LDYgQEAgV0kuU291cmNlQ29k ZVRleHRFZGl0b3IgPSBjbGFzcyBTb3VyY2VDb2RlVGV4dEVkaXRvciBleHRlbmRzIFdJLlRleHRF ZGl0b3IKIAogICAgIGNsb3NlKCkKICAgICB7Ci0gICAgICAgIHN1cGVyLmNsb3NlKCk7Ci0KICAg ICAgICAgaWYgKHRoaXMuX3N1cHBvcnRzRGVidWdnaW5nKSB7CiAgICAgICAgICAgICBXSS5CcmVh a3BvaW50LnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CiAgICAgICAgICAg ICBXSS5kZWJ1Z2dlck1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlz KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RleHRDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RleHRDb250ZW50Vmlldy5qcwppbmRleCAyNTcwOWIzMjdlOTdhODY2YTNkZGE0MTEw YTY2NzM1ZDQyNjk5NWJhLi4zN2JjNTAzODFlYjlmYjg0YzZiNmFjZWM3ZDgzMTk3NWY4ZjQ0OTgx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U ZXh0Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGV4dENvbnRlbnRWaWV3LmpzCkBAIC05MiwxMyArOTIsNiBAQCBXSS5UZXh0Q29u dGVudFZpZXcgPSBjbGFzcyBUZXh0Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50Vmlldwog ICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLmhpZGRlbigpOwogICAgIH0KIAotICAgIGNsb3NlZCgp Ci0gICAgewotICAgICAgICBzdXBlci5jbG9zZWQoKTsKLQotICAgICAgICB0aGlzLl90ZXh0RWRp dG9yLmNsb3NlKCk7Ci0gICAgfQotCiAgICAgZ2V0IHN1cHBvcnRzU2F2ZSgpCiAgICAgewogICAg ICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UZXh0RWRpdG9yLmpzCmluZGV4IGYxNmVlNzM0ZmFkZmUwY2ZjNDA3 NzkxMThkODhiNjdkMGNlNzczNWMuLjY0NWY5NzkxNjQxYTBmM2MwZTllYWExZWI4ZDUwNzE2YmY1 MWI3YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RleHRFZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGV4dEVkaXRvci5qcwpAQCAtMzMsMzcgKzMzLDEyIEBAIFdJLlRleHRFZGl0b3Ig PSBjbGFzcyBUZXh0RWRpdG9yIGV4dGVuZHMgV0kuVmlldwogCiAgICAgICAgIHRoaXMuX2NvZGVN aXJyb3IgPSBXSS5Db2RlTWlycm9yRWRpdG9yLmNyZWF0ZSh0aGlzLmVsZW1lbnQsIHsKICAgICAg ICAgICAgIHJlYWRPbmx5OiB0cnVlLAotICAgICAgICAgICAgaW5kZW50V2l0aFRhYnM6IFdJLnNl dHRpbmdzLmluZGVudFdpdGhUYWJzLnZhbHVlLAotICAgICAgICAgICAgaW5kZW50VW5pdDogV0ku c2V0dGluZ3MuaW5kZW50VW5pdC52YWx1ZSwKLSAgICAgICAgICAgIHRhYlNpemU6IFdJLnNldHRp bmdzLnRhYlNpemUudmFsdWUsCiAgICAgICAgICAgICBsaW5lTnVtYmVyczogdHJ1ZSwKLSAgICAg ICAgICAgIGxpbmVXcmFwcGluZzogV0kuc2V0dGluZ3MuZW5hYmxlTGluZVdyYXBwaW5nLnZhbHVl LAogICAgICAgICAgICAgbWF0Y2hCcmFja2V0czogdHJ1ZSwKICAgICAgICAgICAgIGF1dG9DbG9z ZUJyYWNrZXRzOiB0cnVlLAotICAgICAgICAgICAgc2hvd1doaXRlc3BhY2VDaGFyYWN0ZXJzOiBX SS5zZXR0aW5ncy5zaG93V2hpdGVzcGFjZUNoYXJhY3RlcnMudmFsdWUsCiAgICAgICAgICAgICBz dHlsZVNlbGVjdGVkVGV4dDogdHJ1ZSwKICAgICAgICAgfSk7CiAKLSAgICAgICAgV0kuc2V0dGlu Z3MuaW5kZW50V2l0aFRhYnMuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5n ZWQsIChldmVudCkgPT4gewotICAgICAgICAgICAgdGhpcy5fY29kZU1pcnJvci5zZXRPcHRpb24o ImluZGVudFdpdGhUYWJzIiwgV0kuc2V0dGluZ3MuaW5kZW50V2l0aFRhYnMudmFsdWUpOwotICAg ICAgICB9KTsKLQotICAgICAgICBXSS5zZXR0aW5ncy5pbmRlbnRVbml0LmFkZEV2ZW50TGlzdGVu ZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCAoZXZlbnQpID0+IHsKLSAgICAgICAgICAgIHRo aXMuX2NvZGVNaXJyb3Iuc2V0T3B0aW9uKCJpbmRlbnRVbml0IiwgV0kuc2V0dGluZ3MuaW5kZW50 VW5pdC52YWx1ZSk7Ci0gICAgICAgIH0pOwotCi0gICAgICAgIFdJLnNldHRpbmdzLnRhYlNpemUu YWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIChldmVudCkgPT4gewot ICAgICAgICAgICAgdGhpcy5fY29kZU1pcnJvci5zZXRPcHRpb24oInRhYlNpemUiLCBXSS5zZXR0 aW5ncy50YWJTaXplLnZhbHVlKTsKLSAgICAgICAgfSk7Ci0KLSAgICAgICAgV0kuc2V0dGluZ3Mu ZW5hYmxlTGluZVdyYXBwaW5nLmFkZEV2ZW50TGlzdGVuZXIoV0kuU2V0dGluZy5FdmVudC5DaGFu Z2VkLCAoZXZlbnQpID0+IHsKLSAgICAgICAgICAgIHRoaXMuX2NvZGVNaXJyb3Iuc2V0T3B0aW9u KCJsaW5lV3JhcHBpbmciLCBXSS5zZXR0aW5ncy5lbmFibGVMaW5lV3JhcHBpbmcudmFsdWUpOwot ICAgICAgICB9KTsKLQotICAgICAgICBXSS5zZXR0aW5ncy5zaG93V2hpdGVzcGFjZUNoYXJhY3Rl cnMuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIChldmVudCkgPT4g ewotICAgICAgICAgICAgdGhpcy5fY29kZU1pcnJvci5zZXRPcHRpb24oInNob3dXaGl0ZXNwYWNl Q2hhcmFjdGVycyIsIFdJLnNldHRpbmdzLnNob3dXaGl0ZXNwYWNlQ2hhcmFjdGVycy52YWx1ZSk7 Ci0gICAgICAgIH0pOwotCiAgICAgICAgIHRoaXMuX2NvZGVNaXJyb3Iub24oImZvY3VzIiwgdGhp cy5fZWRpdG9yRm9jdXNlZC5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5fY29kZU1pcnJvci5v bigiY2hhbmdlIiwgdGhpcy5fY29udGVudENoYW5nZWQuYmluZCh0aGlzKSk7CiAgICAgICAgIHRo aXMuX2NvZGVNaXJyb3Iub24oImd1dHRlckNsaWNrIiwgdGhpcy5fZ3V0dGVyTW91c2VEb3duLmJp bmQodGhpcykpOwpAQCAtNTg3LDE1ICs1NjIsNiBAQCBXSS5UZXh0RWRpdG9yID0gY2xhc3MgVGV4 dEVkaXRvciBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgdGhpcy5fdmlzaWJsZSA9IGZhbHNlOwog ICAgIH0KIAotICAgIGNsb3NlKCkKLSAgICB7Ci0gICAgICAgIFdJLnNldHRpbmdzLmluZGVudFdp dGhUYWJzLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7Ci0gICAgICAgIFdJ LnNldHRpbmdzLmluZGVudFVuaXQucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlz KTsKLSAgICAgICAgV0kuc2V0dGluZ3MudGFiU2l6ZS5yZW1vdmVFdmVudExpc3RlbmVyKG51bGws IG51bGwsIHRoaXMpOwotICAgICAgICBXSS5zZXR0aW5ncy5lbmFibGVMaW5lV3JhcHBpbmcucmVt b3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKLSAgICAgICAgV0kuc2V0dGluZ3Mu c2hvd1doaXRlc3BhY2VDaGFyYWN0ZXJzLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwg dGhpcyk7Ci0gICAgfQotCiAgICAgc2V0QnJlYWtwb2ludEluZm9Gb3JMaW5lQW5kQ29sdW1uKGxp bmVOdW1iZXIsIGNvbHVtbk51bWJlciwgYnJlYWtwb2ludEluZm8pCiAgICAgewogICAgICAgICBp ZiAodGhpcy5faWdub3JlU2V0QnJlYWtwb2ludEluZm9DYWxscykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRW aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJl c291cmNlQ29udGVudFZpZXcuanMKaW5kZXggNDlhOWI5NWFhMDYxMTlkZWUyZjYyMzhkNGQ4N2Y0 MjZjOTVjNjBmNi4uMmY5ZjUzYmViNzgyYWEwMGIyOGE4NGJlODRjOGUwNmFhOWVkOTY0NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJl c291cmNlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGV4dFJlc291cmNlQ29udGVudFZpZXcuanMKQEAgLTEyNyw4ICsxMjcsNiBA QCBXSS5UZXh0UmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFRleHRSZXNvdXJjZUNvbnRlbnRW aWV3IGV4dGVuZHMgV0kuUmVzb3VyY2VDbwogICAgICAgICBXSS5kZWJ1Z2dlck1hbmFnZXIucmVt b3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKICAgICAgICAgV0kuc2V0dGluZ3Mu c2hvd0phdmFTY3JpcHRUeXBlSW5mb3JtYXRpb24ucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBu dWxsLCB0aGlzKTsKICAgICAgICAgV0kuc2V0dGluZ3MuZW5hYmxlQ29udHJvbEZsb3dQcm9maWxl ci5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOwotCi0gICAgICAgIHRoaXMu X3RleHRFZGl0b3IuY2xvc2UoKTsKICAgICB9CiAKICAgICBjb250ZW50QXZhaWxhYmxlKGNvbnRl bnQsIGJhc2U2NEVuY29kZWQpCg==