172250 2017-05-17 15:55:36 -0700 Web Inspector: Use ES2015 Modules for Settings tab 2017-05-17 17:07:36 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All NEW P2 Normal --- 172249 1 hi hi inspector-bugzilla-changes joepeck oldest_to_newest 1309880 0 hi 2017-05-17 15:55:36 -0700 . 1309882 1 310455 hi 2017-05-17 16:05:51 -0700 Created attachment 310455 Patch 1309921 2 310455 joepeck 2017-05-17 17:07:36 -0700 Comment on attachment 310455 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=310455&action=review r-, this won't work with copy-user-interface-resources.pl in macOS Production builds. I think we also need to have actual performance numbers to determine if this path forward is worthwhile or not. • A way to measure "time it takes to open web inspector" • See a measurable improvement after converting multiple tabs to dependencies like this. > Source/WebInspectorUI/ChangeLog:23 > + (export.default.SettingEditor): > + (export.default.SettingEditor.createForSetting): > + (export.default.SettingEditor.prototype.set value): > + (export.default.SettingEditor.prototype._createEditorElement): > + (WebInspector.SettingEditor): Deleted. > + (WebInspector.SettingEditor.createForSetting): Deleted. > + (WebInspector.SettingEditor.prototype.get element): Deleted. > + (WebInspector.SettingEditor.prototype.get type): Deleted. > + (WebInspector.SettingEditor.prototype.get label): Deleted. > + (WebInspector.SettingEditor.prototype.get value): Deleted. > + (WebInspector.SettingEditor.prototype.set value): Deleted. > + (WebInspector.SettingEditor.prototype._createEditorElement): Deleted. Eliminate all the unnecessary spam in the ChangeLog now that we are just changing a namespace. > Source/WebInspectorUI/UserInterface/Views/SettingsGroup.js:69 > -}; > +} Shouldn't these semicolon be here? Based on the eslintrc. 310455 2017-05-17 16:05:51 -0700 2017-05-17 17:07:36 -0700 Patch bug-172250-20170517160550.patch text/plain 18853 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDEyNmMxNjEwYWViNWYxNjYwNzliYzkxNjc2NjMy ZWFhMGE4NzliN2YuLjQzZDAxZmJjMjZmMGE0NGQ4YTVjYjMxZDYyOGNjZGE1NDQ0MzUxOTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1IEBACisyMDE3LTA1LTE3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBV c2UgRVMyMDE1IE1vZHVsZXMgZm9yIFNldHRpbmdzIHRhYgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcyMjUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01haW4uaHRtbDoKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxTZXR0aW5nc1ZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuR2VuZXJhbFNldHRpbmdzVmlldy5wcm90b3R5cGUuaW5pdGlhbExh eW91dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nRWRpdG9yLmpzOgor ICAgICAgICAoZXhwb3J0LmRlZmF1bHQuU2V0dGluZ0VkaXRvcik6CisgICAgICAgIChleHBvcnQu ZGVmYXVsdC5TZXR0aW5nRWRpdG9yLmNyZWF0ZUZvclNldHRpbmcpOgorICAgICAgICAoZXhwb3J0 LmRlZmF1bHQuU2V0dGluZ0VkaXRvci5wcm90b3R5cGUuc2V0IHZhbHVlKToKKyAgICAgICAgKGV4 cG9ydC5kZWZhdWx0LlNldHRpbmdFZGl0b3IucHJvdG90eXBlLl9jcmVhdGVFZGl0b3JFbGVtZW50 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yLmNyZWF0ZUZvclNldHRpbmcpOiBEZWxldGVk LgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3IucHJvdG90eXBlLmdldCBlbGVt ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yLnByb3Rv dHlwZS5nZXQgdHlwZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ0Vk aXRvci5wcm90b3R5cGUuZ2V0IGxhYmVsKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TZXR0aW5nRWRpdG9yLnByb3RvdHlwZS5nZXQgdmFsdWUpOiBEZWxldGVkLgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3IucHJvdG90eXBlLnNldCB2YWx1ZSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ0VkaXRvci5wcm90b3R5cGUuX2NyZWF0ZUVk aXRvckVsZW1lbnQpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0 dGluZ3NHcm91cC5qczoKKyAgICAgICAgKGV4cG9ydC5kZWZhdWx0LlNldHRpbmdzR3JvdXAucHJv dG90eXBlLmFkZFNldHRpbmcpOgorICAgICAgICAoZXhwb3J0LmRlZmF1bHQuU2V0dGluZ3NHcm91 cC5wcm90b3R5cGUuYWRkQ3VzdG9tU2V0dGluZyk6CisgICAgICAgIChleHBvcnQuZGVmYXVsdC5T ZXR0aW5nc0dyb3VwKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nc0dyb3VwKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nc0dyb3VwLnByb3RvdHlwZS5nZXQg ZWxlbWVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NHcm91cC5w cm90b3R5cGUuYWRkU2V0dGluZyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0 dGluZ3NHcm91cC5wcm90b3R5cGUuYWRkQ3VzdG9tU2V0dGluZyk6IERlbGV0ZWQuCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1ZpZXcuanM6CisgICAgICAgIChleHBvcnQu ZGVmYXVsdC5TZXR0aW5nc1ZpZXcucHJvdG90eXBlLmFkZEdyb3VwKToKKyAgICAgICAgKGV4cG9y dC5kZWZhdWx0LlNldHRpbmdzVmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NW aWV3KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nc1ZpZXcucHJvdG90 eXBlLmdldCBpZGVudGlmaWVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0 aW5nc1ZpZXcucHJvdG90eXBlLmdldCBkaXNwbGF5TmFtZSk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2V0dGluZ3NWaWV3LnByb3RvdHlwZS5hZGRTZXR0aW5nKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nc1ZpZXcucHJvdG90eXBlLmFkZEdyb3VwV2l0 aEN1c3RvbVNldHRpbmcpOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNldHRpbmdz Vmlldy5wcm90b3R5cGUuYWRkR3JvdXApOiBEZWxldGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNldHRpbmdzVmlldy5wcm90b3R5cGUuYWRkU2VwYXJhdG9yKTogRGVsZXRlZC4KKyAgICAgICAg UmVwbGFjZSBleGlzdGluZyBgV2ViSW5zcGVjdG9yLipgIHdpdGggbW9kdWxlIGV4cG9ydHMuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2V0dGluZ3NUYWJDb250ZW50Vmlldy5sb2FkRGVwZW5k ZW5jaWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5p bml0aWFsTGF5b3V0KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nl ci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJCcm93c2VyLnByb3RvdHlwZS5fdGFiQmFy SXRlbVNlbGVjdGVkKToKKyAgICAgICAgV2hlbiBzaG93aW5nIGEgdGFiIGZvciB0aGUgZmlyc3Qg dGltZSwgbG9hZCBpdCdzIGRlcGVuZGVuY2llcyBiZWZvcmUgc3dpdGNoaW5nIHRvIGl0LgorCiAy MDE3LTA1LTE1ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAg ICAgICAgIFtHVEtdIFdlYiBJbnNwZWN0b3I6IEFkZCBuZXcgR1RLKyBpY29ucyBmb3IgU2VhcmNo IGljb24gb2YgUXVpY2sgT3BlbiBkaWFsb2cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01haW4uaHRtbAppbmRleCBkYmI4M2FlNzk0NGFhNmJlN2U1ZTAzOGNlOWQzMDhi MDM4YzRjNWQxLi41OWQ0NmEwODk0NzU4MjE2NDdiNjljNDk3NTlkMDRjZjZmNzUwNGZlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCkBAIC00ODYs MTIgKzQ4Niw2IEBACiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0RldGFpbHNTZWN0aW9uU2ltcGxl Um93LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvRGV0YWlsc1NlY3Rpb25U ZXh0Um93LmpzIj48L3NjcmlwdD4KIAotICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9TZXR0aW5nRWRp dG9yLmpzIj48L3NjcmlwdD4KLSAgICA8c2NyaXB0IHNyYz0iVmlld3MvU2V0dGluZ3NHcm91cC5q cyI+PC9zY3JpcHQ+Ci0gICAgPHNjcmlwdCBzcmM9IlZpZXdzL1NldHRpbmdzVmlldy5qcyI+PC9z Y3JpcHQ+Ci0KLSAgICA8c2NyaXB0IHNyYz0iVmlld3MvR2VuZXJhbFNldHRpbmdzVmlldy5qcyI+ PC9zY3JpcHQ+Ci0KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvQWN0aXZhdGVCdXR0b25OYXZpZ2F0 aW9uSXRlbS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0FjdGl2YXRlQnV0 dG9uVG9vbGJhckl0ZW0uanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9BcHBs aWNhdGlvbkNhY2hlRGV0YWlsc1NpZGViYXJQYW5lbC5qcyI+PC9zY3JpcHQ+CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsU2V0dGlu Z3NWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2Vu ZXJhbFNldHRpbmdzVmlldy5qcwppbmRleCAzNWI0MDI0NzUwOGI4ZmY1ZDlmZWRlOTM3MzY5NGU3 OWZjOTYxM2ZmLi45NTM1ODIzMjVmZTZjN2JlODdmMDVhMDRhYjdjMDI3ZDMwNmFjMDg0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFs U2V0dGluZ3NWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0dlbmVyYWxTZXR0aW5nc1ZpZXcuanMKQEAgLTIzLDcgKzIzLDEwIEBACiAgKiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLkdlbmVyYWxT ZXR0aW5nc1ZpZXcgPSBjbGFzcyBHZW5lcmFsU2V0dGluZ3NWaWV3IGV4dGVuZHMgV2ViSW5zcGVj dG9yLlNldHRpbmdzVmlldworaW1wb3J0IFNldHRpbmdFZGl0b3IgZnJvbSAiLi9TZXR0aW5nRWRp dG9yLmpzIjsKK2ltcG9ydCBTZXR0aW5nc1ZpZXcgZnJvbSAiLi9TZXR0aW5nc1ZpZXcuanMiOwor CitXZWJJbnNwZWN0b3IuR2VuZXJhbFNldHRpbmdzVmlldyA9IGNsYXNzIEdlbmVyYWxTZXR0aW5n c1ZpZXcgZXh0ZW5kcyBTZXR0aW5nc1ZpZXcKIHsKICAgICBjb25zdHJ1Y3RvcigpCiAgICAgewpA QCAtMzYsOSArMzksOSBAQCBXZWJJbnNwZWN0b3IuR2VuZXJhbFNldHRpbmdzVmlldyA9IGNsYXNz IEdlbmVyYWxTZXR0aW5nc1ZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgIHsKICAgICAgICAg Y29uc3QgaW5kZW50VmFsdWVzID0gW1dlYkluc3BlY3Rvci5VSVN0cmluZygiVGFicyIpLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlNwYWNlcyIpXTsKIAotICAgICAgICBsZXQgWy8qIHVudXNlZCAq LywgaW5kZW50RWRpdG9yXSA9IHRoaXMuYWRkR3JvdXBXaXRoQ3VzdG9tU2V0dGluZyhXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlByZWZlciBpbmRlbnQgdXNpbmc6IiksIFdlYkluc3BlY3Rvci5TZXR0 aW5nRWRpdG9yLlR5cGUuU2VsZWN0LCB7dmFsdWVzOiBpbmRlbnRWYWx1ZXN9KTsKKyAgICAgICAg bGV0IFsvKiB1bnVzZWQgKi8sIGluZGVudEVkaXRvcl0gPSB0aGlzLmFkZEdyb3VwV2l0aEN1c3Rv bVNldHRpbmcoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcmVmZXIgaW5kZW50IHVzaW5nOiIpLCBT ZXR0aW5nRWRpdG9yLlR5cGUuU2VsZWN0LCB7dmFsdWVzOiBpbmRlbnRWYWx1ZXN9KTsKICAgICAg ICAgaW5kZW50RWRpdG9yLnZhbHVlID0gaW5kZW50VmFsdWVzW1dlYkluc3BlY3Rvci5zZXR0aW5n cy5pbmRlbnRXaXRoVGFicy52YWx1ZSA/IDAgOiAxXTsKLSAgICAgICAgaW5kZW50RWRpdG9yLmFk ZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3IuRXZlbnQuVmFsdWVEaWRD aGFuZ2UsICgpID0+IHsKKyAgICAgICAgaW5kZW50RWRpdG9yLmFkZEV2ZW50TGlzdGVuZXIoU2V0 dGluZ0VkaXRvci5FdmVudC5WYWx1ZURpZENoYW5nZSwgKCkgPT4gewogICAgICAgICAgICAgV2Vi SW5zcGVjdG9yLnNldHRpbmdzLmluZGVudFdpdGhUYWJzLnZhbHVlID0gaW5kZW50RWRpdG9yLnZh bHVlID09PSBpbmRlbnRWYWx1ZXNbMF07CiAgICAgICAgIH0pOwogCkBAIC03OCw5ICs4MSw5IEBA IFdlYkluc3BlY3Rvci5HZW5lcmFsU2V0dGluZ3NWaWV3ID0gY2xhc3MgR2VuZXJhbFNldHRpbmdz VmlldyBleHRlbmRzIFdlYkluc3BlY3RvCiAgICAgICAgIGNvbnN0IHpvb21MZXZlbHMgPSBbMC42 LCAwLjgsIDEsIDEuMiwgMS40LCAxLjYsIDEuOCwgMiwgMi4yLCAyLjRdOwogICAgICAgICBjb25z dCB6b29tVmFsdWVzID0gem9vbUxldmVscy5tYXAoKGxldmVsKSA9PiBbbGV2ZWwsIE51bWJlci5w ZXJjZW50YWdlU3RyaW5nKGxldmVsLCAwKV0pOwogCi0gICAgICAgIGxldCBbLyogdW51c2VkICov LCB6b29tRWRpdG9yXSA9IHRoaXMuYWRkR3JvdXBXaXRoQ3VzdG9tU2V0dGluZyhXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIlpvb206IiksIFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yLlR5cGUuU2Vs ZWN0LCB7dmFsdWVzOiB6b29tVmFsdWVzfSk7CisgICAgICAgIGxldCBbLyogdW51c2VkICovLCB6 b29tRWRpdG9yXSA9IHRoaXMuYWRkR3JvdXBXaXRoQ3VzdG9tU2V0dGluZyhXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlpvb206IiksIFNldHRpbmdFZGl0b3IuVHlwZS5TZWxlY3QsIHt2YWx1ZXM6IHpv b21WYWx1ZXN9KTsKICAgICAgICAgem9vbUVkaXRvci52YWx1ZSA9IFdlYkluc3BlY3Rvci5zZXR0 aW5ncy56b29tRmFjdG9yLnZhbHVlOwotICAgICAgICB6b29tRWRpdG9yLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3IuRXZlbnQuVmFsdWVEaWRDaGFuZ2UsICgpID0+ IHsgV2ViSW5zcGVjdG9yLnNldFpvb21GYWN0b3Ioem9vbUVkaXRvci52YWx1ZSk7IH0pOworICAg ICAgICB6b29tRWRpdG9yLmFkZEV2ZW50TGlzdGVuZXIoU2V0dGluZ0VkaXRvci5FdmVudC5WYWx1 ZURpZENoYW5nZSwgKCkgPT4geyBXZWJJbnNwZWN0b3Iuc2V0Wm9vbUZhY3Rvcih6b29tRWRpdG9y LnZhbHVlKTsgfSk7CiAKICAgICAgICAgdGhpcy5hZGRTZXBhcmF0b3IoKTsKIApAQCAtOTEsMTAg Kzk0LDEwIEBAIFdlYkluc3BlY3Rvci5HZW5lcmFsU2V0dGluZ3NWaWV3ID0gY2xhc3MgR2VuZXJh bFNldHRpbmdzVmlldyBleHRlbmRzIFdlYkluc3BlY3RvCiAgICAgICAgICAgICBbV2ViSW5zcGVj dG9yLkxheW91dERpcmVjdGlvbi5SVEwsIFdlYkluc3BlY3Rvci51bmxvY2FsaXplZFN0cmluZygi UmlnaHQgdG8gTGVmdCAoUlRMKSIpXSwKICAgICAgICAgXTsKIAotICAgICAgICBsZXQgW2xheW91 dERpcmVjdGlvbkdyb3VwLCBsYXlvdXREaXJlY3Rpb25FZGl0b3JdID0gdGhpcy5hZGRHcm91cFdp dGhDdXN0b21TZXR0aW5nKFdlYkluc3BlY3Rvci51bmxvY2FsaXplZFN0cmluZygiTGF5b3V0IERp cmVjdGlvbjoiKSwgV2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3IuVHlwZS5TZWxlY3QsIHt2YWx1 ZXM6IGxheW91dERpcmVjdGlvblZhbHVlc30pOworICAgICAgICBsZXQgW2xheW91dERpcmVjdGlv bkdyb3VwLCBsYXlvdXREaXJlY3Rpb25FZGl0b3JdID0gdGhpcy5hZGRHcm91cFdpdGhDdXN0b21T ZXR0aW5nKFdlYkluc3BlY3Rvci51bmxvY2FsaXplZFN0cmluZygiTGF5b3V0IERpcmVjdGlvbjoi KSwgU2V0dGluZ0VkaXRvci5UeXBlLlNlbGVjdCwge3ZhbHVlczogbGF5b3V0RGlyZWN0aW9uVmFs dWVzfSk7CiAgICAgICAgIHRoaXMuX2xheW91dERpcmVjdGlvbkdyb3VwID0gbGF5b3V0RGlyZWN0 aW9uR3JvdXA7CiAgICAgICAgIGxheW91dERpcmVjdGlvbkVkaXRvci52YWx1ZSA9IFdlYkluc3Bl Y3Rvci5zZXR0aW5ncy5sYXlvdXREaXJlY3Rpb24udmFsdWU7Ci0gICAgICAgIGxheW91dERpcmVj dGlvbkVkaXRvci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yLkV2 ZW50LlZhbHVlRGlkQ2hhbmdlLCAoKSA9PiB7IFdlYkluc3BlY3Rvci5zZXRMYXlvdXREaXJlY3Rp b24obGF5b3V0RGlyZWN0aW9uRWRpdG9yLnZhbHVlKTsgfSk7CisgICAgICAgIGxheW91dERpcmVj dGlvbkVkaXRvci5hZGRFdmVudExpc3RlbmVyKFNldHRpbmdFZGl0b3IuRXZlbnQuVmFsdWVEaWRD aGFuZ2UsICgpID0+IHsgV2ViSW5zcGVjdG9yLnNldExheW91dERpcmVjdGlvbihsYXlvdXREaXJl Y3Rpb25FZGl0b3IudmFsdWUpOyB9KTsKICAgICB9CiAKICAgICBsYXlvdXQoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ0VkaXRv ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdF ZGl0b3IuanMKaW5kZXggODQ0Y2ZhN2Y2NTI3ZjcxNWI0MWY0Y2FhZDFlNWZhNmY2NzE2ZjJjYi4u MzcyYTU1MTFmMWIwMDg4Y2JjMDgzZGExZTRkMWQ1YzZiZDM5YmIzYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ0VkaXRvci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nRWRp dG9yLmpzCkBAIC0yMyw3ICsyMyw3IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3IgPSBjbGFzcyBTZXR0aW5nRWRp dG9yIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAorZXhwb3J0IGRlZmF1bHQgY2xhc3MgU2V0 dGluZ0VkaXRvciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKIHsKICAgICBjb25zdHJ1Y3Rv cih0eXBlLCBsYWJlbCwgb3B0aW9ucykKICAgICB7CkBAIC00MSw3ICs0MSw3IEBAIFdlYkluc3Bl Y3Rvci5TZXR0aW5nRWRpdG9yID0gY2xhc3MgU2V0dGluZ0VkaXRvciBleHRlbmRzIFdlYkluc3Bl Y3Rvci5PYmplY3QKICAgICAgICAgdGhpcy5fZWxlbWVudC5hcHBlbmQodGhpcy5fZWRpdG9yRWxl bWVudCk7CiAKICAgICAgICAgaWYgKHRoaXMuX2xhYmVsKSB7Ci0gICAgICAgICAgICB0aGlzLl9l ZGl0b3JFbGVtZW50LmlkID0gInNldHRpbmctZWRpdG9yLSIgKyBXZWJJbnNwZWN0b3IuU2V0dGlu Z0VkaXRvci5fbmV4dEVkaXRvcklkZW50aWZpZXIrKzsKKyAgICAgICAgICAgIHRoaXMuX2VkaXRv ckVsZW1lbnQuaWQgPSAic2V0dGluZy1lZGl0b3ItIiArIFNldHRpbmdFZGl0b3IuX25leHRFZGl0 b3JJZGVudGlmaWVyKys7CiAgICAgICAgICAgICBsZXQgbGFiZWxFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgibGFiZWwiKTsKICAgICAgICAgICAgIGxhYmVsRWxlbWVudC5zZXRBdHRy aWJ1dGUoImZvciIsIHRoaXMuX2VkaXRvckVsZW1lbnQuaWQpOwogICAgICAgICAgICAgbGFiZWxF bGVtZW50LnRleHRDb250ZW50ID0gbGFiZWw7CkBAIC01NCwxNyArNTQsMTcgQEAgV2ViSW5zcGVj dG9yLlNldHRpbmdFZGl0b3IgPSBjbGFzcyBTZXR0aW5nRWRpdG9yIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogICAgIHsKICAgICAgICAgbGV0IHR5cGU7CiAgICAgICAgIGlmICh0eXBlb2Yg c2V0dGluZy52YWx1ZSA9PT0gImJvb2xlYW4iKQotICAgICAgICAgICAgdHlwZSA9IFdlYkluc3Bl Y3Rvci5TZXR0aW5nRWRpdG9yLlR5cGUuQ2hlY2tib3g7CisgICAgICAgICAgICB0eXBlID0gU2V0 dGluZ0VkaXRvci5UeXBlLkNoZWNrYm94OwogICAgICAgICBlbHNlIGlmICh0eXBlb2Ygc2V0dGlu Zy52YWx1ZSA9PT0gIm51bWJlciIpCi0gICAgICAgICAgICB0eXBlID0gV2ViSW5zcGVjdG9yLlNl dHRpbmdFZGl0b3IuVHlwZS5OdW1lcmljOworICAgICAgICAgICAgdHlwZSA9IFNldHRpbmdFZGl0 b3IuVHlwZS5OdW1lcmljOwogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHR5cGUsICJDYW5ub3Qg ZGVkdWNlIGVkaXRvciB0eXBlIGZyb20gc2V0dGluZyB2YWx1ZSB0eXBlLiIsIHNldHRpbmcpOwog ICAgICAgICBpZiAoIXR5cGUpCiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAotICAgICAgICBs ZXQgZWRpdG9yID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yKHR5cGUsIGxhYmVsLCBv cHRpb25zKTsKKyAgICAgICAgbGV0IGVkaXRvciA9IG5ldyBTZXR0aW5nRWRpdG9yKHR5cGUsIGxh YmVsLCBvcHRpb25zKTsKICAgICAgICAgZWRpdG9yLnZhbHVlID0gc2V0dGluZy52YWx1ZTsKLSAg ICAgICAgZWRpdG9yLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3Iu RXZlbnQuVmFsdWVEaWRDaGFuZ2UsICgpID0+IHsgc2V0dGluZy52YWx1ZSA9IGVkaXRvci52YWx1 ZTsgfSk7CisgICAgICAgIGVkaXRvci5hZGRFdmVudExpc3RlbmVyKFNldHRpbmdFZGl0b3IuRXZl bnQuVmFsdWVEaWRDaGFuZ2UsICgpID0+IHsgc2V0dGluZy52YWx1ZSA9IGVkaXRvci52YWx1ZTsg fSk7CiAKICAgICAgICAgcmV0dXJuIGVkaXRvcjsKICAgICB9CkBAIC04OCwxMiArODgsMTIgQEAg V2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3IgPSBjbGFzcyBTZXR0aW5nRWRpdG9yIGV4dGVuZHMg V2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICBsZXQgb2xkVmFsdWUgPSB0aGlzLl92YWx1ZTsK ICAgICAgICAgdGhpcy5fdmFsdWUgPSB2YWx1ZTsKIAotICAgICAgICBpZiAodGhpcy5fdHlwZSA9 PSBXZWJJbnNwZWN0b3IuU2V0dGluZ0VkaXRvci5UeXBlLkNoZWNrYm94KQorICAgICAgICBpZiAo dGhpcy5fdHlwZSA9PSBTZXR0aW5nRWRpdG9yLlR5cGUuQ2hlY2tib3gpCiAgICAgICAgICAgICB0 aGlzLl9lZGl0b3JFbGVtZW50LmNoZWNrZWQgPSAhIXRoaXMuX3ZhbHVlOwogICAgICAgICBlbHNl CiAgICAgICAgICAgICB0aGlzLl9lZGl0b3JFbGVtZW50LnZhbHVlID0gdGhpcy5fdmFsdWU7CiAK LSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNldHRp bmdFZGl0b3IuRXZlbnQuVmFsdWVEaWRDaGFuZ2UsIHtvbGRWYWx1ZX0pOworICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhTZXR0aW5nRWRpdG9yLkV2ZW50LlZhbHVlRGlkQ2hh bmdlLCB7b2xkVmFsdWV9KTsKICAgICB9CiAKICAgICAvLyBQcml2YXRlCkBAIC0xMDMsMTMgKzEw MywxMyBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ0VkaXRvciA9IGNsYXNzIFNldHRpbmdFZGl0b3Ig ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIGxldCBlZGl0b3JFbGVtZW50Owog CiAgICAgICAgIHN3aXRjaCAodGhpcy5fdHlwZSkgewotICAgICAgICBjYXNlIFdlYkluc3BlY3Rv ci5TZXR0aW5nRWRpdG9yLlR5cGUuQ2hlY2tib3g6CisgICAgICAgIGNhc2UgU2V0dGluZ0VkaXRv ci5UeXBlLkNoZWNrYm94OgogICAgICAgICAgICAgZWRpdG9yRWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImlucHV0Iik7CiAgICAgICAgICAgICBlZGl0b3JFbGVtZW50LnR5cGUgPSAi Y2hlY2tib3giOwogICAgICAgICAgICAgZWRpdG9yRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJj aGFuZ2UiLCAoZXZlbnQpID0+IHsgdGhpcy52YWx1ZSA9IGV2ZW50LnRhcmdldC5jaGVja2VkOyB9 KTsKICAgICAgICAgICAgIGJyZWFrOwogCi0gICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNldHRp bmdFZGl0b3IuVHlwZS5OdW1lcmljOgorICAgICAgICBjYXNlIFNldHRpbmdFZGl0b3IuVHlwZS5O dW1lcmljOgogICAgICAgICAgICAgZWRpdG9yRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImlucHV0Iik7CiAgICAgICAgICAgICBlZGl0b3JFbGVtZW50LnR5cGUgPSAibnVtYmVyIjsK IApAQCAtMTI1LDcgKzEyNSw3IEBAIFdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yID0gY2xhc3Mg U2V0dGluZ0VkaXRvciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgIH0p OwogICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuU2V0dGlu Z0VkaXRvci5UeXBlLlNlbGVjdDoKKyAgICAgICAgY2FzZSBTZXR0aW5nRWRpdG9yLlR5cGUuU2Vs ZWN0OgogICAgICAgICAgICAgZWRpdG9yRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo InNlbGVjdCIpOwogICAgICAgICAgICAgdmFyIGtleVZhbHVlUGFpcnMgPSBbXTsKIApAQCAtMTUx LDE2ICsxNTEsMTYgQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdFZGl0b3IgPSBjbGFzcyBTZXR0aW5n RWRpdG9yIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAgICAgICAgIHJldHVybiBlZGl0 b3JFbGVtZW50OwogICAgIH0KLX07Cit9CiAKLVdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yLl9u ZXh0RWRpdG9ySWRlbnRpZmllciA9IDE7CitTZXR0aW5nRWRpdG9yLl9uZXh0RWRpdG9ySWRlbnRp ZmllciA9IDE7CiAKLVdlYkluc3BlY3Rvci5TZXR0aW5nRWRpdG9yLlR5cGUgPSB7CitTZXR0aW5n RWRpdG9yLlR5cGUgPSB7CiAgICAgQ2hlY2tib3g6ICJzZXR0aW5nLWVkaXRvci10eXBlLWNoZWNr Ym94IiwKICAgICBOdW1lcmljOiAic2V0dGluZy1lZGl0b3ItdHlwZS1udW1lcmljIiwKICAgICBT ZWxlY3Q6ICJzZXR0aW5nLWVkaXRvci10eXBlLXNlbGVjdCIsCiB9OwogCi1XZWJJbnNwZWN0b3Iu U2V0dGluZ0VkaXRvci5FdmVudCA9IHsKK1NldHRpbmdFZGl0b3IuRXZlbnQgPSB7CiAgICAgVmFs dWVEaWRDaGFuZ2U6ICJ2YWx1ZS1kaWQtY2hhbmdlIiwKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc0dyb3VwLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NHcm91cC5qcwpp bmRleCA5MjZhOTFkY2M4Y2Q3MTJkOTE4YTc1ZWM1NjQ5NmNmYTZkNGRjMjg5Li40MTk2MjY2Y2Uy ODNiYmU2ZjEyNDg5OTk2YmU2YWVkYTY0YWQwZGU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc0dyb3VwLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzR3JvdXAuanMKQEAg LTIzLDcgKzIzLDkgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwog Ci1XZWJJbnNwZWN0b3IuU2V0dGluZ3NHcm91cCA9IGNsYXNzIFNldHRpbmdzR3JvdXAgZXh0ZW5k cyBXZWJJbnNwZWN0b3IuT2JqZWN0CitpbXBvcnQgU2V0dGluZ0VkaXRvciBmcm9tICIuL1NldHRp bmdFZGl0b3IuanMiOworCitleHBvcnQgZGVmYXVsdCBjbGFzcyBTZXR0aW5nc0dyb3VwIGV4dGVu ZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogewogICAgIGNvbnN0cnVjdG9yKHRpdGxlKQogICAgIHsK QEAgLTQ2LDcgKzQ4LDcgQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdzR3JvdXAgPSBjbGFzcyBTZXR0 aW5nc0dyb3VwIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAgICAgYWRkU2V0dGluZyhz ZXR0aW5nLCBsYWJlbCwgb3B0aW9ucykKICAgICB7Ci0gICAgICAgIGxldCBlZGl0b3IgPSBXZWJJ bnNwZWN0b3IuU2V0dGluZ0VkaXRvci5jcmVhdGVGb3JTZXR0aW5nKHNldHRpbmcsIGxhYmVsLCBv cHRpb25zKTsKKyAgICAgICAgbGV0IGVkaXRvciA9IFNldHRpbmdFZGl0b3IuY3JlYXRlRm9yU2V0 dGluZyhzZXR0aW5nLCBsYWJlbCwgb3B0aW9ucyk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGVk aXRvciwgIkNvdWxkIG5vdCBjcmVhdGUgZGVmYXVsdCBlZGl0b3IgZm9yIHNldHRpbmcuIFVzZSBh ZGRDdXN0b21TZXR0aW5nIGluc3RlYWQuIiwgc2V0dGluZyk7CiAgICAgICAgIGlmICghZWRpdG9y KQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CkBAIC01NywxMSArNTksMTEgQEAgV2ViSW5zcGVj dG9yLlNldHRpbmdzR3JvdXAgPSBjbGFzcyBTZXR0aW5nc0dyb3VwIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogCiAgICAgYWRkQ3VzdG9tU2V0dGluZyhlZGl0b3JUeXBlLCBvcHRpb25zKQog ICAgIHsKLSAgICAgICAgbGV0IGVkaXRvciA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZ0VkaXRv cihlZGl0b3JUeXBlLCBvcHRpb25zLmxhYmVsLCBvcHRpb25zKTsKKyAgICAgICAgbGV0IGVkaXRv ciA9IG5ldyBTZXR0aW5nRWRpdG9yKGVkaXRvclR5cGUsIG9wdGlvbnMubGFiZWwsIG9wdGlvbnMp OwogICAgICAgICBpZiAoIWVkaXRvcikKICAgICAgICAgICAgIHJldHVybiBudWxsOwogCiAgICAg ICAgIHRoaXMuX2VkaXRvckdyb3VwRWxlbWVudC5hcHBlbmQoZWRpdG9yLmVsZW1lbnQpOwogICAg ICAgICByZXR1cm4gZWRpdG9yOwogICAgIH0KLX07Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJD b250ZW50Vmlldy5qcwppbmRleCA1MWExNjQxMTkxNzFiYzczMGNmYzI0Nzk2NDc4YzJhOWJhNGQx MDIzLi44YzRmNjU2YmRmNzA2MzVmYWY1MzhjYzY4ZTM1MDdlMDU4MmNjZjdkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNv bnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKQEAgLTI2LDYgKzI2LDEzIEBACiAKIFdlYklu c3BlY3Rvci5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50 VmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5UYWJDb250ZW50VmlldwogeworICAgIHN0YXRpYyBs b2FkRGVwZW5kZW5jaWVzKCkKKyAgICB7CisgICAgICAgIHJldHVybiBQcm9taXNlLmFsbChbCisg ICAgICAgICAgICBpbXBvcnQoIi4vR2VuZXJhbFNldHRpbmdzVmlldy5qcyIpCisgICAgICAgIF0p OworICAgIH0KKwogICAgIGNvbnN0cnVjdG9yKGlkZW50aWZpZXIpCiAgICAgewogICAgICAgICBs ZXQgdGFiQmFySXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuUGlubmVkVGFiQmFySXRlbSgiSW1hZ2Vz L0dlYXIuc3ZnIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJPcGVuIFNldHRpbmdzIikpOwpAQCAt MzksMTggKzQ2LDggQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFz cyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KICAgICAgICAgV2ViSW5zcGVj dG9yLm5vdGlmaWNhdGlvbnMuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTm90aWZpY2F0 aW9uLkRlYnVnVUlFbmFibGVkRGlkQ2hhbmdlLCBib3VuZE5lZWRzTGF5b3V0KTsKICAgICAgICAg V2ViSW5zcGVjdG9yLnNldHRpbmdzLnpvb21GYWN0b3IuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCBib3VuZE5lZWRzTGF5b3V0KTsKIAotICAgICAg ICB0aGlzLl9uYXZpZ2F0aW9uQmFyID0gbmV3IFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uQmFyOwot ICAgICAgICB0aGlzLl9uYXZpZ2F0aW9uQmFyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y Lk5hdmlnYXRpb25CYXIuRXZlbnQuTmF2aWdhdGlvbkl0ZW1TZWxlY3RlZCwgdGhpcy5fbmF2aWdh dGlvbkl0ZW1TZWxlY3RlZCwgdGhpcyk7Ci0KICAgICAgICAgdGhpcy5fc2VsZWN0ZWRTZXR0aW5n c1ZpZXcgPSBudWxsOwogICAgICAgICB0aGlzLl9zZXR0aW5nc1ZpZXdzID0gW107Ci0KLSAgICAg ICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX25hdmlnYXRpb25CYXIpOwotCi0gICAgICAgIGxldCBn ZW5lcmFsU2V0dGluZ3NWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5HZW5lcmFsU2V0dGluZ3NWaWV3 OwotICAgICAgICB0aGlzLmFkZFNldHRpbmdzVmlldyhnZW5lcmFsU2V0dGluZ3NWaWV3KTsKLQot ICAgICAgICB0aGlzLnNlbGVjdGVkU2V0dGluZ3NWaWV3ID0gZ2VuZXJhbFNldHRpbmdzVmlldzsK ICAgICB9CiAKICAgICBzdGF0aWMgdGFiSW5mbygpCkBAIC0xNjYsNiArMTYzLDE5IEBAIFdlYklu c3BlY3Rvci5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50 VmlldyBleHRlbmRzIFdlYkluCiAgICAgICAgIH0KICAgICB9CiAKKyAgICAvLyBQcm90ZWN0ZWQK KworICAgIGluaXRpYWxMYXlvdXQoKQorICAgIHsKKyAgICAgICAgdGhpcy5fbmF2aWdhdGlvbkJh ciA9IG5ldyBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvbkJhcjsKKyAgICAgICAgdGhpcy5fbmF2aWdh dGlvbkJhci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uQmFyLkV2ZW50 Lk5hdmlnYXRpb25JdGVtU2VsZWN0ZWQsIHRoaXMuX25hdmlnYXRpb25JdGVtU2VsZWN0ZWQsIHRo aXMpOworICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fbmF2aWdhdGlvbkJhcik7CisKKyAg ICAgICAgbGV0IGdlbmVyYWxTZXR0aW5nc1ZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLkdlbmVyYWxT ZXR0aW5nc1ZpZXc7CisgICAgICAgIHRoaXMuYWRkU2V0dGluZ3NWaWV3KGdlbmVyYWxTZXR0aW5n c1ZpZXcpOworICAgICAgICB0aGlzLnNlbGVjdGVkU2V0dGluZ3NWaWV3ID0gZ2VuZXJhbFNldHRp bmdzVmlldzsKKyAgICB9CisKICAgICAvLyBQcml2YXRlCiAKICAgICBfdXBkYXRlTmF2aWdhdGlv bkJhclZpc2liaWxpdHkoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU2V0dGluZ3NWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NWaWV3LmpzCmluZGV4IGIzMzYxZjBiODY0Y2EzNjM0 Y2ViY2U1Mzc2N2M0NGFlNTA0Y2RhMzEuLjg5ZmE3ZGNlY2E5YTkzY2U2NjljYWY3NjRkYTY3MjRl MGM1ZTcxYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NldHRpbmdzVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TZXR0aW5nc1ZpZXcuanMKQEAgLTIzLDcgKzIzLDkgQEAKICAqIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi1XZWJJbnNwZWN0b3IuU2V0dGluZ3NW aWV3ID0gY2xhc3MgU2V0dGluZ3NWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKK2ltcG9y dCBTZXR0aW5nc0dyb3VwIGZyb20gIi4vU2V0dGluZ3NHcm91cC5qcyI7CisKK2V4cG9ydCBkZWZh dWx0IGNsYXNzIFNldHRpbmdzVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiB7CiAgICAg Y29uc3RydWN0b3IoaWRlbnRpZmllciwgZGlzcGxheU5hbWUpCiAgICAgewpAQCAtNTUsNyArNTcs NyBAQCBXZWJJbnNwZWN0b3IuU2V0dGluZ3NWaWV3ID0gY2xhc3MgU2V0dGluZ3NWaWV3IGV4dGVu ZHMgV2ViSW5zcGVjdG9yLlZpZXcKIAogICAgIGFkZEdyb3VwKHRpdGxlKQogICAgIHsKLSAgICAg ICAgbGV0IHNldHRpbmdzR3JvdXAgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmdzR3JvdXAodGl0 bGUpOworICAgICAgICBsZXQgc2V0dGluZ3NHcm91cCA9IG5ldyBTZXR0aW5nc0dyb3VwKHRpdGxl KTsKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZChzZXR0aW5nc0dyb3VwLmVsZW1lbnQpOwog CiAgICAgICAgIHJldHVybiBzZXR0aW5nc0dyb3VwOwpAQCAtNjksOSArNzEsOSBAQCBXZWJJbnNw ZWN0b3IuU2V0dGluZ3NWaWV3ID0gY2xhc3MgU2V0dGluZ3NWaWV3IGV4dGVuZHMgV2ViSW5zcGVj dG9yLlZpZXcKICAgICAgICAgbGV0IHNlcGFyYXRvckVsZW1lbnQgPSB0aGlzLmVsZW1lbnQuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2IikpOwogICAgICAgICBzZXBhcmF0 b3JFbGVtZW50LmNsYXNzTGlzdC5hZGQoInNlcGFyYXRvciIpOwogICAgIH0KLX07Cit9CiAKLVdl Ykluc3BlY3Rvci5TZXR0aW5nc1ZpZXcuRWRpdG9yVHlwZSA9IHsKK1NldHRpbmdzVmlldy5FZGl0 b3JUeXBlID0gewogICAgIENoZWNrYm94OiAic2V0dGluZ3Mtdmlldy1lZGl0b3ItdHlwZS1jaGVj a2JveCIsCiAgICAgTnVtZXJpYzogInNldHRpbmdzLXZpZXctZWRpdG9yLXR5cGUtbnVtZXJpYyIs CiAgICAgU2VsZWN0OiAic2V0dGluZ3Mtdmlldy1lZGl0b3ItdHlwZS1zZWxlY3QiLApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nl ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dz ZXIuanMKaW5kZXggYWIxOWQ2NGQ5N2UxNTNhM2I1YzA3YzFmYzU5YTNjNjVjMmNkZDU5Mi4uNWM0 NzFiZjZlMGFiMzhiYzg4M2YzMzNhNGRjNDRjOTU1ZWRmZDRjYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nlci5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzCkBA IC0yMjgsNiArMjI4LDEzIEBAIFdlYkluc3BlY3Rvci5UYWJCcm93c2VyID0gY2xhc3MgVGFiQnJv d3NlciBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAgICAgX3RhYkJhckl0ZW1TZWxlY3RlZChl dmVudCkKICAgICB7CiAgICAgICAgIGxldCB0YWJDb250ZW50VmlldyA9IHRoaXMuX3RhYkJhci5z ZWxlY3RlZFRhYkJhckl0ZW0gPyB0aGlzLl90YWJCYXIuc2VsZWN0ZWRUYWJCYXJJdGVtLnJlcHJl c2VudGVkT2JqZWN0IDogbnVsbDsKKyAgICAgICAgaWYgKCF0YWJDb250ZW50Vmlldy5jb25zdHJ1 Y3Rvci5fX2xvYWRlZCAmJiB0eXBlb2YgdGFiQ29udGVudFZpZXcuY29uc3RydWN0b3IubG9hZERl cGVuZGVuY2llcyA9PT0gImZ1bmN0aW9uIikgeworICAgICAgICAgICAgdGFiQ29udGVudFZpZXcu Y29uc3RydWN0b3IubG9hZERlcGVuZGVuY2llcygpLnRoZW4oKCkgPT4geworICAgICAgICAgICAg ICAgIHRhYkNvbnRlbnRWaWV3LmNvbnN0cnVjdG9yLl9fbG9hZGVkID0gdHJ1ZTsKKyAgICAgICAg ICAgICAgICB0aGlzLl90YWJCYXJJdGVtU2VsZWN0ZWQoKTsKKyAgICAgICAgICAgIH0pOworICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAKICAgICAgICAgaWYgKHRhYkNvbnRlbnRWaWV3 KSB7CiAgICAgICAgICAgICBsZXQgaXNTZXR0aW5nc1RhYiA9IHRhYkNvbnRlbnRWaWV3IGluc3Rh bmNlb2YgV2ViSW5zcGVjdG9yLlNldHRpbmdzVGFiQ29udGVudFZpZXc7Cg==